avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-06-15 11:59:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove override to configure language

Browse Source
This commit is contained in:
LooKeR
2021-10-08 00:05:03 +05:30
parent f1810cefd6
commit 8231fc8bfb
5 changed files with 2 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/com/looker/droidify/MainApplication.kt
View File

@ -32,10 +32,6 @@ class MainApplication : Application() {
return InstalledItem(packageName, versionName.orEmpty(), versionCodeCompat, signatureString)
}
override fun attachBaseContext(base: Context) {
super.attachBaseContext(Utils.configureLocale(base))
}
override fun onCreate() {
super.onCreate()

6
src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
View File

@ -1,6 +1,5 @@
package com.looker.droidify.screen
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
@ -17,7 +16,6 @@ import com.looker.droidify.content.Cache
import com.looker.droidify.content.Preferences
import com.looker.droidify.database.CursorOwner
import com.looker.droidify.utility.KParcelable
import com.looker.droidify.utility.Utils
import com.looker.droidify.utility.extension.android.Android
import com.looker.droidify.utility.extension.resources.getDrawableFromAttr
import com.looker.droidify.utility.extension.text.nullIfEmpty
@ -71,10 +69,6 @@ abstract class ScreenActivity : FragmentActivity() {
return supportFragmentManager.findFragmentById(R.id.main_content)
}
override fun attachBaseContext(base: Context) {
super.attachBaseContext(Utils.configureLocale(base))
}
override fun onCreate(savedInstanceState: Bundle?) {
setTheme(Preferences[Preferences.Key.Theme].getResId(resources.configuration))
super.onCreate(savedInstanceState)

27
src/main/kotlin/com/looker/droidify/utility/Utils.kt
View File

@ -3,11 +3,8 @@ package com.looker.droidify.utility
import android.animation.ValueAnimator
import android.content.Context
import android.content.pm.Signature
import android.content.res.Configuration
import android.graphics.drawable.Drawable
import android.os.LocaleList
import android.provider.Settings
import com.looker.droidify.BuildConfig
import com.looker.droidify.R
import com.looker.droidify.utility.extension.android.Android
import com.looker.droidify.utility.extension.resources.getColorFromAttr
@ -70,30 +67,6 @@ object Utils {
}
}
fun configureLocale(context: Context): Context {
val supportedLanguages = BuildConfig.LANGUAGES.toSet()
val configuration = context.resources.configuration
val currentLocales = if (Android.sdk(24)) {
val localesList = configuration.locales
(0 until localesList.size()).map(localesList::get)
} else {
@Suppress("DEPRECATION")
listOf(configuration.locale)
}
val compatibleLocales = currentLocales
.filter { it.language in supportedLanguages }
.let { if (it.isEmpty()) listOf(Locale.US) else it }
Locale.setDefault(compatibleLocales.first())
val newConfiguration = Configuration(configuration)
if (Android.sdk(24)) {
newConfiguration.setLocales(LocaleList(*compatibleLocales.toTypedArray()))
} else {
@Suppress("DEPRECATION")
newConfiguration.locale = compatibleLocales.first()
}
return context.createConfigurationContext(newConfiguration)
}
fun areAnimationsEnabled(context: Context): Boolean {
return if (Android.sdk(26)) {
ValueAnimator.areAnimatorsEnabled()