From 6fd076a6d8b05257a3a977ee475d8915db0a9127 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 14 Dec 2012 18:26:49 -0800 Subject: [PATCH] Cool new baby blue theme --- .../res/drawable-hdpi/header_blue_alt.9.png | Bin 0 -> 1203 bytes astrid/res/drawable/comment_blue_alt.xml | 11 ++++++++ .../res/drawable/comment_blue_filled_alt.xml | 11 ++++++++ astrid/res/drawable/header_blue_alt.9.png | Bin 0 -> 1203 bytes .../drawable/lists_disclosure_blue_alt.xml | 10 +++++++ astrid/res/drawable/menu_button_blue_alt.xml | 10 +++++++ astrid/res/values/attrs.xml | 2 ++ astrid/res/values/keys.xml | 2 ++ astrid/res/values/strings-core.xml | 3 ++ astrid/res/values/styles.xml | 26 ++++++++++++++++-- .../astrid/activity/TaskEditFragment.java | 6 ++-- .../todoroo/astrid/service/ThemeService.java | 17 ++++++++++++ .../utility/AstridLitePreferenceSpec.java | 2 +- .../todoroo/astrid/widget/TasksWidget.java | 4 +++ 14 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 astrid/res/drawable-hdpi/header_blue_alt.9.png create mode 100644 astrid/res/drawable/comment_blue_alt.xml create mode 100644 astrid/res/drawable/comment_blue_filled_alt.xml create mode 100644 astrid/res/drawable/header_blue_alt.9.png create mode 100644 astrid/res/drawable/lists_disclosure_blue_alt.xml create mode 100644 astrid/res/drawable/menu_button_blue_alt.xml diff --git a/astrid/res/drawable-hdpi/header_blue_alt.9.png b/astrid/res/drawable-hdpi/header_blue_alt.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0310a5304564530991187a0db339359914831c56 GIT binary patch literal 1203 zcmb_cF>ljA7`;+d(mr~yI20Bv+h@P;d*65O`Fzhh8@HG8Yk2^` zQmd(V**MRx3%Lb$fAi$rLpCgW&3*vD`4xW6fmg3r0XVyE^$cpX@1Oy3By&i%uoOBT z%LYIV5qoqnHHFZz-2jC(G0H&fnZr;Nq7?e5CK~OI&>%h*%91Q8qLvo~LG_0t)YWgr zboN#gw<+}ygyZp88kZ#EKY((zT7^XgDoTN66oOrsnqk2WE>DV_)X{M;@GXy8#1(j5 zbBpZInke!{(<7dz<4qg6L9B}DgQ4j`St`P5Wkyt)M${%lYqYDI6l+RRRto&Q+LJ3t zR!~J&VJ0W(8L=BaHYxFYgxFfg3bF0*S3zM;lqTGCMod;ASCLW`S;i-n!T+U}TBF3* z-{kVhtX__yyS{~)&)iLo>6^h)3Zq!RivwcsMETd0n2-juga&au9|r+%P>%D{ST;YY zf6uk(bWRyK%QBL + + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/comment_blue_filled_alt.xml b/astrid/res/drawable/comment_blue_filled_alt.xml new file mode 100644 index 000000000..0a04982a6 --- /dev/null +++ b/astrid/res/drawable/comment_blue_filled_alt.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/header_blue_alt.9.png b/astrid/res/drawable/header_blue_alt.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0310a5304564530991187a0db339359914831c56 GIT binary patch literal 1203 zcmb_cF>ljA7`;+d(mr~yI20Bv+h@P;d*65O`Fzhh8@HG8Yk2^` zQmd(V**MRx3%Lb$fAi$rLpCgW&3*vD`4xW6fmg3r0XVyE^$cpX@1Oy3By&i%uoOBT z%LYIV5qoqnHHFZz-2jC(G0H&fnZr;Nq7?e5CK~OI&>%h*%91Q8qLvo~LG_0t)YWgr zboN#gw<+}ygyZp88kZ#EKY((zT7^XgDoTN66oOrsnqk2WE>DV_)X{M;@GXy8#1(j5 zbBpZInke!{(<7dz<4qg6L9B}DgQ4j`St`P5Wkyt)M${%lYqYDI6l+RRRto&Q+LJ3t zR!~J&VJ0W(8L=BaHYxFYgxFfg3bF0*S3zM;lqTGCMod;ASCLW`S;i-n!T+U}TBF3* z-{kVhtX__yyS{~)&)iLo>6^h)3Zq!RivwcsMETd0n2-juga&au9|r+%P>%D{ST;YY zf6uk(bWRyK%QBL + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/menu_button_blue_alt.xml b/astrid/res/drawable/menu_button_blue_alt.xml new file mode 100644 index 000000000..d5f035274 --- /dev/null +++ b/astrid/res/drawable/menu_button_blue_alt.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml index 96c96544c..218f3d7f0 100644 --- a/astrid/res/values/attrs.xml +++ b/astrid/res/values/attrs.xml @@ -27,6 +27,8 @@ + + diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml index 3765b377d..8dbe7f287 100644 --- a/astrid/res/values/keys.xml +++ b/astrid/res/values/keys.xml @@ -230,6 +230,7 @@ white white-red + white-alt black transparent transparent-white @@ -240,6 +241,7 @@ same-as-app white white-red + white-alt black transparent transparent-white diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml index 46c8959e0..9e6733a67 100644 --- a/astrid/res/values/strings-core.xml +++ b/astrid/res/values/strings-core.xml @@ -800,6 +800,8 @@ Day - Blue Day - Red + + Baby Blue Night @@ -813,6 +815,7 @@ Same as app Day - Blue Day - Red + Baby Blue Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index 1258e6db9..23b3f825d 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -43,6 +43,8 @@ @drawable/filter_selected_icon @drawable/task_row_bg_dark #322c19 + ?attr/asThemeTextColor + ?attr/asAbBackgroundColor @drawable/header_blue @@ -133,6 +135,26 @@ + + + + diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index 1d7f8b533..2cee290cd 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -1191,16 +1191,16 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); item = menu.add(Menu.NONE, MENU_RECORD_ID, 0, R.string.premium_record_audio); - item.setIcon(R.drawable.ic_menu_mic); + item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_mic)); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); } item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard); - item.setIcon(R.drawable.ic_menu_close); + item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_close)); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save); - item.setIcon(R.drawable.ic_menu_save); + item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_save)); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); boolean wouldShowComments = actFmPreferenceService.isLoggedIn() && remoteId > 0 && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null; diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index 758ef411f..cc8b66d52 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -22,6 +22,7 @@ public class ThemeService { public static final String THEME_WHITE = "white"; public static final String THEME_WHITE_RED = "white-red"; + public static final String THEME_WHITE_ALT = "white-alt"; public static final String THEME_BLACK = "black"; public static final String THEME_TRANSPARENT = "transparent"; public static final String THEME_TRANSPARENT_WHITE = "transparent-white"; @@ -79,6 +80,8 @@ public class ThemeService { return R.style.Theme_TransparentWhite; else if (THEME_WHITE_RED.equals(setting)) return R.style.Theme_White; + else if (THEME_WHITE_ALT.equals(setting)) + return R.style.Theme_White_Alt; else return R.style.Theme_White_Blue; } @@ -95,6 +98,8 @@ public class ThemeService { return R.style.Theme_White_Simple; case R.style.Theme_White_Blue: return R.style.Theme_White_Blue_Simple; + case R.style.Theme_White_Alt: + return R.style.Theme_White_Alt_Simple; default: return original; } @@ -204,9 +209,21 @@ public class ThemeService { AstridPreferences.useTabletLayout(ContextManager.getContext())) return R.drawable.icn_menu_refresh_tablet; + if (theme == R.style.Theme_White_Alt) { + switch(lightDrawable) { + case R.drawable.ic_menu_save: + return R.drawable.ic_menu_save_blue_alt; + case R.drawable.ic_menu_close: + return R.drawable.ic_menu_close_blue_alt; + case R.drawable.ic_menu_mic: + return R.drawable.ic_menu_mic_blue_alt; + } + } + if(!darkTheme) return lightDrawable; + switch(lightDrawable) { case R.drawable.icn_menu_refresh: return R.drawable.icn_menu_refresh_dark; diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java index d0aecdc3d..3ddaeae4f 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java @@ -103,7 +103,7 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec { setPreference(prefs, editor, r, R.string.p_show_list_members, false, ifUnset); - setPreference(prefs, editor, r, R.string.p_theme, ThemeService.THEME_WHITE_RED, ifUnset); + setPreference(prefs, editor, r, R.string.p_theme, ThemeService.THEME_WHITE_ALT, ifUnset); setPreference(prefs, editor, r, R.string.p_force_phone_layout, true, ifUnset); diff --git a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java index ebb956f36..f177fec9c 100644 --- a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java +++ b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java @@ -348,6 +348,10 @@ public class TasksWidget extends AppWidgetProvider { layout = R.layout.widget_initialized_red; titleColor = r.getColor(R.color.widget_text_color_light); buttonDrawable = R.drawable.plus_button_red; + } else if (theme == R.style.Theme_White_Alt) { + layout = R.layout.widget_initialized; + titleColor = r.getColor(R.color.widget_text_color_light); + buttonDrawable = R.drawable.plus_button_blue; } else { layout = (theme == R.style.Theme_TransparentWhite ? R.layout.widget_initialized_transparent : R.layout.widget_initialized); titleColor = r.getColor(R.color.widget_text_color_light);