From feefd1fd9abcd9dab90a233f3ce0602b1e007930 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sat, 25 Feb 2012 14:05:37 +0300
Subject: support different article text sizes

---
 res/layout/article_fragment.xml |  1 +
 res/values/arrays.xml           | 31 ++++++++++++++++++++-----------
 res/values/strings.xml          |  4 ++++
 res/xml/preferences.xml         |  9 ++++++++-
 4 files changed, 33 insertions(+), 12 deletions(-)

(limited to 'res')

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index ea0776c9..3b1eac6b 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -48,6 +48,7 @@
                 android:layout_height="wrap_content"
                 android:layout_above="@+id/linearLayout3"
                 android:layout_alignParentLeft="true"
+                android:textSize="15sp"
                 android:layout_alignParentTop="true"
                 android:layout_weight="1"
                 android:text="There are many variations of passages of Lorem Ipsum available" />
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index fcac426d..ef479753 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,12 +1,21 @@
+<resources>
+    <string-array name="pref_theme_names">
+        <item>@string/theme_dark</item>
+        <item>@string/theme_light</item>
+    </string-array>
+    <string-array name="pref_theme_values">
+        <item>THEME_DARK</item>
+        <item>THEME_LIGHT</item>
+    </string-array>
+    <string-array name="pref_font_size_names">
+        <item>@string/font_size_small</item>
+        <item>@string/font_size_medium</item>
+        <item>@string/font_size_large</item>
+    </string-array>
+    <string-array name="pref_font_size_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
 
-    <resources>
-		<string-array name="pref_theme_names">
-        	<item>@string/theme_dark</item>
-        	<item>@string/theme_light</item>
-    	</string-array>
-    	
-    	<string-array name="pref_theme_values">
-        	<item>THEME_DARK</item>
-        	<item>THEME_LIGHT</item>
-    	</string-array>
-    </resources>
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a469dec8..35d505fc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -118,4 +118,8 @@
 	<string name="search">Search</string>
 	<string name="cancel">Cancel</string>
 	<string name="attachments">Attachments:</string>
+	<string name="font_size_small">Small</string>
+    <string name="font_size_medium">Medium</string>
+    <string name="font_size_large">Large</string>
+    <string name="pref_font_size">Article text size</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 87abd132..44d41d65 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -19,10 +19,10 @@
 
         <EditTextPreference
             android:hint="@string/default_url"
+            android:inputType="textUri"
             android:key="ttrss_url"
             android:singleLine="true"
             android:summary="@string/ttrss_url_summary"
-            android:inputType="textUri"
             android:title="@string/ttrss_url" >
         </EditTextPreference>
 
@@ -59,6 +59,13 @@
             android:summary="@string/pref_theme_long"
             android:title="@string/pref_theme" />
 
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/pref_font_size_names"
+            android:entryValues="@array/pref_font_size_values"
+            android:key="font_size"
+            android:title="@string/pref_font_size" />
+
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="sort_feeds_by_unread"
-- 
cgit v1.2.3-54-g00ecf