mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-05 01:15:14 +01:00
Minor changes
This commit is contained in:
parent
006d17aac7
commit
77b4de3941
@ -80,16 +80,14 @@ object LocaleHelper {
|
||||
}
|
||||
systemLocale = newLocale
|
||||
}
|
||||
val newConfig = Configuration(config)
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
|
||||
newConfig.locale = appLocale ?: systemLocale
|
||||
} else {
|
||||
newConfig.locales = LocaleList(appLocale ?: systemLocale)
|
||||
}
|
||||
val newConfig = updateConfigLocale(config, appLocale ?: systemLocale ?: Locale.getDefault())
|
||||
val resources = app.resources
|
||||
resources.updateConfiguration(newConfig, resources.displayMetrics)
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the locale applied in the given configuration.
|
||||
*/
|
||||
private fun getConfigLocale(config: Configuration): Locale {
|
||||
return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
|
||||
config.locale
|
||||
@ -98,4 +96,17 @@ object LocaleHelper {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a new configuration with the given locale applied.
|
||||
*/
|
||||
private fun updateConfigLocale(config: Configuration, locale: Locale): Configuration {
|
||||
val newConfig = Configuration(config)
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
|
||||
newConfig.locale = locale
|
||||
} else {
|
||||
newConfig.locales = LocaleList(locale)
|
||||
}
|
||||
return newConfig
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user