From 3d23240bb0c10c0393dcf286a1d52f69bc0a24cc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 24 Nov 2013 01:56:01 +0400
Subject: allow more precise font size selection for headlines & article remove
 single_column layout stuff

---
 res/values/arrays.xml   | 10 ----------
 res/xml/preferences.xml | 19 ++++++++-----------
 2 files changed, 8 insertions(+), 21 deletions(-)

(limited to 'res')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 63e90184..b26a97a5 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -11,16 +11,6 @@
         <item>THEME_LIGHT</item>
         <item>THEME_SEPIA</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" translatable="false">
-        <item>0</item>
-        <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>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index ec74841a..addf8852 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -103,21 +103,18 @@
             android:summary="@string/pref_headlines_mark_read_scroll_long"
             android:title="@string/pref_headlines_mark_read_scroll" />
 
-        <ListPreference
-            android:defaultValue="0"
-            android:entries="@array/pref_font_size_names"
-            android:entryValues="@array/pref_font_size_values"
-            android:key="headlines_font_size"
+        <EditTextPreference
+            android:defaultValue="13"
+            android:key="headlines_font_size_sp"
+            android:inputType="number"
             android:title="@string/pref_headline_font_size" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/reading" >
-        <ListPreference
-            android:defaultValue="0"
-            android:entries="@array/pref_font_size_names"
-            android:entryValues="@array/pref_font_size_values"
-            android:key="font_size"
+        <EditTextPreference
+            android:defaultValue="16"
+            android:key="article_font_size_sp"
+            android:inputType="number"
             android:title="@string/pref_font_size" />
-
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="justify_article_text"
-- 
cgit v1.2.3-54-g00ecf