From b4330d7ac345bb445ba48e373d07fe6801a6117d Mon Sep 17 00:00:00 2001
From: Fred <76-fgerber@users.noreply.shinice.net>
Date: Sat, 27 Jan 2024 00:14:40 +0100
Subject: [PATCH] Organize settings more consistently

---
 app/src/main/res/drawable/rounded_colors.xml |   5 +
 app/src/main/res/values/strings.xml          |   1 +
 app/src/main/res/xml/root_preferences.xml    | 105 ++++++++++---------
 3 files changed, 60 insertions(+), 51 deletions(-)
 create mode 100644 app/src/main/res/drawable/rounded_colors.xml

diff --git a/app/src/main/res/drawable/rounded_colors.xml b/app/src/main/res/drawable/rounded_colors.xml
new file mode 100644
index 00000000..d8f08936
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_colors.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="960" android:viewportWidth="960"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorOnBackground" android:pathData="M346,820L100,574Q90,564 85,552Q80,540 80,527Q80,514 85,502Q90,490 100,480L330,251L255,176Q242,163 241.5,145Q241,127 254,113Q267,99 286,99Q305,99 319,113L686,480Q696,490 700.5,502Q705,514 705,527Q705,540 700.5,552Q696,564 686,574L440,820Q430,830 418,835Q406,840 393,840Q380,840 368,835Q356,830 346,820ZM393,314L179,528Q179,528 179,528Q179,528 179,528L607,528Q607,528 607,528Q607,528 607,528L393,314ZM792,840Q756,840 731,814.5Q706,789 706,752Q706,725 719.5,701Q733,677 750,654L769,630Q778,619 792.5,618.5Q807,618 816,629L836,654Q852,677 866,701Q880,725 880,752Q880,789 854,814.5Q828,840 792,840Z"/>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6042f433..a56a84b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -350,4 +350,5 @@ For more info about Pixelfed, you can check here: https://pixelfed.org"</string>
     <string name="story_duration">Story Duration</string>
     <string name="arrange_tabs_summary">Arrange tabs</string>
     <string name="arrange_tabs_description">Change visibility and order of tabs</string>
+    <string name="content_header">Content</string>
 </resources>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 590b3a10..346a5135 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -17,61 +17,64 @@
             android:title="@string/accentColorTitle"
             android:key="themeColor"
             android:defaultValue="0"
-            android:summary="@string/accentColorSummary" />
+            android:summary="@string/accentColorSummary"
+            app:icon="@drawable/rounded_colors"/>
+
+        <ListPreference
+            app:key="language"
+            app:title="@string/language"
+            app:icon="@drawable/translate_black_24dp" />
     </PreferenceCategory>
 
-    <ListPreference
-        app:key="language"
-        app:title="@string/language"
-        app:icon="@drawable/translate_black_24dp" />
+    <PreferenceCategory app:title="@string/content_header">
+        <ListPreference
+            android:key="arrange_tabs"
+            android:title="@string/arrange_tabs_summary"
+            android:summary="@string/arrange_tabs_description"
+            android:icon="@drawable/outline_bottom_navigation" />
 
-    <CheckBoxPreference app:key="always_show_nsfw" app:title="@string/always_show_nsfw"
-        app:icon="@drawable/eye_black_24dp" android:defaultValue="false"
-        android:summary="@string/summary_always_show_nsfw"/>
+        <CheckBoxPreference app:key="always_show_nsfw" app:title="@string/always_show_nsfw"
+            app:icon="@drawable/eye_black_24dp" android:defaultValue="false"
+            android:summary="@string/summary_always_show_nsfw"/>
 
-    <Preference android:title="@string/notifications_settings"
-        android:key="notification"
-        android:summary="@string/notifications_settings_summary"
-        app:icon="@drawable/ic_baseline_notifications_active_24">
-        <intent android:action="android.settings.APP_NOTIFICATION_SETTINGS">
-            <extra android:name="android.provider.extra.APP_PACKAGE"
-                android:value="@string/application_id" />
-        </intent>
-    </Preference>
+        <EditTextPreference android:title="@string/description_template"
+            android:key="prefill_description"
+            android:summary="@string/description_template_summary"
+            app:icon="@drawable/note" />
 
-    <EditTextPreference android:title="@string/description_template"
-        android:key="prefill_description"
-        android:summary="@string/description_template_summary"
-        app:icon="@drawable/note" />
+        <Preference android:title="@string/notifications_settings"
+            android:key="notification"
+            android:summary="@string/notifications_settings_summary"
+            app:icon="@drawable/ic_baseline_notifications_active_24">
+            <intent android:action="android.settings.APP_NOTIFICATION_SETTINGS">
+                <extra android:name="android.provider.extra.APP_PACKAGE"
+                    android:value="@string/application_id" />
+            </intent>
+        </Preference>
+    </PreferenceCategory>
 
-    <ListPreference
-        android:key="arrange_tabs"
-        android:title="@string/arrange_tabs_summary"
-        android:summary="@string/arrange_tabs_description"
-        android:icon="@drawable/outline_bottom_navigation"
-        />
-
-    <Preference android:title="@string/about"
-        android:key="about"
-        android:summary="@string/about_pixeldroid"
-        app:icon="@drawable/info_black_24dp">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:targetPackage="@string/application_id"
-            android:targetClass="org.pixeldroid.common.AboutActivity">
-            <extra android:name="buildVersion" android:value="@string/versionName" />
-            <extra android:name="appImage" android:value="mascot" />
-            <extra android:name="appImageWidth" android:value="508" />
-            <extra android:name="appImageTopMargin" android:value="-130" />
-            <extra android:name="appImageBottomMargin" android:value="-130" />
-            <extra android:name="appImageLeftMargin" android:value="0" />
-            <extra android:name="appImageRightMargin" android:value="0" />
-            <extra android:name="appName" android:value="@string/app_name" />
-            <extra android:name="aboutAppDescription" android:value="@string/license_info" />
-            <extra android:name="website" android:value="@string/project_website" />
-            <extra android:name="translatePlatformUrl" android:value="https://weblate.pixeldroid.org" />
-            <extra android:name="contributeForgeUrl" android:value="https://gitlab.shinice.net/pixeldroid/PixelDroid" />
-        </intent>
-
-    </Preference>
+    <PreferenceCategory app:title="@string/about">
+        <Preference android:title="@string/about"
+            android:key="about"
+            android:summary="@string/about_pixeldroid"
+            app:icon="@drawable/info_black_24dp">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:targetPackage="@string/application_id"
+                android:targetClass="org.pixeldroid.common.AboutActivity">
+                <extra android:name="buildVersion" android:value="@string/versionName" />
+                <extra android:name="appImage" android:value="mascot" />
+                <extra android:name="appImageWidth" android:value="508" />
+                <extra android:name="appImageTopMargin" android:value="-130" />
+                <extra android:name="appImageBottomMargin" android:value="-130" />
+                <extra android:name="appImageLeftMargin" android:value="0" />
+                <extra android:name="appImageRightMargin" android:value="0" />
+                <extra android:name="appName" android:value="@string/app_name" />
+                <extra android:name="aboutAppDescription" android:value="@string/license_info" />
+                <extra android:name="website" android:value="@string/project_website" />
+                <extra android:name="translatePlatformUrl" android:value="https://weblate.pixeldroid.org" />
+                <extra android:name="contributeForgeUrl" android:value="https://gitlab.shinice.net/pixeldroid/PixelDroid" />
+            </intent>
+        </Preference>
+    </PreferenceCategory>
 </PreferenceScreen>