Default to light theme prior to Oreo
Cette révision appartient à :
Parent
edcadb7dd1
révision
2c23c42c98
1 fichiers modifiés avec 8 ajouts et 5 suppressions
|
@ -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 {
|
||||||
|
|
Référencer dans un nouveau ticket