From d70e6463ad7d48a24ede3da7ca98d675823e9999 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 19 Sep 2012 16:59:08 +0400
Subject: implement default browsing of articles

---
 res/menu/category_menu.xml |  4 ++++
 res/menu/feed_menu.xml     |  8 ++++++++
 res/values/arrays.xml      | 10 +++++++++-
 res/values/strings.xml     |  3 +++
 res/xml/preferences.xml    |  9 +++++++++
 5 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'res')

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,5 +1,9 @@
 <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,5 +1,13 @@
 <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/values/arrays.xml b/res/values/arrays.xml
index ef479753..961bd955 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -17,5 +17,13 @@
         <item>1</item>
         <item>2</item>
     </string-array>
-
+    <string-array name="pref_view_mode_names">
+        <item>@string/category_browse_headlines</item>
+        <item>@string/category_browse_articles</item>
+    </string-array>
+    <string-array name="pref_view_mode_values">
+        <item>HEADLINES</item>
+        <item>ARTICLES</item>
+    </string-array>
+    
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 84fd1ed5..fec2ef4c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -131,4 +131,7 @@
     <string name="update_headlines">Refresh</string>
     <string name="attachment_share">Share</string>
     <string name="error_network_unavailable">Error: network unavailable</string>
+    <string name="category_browse_headlines">Browse headlines</string>
+    <string name="pref_default_view_mode">Default feed view</string>
+    <string name="pref_default_view_mode_long">Which feed view to open by default on smartphones</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index d2bae786..400d8a6d 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -98,6 +98,15 @@
             android:defaultValue="true"
             android:key="justify_article_text"
             android:title="@string/justify_article_text" />
+        
+        <ListPreference
+            android:defaultValue="HEADLINES"
+            android:entries="@array/pref_view_mode_names"
+            android:entryValues="@array/pref_view_mode_values"
+            android:key="default_view_mode"
+            android:summary="@string/pref_default_view_mode_long"
+            android:title="@string/pref_default_view_mode" />
+        
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/offline_mode" >
-- 
cgit v1.2.3-54-g00ecf