diff options
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/headlines_action_menu.xml | 1 | ||||
| -rw-r--r-- | res/menu/main_menu.xml | 35 | ||||
| -rw-r--r-- | res/menu/offline_menu.xml | 10 |
3 files changed, 16 insertions, 30 deletions
diff --git a/res/menu/headlines_action_menu.xml b/res/menu/headlines_action_menu.xml index 77a9e745..58cd900b 100644 --- a/res/menu/headlines_action_menu.xml +++ b/res/menu/headlines_action_menu.xml @@ -2,7 +2,6 @@ <item android:id="@+id/selection_toggle_unread" - android:icon="@drawable/ic_menu_tick" android:showAsAction="ifRoom" android:title="@string/selection_toggle_unread"/> diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 483ff37e..16047b33 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -13,52 +13,50 @@ <item android:id="@+id/subscribe_to_feed" - android:icon="@android:drawable/ic_menu_add" - android:showAsAction="" + android:icon="@drawable/ic_new_light" + android:showAsAction="ifRoom" android:title="@string/subscribe_to_feed"/> <item android:id="@+id/show_feeds" - android:icon="@android:drawable/ic_menu_agenda" - android:showAsAction="" + android:icon="@drawable/ic_list_light" + android:showAsAction="ifRoom" android:title="@string/menu_all_feeds"/> <item android:id="@+id/update_feeds" - android:icon="@android:drawable/ic_menu_rotate" + android:icon="@drawable/ic_refresh_light" android:showAsAction="ifRoom" android:title="@string/update_feeds"/> <item android:id="@+id/go_offline" - android:icon="@drawable/ic_menu_cloud" android:showAsAction="" android:title="@string/go_offline"/> <item android:id="@+id/logout" - android:icon="@drawable/ic_menu_exit" android:showAsAction="" android:title="@string/logout"/> </group> <group android:id="@+id/menu_group_headlines" > <item android:id="@+id/update_headlines" - android:icon="@android:drawable/ic_menu_rotate" + android:icon="@drawable/ic_refresh_light" android:showAsAction="ifRoom" android:title="@string/update_headlines"/> <item android:id="@+id/search" android:actionViewClass="android.widget.SearchView" - android:icon="@android:drawable/ic_menu_search" + android:icon="@drawable/ic_search_light" android:showAsAction="ifRoom|collapseActionView" android:title="@string/search"/> <item android:id="@+id/headlines_mark_as_read" - android:icon="@drawable/ic_menu_tick" - android:showAsAction="" + android:icon="@drawable/ic_accept_light" + android:showAsAction="ifRoom" android:title="@string/headlines_mark_as_read"/> <item android:id="@+id/headlines_select" - android:icon="@drawable/ic_menu_database" - android:showAsAction="" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_select_all_light" android:title="@string/headlines_select"/> <item @@ -79,7 +77,6 @@ <group android:id="@+id/menu_group_headlines_selection" > <item android:id="@+id/selection_toggle_unread" - android:icon="@drawable/ic_menu_tick" android:showAsAction="ifRoom" android:title="@string/selection_toggle_unread"/> <item @@ -118,20 +115,20 @@ android:id="@+id/share_article" android:actionProviderClass="android.widget.ShareActionProvider" android:icon="@android:drawable/ic_menu_share" - android:showAsAction="" + android:showAsAction="ifRoom" android:title="@string/share_article"/> <item android:id="@+id/set_unread" - android:icon="@android:drawable/ic_menu_recent_history" - android:showAsAction="" + android:icon="@drawable/ic_undo_light" + android:showAsAction="ifRoom" android:title="@string/article_set_unread"/> <item android:id="@+id/catchup_above" - android:icon="@drawable/ic_menu_tick" android:title="@string/article_mark_read_above"/> <item android:id="@+id/set_labels" - android:icon="@drawable/ic_menu_marked" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_labels_light" android:title="@string/article_set_labels"/> <item android:id="@+id/article_set_note" diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml index 8a30a8e4..93eb5d1a 100644 --- a/res/menu/offline_menu.xml +++ b/res/menu/offline_menu.xml @@ -3,7 +3,6 @@ <group android:id="@+id/menu_group_feeds" > <item android:id="@+id/go_online" - android:icon="@drawable/ic_menu_cloud" android:showAsAction="ifRoom|withText" android:title="@string/go_online" android:visible="false"/> @@ -23,11 +22,6 @@ android:title="@string/menu_all_feeds"/> </group> <group android:id="@+id/menu_group_headlines" > - <!-- <item - android:id="@+id/go_online" - android:icon="@drawable/ic_menu_cloud" - android:title="@string/go_online" - android:visible="false"/> --> <item android:id="@+id/search" android:actionViewClass="android.widget.SearchView" @@ -36,11 +30,9 @@ android:title="@string/search"/> <item android:id="@+id/headlines_mark_as_read" - android:icon="@drawable/ic_menu_tick" android:title="@string/headlines_mark_as_read"/> <item android:id="@+id/headlines_select" - android:icon="@drawable/ic_menu_database" android:showAsAction="" android:title="@string/headlines_select"/> <!-- <item @@ -52,7 +44,6 @@ <group android:id="@+id/menu_group_headlines_selection" > <item android:id="@+id/selection_toggle_unread" - android:icon="@drawable/ic_menu_tick" android:showAsAction="ifRoom" android:title="@string/selection_toggle_unread"/> <item @@ -95,7 +86,6 @@ android:title="@string/article_set_unread"/> <item android:id="@+id/catchup_above" - android:icon="@drawable/ic_menu_tick" android:title="@string/article_mark_read_above"/> <!-- <item android:id="@+id/close_article" |