diff options
author | Andrew Dolgov <[email protected]> | 2017-11-01 15:08:49 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2017-11-01 15:08:49 +0300 |
commit | 14b5c75aec2b670361453e55d17da71dda76039c (patch) | |
tree | d9f8765fea5c0c732fd986a2431e2f428922fee6 /org.fox.ttrss/src/main | |
parent | 20b218648e1caa45c132d2f3789bf6c14e7fd998 (diff) |
remove some obsolete menu entries, move subscribe to feed to bottom so that menu item positions are consistent with offline
Diffstat (limited to 'org.fox.ttrss/src/main')
-rw-r--r-- | org.fox.ttrss/src/main/res/menu/activity_main.xml | 40 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/menu/activity_offline.xml | 11 |
2 files changed, 7 insertions, 44 deletions
diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml index d183f591..04e2a2f4 100644 --- a/org.fox.ttrss/src/main/res/menu/activity_main.xml +++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml @@ -5,39 +5,12 @@ <item android:id="@+id/subscribe_to_feed" + android:orderInCategory="1" android:icon="@drawable/ic_plus_circle" app:showAsAction="" android:title="@string/subscribe_to_feed"/> <!-- iRroom --> - - <!-- <item - android:id="@+id/show_feeds" - 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_download" - android:orderInCategory="800" - app:showAsAction="" - android:title="@string/go_offline"/> --><!-- iRroom --> - <!-- <item - android:id="@+id/update_feeds" - android:icon="@drawable/ic_refresh" - app:showAsAction="" - android:title="@string/update_feeds"/> --> - <!-- <item - android:orderInCategory="900" - 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" - app:showAsAction="" - android:title="@string/update_headlines"/> --> <item android:id="@+id/search" android:icon="@drawable/ic_magnify" @@ -78,15 +51,15 @@ app:showAsAction="ifRoom" android:title="@string/article_toggle_published"/> <item - android:id="@+id/toggle_attachments" - 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="ifRoom" android:title="@string/article_toggle_unread"/> + <item + android:id="@+id/toggle_attachments" + android:icon="@drawable/ic_attachment" + app:showAsAction="" + android:title="@string/attachments_prompt"/> <!-- <item android:id="@+id/share_article" android:icon="@drawable/ic_share" @@ -111,6 +84,7 @@ <item android:id="@+id/donate" + android:orderInCategory="899" app:showAsAction="" android:title="@string/trial_purchase"/> diff --git a/org.fox.ttrss/src/main/res/menu/activity_offline.xml b/org.fox.ttrss/src/main/res/menu/activity_offline.xml index ae0bba79..bd06577c 100644 --- a/org.fox.ttrss/src/main/res/menu/activity_offline.xml +++ b/org.fox.ttrss/src/main/res/menu/activity_offline.xml @@ -1,17 +1,6 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" > <group android:id="@+id/menu_group_feeds" > - <!-- <item - android:id="@+id/go_online" - android:icon="@drawable/ic_cloud_upload" - app:showAsAction="" - android:title="@string/go_online" - android:visible="false"/> --> <!-- ifRoom|withText --> - <!-- <item - android:id="@+id/show_feeds" - android:icon="@drawable/ic_filter_remove" - app:showAsAction="" - android:title="@string/menu_all_feeds"/> --> </group> <group android:id="@+id/menu_group_headlines" > <item |