From e69749c83b16d120cdeab8c3007dfcfe7a21da04 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Sat, 1 Jun 2024 14:57:11 +0530
Subject: [PATCH] preferences*: Rearrange and categorise preferences

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 .../main/res/xml/preferences_installation.xml |  5 +++
 app/src/main/res/xml/preferences_network.xml  | 35 ++++++++++---------
 app/src/main/res/xml/preferences_updates.xml  | 19 ++++++----
 3 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/xml/preferences_installation.xml b/app/src/main/res/xml/preferences_installation.xml
index 7ecda5d93..015859a01 100644
--- a/app/src/main/res/xml/preferences_installation.xml
+++ b/app/src/main/res/xml/preferences_installation.xml
@@ -26,6 +26,11 @@
         app:summary="@string/pref_install_mode_summary"
         app:title="@string/pref_install_mode_title" />
 
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
+        app:title="@string/pref_common_extra" />
+
     <Preference
         app:iconSpaceReserved="false"
         app:key="INSTALLATION_ABANDON_SESSION"
diff --git a/app/src/main/res/xml/preferences_network.xml b/app/src/main/res/xml/preferences_network.xml
index 131ea389d..7aca1db2d 100644
--- a/app/src/main/res/xml/preferences_network.xml
+++ b/app/src/main/res/xml/preferences_network.xml
@@ -20,33 +20,34 @@
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <Preference
-        app:allowDividerBelow="true"
         app:iconSpaceReserved="false"
         app:key="PREFERENCE_DISPENSER_URLS"
         app:summary="@string/pref_dispenser_summary"
         app:title="@string/pref_dispenser_title" />
 
     <PreferenceCategory
-        app:allowDividerAbove="true"
-        app:allowDividerBelow="true"
         app:iconSpaceReserved="false"
-        app:key="PREFERENCE_CATEGORY_PROXY"
+        app:singleLineTitle="false"
         app:summary="protocol://user:password@host:port"
-        app:title="@string/pref_network_proxy_title">
+        app:title="@string/pref_network_proxy_title" />
 
-        <SwitchPreferenceCompat
-            app:disableDependentsState="false"
-            app:iconSpaceReserved="false"
-            app:key="PREFERENCE_PROXY_ENABLED"
-            app:summary="@string/pref_network_proxy_enable_desc"
-            app:title="@string/pref_network_proxy_enable" />
+    <SwitchPreferenceCompat
+        app:disableDependentsState="false"
+        app:iconSpaceReserved="false"
+        app:key="PREFERENCE_PROXY_ENABLED"
+        app:summary="@string/pref_network_proxy_enable_desc"
+        app:title="@string/pref_network_proxy_enable" />
 
-        <EditTextPreference
-            app:dependency="PREFERENCE_PROXY_ENABLED"
-            app:iconSpaceReserved="false"
-            app:key="PREFERENCE_PROXY_URL"
-            app:title="@string/pref_network_proxy_url" />
-    </PreferenceCategory>
+    <EditTextPreference
+        app:dependency="PREFERENCE_PROXY_ENABLED"
+        app:iconSpaceReserved="false"
+        app:key="PREFERENCE_PROXY_URL"
+        app:title="@string/pref_network_proxy_url" />
+
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
+        app:title="@string/pref_common_extra" />
 
     <SwitchPreferenceCompat
         app:defaultValue="false"
diff --git a/app/src/main/res/xml/preferences_updates.xml b/app/src/main/res/xml/preferences_updates.xml
index 77f6312f5..c6db1c84f 100644
--- a/app/src/main/res/xml/preferences_updates.xml
+++ b/app/src/main/res/xml/preferences_updates.xml
@@ -20,13 +20,6 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <SwitchPreferenceCompat
-        app:defaultValue="false"
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_UPDATES_EXTENDED"
-        app:summary="@string/pref_updates_incompatible_desc"
-        app:title="@string/pref_updates_incompatible" />
-
     <com.aurora.store.view.custom.preference.AuroraListPreference
         app:defaultValue="2"
         app:entries="@array/pref_updates_auto"
@@ -46,4 +39,16 @@
         app:iconSpaceReserved="false"
         app:min="1"
         app:showSeekBarValue="true" />
+
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
+        app:title="@string/pref_common_extra" />
+
+    <SwitchPreferenceCompat
+        app:defaultValue="false"
+        app:iconSpaceReserved="false"
+        app:key="PREFERENCE_UPDATES_EXTENDED"
+        app:summary="@string/pref_updates_incompatible_desc"
+        app:title="@string/pref_updates_incompatible" />
 </androidx.preference.PreferenceScreen>