From ef07afec72e181e0b0cec06493c14daf443ea7b9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 12:54:51 +0400
Subject: various menu updates

---
 res/layout/feeds.xml                |  1 +
 res/layout/headlines.xml            |  1 +
 res/layout/headlines_row_unread.xml |  1 +
 res/menu/main_menu.xml              | 36 +++++++++++++++---------------------
 4 files changed, 18 insertions(+), 21 deletions(-)

(limited to 'res')

diff --git a/res/layout/feeds.xml b/res/layout/feeds.xml
index 102dd07e..72067ce0 100644
--- a/res/layout/feeds.xml
+++ b/res/layout/feeds.xml
@@ -1,5 +1,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main"
+    android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
 
diff --git a/res/layout/headlines.xml b/res/layout/headlines.xml
index f00b8d38..9de7f87d 100644
--- a/res/layout/headlines.xml
+++ b/res/layout/headlines.xml
@@ -1,5 +1,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/headlines"
+    android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
 
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 1e789f71..d7cb0e08 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -49,6 +49,7 @@
 
             <LinearLayout
                 android:id="@+id/feed_and_author"
+                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" >
 
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index d9a33b48..34190322 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -106,25 +106,17 @@
                 android:icon="@drawable/ic_menu_publish_light"
                 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="@drawable/ic_undo_light"
-                android:showAsAction="ifRoom"
-                android:title="@string/article_set_unread"/>
             <item
                 android:id="@+id/toggle_attachments"
                 android:icon="@drawable/ic_menu_attaches_light"
                 android:showAsAction="ifRoom"
-                android:title="@string/attachments_prompt"/>            
+                android:title="@string/attachments_prompt"/>
             <item
-                android:id="@+id/catchup_above"
-                android:title="@string/article_mark_read_above"/>
+                android:id="@+id/share_article"
+                android:icon="@android:drawable/ic_menu_share"
+                android:showAsAction="ifRoom"
+                android:title="@string/share_article"/>
+            <!--  android:actionProviderClass="android.widget.ShareActionProvider" -->
             <item
                 android:id="@+id/set_labels"
                 android:showAsAction=""
@@ -135,13 +127,15 @@
                 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"/>
-            -->
+            <item
+                android:id="@+id/catchup_above"
+                android:title="@string/article_mark_read_above"/>
+
+            <item
+                android:id="@+id/set_unread"
+                android:icon="@drawable/ic_undo_light"
+                android:showAsAction="ifRoom"
+                android:title="@string/article_set_unread"/>
 
         </group>
 
-- 
cgit v1.2.3-54-g00ecf