From 02f076de573c7377bc7acd9c0ef7738015125723 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Mon, 2 May 2022 18:24:44 +0530
Subject: [PATCH] Add support for Just Black with Material You

---
 .../retromusic/fragments/settings/ThemeSettingsFragment.kt    | 2 --
 .../code/name/monkey/retromusic/util/theme/ThemeManager.kt    | 3 ++-
 app/src/main/res/values-night-v31/styles.xml                  | 4 ++++
 app/src/main/res/values-v31/styles.xml                        | 2 ++
 app/src/main/res/xml/pref_general.xml                         | 1 -
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
index c0c19fa78..6d339be7c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
@@ -44,12 +44,10 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
         generalTheme?.let {
             setSummary(it)
             it.setOnPreferenceChangeListener { _, newValue ->
-                val theme = newValue as String
                 setSummary(it, newValue)
                 ThemeStore.markChanged(requireContext())
 
                 if (VersionUtils.hasNougatMR()) {
-                    requireActivity().setTheme(PreferenceUtil.themeResFromPrefValue(theme))
                     DynamicShortcutManager(requireContext()).updateDynamicShortcuts()
                 }
                 restartActivity()
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt b/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
index 39da2f4c2..c1a8283df 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
@@ -11,7 +11,8 @@ import code.name.monkey.retromusic.util.theme.ThemeMode.*
 @StyleRes
 fun Context.getThemeResValue(): Int =
     if (PreferenceUtil.materialYou) {
-        R.style.Theme_RetroMusic_MD3
+        if (generalThemeValue == BLACK) R.style.Theme_RetroMusic_MD3_Black
+        else R.style.Theme_RetroMusic_MD3
     } else {
         when (generalThemeValue) {
             LIGHT -> R.style.Theme_RetroMusic_Light
diff --git a/app/src/main/res/values-night-v31/styles.xml b/app/src/main/res/values-night-v31/styles.xml
index 3f0129227..ed9ee3788 100644
--- a/app/src/main/res/values-night-v31/styles.xml
+++ b/app/src/main/res/values-night-v31/styles.xml
@@ -1,4 +1,8 @@
 <resources>
+    <style name="Theme.RetroMusic.MD3.Black" parent="@style/Theme.RetroMusic.MD3">
+        <item name="colorSurface">@color/blackColorSurface</item>
+    </style>
+
     <style name="Theme.AppWidget" parent="@android:style/Theme.DeviceDefault.DayNight">
         <item name="colorSurface">@android:color/system_accent2_800</item>
     </style>
diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml
index f10e95659..7437a1528 100644
--- a/app/src/main/res/values-v31/styles.xml
+++ b/app/src/main/res/values-v31/styles.xml
@@ -11,6 +11,8 @@
         <item name="android:windowBackground">?attr/colorSurface</item>
     </style>
 
+    <style name="Theme.RetroMusic.MD3.Black" parent="@style/Theme.RetroMusic.MD3" />
+
     <style name="Theme.AppWidget" parent="@android:style/Theme.DeviceDefault.DayNight">
         <item name="colorSurface">@android:color/system_accent1_50</item>
     </style>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index a075b334a..0fc27c2e5 100755
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -17,7 +17,6 @@
             app:icon="@drawable/ic_color_lens" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:dependency="material_you"
             android:key="black_theme"
             android:layout="@layout/list_item_view_switch_no_title"
             android:title="@string/black_theme_name" />