Added icons for the various people buttons

pull/14/head
Sam Bosley 12 years ago
parent 63d6605898
commit 4c845f2dfb

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_selected="false" android:drawable="@drawable/people_menu_button_blue_off"/>
<item android:state_selected="true" android:drawable="@drawable/people_menu_button_blue_on"/>
</selector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_selected="false" android:drawable="@drawable/people_menu_button_dark_blue_off"/>
<item android:state_selected="true" android:drawable="@drawable/people_menu_button_dark_blue_on"/>
</selector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_selected="false" android:drawable="@drawable/people_menu_button_red_off"/>
<item android:state_selected="true" android:drawable="@drawable/people_menu_button_red_on"/>
</selector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

@ -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"/>
<View

@ -30,6 +30,7 @@
<attr name="asTaskEditArrow" format="reference" />
<attr name="asRepeatIcon" format="reference" />
<attr name="asMainMenu" format="reference" />
<attr name="asPeopleMenu" format="reference" />
<attr name="asAbBackgroundColor" format="color"/>
<attr name="asListPopoverBg" format="reference"/>
<attr name="asListArrowUp" format="reference"/>

@ -27,6 +27,7 @@
<item name="asEditRowBackground">@drawable/task_edit_background</item>
<item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item>
<item name="asMainMenu">@drawable/menu_button_blue</item>
<item name="asPeopleMenu">@drawable/people_menu_button_blue</item>
<item name="asThemeTextColor">@color/blue_theme_color</item>
<item name="asListsDisclosure">@drawable/lists_disclosure_blue</item>
<item name="asAbBackgroundColor">#000000</item>
@ -75,6 +76,7 @@
<item name="asEditRowBackground">@drawable/task_edit_background_white</item>
<item name="asEditTabBackground">@drawable/custom_tab_indicator</item>
<item name="asMainMenu">@drawable/menu_button_red</item>
<item name="asPeopleMenu">@drawable/people_menu_button_red</item>
<item name="asThemeTextColor">@color/red_theme_color</item>
<item name="asListsDisclosure">@drawable/lists_disclosure_red</item>
<item name="asTaskEditArrow">@drawable/taskedit_arrow_up_white</item>
@ -96,6 +98,7 @@
<item name="asCommentButtonImg">@drawable/comment_dark_blue</item>
<item name="asFilledCommentButtonImg">@drawable/comment_dark_blue_filled</item>
<item name="asMainMenu">@drawable/menu_button_dark_blue</item>
<item name="asPeopleMenu">@drawable/people_menu_button_dark_blue</item>
<item name="asThemeTextColor">@color/dark_blue_theme_color</item>
<item name="asListsDisclosure">@drawable/lists_disclosure_dark_blue</item>
<item name="asRepeatIcon">@drawable/icn_edit_repeats_dark_blue</item>

@ -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() {

@ -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:

@ -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),

Loading…
Cancel
Save