merge separate-activities

5 files changed, 44 insertions, 45 deletions

diff --git a/res/menu/category_menu.xml b/res/menu/category_menu.xml
index a1e5f81b..69f26554 100644
--- a/res/menu/category_menu.xml
+++ b/res/menu/category_menu.xml
@@ -1,6 +1,10 @@
 <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"/>
 
diff --git a/res/menu/feed_menu.xml b/res/menu/feed_menu.xml
index ff58a881..df8e4862 100644
--- a/res/menu/feed_menu.xml
+++ b/res/menu/feed_menu.xml
@@ -1,6 +1,14 @@
 <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/catchup_feed"
         android:title="@string/catchup"/>
     
diff --git a/res/menu/headlines_menu.xml b/res/menu/headlines_context_menu.xml
index 073ecb37..073ecb37 100644
--- a/res/menu/headlines_menu.xml
+++ b/res/menu/headlines_context_menu.xml
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index c6e49511..a4d168a5 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -1,7 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <group android:id="@+id/menu_group_logged_in" >
-
         <group android:id="@+id/menu_group_feeds" >
 
             <!--
@@ -17,136 +16,125 @@
                 android:icon="@android:drawable/ic_menu_agenda"
                 android:showAsAction=""
                 android:title="@string/menu_all_feeds"/>
-
             <item
                 android:id="@+id/update_feeds"
                 android:icon="@android:drawable/ic_menu_rotate"
                 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/go_offline"
-                android:icon="@drawable/ic_menu_cloud"
-                android:title="@string/go_offline"/>
-
+                android:id="@+id/update_headlines"
+                android:icon="@android:drawable/ic_menu_rotate"
+                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:showAsAction="ifRoom|collapseActionView"
                 android:title="@string/search"/>
-
             <item
                 android:id="@+id/headlines_mark_as_read"
                 android:icon="@drawable/ic_menu_tick"
                 android:showAsAction=""
                 android:title="@string/headlines_mark_as_read"/>
-
             <item
                 android:id="@+id/headlines_select"
                 android:icon="@drawable/ic_menu_database"
-                android:showAsAction="ifRoom"
+                android:showAsAction=""
                 android:title="@string/headlines_select"/>
-            
-            <item
+
+            <!--
+                  <item
                 android:id="@+id/close_feed"
                 android:icon="@android:drawable/ic_menu_close_clear_cancel"
                 android:showAsAction=""
                 android:title="@string/close_feed"/>
-            
-        </group>
+            -->
 
+        </group>
         <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
                 android:id="@+id/selection_toggle_marked"
                 android:icon="@drawable/ic_menu_marked"
                 android:showAsAction="ifRoom"
                 android:title="@string/selection_toggle_marked"/>
-
             <item
                 android:id="@+id/selection_toggle_published"
                 android:icon="@drawable/ic_menu_rss"
                 android:showAsAction="ifRoom"
                 android:title="@string/selection_toggle_published"/>
-
             <item
                 android:id="@+id/selection_select_none"
                 android:icon="@android:drawable/ic_menu_close_clear_cancel"
                 android: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_menu_marked"
                 android:showAsAction="ifRoom"
                 android:title="@string/article_toggle_marked"/>
-
             <item
                 android:id="@+id/toggle_published"
                 android:icon="@drawable/ic_menu_rss"
                 android:showAsAction="ifRoom"
                 android:title="@string/article_toggle_published"/>
-
             <item
                 android:id="@+id/share_article"
+                android:actionProviderClass="android.widget.ShareActionProvider"
                 android:icon="@android:drawable/ic_menu_share"
                 android:showAsAction=""
-                android:actionProviderClass="android.widget.ShareActionProvider"
                 android:title="@string/share_article"/>
-                        
             <item
                 android:id="@+id/set_unread"
                 android:icon="@android:drawable/ic_menu_recent_history"
                 android:showAsAction=""
                 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:title="@string/article_set_labels"/>
-            
-            <item
-	            android:id="@+id/article_set_note"
-            	android:showAsAction=""
-            	android:title="@string/article_set_note"/>
-            
             <item
+                android:id="@+id/article_set_note"
+                android:showAsAction=""
+                android:title="@string/article_set_note"/>
+
+            <!--
+                  <item
                 android:id="@+id/close_article"
                 android:icon="@android:drawable/ic_menu_close_clear_cancel"
                 android:showAsAction=""
                 android:title="@string/close_article"/>
-            
+            -->
+
         </group>
+
+        <item
+            android:id="@+id/donate"
+            android:showAsAction=""
+            android:title="@string/donate"/>
     </group>
 
     <item
@@ -154,9 +142,8 @@
         android:icon="@android:drawable/ic_menu_preferences"
         android:showAsAction=""
         android:title="@string/preferences"/>
-    
-    <group android:id="@+id/menu_group_logged_out" >
 
+    <group android:id="@+id/menu_group_logged_out" >
         <item
             android:id="@+id/login"
             android:icon="@android:drawable/ic_menu_rotate"
diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml
index 26444ef8..137184d4 100644
--- a/res/menu/offline_menu.xml
+++ b/res/menu/offline_menu.xml
@@ -23,11 +23,11 @@
             android:title="@string/menu_all_feeds"/>
     </group>
     <group android:id="@+id/menu_group_headlines" >
-        <item
+        <!--  <item
             android:id="@+id/go_online"
             android:icon="@drawable/ic_menu_cloud"
             android:title="@string/go_online"
-            android:visible="false"/>
+            android:visible="false"/> -->
         <item
             android:id="@+id/search"
             android:actionViewClass="android.widget.SearchView"
@@ -41,13 +41,13 @@
         <item
             android:id="@+id/headlines_select"
             android:icon="@drawable/ic_menu_database"
-            android:showAsAction="ifRoom"
+            android:showAsAction=""
             android:title="@string/headlines_select"/>
-        <item
+        <!-- <item
                 android:id="@+id/close_feed"
                 android:icon="@android:drawable/ic_menu_close_clear_cancel"
                 android:showAsAction=""
-                android:title="@string/close_feed"/>
+                android:title="@string/close_feed"/> -->
     </group>
     <group android:id="@+id/menu_group_headlines_selection" >
         <item
@@ -97,11 +97,11 @@
             android:id="@+id/catchup_above"
             android:icon="@drawable/ic_menu_tick"
             android:title="@string/article_mark_read_above"/>
-        <item
+        <!-- <item
                 android:id="@+id/close_article"
                 android:icon="@android:drawable/ic_menu_close_clear_cancel"
                 android:showAsAction=""
-                android:title="@string/close_article"/>        
+                android:title="@string/close_article"/>      -->
     </group>
 
     <item