Reorganize settings.

2 files changed, 29 insertions, 20 deletions

diff --git a/app/src/main/res/xml/interface_preference.xml b/app/src/main/res/xml/interface_preference.xml
index 8ad53611..cf959d82 100644
--- a/app/src/main/res/xml/interface_preference.xml
+++ b/app/src/main/res/xml/interface_preference.xml
@@ -24,14 +24,25 @@
         app:title="@string/settings_enable_bottom_app_bar_title"
         app:summary="@string/settings_enable_bottom_app_bar_summary" />
 
+    <PreferenceCategory
+        app:title="@string/settings_category_post_and_comment_title" />
+
+    <Preference
+        app:title="@string/settings_time_format_title"
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.TimeFormatPreferenceFragment" />
+    
     <SwitchPreference
         app:defaultValue="false"
         app:key="vote_buttons_on_the_right"
         app:title="@string/settings_vote_buttons_on_the_right_title" />
 
-    <Preference
-        app:title="@string/settings_time_format_title"
-        app:fragment="ml.docilealligator.infinityforreddit.Settings.TimeFormatPreferenceFragment" />
+    <SwitchPreference
+        app:defaultValue="true"
+        app:key="show_absolute_number_of_votes"
+        app:title="@string/settings_show_absolute_number_of_votes_title" />
+
+    <PreferenceCategory
+        app:title="@string/settings_category_post_title" />
 
     <ListPreference
         app:defaultValue="0"
@@ -51,6 +62,9 @@
         app:key="show_thumbnail_on_the_left_in_compact_layout"
         app:title="@string/settings_show_thumbnail_on_the_left_in_compact_layout" />
 
+    <PreferenceCategory
+        app:title="@string/settings_category_comment_title" />
+
     <SwitchPreference
         app:defaultValue="false"
         app:key="show_top_level_comments_first"
@@ -76,9 +90,4 @@
         app:key="fully_collapse_comment"
         android:title="@string/settings_fully_collapse_comment_title" />
 
-    <SwitchPreference
-        app:defaultValue="true"
-        app:key="show_absolute_number_of_votes"
-        app:title="@string/settings_show_absolute_number_of_votes_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 c15bfee4..af3f3898 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -22,23 +22,11 @@
         app:title="@string/settings_gestures_and_buttons_title"
         app:fragment="ml.docilealligator.infinityforreddit.Settings.GesturesAndButtonsPreferenceFragment" />
 
-    <SwitchPreference
-        app:defaultValue="false"
-        app:icon="@drawable/ic_link"
-        app:key="open_link_in_app"
-        app:title="@string/settings_open_link_in_app_title" />
-
     <Preference
         app:title="@string/settigns_video_title"
         android:icon="@drawable/ic_outline_video_24dp"
         app:fragment="ml.docilealligator.infinityforreddit.Settings.VideoPreferenceFragment" />
 
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="confirm_to_exit"
-        app:icon="@drawable/ic_exit_24dp"
-        app:title="@string/settings_confirm_to_exit" />
-
     <ListPreference
         app:defaultValue="2.5"
         android:entries="@array/settings_lazy_mode_interval"
@@ -50,6 +38,18 @@
 
     <SwitchPreference
         app:defaultValue="false"
+        app:icon="@drawable/ic_link"
+        app:key="open_link_in_app"
+        app:title="@string/settings_open_link_in_app_title" />
+
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="confirm_to_exit"
+        app:icon="@drawable/ic_exit_24dp"
+        app:title="@string/settings_confirm_to_exit" />
+
+    <SwitchPreference
+        app:defaultValue="false"
         app:key="nsfw"
         app:icon="@drawable/ic_nsfw_on_24dp"
         app:title="@string/settings_enable_nsfw_title" />