From 2d1f1d1198d36f555206ddf8e4ae1142db0d6304 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 5 Mar 2012 20:34:38 -0800 Subject: [PATCH] Renamed and reorganized menu images for easier replacing --- .../todoroo/astrid/actfm/TagUpdatesFragment.java | 2 +- .../todoroo/astrid/actfm/TagViewFragment.java | 5 ++--- .../astrid/gtasks/GtasksListFragment.java | 2 +- astrid/res/drawable-hdpi/ic_menu_refresh.png | Bin 3289 -> 0 bytes astrid/res/drawable-hdpi/icn_menu_add.png | Bin 0 -> 3765 bytes astrid/res/drawable-hdpi/icn_menu_refresh.png | Bin 0 -> 4174 bytes astrid/res/drawable-hdpi/icn_menu_set_as.png | Bin 0 -> 3187 bytes .../res/drawable-hdpi/icn_menu_sort_by_size.png | Bin 0 -> 1460 bytes astrid/res/drawable-hdpi/icn_menu_tasks.png | Bin 410 -> 0 bytes astrid/res/drawable-v11/ic_menu_refresh.png | Bin 2025 -> 0 bytes astrid/res/drawable-xhdpi/ic_menu_refresh.png | Bin 2857 -> 0 bytes astrid/res/drawable/ic_menu_refresh.png | Bin 2156 -> 0 bytes .../{icn_menu_tasks.png => icn_menu_lists.png} | Bin .../{icn_settings.png => icn_menu_settings.png} | Bin .../{icn_support.png => icn_menu_support.png} | Bin .../{icn_tutorial.png => icn_menu_tutorial.png} | Bin .../astrid/activity/TaskEditFragment.java | 2 +- .../astrid/activity/TaskListFragment.java | 8 ++++---- .../com/todoroo/astrid/ui/MainMenuPopover.java | 8 ++++---- 19 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 astrid/res/drawable-hdpi/ic_menu_refresh.png create mode 100644 astrid/res/drawable-hdpi/icn_menu_add.png create mode 100644 astrid/res/drawable-hdpi/icn_menu_refresh.png create mode 100644 astrid/res/drawable-hdpi/icn_menu_set_as.png create mode 100644 astrid/res/drawable-hdpi/icn_menu_sort_by_size.png delete mode 100644 astrid/res/drawable-hdpi/icn_menu_tasks.png delete mode 100644 astrid/res/drawable-v11/ic_menu_refresh.png delete mode 100644 astrid/res/drawable-xhdpi/ic_menu_refresh.png delete mode 100644 astrid/res/drawable/ic_menu_refresh.png rename astrid/res/drawable/{icn_menu_tasks.png => icn_menu_lists.png} (100%) rename astrid/res/drawable/{icn_settings.png => icn_menu_settings.png} (100%) rename astrid/res/drawable/{icn_support.png => icn_menu_support.png} (100%) rename astrid/res/drawable/{icn_tutorial.png => icn_menu_tutorial.png} (100%) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java index b00b3e579..e02caaee7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java @@ -287,7 +287,7 @@ public class TagUpdatesFragment extends ListFragment { if(actFmPreferenceService.isLoggedIn()) { item = menu.add(Menu.NONE, MENU_REFRESH_ID, Menu.NONE, R.string.ENA_refresh_comments); - item.setIcon(R.drawable.ic_menu_refresh); + item.setIcon(R.drawable.icn_menu_refresh); } } diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java index d8c977b8f..f6e14e03f 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java @@ -1,7 +1,5 @@ package com.todoroo.astrid.actfm; -import com.todoroo.astrid.helper.AsyncImageView; - import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -52,6 +50,7 @@ import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Update; +import com.todoroo.astrid.helper.AsyncImageView; import com.todoroo.astrid.helper.ProgressBarSyncResultCallback; import com.todoroo.astrid.service.SyncV2Service; import com.todoroo.astrid.service.TagDataService; @@ -159,7 +158,7 @@ public class TagViewFragment extends TaskListFragment { @Override protected void addSyncRefreshMenuItem(Menu menu) { if(actFmPreferenceService.isLoggedIn()) { - addMenuItem(menu, R.string.actfm_TVA_menu_refresh, R.drawable.ic_menu_refresh, MENU_REFRESH_ID, false); + addMenuItem(menu, R.string.actfm_TVA_menu_refresh, R.drawable.icn_menu_refresh, MENU_REFRESH_ID, false); } else { super.addSyncRefreshMenuItem(menu); } diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java index 11f723eeb..a00a3d3bb 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java @@ -146,7 +146,7 @@ public class GtasksListFragment extends SubtasksListFragment { @Override protected void addSyncRefreshMenuItem(Menu menu) { if(gtasksPreferenceService.isLoggedIn()) { - addMenuItem(menu, R.string.actfm_TVA_menu_refresh, R.drawable.ic_menu_refresh, MENU_REFRESH_ID, false); + addMenuItem(menu, R.string.actfm_TVA_menu_refresh, R.drawable.icn_menu_refresh, MENU_REFRESH_ID, false); } else { super.addSyncRefreshMenuItem(menu); } diff --git a/astrid/res/drawable-hdpi/ic_menu_refresh.png b/astrid/res/drawable-hdpi/ic_menu_refresh.png deleted file mode 100644 index bbb08f1175f1dfcb5958ecfb8a833c7057496004..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3289 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 E00EQeg#Z8m diff --git a/astrid/res/drawable-hdpi/icn_menu_add.png b/astrid/res/drawable-hdpi/icn_menu_add.png new file mode 100644 index 0000000000000000000000000000000000000000..65cc01eb7e495bc84f02b57305f6f60707436285 GIT binary patch literal 3765 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 literal 0 HcmV?d00001 diff --git a/astrid/res/drawable-hdpi/icn_menu_set_as.png b/astrid/res/drawable-hdpi/icn_menu_set_as.png new file mode 100644 index 0000000000000000000000000000000000000000..7e79c15c9164a955c13f65982821483f4179e676 GIT binary patch literal 3187 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 O0000Of{EvnIk4|ob+rx;IyP1KQ2TkE`C5uat znCKD`O-rn~1e*Zqs>mQ}`-uB+M>R(3R zlib`te&>14^PcCt=e)rGV>;-+0-Qh)5FpSjs7Z{CvL*lm=`p~+%N;0k3FQAB~;fiEXcjqTHpih17fuZ2@p7ejxB^>xb*~`Y)Dl zHy_egQYrkH#5jM#7wqn2`0g8H-2BRlcK#z^#>_%EMFD3 z`2J4N69g;lJ6(RP{y^|M0Iv{aI#%Hv7lg0pj4%8pXY=lwBUTGoFkZ^e%^kwUznT+)Xokh1pSN;eP&-buI}tVlL1U}xUwN!yQk^6MM~X2fjUG&0S%6 z<^8k}DnG9S7(n5eDdKq=@~Y{66SX@`sT_bhZ4B=l0F){SL-&TbKY-j~Qa}NLPnM!| zy#x%T>D@Gjeq|H!T;p-xDj5KF!^Q>6XGV>*>DtDaUCc#^pzyCIFc85l8{+^|fs1Bd zYECg$V;4+l(BawL_-J;s^Ax}|j52_Mh{|M;UKDy(MeFu;9RZ)J6Tis(el1^{JrDWk zfCT9R0OF+bQ?W3EAY;AO0S7uxOBiqE)YMr51`xHUo?oU^RE;x75niGK3=wpLrfnE! zI8WplBcI@|d-m)qWRZn~5yY0N;CTZjD;MVkNv{oJ2GBzH-36)+(2Fn^nyMM{+6 z4KX78_=`RvHIAAI&6~{kmLQiKD{r+t8!X{0nK-NL$ePi<9GwNOOb_R9ZYw?q4GaSk zfDQ?UE`*kH-$wt8I!PXwsI6h;J{_J3N1mF(U|&qaTY!MTsFz=Px~`I3lnP5Il)_Io z>NqS9O~$Kd2n2Zm2ezX1M-}zTCIfG&_agcY2a2!=K~Oheuv(NNaZfCRI3=G+#fO3e z2>>7qhnU5&FC-s1T>A_uHaIJP635M0zaP2fWj+A|NN2L6s)ao$FbE8t&iP1tJWV@zi6>i5aO79Za8?!&-wMM;KR$8P1_Ry3CQWyBPBYf&h*#4 zJJQ!FH{cuAttvDPuWhJ*xqLTyNNX#j}1qrrfhV96GPZ1bT1 zNiQH*$*p1=1(-dDBnxp09g)c^HD}}5B)LWJgPc9s?{;RQ9&};_2|zKZO6>&z9XbF8 zv$9Epj)eTFeI%+bE${Y{i8<*hs^BSwbi{)W7W6tAu~o7HGhBeDuQLgP0Y`RvFUGFj zwl0P)mt^}3z!xDPg;Yc-NP2}1-uBazp(o8pWi@o35t*W1{hDqi> z4HhIIFw$eLz-u`8nbu>Eo@hBy>#tnzYtkx&q?n3&z3yP#4P(G}P3<2SXE8JYc1OPk@2IE8dH<=*@WB0VyMVrVXACSQpcJE_>Y_H;s7&G zssH)-CmXOH6R?zbhyVZpC3HntbYx+4WjbSWWnpw>05UK!F)c7LEiyP%GBP?eH##*l zEigDbFfgP}a>)Py03~!qSaf7zbY(hiZ)9m^c>ppnF)=MLF)cDUR5CI;G&edmGc7PU zIxsNR6Uub}000?uMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o00000NkvXX Hu0mjfQR<0n diff --git a/astrid/res/drawable-xhdpi/ic_menu_refresh.png b/astrid/res/drawable-xhdpi/ic_menu_refresh.png deleted file mode 100644 index 9e9f10ee8807efe8379066f03c68309187d13c06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2857 zcmZ{mS5Om*5{4lH2SN!Tpj4$wRUp!XN$5zGE-ED?p++!tq^lD^5EP|_CcT4*atQ6B zARxUPq<5tgLXnVM&Uw2JcXs~&o88%e_I2Ye%?;Us0zf)CI(B0tJ*x}C{t+|7h10n- z*ry&Oe``)CV zZIfrUz4!3FA`6A>iuCY(Vf|JwEJzZ_qdc7_;n59L%_4Du> z<#X-Z$Hwifssj-XNlQtbobU7sS(8|#I zwathsiq8R&I&bdA^6N@fa-?qVIC;W(jx3z%Y*K^n(=y5HnXiyeDC)67+(MVQ@TM4( z0KS2;35%YjHKpKyy?EB01c(a*xpnc;eoam>bSo4FSl8p+zuJ!tfOReE?;V~tRwU4Q zv@=YuE~%nFi(W^l%nHo$f@U=-T{Ck$*$$8d+fHIA|3rcv5zQn~v~Y>BPTGlYw^5`X z4jyAOQnP^BJgRL4i?sQkysocp?7%;?x*;-d3Q6ZVbVe=T#FcZr9|{(x#j`OXd3{4VLG z%On7kI+hl2FW;T4=Eq#`x8{x3fG$6;q9{rkd)Jj?vv)>ETf6Y%@%mgOOVVoZR`0jh zdUkRL924JlJ*#Y?yIgQ#4o)E%fQ0F73yc)QwCB2kbQ_fWmb$z}&+?URxn9?n2g~1l zw5f2EZ*erINkJL%jUxSXJvUBc?*Z$#YCH7&!*{REP6fB>TXKn};VP}-b1`pGFGvqY zpI^@Y;TSF5q{5%hgbV+IMzY7ebo_C5U8`QBcIm^PhKLHppu1B|U$JQ%+@%WWM?kG2 z-Z?^&fhJSWoN}Xqp3oO~-R#Sku!`mOq;+s$yOaH~Y{pH>1Ztk|BYGC=V;6ooK>DYA z5Gwdm?8vx~kLB7s^i$|>?k%rPp7WH4f^2JzL5IAq7{N9v7JTS|ZYDh^{r3YO9o-UH zdu1o1iU1M;$LiICV98iY!9NHUuM%C*Ey&Hce-KxwnQl3tR*5$#MeQie6g4ICVCJ5O zVeQ=2!}&p+oO)87iQyt&S0Pw{Nx2wHx;q$cK1zfK88Qh0vaR!s$ie5=8YJ^Y_l0o0f0^X0j5F;`a$9b364kCY zthTx3s%LLI+GY&=j!-iBdQ|+E?=;(LUlHu{0uGxK%v1)4A^((@@+q)$JL9RL-5&#DU`AkrQ{ON&V@5%*iJhE=X7A`=FuM}})T9^g9|RyB7%GYU#`I=C@5AfG1L7kB%-*3eMrO{T1x zRH|kr1~<=sI_g+>Fq-wHhe~6)Z7? z8r{*#;$J_@{#xhP&}sN$<>+uQ;OvbQ`4y2dg!>7#r6~neG?yBBr#AjZ!T*UF z=42{qPG07yxCE(Q z0|3#j$t_C#ULRzmWa@9kdg`S#Yu}tEr6igbS5~;U^XjZHSbEUJ8~ZW5HynHWs{j0u zQ$YGg`7K>KNWDOzHRq=}3%5?eRbB za_+EJW<)GCjpO+Am99F1%Gkt27}+-*^CulI-J>TR9}S`NGMS~$t&fU94KeMe%o6YK zKS720F;E;t$Y01if&HiMk_;9L3B&%P^rLf|vr?qe6Ul0$ zMy4?N5NGlUaVR~qax;gBC$@!C93X|*8KH@8ulWo!IrKOc63MYUm301%S)voA_SH6Q zbj}_cDJy^%q&=KpC)CJ1Ol==@^1VCiE{{?G??jb!zj60=_wH8|7M{AY46HObmFtPA z38~UpZZXe1R&`Pr%*BLjb?!WQkc`o=qjU?sXNcjo+SQg(3M~1UiXCj9DI1eT3vLKa zhbRAzNj5O%5H0ciO(f1F_M5-EVukqn2&n~- z+Ke!zeCU07`N))_;Hdj9-+Ii{A9(b=;hxxRwS{LZ8L={<1{8ezxz-2qEi1rQ4&5Jx z%S2&t4GBMZRH{AohZ-hVfLX^$mWc_W&5D&&?$vZQn%rr-JdLpmHnQ}nsJHIoiznJ<=(xoG7w}DH A8UO$Q diff --git a/astrid/res/drawable/ic_menu_refresh.png b/astrid/res/drawable/ic_menu_refresh.png deleted file mode 100644 index c3551becfaacab9acaa6abafd4e0530003af4b33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2156 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 T%mB`e_XvQryI@PR@xS>Ge*o(e diff --git a/astrid/res/drawable/icn_menu_tasks.png b/astrid/res/drawable/icn_menu_lists.png similarity index 100% rename from astrid/res/drawable/icn_menu_tasks.png rename to astrid/res/drawable/icn_menu_lists.png diff --git a/astrid/res/drawable/icn_settings.png b/astrid/res/drawable/icn_menu_settings.png similarity index 100% rename from astrid/res/drawable/icn_settings.png rename to astrid/res/drawable/icn_menu_settings.png diff --git a/astrid/res/drawable/icn_support.png b/astrid/res/drawable/icn_menu_support.png similarity index 100% rename from astrid/res/drawable/icn_support.png rename to astrid/res/drawable/icn_menu_support.png diff --git a/astrid/res/drawable/icn_tutorial.png b/astrid/res/drawable/icn_menu_tutorial.png similarity index 100% rename from astrid/res/drawable/icn_tutorial.png rename to astrid/res/drawable/icn_menu_tutorial.png diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index 03525737c..a872d3aa7 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -1026,7 +1026,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { if(actFmPreferenceService.isLoggedIn() && remoteId > 0 && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null) { MenuItem item = menu.add(Menu.NONE, MENU_COMMENTS_REFRESH_ID, Menu.NONE, R.string.ENA_refresh_comments); - item.setIcon(R.drawable.ic_menu_refresh); + item.setIcon(R.drawable.icn_menu_refresh); } super.onPrepareOptionsMenu(menu); } diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java index 7e4287475..435fe18fd 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java @@ -363,7 +363,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, } protected void addSyncRefreshMenuItem(Menu menu) { - addMenuItem(menu, R.string.TLA_menu_sync, R.drawable.ic_menu_refresh, MENU_SYNC_ID, true); + addMenuItem(menu, R.string.TLA_menu_sync, R.drawable.icn_menu_refresh, MENU_SYNC_ID, true); } protected void addMenuItem(Menu menu, int title, int imageRes, int id, boolean showAsAction) { @@ -398,18 +398,18 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, // --- sort if (allowResorting()) { - addMenuItem(menu, R.string.TLA_menu_sort, android.R.drawable.ic_menu_sort_by_size, MENU_SORT_ID, true); + addMenuItem(menu, R.string.TLA_menu_sort, R.drawable.icn_menu_sort_by_size, MENU_SORT_ID, true); } // --- sync addSyncRefreshMenuItem(menu); // --- new filter - addMenuItem(menu, R.string.FLA_new_filter, android.R.drawable.ic_menu_add, MENU_NEW_FILTER_ID, true); + addMenuItem(menu, R.string.FLA_new_filter, R.drawable.icn_menu_add, MENU_NEW_FILTER_ID, true); // --- addons if (!Constants.MARKET_DISABLED) { - addMenuItem(menu, R.string.TLA_menu_addons, android.R.drawable.ic_menu_set_as, MENU_ADDONS_ID, false); + addMenuItem(menu, R.string.TLA_menu_addons, R.drawable.icn_menu_set_as, MENU_ADDONS_ID, false); } // ask about plug-ins diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java index b05d10b71..472fafe03 100644 --- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java +++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java @@ -58,12 +58,12 @@ public class MainMenuPopover extends FragmentPopover { private void addFixedItems(boolean isTablet) { if (!isTablet) - addMenuItem(R.string.TLA_menu_lists, R.drawable.icn_menu_tasks, MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item + addMenuItem(R.string.TLA_menu_lists, R.drawable.icn_menu_lists, MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item // addMenuItem(R.string.TLA_menu_friends, R.drawable.icn_friends, MAIN_MENU_ITEM_FRIENDS, null, topFixed); // Friends item // addMenuItem(R.string.TLA_menu_suggestions, R.drawable.icn_featured_lists, MAIN_MENU_ITEM_SUGGESTIONS, null, topFixed); // Suggestions item - addMenuItem(R.string.TLA_menu_tutorial, R.drawable.icn_tutorial, MAIN_MENU_ITEM_TUTORIAL, null, bottomFixed); // Tutorial item - addMenuItem(R.string.TLA_menu_settings, R.drawable.icn_settings, MAIN_MENU_ITEM_SETTINGS, null, bottomFixed); // Settings item - addMenuItem(R.string.TLA_menu_support, R.drawable.icn_support, MAIN_MENU_ITEM_SUPPORT, null, bottomFixed); // Support item + addMenuItem(R.string.TLA_menu_tutorial, R.drawable.icn_menu_tutorial, MAIN_MENU_ITEM_TUTORIAL, null, bottomFixed); // Tutorial item + addMenuItem(R.string.TLA_menu_settings, R.drawable.icn_menu_settings, MAIN_MENU_ITEM_SETTINGS, null, bottomFixed); // Settings item + addMenuItem(R.string.TLA_menu_support, R.drawable.icn_menu_support, MAIN_MENU_ITEM_SUPPORT, null, bottomFixed); // Support item } @Override