Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-23 11:11:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

App theme summary updated to show both theme when follow system is set

Browse Source
This commit is contained in:
Jays2Kings 2021-04-10 20:03:41 -04:00
parent 9036fa8ca9
commit dbf227f18e
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
View File

@ -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
}