From 1595b8f9cbc34459dbfa01a47f471f25e704be3d Mon Sep 17 00:00:00 2001
From: Tlaster <tlaster@outlook.com>
Date: Tue, 26 May 2020 17:15:09 +0800
Subject: [PATCH] Update androidx appcompat version

---
 twidere/build.gradle                          |  2 +-
 .../twidere/activity/BaseActivity.kt          | 28 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/twidere/build.gradle b/twidere/build.gradle
index 29dd09acb..3aef52793 100644
--- a/twidere/build.gradle
+++ b/twidere/build.gradle
@@ -189,7 +189,7 @@ dependencies {
 
 /** Android support **/
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
     implementation 'androidx.browser:browser:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.core:core:1.2.0'
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt
index bb8294151..f65e033fa 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt
@@ -27,22 +27,22 @@ import android.graphics.Rect
 import android.nfc.NfcAdapter
 import android.os.Build
 import android.os.Bundle
-import androidx.annotation.StyleRes
-import androidx.fragment.app.Fragment
-import androidx.core.graphics.ColorUtils
-import androidx.core.view.OnApplyWindowInsetsListener
-import androidx.core.view.WindowInsetsCompat
-import androidx.appcompat.app.TwilightManagerAccessor
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback
-import androidx.appcompat.view.menu.ActionMenuItemView
-import androidx.appcompat.widget.TwidereActionMenuView
 import android.util.AttributeSet
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
+import androidx.annotation.StyleRes
+import androidx.appcompat.app.TwilightManagerAccessor
+import androidx.appcompat.view.menu.ActionMenuItemView
+import androidx.appcompat.widget.TwidereActionMenuView
+import androidx.core.graphics.ColorUtils
+import androidx.core.view.OnApplyWindowInsetsListener
+import androidx.core.view.WindowInsetsCompat
+import androidx.fragment.app.Fragment
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback
 import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestManager
 import com.squareup.otto.Bus
@@ -363,7 +363,11 @@ open class BaseActivity : ChameleonActivity(), IBaseActivity<BaseActivity>, IThe
             super.attachBaseContext(newBase)
             return
         }
-        super.attachBaseContext(newBase.overriding(locale))
+        val newContext = newBase.overriding(locale)
+        super.attachBaseContext(newContext)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            applyOverrideConfiguration(newContext.resources.configuration)
+        }
     }
 
     override fun executeAfterFragmentResumed(useHandler: Boolean, action: (BaseActivity) -> Unit): Promise<Unit, Exception> {