From cc25b593b4658e837d30d338366f2bafcad45dcc Mon Sep 17 00:00:00 2001 From: Tim Su Date: Tue, 6 Mar 2012 01:52:04 -0800 Subject: [PATCH] Add switching logic via ThemeService to identify light and dark drawables to use. Renamed up filters and plugins icons to be more identificatory. --- .../astrid/core/CoreFilterExposer.java | 4 +- .../astrid/core/CustomFilterExposer.java | 13 +++-- .../todoroo/astrid/tags/TagFilterExposer.java | 4 +- astrid/res/drawable-hdpi/icn_menu_add.png | Bin 650 -> 0 bytes .../res/drawable-hdpi/icn_menu_add_dark.png | Bin 709 -> 0 bytes astrid/res/drawable-hdpi/icn_menu_filters.png | Bin 0 -> 386 bytes .../drawable-hdpi/icn_menu_filters_dark.png | Bin 0 -> 419 bytes ...n_menu_set_as.png => icn_menu_plugins.png} | Bin ..._as_dark.png => icn_menu_plugins_dark.png} | Bin astrid/res/drawable/icn_menu_add.png | Bin 787 -> 0 bytes astrid/res/drawable/icn_menu_add_dark.png | Bin 894 -> 0 bytes astrid/res/drawable/icn_menu_filters.png | Bin 0 -> 802 bytes astrid/res/drawable/icn_menu_filters_dark.png | Bin 0 -> 787 bytes ...n_menu_set_as.png => icn_menu_plugins.png} | Bin ..._as_dark.png => icn_menu_plugins_dark.png} | Bin .../astrid/activity/TaskEditFragment.java | 2 +- .../astrid/activity/TaskListFragment.java | 13 +++-- .../todoroo/astrid/service/ThemeService.java | 46 +++++++++++++++++- .../todoroo/astrid/ui/MainMenuPopover.java | 19 +++++--- 19 files changed, 83 insertions(+), 18 deletions(-) delete mode 100644 astrid/res/drawable-hdpi/icn_menu_add.png delete mode 100644 astrid/res/drawable-hdpi/icn_menu_add_dark.png create mode 100644 astrid/res/drawable-hdpi/icn_menu_filters.png create mode 100644 astrid/res/drawable-hdpi/icn_menu_filters_dark.png rename astrid/res/drawable-hdpi/{icn_menu_set_as.png => icn_menu_plugins.png} (100%) rename astrid/res/drawable-hdpi/{icn_menu_set_as_dark.png => icn_menu_plugins_dark.png} (100%) delete mode 100644 astrid/res/drawable/icn_menu_add.png delete mode 100644 astrid/res/drawable/icn_menu_add_dark.png create mode 100644 astrid/res/drawable/icn_menu_filters.png create mode 100644 astrid/res/drawable/icn_menu_filters_dark.png rename astrid/res/drawable/{icn_menu_set_as.png => icn_menu_plugins.png} (100%) rename astrid/res/drawable/{icn_menu_set_as_dark.png => icn_menu_plugins_dark.png} (100%) diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java index d08e1b6f2..665bcccff 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java @@ -23,6 +23,7 @@ import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskApiDao.TaskCriteria; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.tags.TagService; /** @@ -66,7 +67,8 @@ public final class CoreFilterExposer extends BroadcastReceiver implements Astrid Criterion.and(MetadataCriteria.withKey(TagService.KEY), TagService.TAG.like("x_%", "x"))))))), //$NON-NLS-1$ //$NON-NLS-2$ null); - inbox.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_inbox)).getBitmap(); + inbox.listingIcon = ((BitmapDrawable)r.getDrawable( + ThemeService.getDrawable(R.drawable.filter_inbox))).getBitmap(); return inbox; } diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java index 9fba8aff7..c00dbd09c 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java @@ -39,6 +39,7 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskApiDao.TaskCriteria; import com.todoroo.astrid.gtasks.GtasksPreferenceService; import com.todoroo.astrid.service.TagDataService; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.taskrabbit.TaskRabbitMetadata; /** @@ -91,7 +92,8 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr Task.DUE_DATE.gt(0), Task.DUE_DATE.lte(PermaSql.VALUE_EOD))), todayValues); - list[0].listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_calendar)).getBitmap(); + list[0].listingIcon = ((BitmapDrawable)r.getDrawable( + ThemeService.getDrawable(R.drawable.filter_calendar))).getBitmap(); list[1] = new Filter(r.getString(R.string.BFE_Recent), r.getString(R.string.BFE_Recent), @@ -99,7 +101,8 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr TaskCriteria.ownedByMe()).orderBy( Order.desc(Task.MODIFICATION_DATE)).limit(15), null); - list[1].listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_pencil)).getBitmap(); + list[1].listingIcon = ((BitmapDrawable)r.getDrawable( + ThemeService.getDrawable(R.drawable.filter_pencil))).getBitmap(); list[2] = getAssignedByMeFilter(r); @@ -114,7 +117,8 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr deleteIntent.putExtra(TOKEN_FILTER_NAME, list[i].title); list[i].contextMenuLabels = new String[] { context.getString(R.string.BFE_Saved_delete) }; list[i].contextMenuIntents = new Intent[] { deleteIntent }; - list[i].listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_sliders)).getBitmap(); + list[i].listingIcon = ((BitmapDrawable)r.getDrawable( + ThemeService.getDrawable(R.drawable.filter_sliders))).getBitmap(); } return list; @@ -132,7 +136,8 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr Criterion.or(Task.USER_ID.neq(0), Criterion.and(Metadata.KEY.eq(TaskRabbitMetadata.METADATA_KEY), TaskRabbitMetadata.ID.gt(0))))), null); - f.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_assigned)).getBitmap(); + f.listingIcon = ((BitmapDrawable)r.getDrawable( + ThemeService.getDrawable(R.drawable.filter_assigned))).getBitmap(); return f; } diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java index e3e13ba6c..e439178f9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java @@ -45,6 +45,7 @@ import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.gtasks.GtasksPreferenceService; import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.astrid.service.TagDataService; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.subtasks.SubtasksTagListFragment; import com.todoroo.astrid.tags.TagService.Tag; import com.todoroo.astrid.utility.AstridPreferences; @@ -175,7 +176,8 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE r.getString(R.string.tag_FEx_untagged), TagService.untaggedTemplate(), null); - untagged.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.gl_lists)).getBitmap(); + untagged.listingIcon = ((BitmapDrawable)r.getDrawable( + ThemeService.getDrawable(R.drawable.gl_lists))).getBitmap(); filters[0] = untagged; for(int i = 0; i < tags.length; i++) diff --git a/astrid/res/drawable-hdpi/icn_menu_add.png b/astrid/res/drawable-hdpi/icn_menu_add.png deleted file mode 100644 index dc2c143a17ac7ce0f5345a0bd9266fcd0d7df43d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 650 zcmV;50(Jd~P)-%0O}#Lfpl+2^|_M|EBA5X12V z1ONm;00ck)1V8`;KnMT=AOORu^VN=D}0luk-jNPrqRSEbl+ z{-4sp29ne*mQR4Qqq%t~Iq0m}R?P~zD7}y_^j+z~NvA&gl zls=`~9YYUTQc^X2!2W|oKK>jhAm4t@rU1?1=gb0#D@ohzo!(u>{Ck(z@RyPqQ!kQhIQ^Ar=|=d8gGLLCG^2mk^g00JNY k0w4eaAOrwSi@N{=0Dc=|ZQH&xsQ>@~07*qoM6N<$g0@W|FexbT7FW!Kd@x`IkjfRh595 z?F|S32!H?xfB*=900@9!00cn&+k4vuo6Tlyzaf{tm7XcjOX(-+#q-1S`5a9K&7}WI zKWg9zdUm9DX0dIt2F~2#-FX*CTmgMcPg}g7(wZm$<(kZSNZ(6elJDu6no0TKMS29b z)xfEt+>`=+k$zP&ZL1dTDQ1vbkPix+#%>gQwKj@5sC0~BP{btt|F+3u1f*`8Ps2Pk zr&y;g$FYl@l*~w}TOFPNWCSPGterfdLX$N$h%a)J-P*Qz&Nb*mGYG!22d#;wNZ+L| zENeYI$}l2!d`K7G1wwNI;EbF{qxy6;K0b za6N}BAQwI77z?0Wxam2WaL{wQT8Ke$rGaCs=dAiDyrD9vvh=mGu8p3ve(|}JJOhvku9~OrB zM>h{S>p7geSOdwV=adu+2B)tYRG*Kwh6Cx3McpVu)D|BZG^6fg(sR}nyNZB%PAEY2 z5B{|rQL70(Y)*K0-AbW|YuPgfw%^)dAc};RNQ)d z`=IX;2LYFhc`gbQF6K$dm`fdM=y~Hai#wdRK^-4(06 zLw&EduUw^cfPSBi=c}DkofZ9&+){sxevAPxqnk=4~_0wP@H<ziW0=*$cXlgSl5LQ{jImxkEY6p*1%4EB0W^QL70(Y)*K0-AbW|YuPgf$_>+@*$J=RMcmW3wJoB>}}8gE%D{m+Q5Ix>)kB(raB8p&+^50O#49wrCwX0 zU-Cd@#R`_nmj^t7h61ev3Ll;HNpiz$^OnbT-7FiA2(&D?#KPP6-1>>Y6)Q23+P9}~ wFxK9`KYQ6u&s!c*)?VlAo|bDsym#Wf@bepfUY39FH-Q8^UHx3vIVCg!0OuT;EdT%j literal 0 HcmV?d00001 diff --git a/astrid/res/drawable-hdpi/icn_menu_set_as.png b/astrid/res/drawable-hdpi/icn_menu_plugins.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_set_as.png rename to astrid/res/drawable-hdpi/icn_menu_plugins.png diff --git a/astrid/res/drawable-hdpi/icn_menu_set_as_dark.png b/astrid/res/drawable-hdpi/icn_menu_plugins_dark.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_set_as_dark.png rename to astrid/res/drawable-hdpi/icn_menu_plugins_dark.png diff --git a/astrid/res/drawable/icn_menu_add.png b/astrid/res/drawable/icn_menu_add.png deleted file mode 100644 index 65ec53d631bb51de1b764bd8e3685e2ca41c8cf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)!^ePe}ioqN_sVJhL=*5`$ zx#QbVLeb35_Kq_Q&~;&?Hx^1V6z;YX1jc zz!qo#t!(TZcmE`pJKDys9Ym3}(5)6SK?7j#TBOph5 z{yeDnG4WifLw_erXhk4+4QA+I6(V}UAO){x@LbwMrMLdmx^%NjOWh_D?4cFK=hNzn zsf1FM+|S8kL6rtB!H#sV06dU#zqmv0Cq$kkn13gouE?X-hE0Eu*qXl{enFVK3 zpV(6q;3YWJrLHJ8{yWw#1YKatCinXV+CUR1VfWW4Q}@qOT;gu9ZR1j+(6R^~>r&1O ztnTMGs;@2H*Zusqpz3~pqZ$=GulwopGm__ZKOKd6QuotEnCEprzfCnNdS3U_Mc7T< zZyMw|j9I48zaJJ?OeOaVT$J0oVl0r{FAc&%Vdnolj4&h22s6U&g|KS@1^{bWre{eo RYH|Po002ovPDHLkV1gJ!VY2`L diff --git a/astrid/res/drawable/icn_menu_add_dark.png b/astrid/res/drawable/icn_menu_add_dark.png deleted file mode 100644 index 1cbd8c5c1cd9e7b13450c0d0dc99b706aa7691d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 894 zcmV-^1A+XBP)oa zQM3mm7!gu$f*w>XN}!%pP?VyGhy@RVqKF0cPf!#TZ#js@`T-KqLt8{p30|6$AT}N< zek@j_Mm9bJZ(vw9+u3GzGu!S9KiHYshJE&(nLP70u|}i8=3{iRc^Z+hNLVB+5*7(t z5W)9?q3 zU4{RBaFiO9iEGS1*~gvzt+OWgzEut0j#7wU_H17`h@IFhGp~M z>uOk7YnQ@PxK}F+PDCU=Ns9 z<`w<)eztqxf_*d%3)DAFg38KGu%F%!jN8Wkg6Bee#;Yj5r()Cl^|*OIu*qR;NxRS3 z<>U18;{DS7eC(YTr$QN{&Atbf-KT~2k-X^?r|w&L6?TLcep={TN^k!ZovB{V z;{5^%FH>=d1f*Mh&K7bPIUUYGvci@=_1UF_misoX(5dNd(Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY& z2`nhcwyPrm00N>(L_t(&-tC!9YZFlvhM$wEo!CerXf22+76s9Tt3q7}cIn2YKfs-W zf5C-+psrl%R&cF!Aw)!1A|kC76coQeH-g0^ZJPGD@B}VlW-^mZrqgmC2)Vg)KhAsS zoO{nqz~k|FJRXmyC?riIRXqXR0~UAD)&_7>M84)WqN*-yIatp7j%@;yCGfD0h=gex zR#FbQU6RmAZAV&RS`uNY?U)#0l1<=~m8XD{3C4W1)ee9&2_f(WXjyp<2*D86O4QZ zytFX_$Gx|mew}d(iwpFqth;UXT_9A|(9XWUHm_KU^#k|}sED*3m!34C*cfAZHPDQ3 zmG>fY&aPhqp7&k94g4|@?ji(c=qzvt*s%}5VlReObp<%vcLQ1?QXBUj8`d*4!c{8~ z3q3K4ed83i4*ZFkqnjer*SuCTZyt!qdV+gT19!`kd1T?CsIJM#xHd9IIXH{R!-XC z0^qHx_TDQ732h(QP743uD-O*lDb;R}I;E=Qxc~(qdB<2#5@A8!!WtzJ*2p`?_UAvE g9*@W4@py{mA6DzC6tU;j6951J07*qoM6N<$g0(zhYXATM literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/icn_menu_filters_dark.png b/astrid/res/drawable/icn_menu_filters_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..f3dd28c4a1728c64f4d21a3730bc838748acb134 GIT binary patch literal 787 zcmV+u1MK{XP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY& z2`vER7&4du00NUqL_t(&-tC#cixWW<$3NM`+jxzhX;zD#kFT=DiuM5;rs(E z1O@*9TN}%>vary`!seA)31^{|92TO59*Vy}8^OaQXH0Hwo-l-Lb~o8gHeo)^4#Vu5 z_uYN-=FKiR91e%W;c$$KLfnDIm?OYlpf*N-H-PIR@;Pc?DS^>@z}Ydshzsh+xu}6& z0;9E@L|H69k_hYML|7+nVL?uW#qy&xgWP+3wQ|Zs+gL!hBtu|gZP@Yu&}v;9-->>$g-tDeau?eHt;KC zo_35%KS<*#X2Amy+3vF~%mH`uQh6ldkuj#BN#=@()QvF};Jzk>**uk0NjPt{uW23W z1DB`eJl5{o$J)~(%$=a~B5c=c??jAkc3s2R39+AuBtIqUJ+jz1zAH9Fq>^=3^nsHx zAK>wrHWx=7iiMmkpF-Ngia8NhOk3DSPK3qsBgq=ON>2W0;&3<|4u@kh`3Lr&ntVlr R21x(_002ovPDHLkV1h{LVAB8q literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/icn_menu_set_as.png b/astrid/res/drawable/icn_menu_plugins.png similarity index 100% rename from astrid/res/drawable/icn_menu_set_as.png rename to astrid/res/drawable/icn_menu_plugins.png diff --git a/astrid/res/drawable/icn_menu_set_as_dark.png b/astrid/res/drawable/icn_menu_plugins_dark.png similarity index 100% rename from astrid/res/drawable/icn_menu_set_as_dark.png rename to astrid/res/drawable/icn_menu_plugins_dark.png diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index a872d3aa7..f74588dad 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.icn_menu_refresh); + item.setIcon(R.drawable.icn_menu_refresh_dark); } super.onPrepareOptionsMenu(menu); } diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java index 435fe18fd..056bd6a83 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java @@ -86,6 +86,7 @@ import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.TaskService; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.service.UpgradeService; import com.todoroo.astrid.subtasks.SubtasksListFragment; import com.todoroo.astrid.sync.SyncProviderPreferences; @@ -363,7 +364,8 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, } protected void addSyncRefreshMenuItem(Menu menu) { - addMenuItem(menu, R.string.TLA_menu_sync, R.drawable.icn_menu_refresh, MENU_SYNC_ID, true); + addMenuItem(menu, R.string.TLA_menu_sync, + ThemeService.getDrawable(R.drawable.icn_menu_refresh), MENU_SYNC_ID, true); } protected void addMenuItem(Menu menu, int title, int imageRes, int id, boolean showAsAction) { @@ -398,18 +400,21 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, // --- sort if (allowResorting()) { - addMenuItem(menu, R.string.TLA_menu_sort, R.drawable.icn_menu_sort_by_size, MENU_SORT_ID, true); + addMenuItem(menu, R.string.TLA_menu_sort, + ThemeService.getDrawable(R.drawable.icn_menu_sort_by_size), MENU_SORT_ID, true); } // --- sync addSyncRefreshMenuItem(menu); // --- new filter - addMenuItem(menu, R.string.FLA_new_filter, R.drawable.icn_menu_add, MENU_NEW_FILTER_ID, true); + addMenuItem(menu, R.string.FLA_new_filter, + ThemeService.getDrawable(R.drawable.icn_menu_filters), MENU_NEW_FILTER_ID, true); // --- addons if (!Constants.MARKET_DISABLED) { - addMenuItem(menu, R.string.TLA_menu_addons, R.drawable.icn_menu_set_as, MENU_ADDONS_ID, false); + addMenuItem(menu, R.string.TLA_menu_addons, + ThemeService.getDrawable(R.drawable.icn_menu_plugins), MENU_ADDONS_ID, false); } // ask about plug-ins diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index 35dc64294..0f7dc4d02 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -5,6 +5,7 @@ import android.graphics.PixelFormat; import android.view.WindowManager; import com.timsu.astrid.R; +import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; @@ -17,8 +18,11 @@ public class ThemeService { public static final String THEME_TRANSPARENT = "transparent"; public static final String THEME_TRANSPARENT_WHITE = "transparent-white"; + private static int currentTheme; + public static void applyTheme(Activity activity) { - activity.setTheme(getTheme()); + currentTheme = getTheme(); + activity.setTheme(currentTheme); activity.getWindow().setFormat(PixelFormat.RGBA_8888); activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DITHER); @@ -64,4 +68,44 @@ public class ThemeService { return (AndroidUtilities.getSdkVersion() >= 11 ? "black" : "white"); } + public static int getDrawable(int lightDrawable) { + boolean darkTheme = currentTheme == R.style.Theme || currentTheme == R.style.Theme_Transparent; + if(!darkTheme) + return lightDrawable; + + switch(lightDrawable) { + case R.drawable.icn_menu_refresh: + return R.drawable.icn_menu_refresh_dark; + case R.drawable.icn_menu_filters: + return R.drawable.icn_menu_filters_dark; + case R.drawable.icn_menu_sort_by_size: + return R.drawable.icn_menu_sort_by_size_dark; + case R.drawable.icn_menu_lists: + return R.drawable.icn_menu_lists_dark; + case R.drawable.icn_menu_plugins: + return R.drawable.icn_menu_plugins_dark; + case R.drawable.icn_menu_settings: + return R.drawable.icn_menu_settings_dark; + case R.drawable.icn_menu_support: + return R.drawable.icn_menu_support_dark; + case R.drawable.icn_menu_tutorial: + return R.drawable.icn_menu_tutorial_dark; + case R.drawable.filter_assigned: + return R.drawable.filter_assigned_dark; + case R.drawable.filter_calendar: + return R.drawable.filter_calendar_dark; + case R.drawable.filter_inbox: + return R.drawable.filter_inbox_dark; + case R.drawable.filter_pencil: + return R.drawable.filter_pencil_dark; + case R.drawable.filter_sliders: + return R.drawable.filter_sliders_dark; + case R.drawable.gl_lists: + return R.drawable.gl_lists_dark; + } + + throw new RuntimeException("No theme drawable found for " + + ContextManager.getResources().getResourceName(lightDrawable)); + } + } diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java index 472fafe03..7209fd4aa 100644 --- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java +++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java @@ -13,6 +13,7 @@ import android.widget.TextView; import com.timsu.astrid.R; import com.todoroo.astrid.activity.AstridActivity; +import com.todoroo.astrid.service.ThemeService; public class MainMenuPopover extends FragmentPopover { @@ -58,12 +59,18 @@ public class MainMenuPopover extends FragmentPopover { private void addFixedItems(boolean isTablet) { if (!isTablet) - 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_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 + addMenuItem(R.string.TLA_menu_lists, + ThemeService.getDrawable(R.drawable.icn_menu_lists), + MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item + addMenuItem(R.string.TLA_menu_tutorial, + ThemeService.getDrawable(R.drawable.icn_menu_tutorial), + MAIN_MENU_ITEM_TUTORIAL, null, bottomFixed); // Tutorial item + addMenuItem(R.string.TLA_menu_settings, + ThemeService.getDrawable(R.drawable.icn_menu_settings), + MAIN_MENU_ITEM_SETTINGS, null, bottomFixed); // Settings item + addMenuItem(R.string.TLA_menu_support, + ThemeService.getDrawable(R.drawable.icn_menu_support), + MAIN_MENU_ITEM_SUPPORT, null, bottomFixed); // Support item } @Override