From 3b6afd2cb699672269fbded78aced9db474054aa Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sat, 10 Apr 2021 15:04:59 -0400 Subject: [PATCH] Fix light theme sometimes being wrong when switching themes --- .../main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt index 75beecdf33..a0135011c4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt @@ -236,7 +236,11 @@ fun Activity.setThemeAndNight(preferences: PreferencesHelper) { fun Context.getPrefTheme(preferences: PreferencesHelper): ThemeUtil.Themes { // Using a try catch in case I start to remove themes return try { - (if (isInNightMode() || preferences.nightMode().get() == AppCompatDelegate.MODE_NIGHT_YES) preferences.darkTheme() else preferences.lightTheme()).get() + ( + if ((applicationContext.isInNightMode() || preferences.nightMode().get() == AppCompatDelegate.MODE_NIGHT_YES) && + preferences.nightMode().get() != AppCompatDelegate.MODE_NIGHT_NO + ) preferences.darkTheme() else preferences.lightTheme() + ).get() } catch (e: Exception) { preferences.lightTheme().set(ThemeUtil.Themes.PURE_WHITE) preferences.darkTheme().set(ThemeUtil.Themes.DARK)