Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Just Black theme

Browse source
This commit is contained in:
Prathamesh More 2022-01-29 22:04:02 +05:30
parent 75837607f4
commit 7c5a97c410
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
View file

@ -51,7 +51,9 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
private fun updateTheme() { private fun updateTheme() {
setTheme(ThemeManager.getThemeResValue()) setTheme(ThemeManager.getThemeResValue())
if (PreferenceUtil.materialYou) {
setDefaultNightMode(ThemeManager.getNightMode()) setDefaultNightMode(ThemeManager.getNightMode())
}
if (PreferenceUtil.isCustomFont) { if (PreferenceUtil.isCustomFont) {
setTheme(R.style.FontThemeOverlay) setTheme(R.style.FontThemeOverlay)

7
app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
View file

@ -26,13 +26,6 @@ object ThemeManager {
fun getNightMode(): Int = when (App.getContext().generalThemeValue) { fun getNightMode(): Int = when (App.getContext().generalThemeValue) {
LIGHT -> AppCompatDelegate.MODE_NIGHT_NO LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
DARK -> AppCompatDelegate.MODE_NIGHT_YES 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 else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
} }
} }

2
app/src/main/res/values/styles_parents.xml
View file

@ -29,7 +29,7 @@
<item name="popupMenuBackground">@drawable/popup_background</item> <item name="popupMenuBackground">@drawable/popup_background</item>
</style> </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="roundSelector">@drawable/round_selector</item>
<item name="rectSelector">@drawable/rect_selector</item> <item name="rectSelector">@drawable/rect_selector</item>
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item> <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>