handle uiMode config changes

YouROK · Dec 14, 2023 · 54540ef · 54540ef
1 parent b99e11b
commit 54540ef
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
         <activity
             android:name="ru.yourok.torrserve.ui.activities.main.MainActivity"
             android:launchMode="singleInstance"
+            android:configChanges="uiMode"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -72,6 +73,7 @@
         <activity
             android:name="ru.yourok.torrserve.ui.activities.play.PlayActivity"
             android:theme="@style/PlayDialog.DayNight"
+            android:configChanges="uiMode"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -205,6 +207,7 @@
         </activity>
 
         <activity android:name="ru.yourok.torrserve.ui.activities.main.SettingsActivity"
+            android:configChanges="uiMode"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/ru/yourok/torrserve/ui/activities/main/MainActivity.kt b/app/src/main/java/ru/yourok/torrserve/ui/activities/main/MainActivity.kt
@@ -2,6 +2,7 @@ package ru.yourok.torrserve.ui.activities.main
 
 import android.content.DialogInterface.BUTTON_POSITIVE
 import android.content.Intent
+import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
@@ -127,6 +128,11 @@ class MainActivity : AppCompatActivity() {
         if (Settings.showFab()) setupFab()
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        themeUtil.onConfigurationChanged(this, newConfig)
+    }
+
     private fun updateStatus() {
         val host = viewModel.getHost()
         host.observe(this) {

diff --git a/app/src/main/java/ru/yourok/torrserve/ui/activities/main/SettingsActivity.kt b/app/src/main/java/ru/yourok/torrserve/ui/activities/main/SettingsActivity.kt
@@ -1,5 +1,6 @@
 package ru.yourok.torrserve.ui.activities.main
 
+import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
@@ -89,4 +90,9 @@ class SettingsActivity : AppCompatActivity() {
         themeUtil.onResume(this)
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        themeUtil.onConfigurationChanged(this, newConfig)
+    }
+
 }
diff --git a/app/src/main/java/ru/yourok/torrserve/ui/activities/play/PlayActivity.kt b/app/src/main/java/ru/yourok/torrserve/ui/activities/play/PlayActivity.kt
@@ -1,5 +1,6 @@
 package ru.yourok.torrserve.ui.activities.play
 
+import android.content.res.Configuration
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -44,6 +45,9 @@ class PlayActivity : AppCompatActivity() {
     private var userClose = false
 
     var ad: AD? = null
+
+    private val themeUtil = ThemeUtil()
+
     val infoFragment = InfoFragment()
 
     private var firebaseAnalytics: FirebaseAnalytics? = null
@@ -144,6 +148,12 @@ class PlayActivity : AppCompatActivity() {
         super.onDestroy()
     }
 
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        if (App.inForeground) super.onConfigurationChanged(newConfig)
+        themeUtil.onConfigurationChanged(this, newConfig)
+    }
+
     private fun setWindow() {
         setFinishOnTouchOutside(false)
         val attr = window.attributes

diff --git a/app/src/main/java/ru/yourok/torrserve/utils/ThemeUtil.kt b/app/src/main/java/ru/yourok/torrserve/utils/ThemeUtil.kt
@@ -30,15 +30,16 @@ class ThemeUtil {
     }
 
     fun onConfigurationChanged(activity: AppCompatActivity, newConfig: Configuration) {
+        val config = activity.resources.configuration
         val isNightModeActive =
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                activity.resources.configuration.isNightModeActive
+                config.isNightModeActive
             } else {
-                newConfig.uiMode and
+                config.uiMode and
                         Configuration.UI_MODE_NIGHT_MASK ==
                         Configuration.UI_MODE_NIGHT_YES
             }
-        if (BuildConfig.DEBUG) Log.d("*****", "onConfigurationChanged isNightModeActive = $isNightModeActive")
+        if (BuildConfig.DEBUG) Log.d("*****", "ThemeUtil onConfigurationChanged isNightModeActive = $isNightModeActive")
     }
 
     companion object {