mirror of
https://github.com/mihonapp/mihon.git
synced 2025-06-25 10:37:51 +02:00
Format fixes. Move lang setting to the first entry (looks better IMO)
This commit is contained in:
@ -5,9 +5,10 @@ import eu.kanade.tachiyomi.util.LocaleHelper
|
||||
|
||||
abstract class BaseActivity : AppCompatActivity(), ActivityMixin {
|
||||
|
||||
override fun getActivity() = this
|
||||
init {
|
||||
LocaleHelper.updateCfg(this)
|
||||
}
|
||||
|
||||
override fun getActivity() = this
|
||||
|
||||
}
|
||||
|
@ -8,11 +8,11 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
|
||||
import uy.kohesive.injekt.injectLazy
|
||||
import java.util.Locale
|
||||
|
||||
|
||||
object LocaleHelper {
|
||||
|
||||
private val preferences: PreferencesHelper by injectLazy()
|
||||
private var pLocale = Locale(LocaleHelper.intToLangCode(preferences.lang()))
|
||||
|
||||
private var pLocale = Locale(intToLangCode(preferences.lang()))
|
||||
|
||||
fun setLocale(locale: Locale) {
|
||||
pLocale = locale
|
||||
@ -20,7 +20,7 @@ object LocaleHelper {
|
||||
}
|
||||
|
||||
fun updateCfg(wrapper: ContextThemeWrapper) {
|
||||
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1){
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
|
||||
val config = Configuration()
|
||||
config.setLocale(pLocale)
|
||||
wrapper.applyOverrideConfiguration(config)
|
||||
@ -28,20 +28,19 @@ object LocaleHelper {
|
||||
}
|
||||
|
||||
fun updateCfg(app: Application, config: Configuration){
|
||||
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
|
||||
config.locale = pLocale
|
||||
app.baseContext.resources.updateConfiguration(config, app.baseContext.resources.displayMetrics)
|
||||
}
|
||||
}
|
||||
|
||||
fun intToLangCode(i: Int): String {
|
||||
return when(i){
|
||||
return when(i) {
|
||||
1 -> "en"
|
||||
2 -> "es"
|
||||
3 -> "it"
|
||||
4 -> "pt"
|
||||
// System Language
|
||||
else -> ""
|
||||
else -> "" // System Language
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user