From 54a9f241d473765c963161a5c27d9b03d8b42e1e Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 10 Jun 2020 15:43:34 +0800
Subject: Changing font is available. Fix subtitle on toolbar being cut if the
 font is large.

---
 app/src/main/res/xml/font_preferences.xml      | 62 ++++++++++++++++++++++++++
 app/src/main/res/xml/font_size_preferences.xml | 29 ------------
 app/src/main/res/xml/interface_preference.xml  |  4 +-
 3 files changed, 64 insertions(+), 31 deletions(-)
 create mode 100644 app/src/main/res/xml/font_preferences.xml
 delete mode 100644 app/src/main/res/xml/font_size_preferences.xml

(limited to 'app/src/main/res/xml')

diff --git a/app/src/main/res/xml/font_preferences.xml b/app/src/main/res/xml/font_preferences.xml
new file mode 100644
index 00000000..317894b0
--- /dev/null
+++ b/app/src/main/res/xml/font_preferences.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        app:title="@string/settings_font_summary" />
+
+    <ListPreference
+        app:defaultValue="Default"
+        android:entries="@array/settings_font_family"
+        app:entryValues="@array/settings_font_family_values"
+        app:key="font_family"
+        app:title="@string/settings_font_family_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <ListPreference
+        app:defaultValue="Normal"
+        android:entries="@array/settings_font_size"
+        app:entryValues="@array/settings_font_size_values"
+        app:key="font_size"
+        app:title="@string/settings_font_size_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <PreferenceCategory
+        app:title="@string/settings_title_font_summary" />
+
+    <ListPreference
+        app:defaultValue="Default"
+        android:entries="@array/settings_font_family"
+        app:entryValues="@array/settings_font_family_values"
+        app:key="title_font_family"
+        app:title="@string/settings_title_font_family_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <ListPreference
+        app:defaultValue="Normal"
+        android:entries="@array/settings_title_font_size"
+        app:entryValues="@array/settings_title_font_size_values"
+        app:key="title_font_size"
+        app:title="@string/settings_title_font_size_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <PreferenceCategory
+        app:title="@string/settings_content_font_summary" />
+
+    <ListPreference
+        app:defaultValue="Default"
+        android:entries="@array/settings_font_family"
+        app:entryValues="@array/settings_font_family_values"
+        app:key="content_font_family"
+        app:title="@string/settings_content_font_family_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <ListPreference
+        app:defaultValue="Normal"
+        android:entries="@array/settings_content_font_size"
+        app:entryValues="@array/settings_content_font_size_values"
+        app:key="content_font_size"
+        app:title="@string/settings_content_font_size_title"
+        app:useSimpleSummaryProvider="true" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/font_size_preferences.xml b/app/src/main/res/xml/font_size_preferences.xml
deleted file mode 100644
index 40695b92..00000000
--- a/app/src/main/res/xml/font_size_preferences.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <ListPreference
-        app:defaultValue="Normal"
-        android:entries="@array/settings_font_size"
-        app:entryValues="@array/settings_font_size_values"
-        app:key="font_size"
-        app:title="@string/settings_font_size_title"
-        app:useSimpleSummaryProvider="true" />
-
-    <ListPreference
-        app:defaultValue="Normal"
-        android:entries="@array/settings_title_font_size"
-        app:entryValues="@array/settings_title_font_size_values"
-        app:key="title_font_size"
-        app:title="@string/settings_title_font_size_title"
-        app:useSimpleSummaryProvider="true" />
-
-    <ListPreference
-        app:defaultValue="Normal"
-        android:entries="@array/settings_content_font_size"
-        app:entryValues="@array/settings_content_font_size_values"
-        app:key="content_font_size"
-        app:title="@string/settings_content_font_size_title"
-        app:useSimpleSummaryProvider="true" />
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/interface_preference.xml b/app/src/main/res/xml/interface_preference.xml
index 58de9ef4..1d77970c 100644
--- a/app/src/main/res/xml/interface_preference.xml
+++ b/app/src/main/res/xml/interface_preference.xml
@@ -3,9 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <Preference
-        app:title="@string/settings_font_size_title"
+        app:title="@string/settings_font_title"
         app:icon="@drawable/ic_font_size_24dp"
-        app:fragment="ml.docilealligator.infinityforreddit.Settings.FontSizePreferenceFragment" />
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.FontPreferenceFragment" />
 
     <SwitchPreference
         app:defaultValue="true"
-- 
cgit v1.2.3