From 05c0e28ce571064da22ac168fe946987459c6c14 Mon Sep 17 00:00:00 2001
From: machiav3lli <antonios.hazim@tutanota.com>
Date: Wed, 17 Nov 2021 00:59:18 +0100
Subject: [PATCH] Add: Personalization preference category (replacing language
 & themes)

---
 .../droidify/screen/SettingsFragment.kt       | 34 +++++++++----------
 src/main/res/values/strings.xml               |  1 +
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt b/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
index bf65482b..bdd13d09 100644
--- a/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
@@ -70,12 +70,27 @@ class SettingsFragment : ScreenFragment() {
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
 
-        preferences.addCategory(requireContext().getString(R.string.prefs_language_title)) {
+        preferences.addCategory(requireContext().getString(R.string.prefs_personalization)) {
             addList(
                 Preferences.Key.Language,
                 context.getString(R.string.prefs_language_title),
                 languagesList
             ) { translateLocale(context.getLocaleOfCode(it)) }
+            addEnumeration(Preferences.Key.Theme, getString(R.string.theme)) {
+                when (it) {
+                    is Preferences.Theme.System -> getString(R.string.system)
+                    is Preferences.Theme.AmoledSystem -> getString(R.string.system) + " " + getString(
+                        R.string.amoled
+                    )
+                    is Preferences.Theme.Light -> getString(R.string.light)
+                    is Preferences.Theme.Dark -> getString(R.string.dark)
+                    is Preferences.Theme.Amoled -> getString(R.string.amoled)
+                }
+            }
+            addSwitch(
+                Preferences.Key.ListAnimation, getString(R.string.list_animation),
+                getString(R.string.list_animation_description)
+            )
         }
         preferences.addCategory(getString(R.string.updates)) {
             addEnumeration(
@@ -112,23 +127,6 @@ class SettingsFragment : ScreenFragment() {
             addEditString(Preferences.Key.ProxyHost, getString(R.string.proxy_host))
             addEditInt(Preferences.Key.ProxyPort, getString(R.string.proxy_port), 1..65535)
         }
-        preferences.addCategory(getString(R.string.themes)) {
-            addEnumeration(Preferences.Key.Theme, getString(R.string.theme)) {
-                when (it) {
-                    is Preferences.Theme.System -> getString(R.string.system)
-                    is Preferences.Theme.AmoledSystem -> getString(R.string.system) + " " + getString(
-                        R.string.amoled
-                    )
-                    is Preferences.Theme.Light -> getString(R.string.light)
-                    is Preferences.Theme.Dark -> getString(R.string.dark)
-                    is Preferences.Theme.Amoled -> getString(R.string.amoled)
-                }
-            }
-            addSwitch(
-                Preferences.Key.ListAnimation, getString(R.string.list_animation),
-                getString(R.string.list_animation_description)
-            )
-        }
         preferences.addCategory(getString(R.string.install_types)) {
             addSwitch(
                 Preferences.Key.RootPermission, getString(R.string.root_permission),
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7e206f4e..c629ef46 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -174,4 +174,5 @@
     <string name="whats_new">What\'s New</string>
     <string name="website">Website</string>
     <string name="prefs_language_title">Langugage</string>
+    <string name="prefs_personalization">Personalization</string>
 </resources>
\ No newline at end of file