diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res/menu')
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/menu/main_menu.xml | 86 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/menu/offline_menu.xml | 53 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/menu/share_menu.xml | 2 |
5 files changed, 48 insertions, 102 deletions
diff --git a/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml b/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml index 5e6a41ed..52855d14 100644..100755 --- a/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml @@ -7,10 +7,11 @@ <item android:id="@+id/article_img_copy" app:showAsAction="" + android:icon="@drawable/ic_content_copy" android:title="@string/article_link_copy"/> <item android:id="@+id/article_img_share" - android:icon="@drawable/ic_share_light" + android:icon="@drawable/ic_share" app:showAsAction="ifRoom" android:title="@string/article_img_share"/> <item diff --git a/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml b/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml index fdf18233..b3afdafc 100644..100755 --- a/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml @@ -3,18 +3,18 @@ <item android:id="@+id/selection_toggle_unread" app:showAsAction="always" - android:icon="@drawable/ic_unread_light" + android:icon="@drawable/ic_email_open" android:title="@string/selection_toggle_unread"/> <item android:id="@+id/selection_toggle_marked" - android:icon="@drawable/ic_unimportant_light" + android:icon="@drawable/ic_star_outline" app:showAsAction="always" android:title="@string/selection_toggle_marked"/> <item android:id="@+id/selection_toggle_published" - android:icon="@drawable/ic_menu_unpublished_light" + android:icon="@drawable/ic_rss_box" app:showAsAction="always" android:title="@string/selection_toggle_published"/> diff --git a/org.fox.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/main_menu.xml index 1abfff28..6e163a60 100644..100755 --- a/org.fox.ttrss/src/main/res/menu/main_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/main_menu.xml @@ -3,136 +3,101 @@ <group android:id="@+id/menu_group_logged_in" > <group android:id="@+id/menu_group_feeds" > - <!-- - <item - android:id="@+id/back_to_categories" - android:icon="@android:drawable/ic_menu_close_clear_cancel" - app:showAsAction="" - android:title="@string/back_to_categories"/> - --> - <item android:id="@+id/subscribe_to_feed" - android:icon="@drawable/ic_new_light" - app:showAsAction="" + android:icon="@drawable/ic_plus_circle" + app:showAsAction="ifRoom" android:title="@string/subscribe_to_feed"/> <item android:id="@+id/show_feeds" - android:icon="@drawable/ic_list_light" + android:icon="@drawable/ic_filter_remove" app:showAsAction="" android:title="@string/menu_all_feeds"/> <item android:id="@+id/go_offline" - android:icon="@drawable/ic_cloud_light" + android:icon="@drawable/ic_cloud_download" app:showAsAction="ifRoom" android:title="@string/go_offline"/> <item android:id="@+id/update_feeds" - android:icon="@drawable/ic_refresh_light" + android:icon="@drawable/ic_refresh" app:showAsAction="" android:title="@string/update_feeds"/> <item android:id="@+id/logout" + android:icon="@drawable/ic_logout" app:showAsAction="" android:title="@string/logout"/> </group> <group android:id="@+id/menu_group_headlines" > <item android:id="@+id/update_headlines" - android:icon="@drawable/ic_refresh_light" + android:icon="@drawable/ic_refresh" app:showAsAction="" android:title="@string/update_headlines"/> <item android:id="@+id/search" - android:icon="@drawable/ic_search_light" + android:icon="@drawable/ic_magnify" app:showAsAction="ifRoom" android:title="@string/search"/> <item android:id="@+id/headlines_mark_as_read" - android:icon="@drawable/ic_accept_light" + android:icon="@drawable/ic_check_all" app:showAsAction="" android:title="@string/headlines_mark_as_read"/> <item android:id="@+id/headlines_select" - app:showAsAction="" - android:icon="@drawable/ic_select_all_light" + app:showAsAction="ifRoom" + android:icon="@drawable/ic_select" android:title="@string/headlines_select"/> <item android:id="@+id/headlines_toggle_sort_order" - android:icon="@drawable/ic_action_sort_by_size" + android:icon="@drawable/ic_sort" app:showAsAction="ifRoom" android:title="@string/toggle_sort_order"/> <item android:id="@+id/headlines_view_mode" + android:icon="@drawable/ic_filter_outline" app:showAsAction="" android:title="@string/headlines_view_mode"/> - - <!-- <item - android:id="@+id/headlines_toggle_sidebar" - app:showAsAction="" - android:title="@string/toggle_sidebar"/> --> - - <!-- - <item - android:id="@+id/close_feed" - android:icon="@android:drawable/ic_menu_close_clear_cancel" - app:showAsAction="" - android:title="@string/close_feed"/> - --> - </group> - <!-- <group android:id="@+id/menu_group_headlines_selection" > - <item - android:id="@+id/selection_toggle_unread" - app:showAsAction="ifRoom" - android:title="@string/selection_toggle_unread"/> - <item - android:id="@+id/selection_toggle_marked" - android:icon="@drawable/ic_unimportant_light" - app:showAsAction="ifRoom" - android:title="@string/selection_toggle_marked"/> - <item - android:id="@+id/selection_toggle_published" - android:icon="@drawable/ic_menu_unpublished_light" - app:showAsAction="ifRoom" - android:title="@string/selection_toggle_published"/> - <item - android:id="@+id/selection_select_none" - app:showAsAction="" - android:title="@string/selection_select_none"/> - </group> --> <group android:id="@+id/menu_group_article" > <item android:id="@+id/toggle_marked" - android:icon="@drawable/ic_unimportant_light" + android:icon="@drawable/ic_star_outline" app:showAsAction="ifRoom" android:title="@string/article_toggle_marked"/> <item android:id="@+id/toggle_published" - android:icon="@drawable/ic_menu_unpublished_light" + android:icon="@drawable/ic_rss_box" app:showAsAction="ifRoom" android:title="@string/article_toggle_published"/> <item android:id="@+id/toggle_attachments" - android:icon="@drawable/ic_menu_attaches_light" + android:icon="@drawable/ic_attachment" app:showAsAction="" android:title="@string/attachments_prompt"/> <item + android:id="@+id/toggle_unread" + android:icon="@drawable/ic_email" + app:showAsAction="" + android:title="@string/article_toggle_unread"/> + <item android:id="@+id/share_article" - android:icon="@drawable/ic_share_light" + android:icon="@drawable/ic_share" app:showAsAction="ifRoom" android:title="@string/share_article"/> - <!-- android:actionProviderClass="android.widget.ShareActionProvider" --> <item android:id="@+id/set_labels" app:showAsAction="" - android:icon="@drawable/ic_labels_light" + android:icon="@drawable/ic_bookmark_outline_plus" android:title="@string/article_set_labels"/> <item android:id="@+id/article_set_note" + android:icon="@drawable/ic_comment_plus_outline" app:showAsAction="" android:title="@string/article_set_note"/> @@ -150,13 +115,14 @@ <item android:id="@+id/preferences" - android:icon="@android:drawable/ic_menu_preferences" + android:icon="@drawable/ic_settings" app:showAsAction="" android:title="@string/preferences"/> <group android:id="@+id/menu_group_logged_out" > <item android:id="@+id/login" + android:icon="@drawable/ic_login" app:showAsAction="ifRoom" android:title="@string/login_login"/> </group> diff --git a/org.fox.ttrss/src/main/res/menu/offline_menu.xml b/org.fox.ttrss/src/main/res/menu/offline_menu.xml index 34633e5b..5cd45177 100644..100755 --- a/org.fox.ttrss/src/main/res/menu/offline_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/offline_menu.xml @@ -3,13 +3,13 @@ <group android:id="@+id/menu_group_feeds" > <item android:id="@+id/go_online" - android:icon="@drawable/ic_cloud_light" + android:icon="@drawable/ic_cloud_upload" app:showAsAction="ifRoom|withText" android:title="@string/go_online" android:visible="false"/> <item android:id="@+id/show_feeds" - android:icon="@drawable/ic_list_light" + android:icon="@drawable/ic_filter_remove" app:showAsAction="" android:title="@string/menu_all_feeds"/> </group> @@ -17,71 +17,50 @@ <item android:id="@+id/search" app:showAsAction="ifRoom" - android:icon="@drawable/ic_search_light" + android:icon="@drawable/ic_magnify" android:title="@string/search"/> <item android:id="@+id/headlines_mark_as_read" - android:icon="@drawable/ic_accept_light" + android:icon="@drawable/ic_check_all" app:showAsAction="" android:title="@string/headlines_mark_as_read"/> <item android:id="@+id/headlines_select" - android:icon="@drawable/ic_select_all_light" - app:showAsAction="" + android:icon="@drawable/ic_select" + app:showAsAction="ifRoom" android:title="@string/headlines_select"/> <item android:id="@+id/headlines_toggle_sort_order" - android:icon="@drawable/ic_action_sort_by_size" + android:icon="@drawable/ic_sort" app:showAsAction="ifRoom" android:title="@string/toggle_sort_order"/> <item android:id="@+id/headlines_view_mode" + android:icon="@drawable/ic_filter_outline" app:showAsAction="" android:title="@string/headlines_view_mode"/> - - <!-- <item - android:id="@+id/headlines_toggle_sidebar" - app:showAsAction="" - android:title="@string/toggle_sidebar"/> --> - </group> - <!-- - <group android:id="@+id/menu_group_headlines_selection" > - <item - android:id="@+id/selection_toggle_unread" - app:showAsAction="ifRoom" - android:title="@string/selection_toggle_unread"/> - <item - android:id="@+id/selection_toggle_marked" - android:icon="@drawable/ic_unimportant_light" - app:showAsAction="ifRoom" - android:title="@string/selection_toggle_marked"/> - <item - android:id="@+id/selection_toggle_published" - android:icon="@drawable/ic_menu_unpublished_light" - app:showAsAction="ifRoom" - android:title="@string/selection_toggle_published"/> - <item - android:id="@+id/selection_select_none" - app:showAsAction="" - android:title="@string/selection_select_none"/> </group> - --> <group android:id="@+id/menu_group_article" > <item android:id="@+id/toggle_marked" - android:icon="@drawable/ic_unimportant_light" + android:icon="@drawable/ic_star_outline" app:showAsAction="ifRoom" android:title="@string/article_toggle_marked"/> <item android:id="@+id/toggle_published" - android:icon="@drawable/ic_menu_unpublished_light" + android:icon="@drawable/ic_rss_box" app:showAsAction="ifRoom" android:title="@string/article_toggle_published"/> + <!-- <item + android:id="@+id/toggle_unread" + android:icon="@drawable/ic_email" + app:showAsAction="ifRoom" + android:title="@string/article_toggle_unread"/> --> <item android:id="@+id/share_article" - android:icon="@drawable/ic_share_light" + android:icon="@drawable/ic_share" app:showAsAction="ifRoom" android:title="@string/share_article"/> <item diff --git a/org.fox.ttrss/src/main/res/menu/share_menu.xml b/org.fox.ttrss/src/main/res/menu/share_menu.xml index abf87ccd..40bb9237 100644..100755 --- a/org.fox.ttrss/src/main/res/menu/share_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/share_menu.xml @@ -2,7 +2,7 @@ <item android:id="@+id/preferences" - android:icon="@android:drawable/ic_menu_preferences" + android:icon="@drawable/ic_settings" app:showAsAction="" android:title="@string/preferences"/> |