From 09dc2b7eb38255a65e9098a8414c8e04dffd4926 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Tue, 3 Jan 2012 19:09:06 -0800 Subject: [PATCH] Put sort and filter button in header --- astrid/res/drawable/ic_sort.png | Bin 0 -> 2040 bytes astrid/res/layout/task_list_activity.xml | 30 ++++++++++-------- .../activity/DraggableTaskListActivity.java | 6 ++++ .../astrid/activity/TaskListActivity.java | 27 +++++++--------- 4 files changed, 34 insertions(+), 29 deletions(-) create mode 100644 astrid/res/drawable/ic_sort.png diff --git a/astrid/res/drawable/ic_sort.png b/astrid/res/drawable/ic_sort.png new file mode 100644 index 0000000000000000000000000000000000000000..af942422d0ef021c262191afa210b9a5e3b22139 GIT binary patch literal 2040 zcmZWp2T+sQ7XAa$Lz7Tqfe=c-lF&;C0SO=|B^aa|NJ4-}LShmGEC^U=OIJavh>hk0 z+*PD1CCZAp5~_&6N|6l+ilCw!H{g5D&b&Kw?mhR+cfRwTJ9AGe-ebSK>^4~d0OVa= z91n?3qYaam6z#rZUy=bpT$6^w;azb!7@o}xqtU4V5DPl*JrT*rLxeA>C3REj=x}8j zY(!2}D1nPBz8C4+^eo^ni~HIxMK>8ig*@HG_&TZ4bSAnx=Dig5ixhbDEc0ZpJP$(p zT$2KKTZ7*%Ei!XQ5X2vRYM%J=&KfZ{O}zT$SO6b_QiL2Pcy@Pu>zam4d;k%5;C6qD za8JLWc0hl>y&}IMZt3odf+mm7eaD=r7E%TaFM*Ypcfi^%ns>pc{IAl22DmDdL#az8 z#^xQ*+&F%>w#aCOTQMn#Q@>>BTn;lcw=b0Gkm`0oA8fR@DxgiS$dB|TLZ%V=mAS}t zOtsS?)J&*T19)v&i*xovaNX^T^F_6DN*RnosK<*_X|J`cPqTiR1qL741#7hKYb;^; zS-hz*k9T;cdq-Knb?zOPR1Q`}I=f=L?8IFhk}`LM8cgOmfJudvuBy*&YEbxr>-{vYcU*(jkc~m!<;5NQV|#)X z8i{JFfenpolV3~6^@cNBRL^(cuNd)K{4H_5sX?W1`+Zokz(q6)} znR*u@^>@!Cui5V>r0;dD^3#N4 zd$84|glD`3y?(cTL1<%p+NuLj<4d+NE}*1M*S$E+`ol}S96~ZCNih3o5NcSew7K`l z)cOPIS|nR1vqOE=>6G?zn`s+1_&zg*bZe}QA1bIY4iGf+bDFNzpSYMchFG)BtWtqC z)VI~g`$+Hp^%~{qfxBE!KwOXEk-s95x1@Yd?o`U1y{TE%WZ!Jh-LlLpU}8Sl^*=77 z$U2*>Me%!tp(C@jV2<_5F4p|^zdHp;%fpgH=))Hrr219U=xLd{Q^Y+2)iEth>HUNp zn=wkQErZmQj`gV?<01n!LCuQQgJsXF2FK^7&&b7Ae3PuyksazN4>l2f7#Ws}KL-Hh zR5lC*6c%d$04R#)?Z@?VcSBQ{3?wO(Nv0xW87vVR05Gv=k;|ZRNw8Q3J&J>lwS{jY z&?0{$jDo{9A>2q?xSu;7hGVj+Ff*hX(g==~g~4DLc4!#-kfZZ|(?vI1cm$WrLZeVI zF)_#(QzVlejxx5kwniD5piE5miV%A_aZy}S?A|Dj&JU9R@i@D_6-s38`#>33mgeWrE`05nMxOWc*%^H^(w zObn5nMq@QPZ93Q0R(4Y`Sf!H@=T@uUL{>_=7wP75}XKw#I?-MtOXhBU>bcFD>NU{)KZ z#{US>o(>6P%%rQ>6#6~XU0EI|#U-CSdeR;gbo+*i?=DpiMsp14YV^@m0G%i$KE{P3 zZoUlcWg4B2hs$Uw}l5J2@;8BqDN5(<>r=2+a^zQF;$8G>Anv zg1@XKYfxsJkR9vVDkj{e`^Xj=XexG0kZqW4sPsa-QnCDua`Nd)pPCETHztm&lZWFS IhmfRy0H^hLv;Y7A literal 0 HcmV?d00001 diff --git a/astrid/res/layout/task_list_activity.xml b/astrid/res/layout/task_list_activity.xml index 45359fe78..fd58f4c46 100644 --- a/astrid/res/layout/task_list_activity.xml +++ b/astrid/res/layout/task_list_activity.xml @@ -34,18 +34,6 @@ android:layout_height="fill_parent" android:layout_weight="1" android:orientation="horizontal"> - - - - + + + + + + diff --git a/astrid/src/com/todoroo/astrid/activity/DraggableTaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/DraggableTaskListActivity.java index a1f4f57fd..870a23cac 100644 --- a/astrid/src/com/todoroo/astrid/activity/DraggableTaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/DraggableTaskListActivity.java @@ -55,6 +55,12 @@ public class DraggableTaskListActivity extends TaskListActivity { return getLayoutInflater().inflate(R.layout.task_list_body_draggable, root, false); } + @Override + protected void setUpUiComponents() { + super.setUpUiComponents(); + findViewById(R.id.sortContainer).setVisibility(View.GONE); + } + // --- task adapter /** diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index ff36bf305..734c74ded 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -137,7 +137,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, 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_SUPPORT_ID = Menu.FIRST + 6; protected static final int MENU_ADDON_INTENT_ID = Menu.FIRST + 7; @@ -301,8 +300,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, isFilter = true; } else { filter = CoreFilterExposer.buildInboxFilter(getResources()); - //findViewById(R.id.headerLogo).setVisibility(View.VISIBLE); - //findViewById(R.id.listLabel).setVisibility(View.GONE); isFilter = false; } @@ -331,12 +328,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, MenuItem item; - if(!(this instanceof DraggableTaskListActivity)) { - item = menu.add(Menu.NONE, MENU_SORT_ID, Menu.NONE, - R.string.TLA_menu_sort); - item.setIcon(android.R.drawable.ic_menu_sort_by_size); - } - addSyncRefreshMenuItem(menu); item = menu.add(Menu.NONE, MENU_LISTS_ID, Menu.NONE, @@ -377,7 +368,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, return true; } - private void setUpUiComponents() { + protected void setUpUiComponents() { ((ImageView)findViewById(R.id.back)).setOnClickListener(new OnClickListener() { public void onClick(View v) { Preferences.setBoolean(R.string.p_showed_lists_help, true); @@ -385,6 +376,16 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, } }); + findViewById(R.id.sort_settings).setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SORT); + AlertDialog dialog = SortSelectionActivity.createDialog(TaskListActivity.this, + TaskListActivity.this, sortFlags, sortSort); + dialog.show(); + } + }); + // set listener for quick-changing task priority getListView().setOnKeyListener(new OnKeyListener() { @Override @@ -1204,12 +1205,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, intent = new Intent(this, EditPreferences.class); startActivityForResult(intent, ACTIVITY_SETTINGS); return true; - case MENU_SORT_ID: - StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SORT); - AlertDialog dialog = SortSelectionActivity.createDialog(this, - this, sortFlags, sortSort); - dialog.show(); - return true; case MENU_SYNC_ID: StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SYNC); performSyncAction();