From b6b496b202cae81d36eca24c694a96381eb7daea Mon Sep 17 00:00:00 2001
From: DerGoogler <jxhazhungerz@gmail.com>
Date: Tue, 26 Apr 2022 18:26:59 +0200
Subject: [PATCH] Improve Settings Preferences

---
 app/src/main/res/values/strings.xml       |  3 +
 app/src/main/res/xml/root_preferences.xml | 78 +++++++++++++----------
 2 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 49e4b48..7a3da1e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,4 +100,7 @@
     <string name="repo_enabled">Repo enabled</string>
     <string name="repo_disabled">Repo disabled</string>
     <string name="androidacy_repo_info">Androidacy repo uses ads and trackers.</string>
+    <string name="pref_category_security">Security</string>
+    <string name="pref_category_appearance">Appearance</string>
+    <string name="pref_category_general">General</string>
 </resources>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index b278e9e..c8fb96b 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -1,13 +1,42 @@
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory
-        app:title="@string/pref_category_settings">
+    <!-- Custom repos has been announced, check https://github.com/Fox2Code/FoxMagiskModuleManager/issues/131 -->
+    <PreferenceCategory app:title="@string/pref_category_repos">
         <Preference
             app:key="pref_manage_repos"
             app:icon="@drawable/ic_baseline_extension_24"
             app:title="@string/manage_repos_pref"
             app:singleLineTitle="false"	/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        app:title="@string/pref_category_general">
+        <SwitchPreferenceCompat
+            app:defaultValue="false"
+            app:key="pref_show_incompatible"
+            app:icon="@drawable/ic_baseline_hide_source_24"
+            app:title="@string/show_incompatible_pref"
+            app:summary="@string/show_incompatible_desc"
+            app:singleLineTitle="false"	/>
 
+        <SwitchPreferenceCompat
+            app:defaultValue="false"
+            app:key="pref_use_magisk_install_command"
+            app:icon="@drawable/ic_baseline_numbers_24"
+            app:title="@string/use_magisk_install_command_pref"
+            app:summary="@string/use_magisk_install_command_desc"
+            app:singleLineTitle="false"	/>
+
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:key="pref_dns_over_https"
+            app:icon="@drawable/ic_baseline_security_24"
+            app:title="@string/dns_over_https_pref"
+            app:summary="@string/dns_over_https_desc"
+            app:singleLineTitle="false"	/>
+    </PreferenceCategory>
+
+    <PreferenceCategory app:title="@string/pref_category_appearance">
         <ListPreference
             app:key="pref_theme"
             app:icon="@drawable/ic_baseline_palette_24"
@@ -38,6 +67,16 @@
             app:title="@string/force_dark_terminal_title"
             app:singleLineTitle="false"	/>
 
+        <SwitchPreferenceCompat
+            app:defaultValue="false"
+            app:key="pref_wrap_text"
+            app:icon="@drawable/ic_baseline_keyboard_return_24"
+            app:title="@string/wrap_text_pref"
+            app:summary="@string/wrap_text_desc"
+            app:singleLineTitle="false"	/>
+    </PreferenceCategory>
+
+    <PreferenceCategory app:title="@string/pref_category_security">
         <!-- Note: Lockdown mode used to be called showcase mode -->
         <SwitchPreferenceCompat
             app:defaultValue="false"
@@ -55,22 +94,6 @@
             app:summary="@string/prevent_reboot_desc"
             app:singleLineTitle="false"	/>
 
-        <SwitchPreferenceCompat
-            app:defaultValue="false"
-            app:key="pref_wrap_text"
-            app:icon="@drawable/ic_baseline_keyboard_return_24"
-            app:title="@string/wrap_text_pref"
-            app:summary="@string/wrap_text_desc"
-            app:singleLineTitle="false"	/>
-
-        <SwitchPreferenceCompat
-            app:defaultValue="false"
-            app:key="pref_show_incompatible"
-            app:icon="@drawable/ic_baseline_hide_source_24"
-            app:title="@string/show_incompatible_pref"
-            app:summary="@string/show_incompatible_desc"
-            app:singleLineTitle="false"	/>
-
         <SwitchPreferenceCompat
             app:defaultValue="false"
             app:key="pref_disable_low_quality_module_filter"
@@ -78,22 +101,6 @@
             app:title="@string/disable_low_quality_module_filter_pref"
             app:summary="@string/disable_low_quality_module_filter_desc"
             app:singleLineTitle="false"	/>
-
-        <SwitchPreferenceCompat
-            app:defaultValue="false"
-            app:key="pref_use_magisk_install_command"
-            app:icon="@drawable/ic_baseline_numbers_24"
-            app:title="@string/use_magisk_install_command_pref"
-            app:summary="@string/use_magisk_install_command_desc"
-            app:singleLineTitle="false"	/>
-
-        <SwitchPreferenceCompat
-            app:defaultValue="true"
-            app:key="pref_dns_over_https"
-            app:icon="@drawable/ic_baseline_security_24"
-            app:title="@string/dns_over_https_pref"
-            app:summary="@string/dns_over_https_desc"
-            app:singleLineTitle="false"	/>
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -122,6 +129,7 @@
             app:key="pref_pkg_info"
             app:enabled="false"
             app:summary="@string/loading"
-            app:singleLineTitle="false"	/>
+            app:singleLineTitle="false"
+            app:iconSpaceReserved="false"	/>
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file