From 4acc9ac37e3363552cebc7a37e16e254f9438f4d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 10 Jun 2015 19:40:08 +0300
Subject: further refactoring

---
 .../src/main/res/menu/action_mode_headlines.xml    |  21 +++
 org.fox.ttrss/src/main/res/menu/activity_main.xml  | 142 +++++++++++++++++++++
 .../src/main/res/menu/activity_offline.xml         |  76 +++++++++++
 org.fox.ttrss/src/main/res/menu/activity_share.xml |   9 ++
 .../res/menu/article_content_img_context_menu.xml  |  29 -----
 .../main/res/menu/article_link_context_menu.xml    |  13 --
 org.fox.ttrss/src/main/res/menu/category_menu.xml  |  22 ----
 .../main/res/menu/context_article_content_img.xml  |  29 +++++
 .../src/main/res/menu/context_article_link.xml     |  13 ++
 .../src/main/res/menu/context_category.xml         |  22 ++++
 org.fox.ttrss/src/main/res/menu/context_feed.xml   |  27 ++++
 .../src/main/res/menu/context_headlines.xml        |  42 ++++++
 org.fox.ttrss/src/main/res/menu/feed_menu.xml      |  27 ----
 .../src/main/res/menu/headlines_action_menu.xml    |  21 ---
 .../src/main/res/menu/headlines_context_menu.xml   |  42 ------
 org.fox.ttrss/src/main/res/menu/main_menu.xml      | 142 ---------------------
 org.fox.ttrss/src/main/res/menu/offline_menu.xml   |  76 -----------
 org.fox.ttrss/src/main/res/menu/share_menu.xml     |   9 --
 18 files changed, 381 insertions(+), 381 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml
 create mode 100644 org.fox.ttrss/src/main/res/menu/activity_main.xml
 create mode 100644 org.fox.ttrss/src/main/res/menu/activity_offline.xml
 create mode 100644 org.fox.ttrss/src/main/res/menu/activity_share.xml
 delete mode 100755 org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml
 delete mode 100644 org.fox.ttrss/src/main/res/menu/article_link_context_menu.xml
 delete mode 100644 org.fox.ttrss/src/main/res/menu/category_menu.xml
 create mode 100644 org.fox.ttrss/src/main/res/menu/context_article_content_img.xml
 create mode 100644 org.fox.ttrss/src/main/res/menu/context_article_link.xml
 create mode 100644 org.fox.ttrss/src/main/res/menu/context_category.xml
 create mode 100644 org.fox.ttrss/src/main/res/menu/context_feed.xml
 create mode 100644 org.fox.ttrss/src/main/res/menu/context_headlines.xml
 delete mode 100644 org.fox.ttrss/src/main/res/menu/feed_menu.xml
 delete mode 100755 org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml
 delete mode 100644 org.fox.ttrss/src/main/res/menu/headlines_context_menu.xml
 delete mode 100755 org.fox.ttrss/src/main/res/menu/main_menu.xml
 delete mode 100755 org.fox.ttrss/src/main/res/menu/offline_menu.xml
 delete mode 100755 org.fox.ttrss/src/main/res/menu/share_menu.xml

(limited to 'org.fox.ttrss/src/main/res/menu')

