From f0b50b314acec25023da6299414f48bff68ae21d Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 27 Jan 2012 19:42:32 -0800 Subject: [PATCH] Lots of image and drawable polish for both themes --- astrid/res/drawable/lists_disclosure_blue.xml | 5 +++++ ...gray.png => lists_disclosure_blue_off.png} | Bin 2884 -> 2884 bytes .../res/drawable/lists_disclosure_blue_on.png | Bin 0 -> 3232 bytes astrid/res/drawable/lists_disclosure_red.xml | 5 +++++ ...e_red.png => lists_disclosure_red_off.png} | Bin ..._white.png => lists_disclosure_red_on.png} | Bin astrid/res/drawable/menu_button_blue.xml | 5 +++++ astrid/res/drawable/menu_button_blue_off.png | Bin 0 -> 2935 bytes astrid/res/drawable/menu_button_blue_on.png | Bin 0 -> 2917 bytes astrid/res/drawable/menu_button_red.xml | 5 +++++ astrid/res/drawable/menu_button_red_off.png | Bin 0 -> 2929 bytes astrid/res/drawable/menu_button_red_on.png | Bin 0 -> 2912 bytes .../{menu.png => plus_button_blue.png} | Bin 2847 -> 2883 bytes .../res/layout-land/filter_list_activity.xml | 17 ++++++++++++---- astrid/res/layout/filter_list_activity.xml | 19 +++++++++++++----- astrid/res/layout/header_nav_views.xml | 5 ++--- astrid/res/values/attrs.xml | 6 +++--- astrid/res/values/styles.xml | 12 +++++------ .../activity/TaskListWrapperActivity.java | 19 ++++++------------ 19 files changed, 64 insertions(+), 34 deletions(-) create mode 100644 astrid/res/drawable/lists_disclosure_blue.xml rename astrid/res/drawable/{lists_disclosure_gray.png => lists_disclosure_blue_off.png} (94%) create mode 100644 astrid/res/drawable/lists_disclosure_blue_on.png create mode 100644 astrid/res/drawable/lists_disclosure_red.xml rename astrid/res/drawable/{lists_disclosure_red.png => lists_disclosure_red_off.png} (100%) rename astrid/res/drawable/{lists_disclosure_white.png => lists_disclosure_red_on.png} (100%) create mode 100644 astrid/res/drawable/menu_button_blue.xml create mode 100644 astrid/res/drawable/menu_button_blue_off.png create mode 100644 astrid/res/drawable/menu_button_blue_on.png create mode 100644 astrid/res/drawable/menu_button_red.xml create mode 100644 astrid/res/drawable/menu_button_red_off.png create mode 100644 astrid/res/drawable/menu_button_red_on.png rename astrid/res/drawable/{menu.png => plus_button_blue.png} (93%) diff --git a/astrid/res/drawable/lists_disclosure_blue.xml b/astrid/res/drawable/lists_disclosure_blue.xml new file mode 100644 index 000000000..2c8a4d6ec --- /dev/null +++ b/astrid/res/drawable/lists_disclosure_blue.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/lists_disclosure_gray.png b/astrid/res/drawable/lists_disclosure_blue_off.png similarity index 94% rename from astrid/res/drawable/lists_disclosure_gray.png rename to astrid/res/drawable/lists_disclosure_blue_off.png index 7d9674abac5bc73716a9f00eed04e2b69aaa6b72..c672dd388a987eba296e61914ed59c80bcd64583 100644 GIT binary patch delta 132 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 + + + + \ No newline at end of file diff --git a/astrid/res/drawable/lists_disclosure_red.png b/astrid/res/drawable/lists_disclosure_red_off.png similarity index 100% rename from astrid/res/drawable/lists_disclosure_red.png rename to astrid/res/drawable/lists_disclosure_red_off.png diff --git a/astrid/res/drawable/lists_disclosure_white.png b/astrid/res/drawable/lists_disclosure_red_on.png similarity index 100% rename from astrid/res/drawable/lists_disclosure_white.png rename to astrid/res/drawable/lists_disclosure_red_on.png diff --git a/astrid/res/drawable/menu_button_blue.xml b/astrid/res/drawable/menu_button_blue.xml new file mode 100644 index 000000000..c3c0837c1 --- /dev/null +++ b/astrid/res/drawable/menu_button_blue.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/menu_button_blue_off.png b/astrid/res/drawable/menu_button_blue_off.png new file mode 100644 index 0000000000000000000000000000000000000000..dcacc121b8092a6b6008c1f368d04710a2129033 GIT binary patch literal 2935 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 literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/menu_button_blue_on.png b/astrid/res/drawable/menu_button_blue_on.png new file mode 100644 index 0000000000000000000000000000000000000000..61775f825113728d1e642271eb1548e3d7e7cba1 GIT binary patch literal 2917 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 P00000NkvXXu0mjf8@E|* literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/menu_button_red.xml b/astrid/res/drawable/menu_button_red.xml new file mode 100644 index 000000000..035efd291 --- /dev/null +++ b/astrid/res/drawable/menu_button_red.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/menu_button_red_off.png b/astrid/res/drawable/menu_button_red_off.png new file mode 100644 index 0000000000000000000000000000000000000000..b3cac75dceb6f6330afd55f3fcffdeaf5ca46d21 GIT binary patch literal 2929 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 b|NjF3@9htNpL-*%00000NkvXXu0mjf@tIy% literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/menu_button_red_on.png b/astrid/res/drawable/menu_button_red_on.png new file mode 100644 index 0000000000000000000000000000000000000000..640b27b20d67111f2a59653201ebac1a2d75a0f7 GIT binary patch literal 2912 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 ZR8I@M|M%4`6Ub%oboFy#S?83{1OU!*KGFaH delta 138 zcmX>sHeXD!Gr-TCmrII^fq{Y7)59eQNGkxbBnKOi4B*$9xKVLFSG<>}i(^Q|t)x9C z4}6%#&QPkX-AGZq%4x@Z3<)$&=u^P*0PvSLYLG1@_`H` k86YidumETr!~g%x48JScMK%bfo(1teUHx3vIVCg!0FtsP;{X5v diff --git a/astrid/res/layout-land/filter_list_activity.xml b/astrid/res/layout-land/filter_list_activity.xml index e06640db0..5f7b3661b 100644 --- a/astrid/res/layout-land/filter_list_activity.xml +++ b/astrid/res/layout-land/filter_list_activity.xml @@ -10,22 +10,31 @@ + + - - + + + + - - + + @@ -41,7 +40,7 @@ android:layout_marginLeft="10dip" android:layout_toRightOf="@id/list_title" android:layout_alignBottom="@id/list_title" - android:src="@drawable/lists_disclosure_red" + android:src="?attr/asListsDisclosure" android:scaleType="fitCenter"/> diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml index 550fd8278..93f0fd849 100644 --- a/astrid/res/values/attrs.xml +++ b/astrid/res/values/attrs.xml @@ -20,12 +20,12 @@ - + - - + + diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index cbbbe8587..80a6b63e1 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -19,15 +19,15 @@ @drawable/edit_titlebar @drawable/ios_fabric_480_dark #888888 - @drawable/plus_button_red + @drawable/plus_button_blue @drawable/mic_button_gray @drawable/camera_button_gray #171317 @drawable/task_edit_background @drawable/custom_tab_indicator_dark - @drawable/menu - @drawable/menu + @drawable/menu_button_blue @color/blue_theme_color + @drawable/lists_disclosure_blue @android:color/black useLogo|showHome|showTitle @@ -76,9 +76,9 @@ @drawable/camera_button_red @drawable/task_edit_background_white @drawable/custom_tab_indicator - @drawable/menu - @drawable/menu + @drawable/menu_button_red @color/red_theme_color + @drawable/lists_disclosure_red @android:color/white useLogo|showHome|showTitle @@ -186,7 +186,7 @@ diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java index 1b4fe65b8..fd4e2ae25 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java @@ -45,7 +45,7 @@ public class TaskListWrapperActivity extends AstridWrapperActivity implements Ma private final OnClickListener mainMenuClickListener = new OnClickListener() { @Override public void onClick(View v) { - setMainMenuSelected(true); + mainMenu.setSelected(true); mainMenuPopover.show(v); } }; @@ -159,7 +159,7 @@ public class TaskListWrapperActivity extends AstridWrapperActivity implements Ma mainMenuPopover.setOnDismissListener(new OnDismissListener() { @Override public void onDismiss() { - setMainMenuSelected(false); + mainMenu.setSelected(false); } }); } @@ -204,19 +204,12 @@ public class TaskListWrapperActivity extends AstridWrapperActivity implements Ma private void setListsDropdownSelected(boolean selected) { int oldTextColor = lists.getTextColors().getDefaultColor(); int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected : R.style.TextAppearance_ActionBar_ListsHeader); + + TypedValue listDisclosure = new TypedValue(); + getTheme().resolveAttribute(R.attr.asListsDisclosure, listDisclosure, false); lists.setTextAppearance(this, textStyle); listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent); - listsNavDisclosure.setImageResource(selected ? R.drawable.lists_disclosure_white : R.drawable.lists_disclosure_red); - } - - private void setMainMenuSelected(boolean selected) { - TypedValue onImage = new TypedValue(); - TypedValue offImage = new TypedValue(); - - getTheme().resolveAttribute(R.attr.asMainMenuOn, onImage, false); - getTheme().resolveAttribute(R.attr.asMainMenuOff, offImage, false); - - mainMenu.setImageResource(selected ? onImage.data : offImage.data); + listsNavDisclosure.setSelected(selected); } @Override