From a1952fb9e7f843fb5875d3db06da2df7ac41677d Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 2 May 2023 16:00:08 +0800 Subject: [PATCH] Fix issue when changing color mode, use update theme instead of updateColor mode This prevents the Dark theme from being used instead of Black when changing theme on Android. --- .../app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt index 417304f5c..9689656fc 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt @@ -290,13 +290,13 @@ class WebReaderViewModel @Inject constructor( fun updateStoredThemePreference(index: Int, isDarkMode: Boolean) { val newThemeKey = themeKey(isDarkMode, systemThemeKeys[index]) + Log.d("theme", "Setting theme key: ${newThemeKey}") runBlocking { datastoreRepo.putString(DatastoreKeys.preferredTheme, systemThemeKeys[index]) } - val isDark = newThemeKey == "Dark" || newThemeKey == "Black" - val script = "var event = new Event('updateColorMode');event.isDark = '$isDark';document.dispatchEvent(event);" + val script = "var event = new Event('updateTheme');event.themeName = '$newThemeKey';document.dispatchEvent(event);" enqueueScript(script) }