From d9b9a7c3c13303e2f61b2cb557ab96ec1a23a7ac Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Thu, 20 Feb 2020 15:10:50 +0800
Subject: Add an option to show comment dividers. Put theme option to
 InterfacePreferenceFragment.

---
 app/src/main/res/xml/interface_preference.xml | 18 ++++++++++++++++++
 app/src/main/res/xml/main_preferences.xml     | 13 -------------
 2 files changed, 18 insertions(+), 13 deletions(-)

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

diff --git a/app/src/main/res/xml/interface_preference.xml b/app/src/main/res/xml/interface_preference.xml
index 626f1333..f3e1dabe 100644
--- a/app/src/main/res/xml/interface_preference.xml
+++ b/app/src/main/res/xml/interface_preference.xml
@@ -2,6 +2,19 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <ListPreference
+        app:defaultValue="2"
+        app:entryValues="@array/settings_theme_values"
+        app:key="theme"
+        app:icon="@drawable/ic_outline_color_lens_24px"
+        app:title="@string/settings_theme_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="amoled_dark"
+        app:title="@string/settings_amoled_dark_title" />
+
     <Preference
         app:title="@string/settings_font_size_title"
         app:icon="@drawable/ic_font_size_24dp"
@@ -46,4 +59,9 @@
         app:key="show_top_level_comments_first"
         app:title="@string/settings_show_top_level_comments_first_title" />
 
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="show_comment_divider"
+        app:title="@string/settings_show_comment_divider_title" />
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 550525ef..d95e675f 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -7,19 +7,6 @@
         app:title="@string/settings_notification_master_title"
         app:fragment="ml.docilealligator.infinityforreddit.Settings.NotificationPreferenceFragment" />
 
-    <ListPreference
-        app:defaultValue="2"
-        app:entryValues="@array/settings_theme_values"
-        app:key="theme"
-        app:icon="@drawable/ic_outline_color_lens_24px"
-        app:title="@string/settings_theme_title"
-        app:useSimpleSummaryProvider="true" />
-
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="amoled_dark"
-        app:title="@string/settings_amoled_dark_title" />
-
     <Preference
         app:icon="@drawable/ic_interface_24dp"
         app:title="@string/settings_interface_title"
-- 
cgit v1.2.3