add show unread/show all menu item

4 files changed, 17 insertions, 10 deletions

diff --git a/res/layout/main.xml b/res/layout/main.xml
index fcac33d5..ee05766b 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,17 +1,16 @@
 <ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"    
     android:layout_height="fill_parent" android:id="@+id/main_flipper">
-    <FrameLayout android:id="@+id/sync_splash" android:layout_height="match_parent" android:layout_gravity="center_vertical" android:layout_width="match_parent">
-        <LinearLayout android:gravity="center" android:id="@+id/linearLayout1" android:layout_width="match_parent" android:layout_height="match_parent">
-            <ProgressBar android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge" android:layout_height="wrap_content" android:id="@+id/loading_progress"></ProgressBar>
-            <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/loading_message" android:text="@string/loading_message"></TextView>
+    <FrameLayout android:layout_height="match_parent" android:id="@+id/sync_splash" android:layout_gravity="center_vertical" android:layout_width="match_parent">
+        <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/linearLayout1" android:gravity="center">
+            <ProgressBar android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge" android:id="@+id/loading_progress" android:layout_height="wrap_content"></ProgressBar>
+            <TextView android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:text="@string/loading_message" android:layout_height="wrap_content" android:id="@+id/loading_message"></TextView>
         </LinearLayout>
     </FrameLayout>
-    <LinearLayout android:layout_height="fill_parent" android:id="@+id/main" android:layout_width="fill_parent" android:orientation="horizontal">
-        <LinearLayout android:id="@+id/feeds_fragment" android:layout_weight="0.6" android:layout_height="match_parent" android:orientation="vertical" android:layout_width="match_parent"></LinearLayout>
-    				
-        <LinearLayout android:layout_height="match_parent" android:layout_weight="0.5" android:id="@+id/headlines_fragment" android:orientation="vertical" android:layout_width="match_parent"></LinearLayout>
-        <LinearLayout android:id="@+id/article_fragment" android:layout_weight="0.5" android:layout_height="match_parent" android:orientation="vertical" android:layout_width="match_parent"></LinearLayout>
+    <LinearLayout android:orientation="horizontal" android:layout_height="fill_parent" android:id="@+id/main" android:layout_width="fill_parent">
+        <LinearLayout android:orientation="vertical" android:id="@+id/feeds_fragment" android:layout_height="match_parent" android:layout_width="300px"></LinearLayout>
+        <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_weight="0.5" android:id="@+id/headlines_fragment" android:layout_height="match_parent"></LinearLayout>
+        <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_weight="0.5" android:id="@+id/article_fragment" android:layout_height="match_parent"></LinearLayout>
     </LinearLayout>
     
     
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 42ec20e9..ac7423c4 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -1,5 +1,10 @@
 
     <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/show_feeds"
+          android:icon="@android:drawable/ic_menu_rotate"
+          android:title="@string/menu_unread_feeds" 
+          android:showAsAction="ifRoom|withText"/>
+          
      <item android:id="@+id/preferences"
           android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/preferences" 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 72aa1cb6..44d99b3d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,4 +26,7 @@
     <string name="no_unread_feeds">No unread feeds.</string>
     <string name="no_unread_headlines">No unread headlines.</string>
     <string name="loading_message">Loading, please wait...</string>
+    <string name="menu_unread_feeds">Unread feeds</string>
+    <string name="menu_all_feeds">All feeds</string>
+    
 </resources>
diff --git a/res/values/style.xml b/res/values/style.xml
index 84a40558..4bc343e1 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -5,7 +5,7 @@
 		<item name="unreadCounterColor">#0000ff</item>

 		<item name="headlinesBackground">#ffffff</item>

 		<item name="articleDivider">#f0f0f0</item>

-		<item name="articleHeader">#ffffff</item>		

+		<item name="articleHeader">#E8F2FF</item>		

 	</style>

 

 	<style name="DarkTheme" parent="android:Theme.Holo">