made font size selectable

5 files changed, 78 insertions, 20 deletions

diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 7d7823a46..fe18139fd 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -103,4 +103,14 @@
         <item>@string/default_off</item>
     </string-array>
 
+    <string-array name="font_size_entry_values">
+        <item>small</item>
+        <item>medium</item>
+        <item>large</item>
+    </string-array>
+    <string-array name="font_size_entries">
+        <item>@string/small</item>
+        <item>@string/medium</item>
+        <item>@string/large</item>
+    </string-array>
 </resources>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index d3f76d528..d38c01174 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -104,5 +104,6 @@
     <bool name="scroll_to_bottom">true</bool>
     <string name="omemo_setting_default">default_off</string>
     <string name="theme">light</string>
+    <string name="default_font_size">small</string>
 </resources>
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 809b77dba..7aeadd71d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -782,4 +782,9 @@
     <string name="pref_theme_options_summary">Select the color palette</string>
     <string name="pref_theme_options">Theme</string>
     <string name="chooce_account">Choose account</string>
+    <string name="pref_font_size">Font Size</string>
+    <string name="pref_font_size_summary">The relative font size used within the app.</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 4495b2f49..5bf27cbfd 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -238,21 +238,6 @@
         <item name="ic_settings_about" type="reference">@drawable/ic_help_circle_white_24dp</item>
     </style>
 
-
-    <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
-        <item name="TextSizeCaption">12sp</item>
-        <item name="TextSizeBody1">14sp</item>
-        <item name="TextSizeBody2">14sp</item>
-        <item name="TextSizeSubhead">16sp</item>
-        <item name="TextSizeTitle">20sp</item>
-        <item name="TextSizeInput">16sp</item>
-        <item name="TextSeparation">5sp</item>
-        <item name="IconSize">18sp</item>
-        <item name="TextSizeInfo">12sp</item>
-        <item name="TextSizeBody">14sp</item>
-        <item name="TextSizeHeadline">18sp</item>
-    </style>
-
     <style name="ConversationsDialog" parent="Theme.AppCompat.Light.Dialog">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>
@@ -314,4 +299,59 @@
         <item name="android:windowBackground">@drawable/background</item>
     </style>
 
+    <style name="ConversationsTheme.Medium" parent="ConversationsTheme">
+        <item name="TextSizeCaption">14sp</item>
+        <item name="TextSizeBody1">16sp</item>
+        <item name="TextSizeBody2">16sp</item>
+        <item name="TextSizeSubhead">18sp</item>
+        <item name="TextSizeTitle">22sp</item>
+        <item name="TextSizeInput">18sp</item>
+        <item name="TextSeparation">6sp</item>
+        <item name="IconSize">20sp</item>
+        <item name="TextSizeInfo">14sp</item>
+        <item name="TextSizeBody">16sp</item>
+        <item name="TextSizeHeadline">20sp</item>
+    </style>
+
+    <style name="ConversationsTheme.Dark.Medium" parent="ConversationsTheme.Dark">
+        <item name="TextSizeCaption">14sp</item>
+        <item name="TextSizeBody1">16sp</item>
+        <item name="TextSizeBody2">16sp</item>
+        <item name="TextSizeSubhead">18sp</item>
+        <item name="TextSizeTitle">22sp</item>
+        <item name="TextSizeInput">18sp</item>
+        <item name="TextSeparation">6sp</item>
+        <item name="IconSize">20sp</item>
+        <item name="TextSizeInfo">14sp</item>
+        <item name="TextSizeBody">16sp</item>
+        <item name="TextSizeHeadline">20sp</item>
+    </style>
+
+    <style name="ConversationsTheme.Dark.Large" parent="ConversationsTheme.Dark">
+        <item name="TextSizeCaption">16sp</item>
+        <item name="TextSizeBody1">18sp</item>
+        <item name="TextSizeBody2">18sp</item>
+        <item name="TextSizeSubhead">20sp</item>
+        <item name="TextSizeTitle">24sp</item>
+        <item name="TextSizeInput">20sp</item>
+        <item name="TextSeparation">7sp</item>
+        <item name="IconSize">22sp</item>
+        <item name="TextSizeInfo">16sp</item>
+        <item name="TextSizeBody">18sp</item>
+        <item name="TextSizeHeadline">22sp</item>
+    </style>
+
+    <style name="ConversationsTheme.Large" parent="ConversationsTheme">
+        <item name="TextSizeCaption">16sp</item>
+        <item name="TextSizeBody1">18sp</item>
+        <item name="TextSizeBody2">18sp</item>
+        <item name="TextSizeSubhead">20sp</item>
+        <item name="TextSizeTitle">24sp</item>
+        <item name="TextSizeInput">20sp</item>
+        <item name="TextSeparation">7sp</item>
+        <item name="IconSize">22sp</item>
+        <item name="TextSizeInfo">16sp</item>
+        <item name="TextSizeBody">18sp</item>
+        <item name="TextSizeHeadline">22sp</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 822abddcc..f3fa6a5ed 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -21,11 +21,13 @@
             android:key="theme"
             android:summary="@string/pref_theme_options_summary"
             android:title="@string/pref_theme_options" />
-        <CheckBoxPreference
-            android:defaultValue="@bool/use_larger_font"
-            android:key="use_larger_font"
-            android:summary="@string/pref_use_larger_font_summary"
-            android:title="@string/pref_use_larger_font" />
+        <ListPreference
+            android:defaultValue="@string/default_font_size"
+            android:entries="@array/font_size_entries"
+            android:entryValues="@array/font_size_entry_values"
+            android:key="font_size"
+            android:summary="@string/pref_font_size_summary"
+            android:title="@string/pref_font_size" />
         <CheckBoxPreference
             android:defaultValue="@bool/send_button_status"
             android:key="send_button_status"