offline: fix sharingactionprovider

offline: implement list navigation

1 files changed, 37 insertions, 52 deletions

diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml
index a7ee4c42..e4169f43 100644
--- a/res/menu/offline_menu.xml
+++ b/res/menu/offline_menu.xml
@@ -1,7 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <group android:id="@+id/menu_group_feeds" >
-
         <item
             android:id="@+id/go_online"
             android:icon="@drawable/ic_menu_cloud"
@@ -9,11 +8,13 @@
             android:title="@string/go_online"
             android:visible="false"/>
 
-        <!--  <item
+        <!--
+              <item
             android:id="@+id/back_to_categories"
             android:icon="@android:drawable/ic_menu_close_clear_cancel"
             android:showAsAction="ifRoom|withText"
-            android:title="@string/back_to_categories"/> -->
+            android:title="@string/back_to_categories"/>
+        -->
 
         <item
             android:id="@+id/show_feeds"
@@ -21,88 +22,72 @@
             android:showAsAction=""
             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:icon="@drawable/ic_menu_cloud"
             android:title="@string/go_online"
             android:visible="false"/>
-
         <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"/>
-        
+            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:title="@string/headlines_mark_as_read"/>
-
         <item
             android:id="@+id/headlines_select"
             android:icon="@drawable/ic_menu_database"
             android:showAsAction="ifRoom"
             android:title="@string/headlines_select"/>
     </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/share_article"
-            android:icon="@android:drawable/ic_menu_share"
-            android:showAsAction="ifRoom|collapseActionView"
-            android:actionProviderClass="android.widget.ShareActionProvider"
-            android:title="@string/share_article"/>
-
+            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="ifRoom"
+            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"