From 8231fc8bfbea990d190bf54a445ba49709d01a48 Mon Sep 17 00:00:00 2001
From: LooKeR <mohit2002ss@gmail.com>
Date: Fri, 8 Oct 2021 00:05:03 +0530
Subject: [PATCH] Remove override to configure language

---
 build.gradle                                  |  5 +---
 .../com/looker/droidify/MainApplication.kt    |  4 ---
 .../looker/droidify/screen/ScreenActivity.kt  |  6 -----
 .../com/looker/droidify/utility/Utils.kt      | 27 -------------------
 src/main/res/values-pt-rBR/strings.xml        |  3 +--
 5 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1935da20..5b621dbe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,10 +29,6 @@ android {
         versionName '0.3'
 
         vectorDrawables.useSupportLibrary true
-
-        def languages = ['en']
-        buildConfigField 'String[]', 'LANGUAGES', '{ "' + languages.join('", "') + '" }'
-        resConfigs languages
     }
 
     sourceSets.all {
@@ -113,5 +109,6 @@ dependencies {
     implementation 'io.reactivex.rxjava3:rxjava:3.1.1'
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
     implementation 'com.fasterxml.jackson.core:jackson-core:2.13.0'
+    implementation 'io.coil-kt:coil:1.3.2'
     implementation 'com.squareup.picasso:picasso:2.71828'
 }
diff --git a/src/main/kotlin/com/looker/droidify/MainApplication.kt b/src/main/kotlin/com/looker/droidify/MainApplication.kt
index 8f4ccb8b..14936841 100644
--- a/src/main/kotlin/com/looker/droidify/MainApplication.kt
+++ b/src/main/kotlin/com/looker/droidify/MainApplication.kt
@@ -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()
 
diff --git a/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt b/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
index 5334c15e..2312301f 100644
--- a/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
@@ -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)
diff --git a/src/main/kotlin/com/looker/droidify/utility/Utils.kt b/src/main/kotlin/com/looker/droidify/utility/Utils.kt
index 607630a5..769a8c8b 100644
--- a/src/main/kotlin/com/looker/droidify/utility/Utils.kt
+++ b/src/main/kotlin/com/looker/droidify/utility/Utils.kt
@@ -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()
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index bfa2e9e5..1470f58c 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -11,7 +11,6 @@
   <string name="amoled">Amoled</string>
   <string name="anti_features">Características indesejadas</string>
   <string name="application">Aplicativo</string>
-  <string name="application_name" translatable="false">Droid-ify</string>
   <string name="application_not_found">Aplicativo não encontrado</string>
   <string name="author_email">Email do autor</string>
   <string name="author_website">Página do autor</string>
@@ -95,7 +94,7 @@
   <string name="no_proxy">Sem proxy</string>
   <string name="notify_about_updates">Notificar sobre atualizações</string>
   <string name="notify_about_updates_summary">Mostrar uma notificação quando atualizações estiverem disponíveis</string>
-  <string name="number_of_applications">Numero de aplicativos</string>
+  <string name="number_of_applications">Número de aplicativos</string>
   <string name="ok">OK</string>
   <string name="only_compatible_with_FORMAT">Somente compatível com %s</string>
   <string name="only_on_wifi">Somente no Wi-Fi</string>