From 91498139da0f5af49639747ea7e5e27e9e60c6bb Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Mon, 5 Jul 2021 14:45:01 -0400 Subject: [PATCH] Refactor themepref to use isDarkTheme --- .../eu/kanade/tachiyomi/ui/setting/ThemePreference.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt index 404c80ec64..a9f92c3117 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt @@ -56,8 +56,8 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu selectExtensionLight = fastAdapterLight.getSelectExtension().setThemeListener() selectExtensionDark = fastAdapterDark.getSelectExtension().setThemeListener() val enumConstants = Themes.values() - itemAdapterLight.set(enumConstants.filter { it.nightMode == AppCompatDelegate.MODE_NIGHT_NO }.map(::ThemeItem)) - itemAdapterDark.set(enumConstants.filter { it.nightMode == AppCompatDelegate.MODE_NIGHT_YES }.map(::ThemeItem)) + itemAdapterLight.set(enumConstants.filter { !it.isDarkTheme }.map(::ThemeItem)) + itemAdapterDark.set(enumConstants.filter { it.isDarkTheme }.map(::ThemeItem)) isSelectable = false } @@ -66,7 +66,7 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu multiSelect = true selectionListener = object : ISelectionListener { override fun onSelectionChanged(item: ThemeItem, selected: Boolean) { - if (item.theme.nightMode == AppCompatDelegate.MODE_NIGHT_YES) { + if (item.theme.isDarkTheme) { preferences.darkTheme().set(item.theme) } else { preferences.lightTheme().set(item.theme) @@ -192,9 +192,9 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu if (binding.checkbox.isVisible) { val themeMatchesApp = if (context.isInNightMode()) { - item.theme.nightMode == AppCompatDelegate.MODE_NIGHT_YES + item.theme.isDarkTheme } else { - item.theme.nightMode == AppCompatDelegate.MODE_NIGHT_NO + !item.theme.isDarkTheme } binding.themeSelected.alpha = if (themeMatchesApp) 1f else 0.5f binding.checkbox.alpha = if (themeMatchesApp) 1f else 0.5f