From e9b37ffb3ff47cf213a58df4e424b67e6795acf0 Mon Sep 17 00:00:00 2001
From: Yasan Ghaffarian <y.ghafarian@dariahamrah.ir>
Date: Wed, 8 Jun 2022 11:11:45 +0430
Subject: [PATCH] Allow setting default accent color from config.xml

Co-authored-by: Daria Hamrah Paytakht <info@dariarnd.ir>
---
 lawnchair/res/values/config.xml                             | 3 +++
 .../src/app/lawnchair/preferences2/PreferenceManager2.kt    | 6 +-----
 lawnchair/src/app/lawnchair/theme/color/ColorOption.kt      | 6 +++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lawnchair/res/values/config.xml b/lawnchair/res/values/config.xml
index bffd563ec2..8f151db5e2 100644
--- a/lawnchair/res/values/config.xml
+++ b/lawnchair/res/values/config.xml
@@ -47,6 +47,9 @@
     <!-- Which calendar to use on smartspace by default -->
     <string name="config_default_smart_space_calendar" translatable="false">gregorian</string>
 
+    <!-- which accent color to use by default -->
+    <string name="config_default_accent_color" translatable="false"></string>
+
     <bool name="config_default_dark_status_bar">false</bool>
     <bool name="config_default_dock_search_bar">true</bool>
     <bool name="config_default_show_notification_count">false</bool>
diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
index 392fc9051e..4125f859ac 100644
--- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
+++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
@@ -114,11 +114,7 @@ class PreferenceManager2(private val context: Context) : PreferenceManager {
         parse = ColorOption::fromString,
         save = ColorOption::toString,
         onSet = { reloadHelper.recreate() },
-        defaultValue = when {
-            Utilities.ATLEAST_S -> ColorOption.SystemAccent
-            Utilities.ATLEAST_O_MR1 -> ColorOption.WallpaperPrimary
-            else -> ColorOption.LawnchairBlue
-        },
+        defaultValue = ColorOption.fromString(context.getString(R.string.config_default_accent_color)),
     )
 
     val hiddenApps = preference(
diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt b/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt
index 4aa8b864c7..6e05e37c38 100644
--- a/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt
+++ b/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt
@@ -80,7 +80,11 @@ sealed class ColorOption {
             } catch (e: IllegalArgumentException) {
                 // ignore
             }
-            return SystemAccent
+            return when {
+                Utilities.ATLEAST_S -> SystemAccent
+                Utilities.ATLEAST_O_MR1 -> WallpaperPrimary
+                else -> LawnchairBlue
+            }
         }
     }
 }