github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-07 20:31:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Group theme settings into category

Browse source
This commit is contained in:
arkon 2020-07-10 22:37:36 -04:00
parent d353a3457d
commit fa5d2276c0
2 changed files with 107 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
View file

@ -58,58 +58,8 @@ class SettingsGeneralController : SettingsController() {
} }
preferenceCategory { preferenceCategory {
titleRes = R.string.pref_category_display titleRes = R.string.pref_category_theme
listPreference {
key = Keys.lang
titleRes = R.string.pref_language
val langs = mutableListOf<Pair<String, String>>()
langs += Pair("", "${context.getString(R.string.system_default)} (${LocaleHelper.getDisplayName("")})")
// Due to compatibility issues:
// - Hebrew: `he` is copied into `iw` at build time
langs += arrayOf(
"ar", "be", "bg", "bn", "ca", "cs", "cv", "de", "el", "es", "es-419", "en-US", "en-GB", "fa", "fi", "fil", "fr", "he",
"hi", "hr", "hu", "in", "it", "ja", "ka-rGE", "kn", "ko", "lv", "mr", "ms", "nb-rNO", "nl", "pl", "pt",
"pt-BR", "ro", "ru", "sc", "sk", "sr", "sv", "th", "tl", "tr", "uk", "ur-rPK", "vi", "zh-rCN", "zh-rTW"
)
.map {
Pair(it, LocaleHelper.getDisplayName(it))
}
.sortedBy { it.second }
entryValues = langs.map { it.first }.toTypedArray()
entries = langs.map { it.second }.toTypedArray()
defaultValue = ""
summary = "%s"
onChange { newValue ->
val activity = activity ?: return@onChange false
val app = activity.application
LocaleHelper.changeLocale(newValue.toString())
LocaleHelper.updateConfiguration(app, app.resources.configuration)
activity.recreate()
true
}
}
listPreference {
key = Keys.dateFormat
titleRes = R.string.pref_date_format
entryValues = arrayOf("", "MM/dd/yy", "dd/MM/yy", "yyyy-MM-dd")
val now = Date().time
entries = entryValues.map { value ->
val formattedDate = preferences.dateFormat(value.toString()).format(now)
if (value == "") {
"${context.getString(R.string.system_default)} ($formattedDate)"
} else {
"$value ($formattedDate)"
}
}.toTypedArray()
defaultValue = ""
summary = "%s"
}
listPreference { listPreference {
key = Keys.themeMode key = Keys.themeMode
titleRes = R.string.pref_theme_mode titleRes = R.string.pref_theme_mode
@ -196,5 +146,109 @@ class SettingsGeneralController : SettingsController() {
} }
} }
} }
preferenceCategory {
titleRes = R.string.pref_category_locale
listPreference {
key = Keys.lang
titleRes = R.string.pref_language
val langs = mutableListOf<Pair<String, String>>()
langs += Pair(
"",
"${context.getString(R.string.system_default)} (${LocaleHelper.getDisplayName("")})"
)
// Due to compatibility issues:
// - Hebrew: `he` is copied into `iw` at build time
langs += arrayOf(
"ar",
"be",
"bg",
"bn",
"ca",
"cs",
"cv",
"de",
"el",
"es",
"es-419",
"en-US",
"en-GB",
"fa",
"fi",
"fil",
"fr",
"he",
"hi",
"hr",
"hu",
"in",
"it",
"ja",
"ka-rGE",
"kn",
"ko",
"lv",
"mr",
"ms",
"nb-rNO",
"nl",
"pl",
"pt",
"pt-BR",
"ro",
"ru",
"sc",
"sk",
"sr",
"sv",
"th",
"tl",
"tr",
"uk",
"ur-rPK",
"vi",
"zh-rCN",
"zh-rTW"
)
.map {
Pair(it, LocaleHelper.getDisplayName(it))
}
.sortedBy { it.second }
entryValues = langs.map { it.first }.toTypedArray()
entries = langs.map { it.second }.toTypedArray()
defaultValue = ""
summary = "%s"
onChange { newValue ->
val activity = activity ?: return@onChange false
val app = activity.application
LocaleHelper.changeLocale(newValue.toString())
LocaleHelper.updateConfiguration(app, app.resources.configuration)
activity.recreate()
true
}
}
listPreference {
key = Keys.dateFormat
titleRes = R.string.pref_date_format
entryValues = arrayOf("", "MM/dd/yy", "dd/MM/yy", "yyyy-MM-dd")
val now = Date().time
entries = entryValues.map { value ->
val formattedDate = preferences.dateFormat(value.toString()).format(now)
if (value == "") {
"${context.getString(R.string.system_default)} ($formattedDate)"
} else {
"$value ($formattedDate)"
}
}.toTypedArray()
defaultValue = ""
summary = "%s"
}
}
} }
} }

2
app/src/main/res/values/strings.xml
View file

@ -137,6 +137,8 @@
<string name="pref_category_about">About</string> <string name="pref_category_about">About</string>
<!-- General section --> <!-- General section -->
<string name="pref_category_theme">Theme</string>
<string name="pref_category_locale">Locale</string>
<string name="pref_theme_mode">Dark mode</string> <string name="pref_theme_mode">Dark mode</string>
<string name="theme_system">Follow system</string> <string name="theme_system">Follow system</string>
<string name="theme_light">Off</string> <string name="theme_light">Off</string>