Default to light theme prior to Oreo

This commit is contained in:
arkon 2020-02-19 18:38:40 -05:00
parent edcadb7dd1
commit 2c23c42c98

View File

@ -54,15 +54,17 @@ class SettingsGeneralController : SettingsController() {
listPreference { listPreference {
key = Keys.themeMode key = Keys.themeMode
titleRes = R.string.pref_theme_mode titleRes = R.string.pref_theme_mode
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
entriesRes = arrayOf( entriesRes = arrayOf(
R.string.theme_system,
R.string.theme_light, R.string.theme_light,
R.string.theme_dark, R.string.theme_dark)
R.string.theme_system)
entryValues = arrayOf( entryValues = arrayOf(
Values.THEME_MODE_SYSTEM,
Values.THEME_MODE_LIGHT, Values.THEME_MODE_LIGHT,
Values.THEME_MODE_DARK, Values.THEME_MODE_DARK)
Values.THEME_MODE_SYSTEM) defaultValue = Values.THEME_MODE_SYSTEM
} else { } else {
entriesRes = arrayOf( entriesRes = arrayOf(
R.string.theme_light, R.string.theme_light,
@ -70,8 +72,9 @@ class SettingsGeneralController : SettingsController() {
entryValues = arrayOf( entryValues = arrayOf(
Values.THEME_MODE_LIGHT, Values.THEME_MODE_LIGHT,
Values.THEME_MODE_DARK) Values.THEME_MODE_DARK)
defaultValue = Values.THEME_MODE_LIGHT
} }
defaultValue = Values.THEME_MODE_SYSTEM
summary = "%s" summary = "%s"
onChange { onChange {