From 36d5ee0763be2b0bcc65f9d061961d86359fe6f6 Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Sun, 17 Nov 2024 03:30:48 +0700 Subject: [PATCH] Fix reader transition color scheme in auto background mode (#1487) --- .../eu/kanade/tachiyomi/util/system/ContextExtensions.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt index 190764631..aadf3b29c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt @@ -15,6 +15,7 @@ import androidx.core.content.getSystemService import androidx.core.net.toUri import com.hippo.unifile.UniFile import eu.kanade.domain.ui.UiPreferences +import eu.kanade.domain.ui.model.ThemeMode import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.base.delegate.ThemingDelegate @@ -107,9 +108,13 @@ fun Context.createFileInCacheDir(name: String): File { fun Context.createReaderThemeContext(): Context { val preferences = Injekt.get() val readerPreferences = Injekt.get() + val themeMode = preferences.themeMode().get() val isDarkBackground = when (readerPreferences.readerTheme().get()) { 1, 2 -> true // Black, Gray - 3 -> applicationContext.isNightMode() // Automatic bg uses activity background by default + 3 -> when (themeMode) { // Automatic bg uses activity background by default + ThemeMode.SYSTEM -> applicationContext.isNightMode() + else -> themeMode == ThemeMode.DARK + } else -> false // White } val expected = if (isDarkBackground) Configuration.UI_MODE_NIGHT_YES else Configuration.UI_MODE_NIGHT_NO