From dbf227f18e2302e0e064502f534bd12574473012 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sat, 10 Apr 2021 20:03:41 -0400 Subject: [PATCH] App theme summary updated to show both theme when follow system is set --- .../ui/setting/SettingsGeneralController.kt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt index 51e5dc88b2..c21def6c51 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt @@ -11,6 +11,7 @@ import eu.kanade.tachiyomi.data.updater.UpdaterJob import eu.kanade.tachiyomi.util.system.LocaleHelper import eu.kanade.tachiyomi.util.system.appDelegateNightMode import eu.kanade.tachiyomi.util.system.getPrefTheme +import eu.kanade.tachiyomi.util.system.isInNightMode import kotlinx.coroutines.flow.launchIn import java.util.Locale import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys @@ -104,7 +105,18 @@ class SettingsGeneralController : SettingsController() { key = "theme_preference" titleRes = R.string.app_theme lastScrollPostion = lastThemeX - summaryRes = context.getPrefTheme(preferences).nameRes + summary = if (preferences.nightMode() + .get() == AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM + ) { + val lightTheme = preferences.lightTheme().get().nameRes + val darkTheme = preferences.darkTheme().get().nameRes + val nightMode = context.isInNightMode() + mutableListOf(context.getString(lightTheme), context.getString(darkTheme)).apply { + if (nightMode) reverse() + }.joinToString(" / ") + } else { + context.getString(context.getPrefTheme(preferences).nameRes) + } activity = this@SettingsGeneralController.activity }