From a6459461334a3f21b777ce2f42a3625fd2b04208 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Mon, 27 Jun 2011 23:40:03 -0700 Subject: [PATCH] Moved backup to settings menu to make room for lists --- astrid/AndroidManifest.xml | 10 +-- .../astrid/backup/BackupPreferences.java | 10 +++ astrid/res/drawable/ic_menu_lists.png | Bin 0 -> 1364 bytes astrid/res/values/strings-backup.xml | 2 +- astrid/res/xml/preferences_backup.xml | 6 ++ .../astrid/activity/TaskListActivity.java | 64 ++++++++++-------- 6 files changed, 54 insertions(+), 38 deletions(-) create mode 100644 astrid/res/drawable/ic_menu_lists.png diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index 877980d01..448842e55 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -357,15 +357,7 @@ - - - - - + android:theme="@android:style/Theme.Dialog" /> diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java index cce9514ac..3345dfe63 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java @@ -2,6 +2,7 @@ package com.todoroo.astrid.backup; import java.util.Date; +import android.content.Intent; import android.content.res.Resources; import android.graphics.Color; import android.os.Bundle; @@ -53,6 +54,15 @@ public class BackupPreferences extends TodorooPreferenceActivity { view.setBackgroundColor(statusColor); } }); + + findPreference(getString(R.string.backup_BAc_label)).setOnPreferenceClickListener(new OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + Intent intent = new Intent(BackupPreferences.this, BackupActivity.class); + startActivity(intent); + return false; + } + }); } @Override diff --git a/astrid/res/drawable/ic_menu_lists.png b/astrid/res/drawable/ic_menu_lists.png new file mode 100644 index 0000000000000000000000000000000000000000..769ba936d54b88b2e740fc802ca222136227b0a9 GIT binary patch literal 1364 zcmV-a1*`grP)Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipc51{ymg z2{eWP00h`cL_t(o!|hjFY*bYgUHhDS?z}pkK42`BYHgadB|ro<0xF0=_^9s~Fc{^- z53D9e1wV{@Nkmby$5etPeU|CU<6Ey&!}E;^W0kp_U6SSD7e~!5 z1$b#}cw^F>XW)1Ak}6^+f`-X=vB?(uT{DV7+ooSVr`Yy26A@eS+EcXw_P3-_Lir2f z-RZo~ds4R5Ov}7YQ=R}o%<11fBFXh)AuNqJjN)-nN&qfNz!ey?v4pq=Eki?aiBK*o zfG_{iz0($?`bWB=^8@M%Lz3x>)|UX6NEXjLxWb$Os&Ub<_>rBpn;X{DzTdhkkkk@@ zMpUdE{_1;Z62&DL-mn2;hzx;_)gza)lRD$V&FPFg%o2cRg6oK&u6CS^QDyVwOym-X z)JN8)1UR(J@D7R~Lf+T5_F?!%U+%p^+y4q~D`xHq{P%cpn5cAZvWAx`Twr#a0-+I69a(QJPmT|YxlAGvdSm7@!FFeXNj zjPSzj>}MO^3Dwwn3J?LQBM0L1-JSv;n2{+mAjot!sJojwqWw3iJ@%>M8t_JPmrh%> z<+hK_YFl5er8-m_2t^PMm|-)l!YZu7W>`s+1)w3w%mE zyowbD9G47eXaK0WXI5wIst>dT;7}E{2lu3aF&GZtg4LmI)z(z>jc+^SHK1cTbMMyP zd8wnqfO{orb>6xl(k`qlUqTW|N>UOR;b<@**o9!08|?N!twX`zCYC;rz>3_Qy)QcR z-S`^VT8Z_}n}0|fW|CZ$t-BAd}*LRQMotWZBb#M7KCY@fio6| zl>6z42L_MJ2myTrEeQmMzUD^~mhrm%#HoQlR3uFRdE|k2Cf8xn+7?&-lGtwdn&(d* zIPTd~Ox3mvU-STL+d{E3DfD<<5}x%#GL~Xz{qh+DgC~EW{T{wzK%5)yJoK|s`N_=p z0%0FcKA(w!EW-AZ5R4_AJQyV}Y?}Bdbk|fr#?acgZ3^FB2@o@Q5J09_!PlCLO`4); zLoRDb6;z5x@xh|h_*epgDD}3UfY&_EhG@Z9B3*COX8;yMbS?wG<>BNQK!SB}#CGVq z1Q38WYHyCVxc(ZFb}CiKEoLUe54{2KLwK~J#8eU-n~ucf1Q0=F$reKpC7sA5gdoe; zo8&bYQHURpv?|5r><0`GvP1R`9PwH}{1`;g1T~2b=K>P{v2Btjxo2|O+TNglo&E-~ WvJCBI;Ri$j0000 - Backups + Manage Backups Manage Your Backups diff --git a/astrid/res/xml/preferences_backup.xml b/astrid/res/xml/preferences_backup.xml index 4e38116df..9fb467d18 100644 --- a/astrid/res/xml/preferences_backup.xml +++ b/astrid/res/xml/preferences_backup.xml @@ -22,5 +22,11 @@ android:defaultValue="true" /> + + \ No newline at end of file diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 5e98ae688..dd95f2cab 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -121,12 +121,13 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, // --- menu codes - protected static final int MENU_ADDONS_ID = Menu.FIRST + 1; - protected static final int MENU_SETTINGS_ID = Menu.FIRST + 2; - protected static final int MENU_SORT_ID = Menu.FIRST + 3; - protected static final int MENU_SYNC_ID = Menu.FIRST + 4; - protected static final int MENU_HELP_ID = Menu.FIRST + 5; - protected static final int MENU_ADDON_INTENT_ID = Menu.FIRST + 6; + protected static final int MENU_LISTS_ID = Menu.FIRST + 1; + protected static final int MENU_ADDONS_ID = Menu.FIRST + 2; + protected static final int MENU_SETTINGS_ID = Menu.FIRST + 3; + protected static final int MENU_SORT_ID = Menu.FIRST + 4; + protected static final int MENU_SYNC_ID = Menu.FIRST + 5; + protected static final int MENU_HELP_ID = Menu.FIRST + 6; + protected static final int MENU_ADDON_INTENT_ID = Menu.FIRST + 7; protected static final int CONTEXT_MENU_EDIT_TASK_ID = Menu.FIRST + 20; protected static final int CONTEXT_MENU_COPY_TASK_ID = Menu.FIRST + 21; @@ -277,16 +278,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, MenuItem item; - if(!Constants.MARKET_DISABLED) { - item = menu.add(Menu.NONE, MENU_ADDONS_ID, Menu.NONE, - R.string.TLA_menu_addons); - item.setIcon(android.R.drawable.ic_menu_set_as); - } - - item = menu.add(Menu.NONE, MENU_SETTINGS_ID, Menu.NONE, - R.string.TLA_menu_settings); - item.setIcon(android.R.drawable.ic_menu_preferences); - if(!(this instanceof DraggableTaskListActivity)) { item = menu.add(Menu.NONE, MENU_SORT_ID, Menu.NONE, R.string.TLA_menu_sort); @@ -297,10 +288,24 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, R.string.TLA_menu_sync); item.setIcon(R.drawable.ic_menu_refresh); + item = menu.add(Menu.NONE, MENU_LISTS_ID, Menu.NONE, + R.string.tag_TLA_menu); + item.setIcon(R.drawable.ic_menu_lists); + + if(!Constants.MARKET_DISABLED) { + item = menu.add(Menu.NONE, MENU_ADDONS_ID, Menu.NONE, + R.string.TLA_menu_addons); + item.setIcon(android.R.drawable.ic_menu_set_as); + } + item = menu.add(Menu.NONE, MENU_HELP_ID, Menu.NONE, R.string.TLA_menu_help); item.setIcon(android.R.drawable.ic_menu_help); + item = menu.add(Menu.NONE, MENU_SETTINGS_ID, Menu.NONE, + R.string.TLA_menu_settings); + item.setIcon(android.R.drawable.ic_menu_preferences); + // ask about plug-ins Intent queryIntent = new Intent(AstridApiConstants.ACTION_TASK_LIST_MENU); PackageManager pm = getPackageManager(); @@ -324,12 +329,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, private void setUpUiComponents() { ((ImageView)findViewById(R.id.back)).setOnClickListener(new OnClickListener() { public void onClick(View v) { - Intent intent = new Intent(TaskListActivity.this, - FilterListActivity.class); - startActivity(intent); - AndroidUtilities.callApiMethod(5, TaskListActivity.this, "overridePendingTransition", //$NON-NLS-1$ - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_right_in, R.anim.slide_right_out); + showFilterListActivity(); } }); @@ -1006,6 +1006,10 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, // handle my own menus switch (item.getItemId()) { + case MENU_LISTS_ID: + StatisticsService.reportEvent("tla-menu-lists"); //$NON-NLS-1$ + showFilterListActivity(); + return true; case MENU_ADDONS_ID: StatisticsService.reportEvent("tla-menu-addons"); //$NON-NLS-1$ intent = new Intent(this, AddOnActivity.class); @@ -1116,15 +1120,19 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, @Override public void gesturePerformed(String gesture) { if("nav_right".equals(gesture)) { - Intent intent = new Intent(TaskListActivity.this, - FilterListActivity.class); - startActivity(intent); - AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_right_in, R.anim.slide_right_out); + showFilterListActivity(); } } + private void showFilterListActivity() { + Intent intent = new Intent(TaskListActivity.this, + FilterListActivity.class); + startActivity(intent); + AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", + new Class[] { Integer.TYPE, Integer.TYPE }, + R.anim.slide_right_in, R.anim.slide_right_out); + } + @Override public void onSortSelected(boolean always, int flags, int sort) { sortFlags = flags;