From 93cc50a0c370623de2f90d5dfe77b2f502eb45cc Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Sun, 19 Sep 2021 13:41:11 +0530
Subject: [PATCH] Added Material You accent color

---
 appthemehelper/build.gradle                                  | 2 +-
 .../main/java/code/name/monkey/appthemehelper/ThemeStore.kt  | 5 +++++
 .../code/name/monkey/appthemehelper/util/VersionUtils.kt     | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle
index 85b29622c..f6fd93ce6 100644
--- a/appthemehelper/build.gradle
+++ b/appthemehelper/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
index bcea73fb2..12b60a0c8 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
@@ -6,9 +6,11 @@ import android.graphics.Color
 import androidx.annotation.*
 import androidx.annotation.IntRange
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark
 import code.name.monkey.appthemehelper.util.ATHUtil.resolveColor
 import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.VersionUtils
 
 
 /**
@@ -204,6 +206,9 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
         @CheckResult
         @ColorInt
         fun accentColor(context: Context): Int {
+            if (VersionUtils.hasS()) {
+                return ContextCompat.getColor(context, android.R.color.system_accent1_600)
+            }
             val desaturatedColor = prefs(context).getBoolean("desaturated_color", false)
             val color = prefs(context).getInt(
                 ThemeStorePrefKeys.KEY_ACCENT_COLOR,
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/VersionUtils.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/VersionUtils.kt
index 641bce190..cf6399301 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/VersionUtils.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/VersionUtils.kt
@@ -1,6 +1,7 @@
 package code.name.monkey.appthemehelper.util
 
 import android.os.Build
+import androidx.annotation.ChecksSdkIntAtLeast
 
 /**
  * @author Hemanth S (h4h13).
@@ -57,4 +58,8 @@ object VersionUtils {
     fun hasQ(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
     }
+
+    fun hasS(): Boolean {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+    }
 }