diff --git a/astrid/res/drawable-hdpi/people_menu_button_blue_off.png b/astrid/res/drawable-hdpi/people_menu_button_blue_off.png new file mode 100644 index 000000000..919a1e72e Binary files /dev/null and b/astrid/res/drawable-hdpi/people_menu_button_blue_off.png differ diff --git a/astrid/res/drawable-hdpi/people_menu_button_blue_on.png b/astrid/res/drawable-hdpi/people_menu_button_blue_on.png new file mode 100644 index 000000000..95be72f90 Binary files /dev/null and b/astrid/res/drawable-hdpi/people_menu_button_blue_on.png differ diff --git a/astrid/res/drawable-hdpi/people_menu_button_dark_blue_off.png b/astrid/res/drawable-hdpi/people_menu_button_dark_blue_off.png new file mode 100644 index 000000000..a82daf39b Binary files /dev/null and b/astrid/res/drawable-hdpi/people_menu_button_dark_blue_off.png differ diff --git a/astrid/res/drawable-hdpi/people_menu_button_dark_blue_on.png b/astrid/res/drawable-hdpi/people_menu_button_dark_blue_on.png new file mode 100644 index 000000000..9b7cda0c9 Binary files /dev/null and b/astrid/res/drawable-hdpi/people_menu_button_dark_blue_on.png differ diff --git a/astrid/res/drawable-hdpi/people_menu_button_red_off.png b/astrid/res/drawable-hdpi/people_menu_button_red_off.png new file mode 100644 index 000000000..0cf8523b5 Binary files /dev/null and b/astrid/res/drawable-hdpi/people_menu_button_red_off.png differ diff --git a/astrid/res/drawable-hdpi/people_menu_button_red_on.png b/astrid/res/drawable-hdpi/people_menu_button_red_on.png new file mode 100644 index 000000000..5a0e865ad Binary files /dev/null and b/astrid/res/drawable-hdpi/people_menu_button_red_on.png differ diff --git a/astrid/res/drawable/icn_menu_friends.png b/astrid/res/drawable/icn_menu_friends.png new file mode 100644 index 000000000..d04d6058e Binary files /dev/null and b/astrid/res/drawable/icn_menu_friends.png differ diff --git a/astrid/res/drawable/icn_menu_friends_dark.png b/astrid/res/drawable/icn_menu_friends_dark.png new file mode 100644 index 000000000..3a698aeac Binary files /dev/null and b/astrid/res/drawable/icn_menu_friends_dark.png differ diff --git a/astrid/res/drawable/people_menu_button_blue.xml b/astrid/res/drawable/people_menu_button_blue.xml new file mode 100644 index 000000000..25dff3d5d --- /dev/null +++ b/astrid/res/drawable/people_menu_button_blue.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/people_menu_button_blue_off.png b/astrid/res/drawable/people_menu_button_blue_off.png new file mode 100644 index 000000000..ccf838127 Binary files /dev/null and b/astrid/res/drawable/people_menu_button_blue_off.png differ diff --git a/astrid/res/drawable/people_menu_button_blue_on.png b/astrid/res/drawable/people_menu_button_blue_on.png new file mode 100644 index 000000000..48521e6c3 Binary files /dev/null and b/astrid/res/drawable/people_menu_button_blue_on.png differ diff --git a/astrid/res/drawable/people_menu_button_dark_blue.xml b/astrid/res/drawable/people_menu_button_dark_blue.xml new file mode 100644 index 000000000..daad105da --- /dev/null +++ b/astrid/res/drawable/people_menu_button_dark_blue.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/people_menu_button_dark_blue_off.png b/astrid/res/drawable/people_menu_button_dark_blue_off.png new file mode 100644 index 000000000..e78e8af09 Binary files /dev/null and b/astrid/res/drawable/people_menu_button_dark_blue_off.png differ diff --git a/astrid/res/drawable/people_menu_button_dark_blue_on.png b/astrid/res/drawable/people_menu_button_dark_blue_on.png new file mode 100644 index 000000000..d1a6afc28 Binary files /dev/null and b/astrid/res/drawable/people_menu_button_dark_blue_on.png differ diff --git a/astrid/res/drawable/people_menu_button_red.xml b/astrid/res/drawable/people_menu_button_red.xml new file mode 100644 index 000000000..a2ed1592b --- /dev/null +++ b/astrid/res/drawable/people_menu_button_red.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/people_menu_button_red_off.png b/astrid/res/drawable/people_menu_button_red_off.png new file mode 100644 index 000000000..4fbdeb11d Binary files /dev/null and b/astrid/res/drawable/people_menu_button_red_off.png differ diff --git a/astrid/res/drawable/people_menu_button_red_on.png b/astrid/res/drawable/people_menu_button_red_on.png new file mode 100644 index 000000000..edefe1fe3 Binary files /dev/null and b/astrid/res/drawable/people_menu_button_red_on.png differ diff --git a/astrid/res/layout/header_people_view.xml b/astrid/res/layout/header_people_view.xml index b25ced504..4d049fd58 100644 --- a/astrid/res/layout/header_people_view.xml +++ b/astrid/res/layout/header_people_view.xml @@ -8,7 +8,7 @@ android:id="@+id/main_menu" android:layout_width="51dip" android:layout_height="fill_parent" - android:src="?attr/asMainMenu" + android:src="?attr/asPeopleMenu" android:scaleType="fitCenter"/> + diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index 31d0ffb9c..15e8fbdc8 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -27,6 +27,7 @@ @drawable/task_edit_background @drawable/custom_tab_indicator_dark @drawable/menu_button_blue + @drawable/people_menu_button_blue @color/blue_theme_color @drawable/lists_disclosure_blue #000000 @@ -75,6 +76,7 @@ @drawable/task_edit_background_white @drawable/custom_tab_indicator @drawable/menu_button_red + @drawable/people_menu_button_red @color/red_theme_color @drawable/lists_disclosure_red @drawable/taskedit_arrow_up_white @@ -96,6 +98,7 @@ @drawable/comment_dark_blue @drawable/comment_dark_blue_filled @drawable/menu_button_dark_blue + @drawable/people_menu_button_dark_blue @color/dark_blue_theme_color @drawable/lists_disclosure_dark_blue @drawable/icn_edit_repeats_dark_blue diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index dcbc1d61b..dedaee407 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -723,6 +723,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener private void setupMainMenuForPeopleViewState(boolean inPeopleMode) { mainMenuPopover.setFixedItemVisibility(0, inPeopleMode ? View.VISIBLE : View.GONE, true); mainMenuPopover.setFixedItemVisibility(1, inPeopleMode ? View.GONE : View.VISIBLE, true); + + TypedValue tv = new TypedValue(); + getTheme().resolveAttribute(inPeopleMode ? R.attr.asPeopleMenu : R.attr.asMainMenu, tv, false); + mainMenu.setImageResource(tv.data); } public MainMenuPopover getMainMenuPopover() { diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index 4211aeb8f..5ffc35635 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -138,6 +138,8 @@ public class ThemeService { return R.drawable.icn_menu_sort_by_size_dark; case R.drawable.icn_menu_search: return R.drawable.icn_menu_search_dark; + case R.drawable.icn_menu_friends: + return R.drawable.icn_menu_friends_dark; case R.drawable.icn_menu_lists: return R.drawable.icn_menu_lists_dark; case R.drawable.icn_menu_plugins: diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java index 7553a1c8f..8c9db62e0 100644 --- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java +++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java @@ -101,7 +101,7 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi ThemeService.getDrawable(R.drawable.icn_menu_lists, themeFlags), MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item addMenuItem(R.string.TLA_menu_friends, - R.drawable.icn_anyone, + ThemeService.getDrawable(R.drawable.icn_menu_friends, themeFlags), MAIN_MENU_ITEM_FRIENDS, null, topFixed); addMenuItem(R.string.TLA_menu_search, ThemeService.getDrawable(R.drawable.icn_menu_search, themeFlags),