From 7c5a97c410e329566da06355528dc4cde4f8a318 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Sat, 29 Jan 2022 22:04:02 +0530
Subject: [PATCH] Fixed Just Black theme

---
 .../monkey/retromusic/activities/base/AbsThemeActivity.kt  | 4 +++-
 .../code/name/monkey/retromusic/util/theme/ThemeManager.kt | 7 -------
 app/src/main/res/values/styles_parents.xml                 | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
index d6c51f291..25e6d2d65 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
@@ -51,7 +51,9 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
     private fun updateTheme() {
         setTheme(ThemeManager.getThemeResValue())
-        setDefaultNightMode(ThemeManager.getNightMode())
+        if (PreferenceUtil.materialYou) {
+            setDefaultNightMode(ThemeManager.getNightMode())
+        }
 
         if (PreferenceUtil.isCustomFont) {
             setTheme(R.style.FontThemeOverlay)
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 8bd8504b2..1f69fbc4f 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
@@ -26,13 +26,6 @@ object ThemeManager {
     fun getNightMode(): Int = when (App.getContext().generalThemeValue) {
         LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
         DARK -> AppCompatDelegate.MODE_NIGHT_YES
-        BLACK -> {
-            if (PreferenceUtil.baseTheme == "dark") {
-                AppCompatDelegate.MODE_NIGHT_YES
-            } else {
-                AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-            }
-        }
         else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 18c71ebb8..6739788ff 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -29,7 +29,7 @@
         <item name="popupMenuBackground">@drawable/popup_background</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base.Black" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.RetroMusic.Base.Black" parent="Theme.Material3.Dark.NoActionBar">
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>