github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Locale fix. Kotlin update to 1.0.6

Browse source
This commit is contained in:
len 2016-12-27 20:18:38 +01:00
parent dc882b4dce
commit a7192e866f
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -204,7 +204,7 @@ dependencies {
}
buildscript {
ext.kotlin_version = '1.0.5-2'
ext.kotlin_version = '1.0.6'
repositories {
mavenCentral()
}

17
app/src/main/java/eu/kanade/tachiyomi/util/LocaleHelper.kt
View file

@ -30,6 +30,12 @@ object LocaleHelper {
*/
private var appLocale = getLocaleFromString(preferences.lang())
/**
* The currently applied locale. Used to avoid losing the selected language after a non locale
* configuration change to the application.
*/
private var currentLocale: Locale? = null
/**
* Returns the locale for the value stored in preferences, or null if it's system language.
*
@ -72,15 +78,16 @@ object LocaleHelper {
if (systemLocale == null) {
systemLocale = getConfigLocale(config)
}
// In API 16 and lower the system locale can't be changed.
// In API 16 and lower [systemLocale] can't be changed.
if (configChange && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
val newLocale = getConfigLocale(config)
if (systemLocale == newLocale) {
val configLocale = getConfigLocale(config)
if (currentLocale == configLocale) {
return
}
systemLocale = newLocale
systemLocale = configLocale
}
val newConfig = updateConfigLocale(config, appLocale ?: systemLocale ?: Locale.getDefault())
currentLocale = appLocale ?: systemLocale ?: Locale.getDefault()
val newConfig = updateConfigLocale(config, currentLocale!!)
val resources = app.resources
resources.updateConfiguration(newConfig, resources.displayMetrics)
}