diff --git a/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml
new file mode 100644
index 00000000..b3afdafc
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml
@@ -0,0 +1,21 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/selection_toggle_unread"
+        app:showAsAction="always"
+        android:icon="@drawable/ic_email_open"
+        android:title="@string/selection_toggle_unread"/>
+
+    <item
+        android:id="@+id/selection_toggle_marked"
+        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_rss_box"
+        app:showAsAction="always"
+        android:title="@string/selection_toggle_published"/>
+
+</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml
new file mode 100644
index 00000000..d183f591
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml
@@ -0,0 +1,142 @@
+<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_logged_in" >
+        <group android:id="@+id/menu_group_feeds" >
+
+            <item
+                android:id="@+id/subscribe_to_feed"
+                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"
+                app:showAsAction="ifRoom"
+                android:title="@string/search"/>
+            <item
+                android:id="@+id/headlines_mark_as_read"
+                android:icon="@drawable/ic_check_all"
+                app:showAsAction=""
+                android:title="@string/headlines_mark_as_read"/>
+            <item
+                android:id="@+id/headlines_select"
+                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_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"/>
+        </group>
+        <group android:id="@+id/menu_group_article" >
+            <item
+                android:id="@+id/toggle_marked"
+                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_rss_box"
+                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/share_article"
+                android:icon="@drawable/ic_share"
+                app:showAsAction="ifRoom"
+                android:title="@string/share_article"/> -->
+            <item
+                android:id="@+id/set_labels"
+                app:showAsAction=""
+                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"/>
+
+            <item
+                android:id="@+id/catchup_above"
+                android:title="@string/article_mark_read_above"/>
+
+        </group>
+
+        <item
+            android:id="@+id/donate"
+            app:showAsAction=""
+            android:title="@string/trial_purchase"/>
+
+        <!-- <item
+            android:orderInCategory="999"
+            android:id="@+id/preferences"
+            android:icon="@drawable/ic_settings"
+            app:showAsAction=""
+            android:title="@string/preferences"/> -->
+
+    </group>
+
+    <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"/>
+
+        <item
+            android:orderInCategory="999"
+            android:id="@+id/preferences"
+            android:icon="@drawable/ic_settings"
+            app:showAsAction="ifRoom"
+            android:title="@string/preferences"/>
+
+    </group>
+
+</menu>
diff --git a/org.fox.ttrss/src/main/res/menu/activity_offline.xml b/org.fox.ttrss/src/main/res/menu/activity_offline.xml
new file mode 100644
index 00000000..e8e81329
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/activity_offline.xml
@@ -0,0 +1,76 @@
+<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
+            android:id="@+id/search"
+            app:showAsAction="ifRoom"
+            android:icon="@drawable/ic_magnify"
+            android:title="@string/search"/>
+        <item
+            android:id="@+id/headlines_mark_as_read"
+            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"
+            app:showAsAction="ifRoom"
+            android:title="@string/headlines_select"/>
+
+        <item
+            android:id="@+id/headlines_toggle_sort_order"
+            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"/>
+    </group>
+    <group android:id="@+id/menu_group_article" >
+        <item
+            android:id="@+id/toggle_marked"
+            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_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"
+            app:showAsAction="ifRoom"
+            android:title="@string/share_article"/> -->
+        <item
+            android:id="@+id/catchup_above"
+            android:title="@string/article_mark_read_above"/>
+    </group>
+
+    <item
+        android:id="@+id/preferences"
+        app:showAsAction=""
+        android:title="@string/preferences"/>
+
+</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/activity_share.xml b/org.fox.ttrss/src/main/res/menu/activity_share.xml
new file mode 100644
index 00000000..40bb9237
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/activity_share.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" >
+
+    <item
+        android:id="@+id/preferences"
+        android:icon="@drawable/ic_settings"
+        app:showAsAction=""
+        android:title="@string/preferences"/>
+
+</menu>
\ No newline at end of file
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
deleted file mode 100755
index 52855d14..00000000
--- a/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" >
-
-    <item
-        android:id="@+id/article_img_open"
-        app:showAsAction=""
-        android:title="@string/article_img_open"/>
-    <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"
-        app:showAsAction="ifRoom"
-        android:title="@string/article_img_share"/>
-    <item
-        android:id="@+id/article_img_view_caption"
-        app:showAsAction=""
-        android:title="@string/article_img_view_caption"/>
-
-    <!--
-          <item
-        android:id="@+id/article_img_save"
-        app:showAsAction=""
-        android:title="Save image to file"/>
-    -->
-
-</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/article_link_context_menu.xml b/org.fox.ttrss/src/main/res/menu/article_link_context_menu.xml
deleted file mode 100644
index dcef75b6..00000000
--- a/org.fox.ttrss/src/main/res/menu/article_link_context_menu.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/article_link_share"
-        app:showAsAction=""
-        android:title="@string/share_article"/>
-
-    <item
-        android:id="@+id/article_link_copy"
-        app:showAsAction=""
-        android:title="@string/article_link_copy"/>
-
-</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/category_menu.xml b/org.fox.ttrss/src/main/res/menu/category_menu.xml
deleted file mode 100644
index f2547a6d..00000000
--- a/org.fox.ttrss/src/main/res/menu/category_menu.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/browse_headlines"
-        android:title="@string/category_browse_headlines"/>
-    
-    <!-- <item
-        android:id="@+id/browse_articles"
-        android:title="@string/category_browse_articles"/> -->
-
-    <item
-        android:id="@+id/browse_feeds"
-        android:title="@string/category_browse_feeds"/>
-
-    <item
-        android:id="@+id/catchup_category"
-        android:title="@string/catchup"/>
-    
- 	<item	
-        android:id="@+id/create_shortcut"
-        android:title="@string/place_shortcut"/>    
-</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/context_article_content_img.xml b/org.fox.ttrss/src/main/res/menu/context_article_content_img.xml
new file mode 100644
index 00000000..52855d14
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/context_article_content_img.xml
@@ -0,0 +1,29 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" >
+
+    <item
+        android:id="@+id/article_img_open"
+        app:showAsAction=""
+        android:title="@string/article_img_open"/>
+    <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"
+        app:showAsAction="ifRoom"
+        android:title="@string/article_img_share"/>
+    <item
+        android:id="@+id/article_img_view_caption"
+        app:showAsAction=""
+        android:title="@string/article_img_view_caption"/>
+
+    <!--
+          <item
+        android:id="@+id/article_img_save"
+        app:showAsAction=""
+        android:title="Save image to file"/>
+    -->
+
+</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/context_article_link.xml b/org.fox.ttrss/src/main/res/menu/context_article_link.xml
new file mode 100644
index 00000000..dcef75b6
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/context_article_link.xml
@@ -0,0 +1,13 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/article_link_share"
+        app:showAsAction=""
+        android:title="@string/share_article"/>
+
+    <item
+        android:id="@+id/article_link_copy"
+        app:showAsAction=""
+        android:title="@string/article_link_copy"/>
+
+</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/context_category.xml b/org.fox.ttrss/src/main/res/menu/context_category.xml
new file mode 100644
index 00000000..f2547a6d
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/context_category.xml
@@ -0,0 +1,22 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/browse_headlines"
+        android:title="@string/category_browse_headlines"/>
+    
+    <!-- <item
+        android:id="@+id/browse_articles"
+        android:title="@string/category_browse_articles"/> -->
+
+    <item
+        android:id="@+id/browse_feeds"
+        android:title="@string/category_browse_feeds"/>
+
+    <item
+        android:id="@+id/catchup_category"
+        android:title="@string/catchup"/>
+    
+ 	<item	
+        android:id="@+id/create_shortcut"
+        android:title="@string/place_shortcut"/>    
+</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/context_feed.xml b/org.fox.ttrss/src/main/res/menu/context_feed.xml
new file mode 100644
index 00000000..ba5ad55b
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/context_feed.xml
@@ -0,0 +1,27 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/browse_headlines"
+        android:title="@string/category_browse_headlines"/>
+    
+    <!-- <item
+        android:id="@+id/browse_articles"
+        android:title="@string/category_browse_articles"/> -->
+    
+     <item
+        android:id="@+id/browse_feeds"
+        android:title="@string/category_browse_feeds"/>
+    
+    <item
+        android:id="@+id/catchup_feed"
+        android:title="@string/catchup"/>
+
+    <item
+        android:id="@+id/create_shortcut"
+        android:title="@string/place_shortcut"/>
+
+    <item
+     	android:id="@+id/unsubscribe_feed"
+        android:title="@string/unsubscribe"/>
+    
+</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/context_headlines.xml b/org.fox.ttrss/src/main/res/menu/context_headlines.xml
new file mode 100644
index 00000000..fafac872
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/context_headlines.xml
@@ -0,0 +1,42 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/selection_toggle_unread"
+        app:showAsAction=""
+        android:title="@string/context_selection_toggle_unread"/>
+    <item
+        android:id="@+id/selection_toggle_marked"
+        app:showAsAction=""
+        android:title="@string/context_selection_toggle_marked"/>
+    <item
+        android:id="@+id/selection_toggle_published"
+        app:showAsAction=""
+        android:title="@string/context_selection_toggle_published"/>
+
+    <group android:id="@+id/menu_group_single_article" >
+        <item
+            android:id="@+id/headlines_share_article"
+            app:showAsAction=""
+            android:title="@string/share_article"/>
+        <item
+            android:id="@+id/headlines_article_link_open"
+            app:showAsAction=""
+            android:title="@string/open_article_in_web_browser"/>
+        <item
+            android:id="@+id/headlines_article_link_copy"
+            app:showAsAction=""
+            android:title="@string/article_link_copy"/>
+        <item
+            android:id="@+id/catchup_above"
+            app:showAsAction=""
+            android:title="@string/article_mark_read_above"/>
+        <item
+            android:id="@+id/set_labels"
+            android:title="@string/article_set_labels"/>
+        <item
+            android:id="@+id/article_set_note"
+            app:showAsAction=""
+            android:title="@string/article_set_note"/>
+    </group>
+
+</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/feed_menu.xml b/org.fox.ttrss/src/main/res/menu/feed_menu.xml
deleted file mode 100644
index ba5ad55b..00000000
--- a/org.fox.ttrss/src/main/res/menu/feed_menu.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/browse_headlines"
-        android:title="@string/category_browse_headlines"/>
-    
-    <!-- <item
-        android:id="@+id/browse_articles"
-        android:title="@string/category_browse_articles"/> -->
-    
-     <item
-        android:id="@+id/browse_feeds"
-        android:title="@string/category_browse_feeds"/>
-    
-    <item
-        android:id="@+id/catchup_feed"
-        android:title="@string/catchup"/>
-
-    <item
-        android:id="@+id/create_shortcut"
-        android:title="@string/place_shortcut"/>
-
-    <item
-     	android:id="@+id/unsubscribe_feed"
-        android:title="@string/unsubscribe"/>
-    
-</menu>
\ No newline at end of file
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
deleted file mode 100755
index b3afdafc..00000000
--- a/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/selection_toggle_unread"
-        app:showAsAction="always"
-        android:icon="@drawable/ic_email_open"
-        android:title="@string/selection_toggle_unread"/>
-
-    <item
-        android:id="@+id/selection_toggle_marked"
-        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_rss_box"
-        app:showAsAction="always"
-        android:title="@string/selection_toggle_published"/>
-
-</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/headlines_context_menu.xml b/org.fox.ttrss/src/main/res/menu/headlines_context_menu.xml
deleted file mode 100644
index fafac872..00000000
--- a/org.fox.ttrss/src/main/res/menu/headlines_context_menu.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/selection_toggle_unread"
-        app:showAsAction=""
-        android:title="@string/context_selection_toggle_unread"/>
-    <item
-        android:id="@+id/selection_toggle_marked"
-        app:showAsAction=""
-        android:title="@string/context_selection_toggle_marked"/>
-    <item
-        android:id="@+id/selection_toggle_published"
-        app:showAsAction=""
-        android:title="@string/context_selection_toggle_published"/>
-
-    <group android:id="@+id/menu_group_single_article" >
-        <item
-            android:id="@+id/headlines_share_article"
-            app:showAsAction=""
-            android:title="@string/share_article"/>
-        <item
-            android:id="@+id/headlines_article_link_open"
-            app:showAsAction=""
-            android:title="@string/open_article_in_web_browser"/>
-        <item
-            android:id="@+id/headlines_article_link_copy"
-            app:showAsAction=""
-            android:title="@string/article_link_copy"/>
-        <item
-            android:id="@+id/catchup_above"
-            app:showAsAction=""
-            android:title="@string/article_mark_read_above"/>
-        <item
-            android:id="@+id/set_labels"
-            android:title="@string/article_set_labels"/>
-        <item
-            android:id="@+id/article_set_note"
-            app:showAsAction=""
-            android:title="@string/article_set_note"/>
-    </group>
-
-</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/main_menu.xml
deleted file mode 100755
index d183f591..00000000
--- a/org.fox.ttrss/src/main/res/menu/main_menu.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<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_logged_in" >
-        <group android:id="@+id/menu_group_feeds" >
-
-            <item
-                android:id="@+id/subscribe_to_feed"
-                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"
-                app:showAsAction="ifRoom"
-                android:title="@string/search"/>
-            <item
-                android:id="@+id/headlines_mark_as_read"
-                android:icon="@drawable/ic_check_all"
-                app:showAsAction=""
-                android:title="@string/headlines_mark_as_read"/>
-            <item
-                android:id="@+id/headlines_select"
-                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_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"/>
-        </group>
-        <group android:id="@+id/menu_group_article" >
-            <item
-                android:id="@+id/toggle_marked"
-                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_rss_box"
-                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/share_article"
-                android:icon="@drawable/ic_share"
-                app:showAsAction="ifRoom"
-                android:title="@string/share_article"/> -->
-            <item
-                android:id="@+id/set_labels"
-                app:showAsAction=""
-                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"/>
-
-            <item
-                android:id="@+id/catchup_above"
-                android:title="@string/article_mark_read_above"/>
-
-        </group>
-
-        <item
-            android:id="@+id/donate"
-            app:showAsAction=""
-            android:title="@string/trial_purchase"/>
-
-        <!-- <item
-            android:orderInCategory="999"
-            android:id="@+id/preferences"
-            android:icon="@drawable/ic_settings"
-            app:showAsAction=""
-            android:title="@string/preferences"/> -->
-
-    </group>
-
-    <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"/>
-
-        <item
-            android:orderInCategory="999"
-            android:id="@+id/preferences"
-            android:icon="@drawable/ic_settings"
-            app:showAsAction="ifRoom"
-            android:title="@string/preferences"/>
-
-    </group>
-
-</menu>
diff --git a/org.fox.ttrss/src/main/res/menu/offline_menu.xml b/org.fox.ttrss/src/main/res/menu/offline_menu.xml
deleted file mode 100755
index e8e81329..00000000
--- a/org.fox.ttrss/src/main/res/menu/offline_menu.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<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
-            android:id="@+id/search"
-            app:showAsAction="ifRoom"
-            android:icon="@drawable/ic_magnify"
-            android:title="@string/search"/>
-        <item
-            android:id="@+id/headlines_mark_as_read"
-            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"
-            app:showAsAction="ifRoom"
-            android:title="@string/headlines_select"/>
-
-        <item
-            android:id="@+id/headlines_toggle_sort_order"
-            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"/>
-    </group>
-    <group android:id="@+id/menu_group_article" >
-        <item
-            android:id="@+id/toggle_marked"
-            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_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"
-            app:showAsAction="ifRoom"
-            android:title="@string/share_article"/> -->
-        <item
-            android:id="@+id/catchup_above"
-            android:title="@string/article_mark_read_above"/>
-    </group>
-
-    <item
-        android:id="@+id/preferences"
-        app:showAsAction=""
-        android:title="@string/preferences"/>
-
-</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/share_menu.xml b/org.fox.ttrss/src/main/res/menu/share_menu.xml
deleted file mode 100755
index 40bb9237..00000000
--- a/org.fox.ttrss/src/main/res/menu/share_menu.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" >
-
-    <item
-        android:id="@+id/preferences"
-        android:icon="@drawable/ic_settings"
-        app:showAsAction=""
-        android:title="@string/preferences"/>
-
-</menu>
\ No newline at end of file
-- 
cgit v1.2.3