move setNightMode to ThemeUtil

YouROK · Nov 17, 2023 · 0e5172b · 0e5172b
1 parent 8959d3f
commit 0e5172b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/app/src/main/java/ru/yourok/torrserve/app/App.kt b/app/src/main/java/ru/yourok/torrserve/app/App.kt
@@ -8,13 +8,12 @@ import android.os.Looper
 import android.os.PowerManager
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDexApplication
-import ru.yourok.torrserve.atv.Utils
-import ru.yourok.torrserve.settings.Settings
+import ru.yourok.torrserve.utils.ThemeUtil
+
 
 class App : MultiDexApplication() {
 
@@ -87,12 +86,7 @@ class App : MultiDexApplication() {
         // Track activities
         registerActivityLifecycleCallbacks(mActivityLifecycleCallbacks)
         // DayNight Auto ON/OFF
-        when (Settings.getTheme()) {
-            "dark", "black" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-            "light" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-            else -> if (Utils.isTvBox()) AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_TIME) else
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) // phones
-        }
+        ThemeUtil.setNightMode()
 
         val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
         wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "TorrServe:WakeLock")

diff --git a/app/src/main/java/ru/yourok/torrserve/ui/fragments/main/settings/SettingsFragment.kt b/app/src/main/java/ru/yourok/torrserve/ui/fragments/main/settings/SettingsFragment.kt
@@ -34,6 +34,7 @@ import ru.yourok.torrserve.ui.fragments.main.update.apk.ApkUpdateFragment
 import ru.yourok.torrserve.ui.fragments.main.update.apk.UpdaterApk
 import ru.yourok.torrserve.ui.fragments.speedtest.SpeedTest
 import ru.yourok.torrserve.utils.Accessibility
+import ru.yourok.torrserve.utils.ThemeUtil
 import ru.yourok.torrserve.utils.ThemeUtil.Companion.isDarkMode
 
 
@@ -136,6 +137,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
             summary = "$summary (${darkMode})"
             setOnPreferenceChangeListener { _, newValue ->
                 Settings.setTheme(newValue.toString())
+                ThemeUtil.setNightMode()
                 requireActivity().recreate()
                 true
             }

diff --git a/app/src/main/java/ru/yourok/torrserve/utils/ThemeUtil.kt b/app/src/main/java/ru/yourok/torrserve/utils/ThemeUtil.kt
@@ -8,9 +8,12 @@ import android.util.TypedValue
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import ru.yourok.torrserve.BuildConfig
 import ru.yourok.torrserve.R
 import ru.yourok.torrserve.app.App
+import ru.yourok.torrserve.atv.Utils
+import ru.yourok.torrserve.settings.Settings
 import ru.yourok.torrserve.settings.Settings.getTheme
 
 class ThemeUtil {
@@ -41,8 +44,7 @@ class ThemeUtil {
     companion object {
         val selectedTheme: Int
             get() {
-                val theme = getTheme()
-                return when (theme) {
+                return when (getTheme()) {
                     "light" -> R.style.Theme_TorrServe_Light
                     "dark" -> R.style.Theme_TorrServe_Dark
                     "black" -> R.style.Theme_TorrServe_Black
@@ -69,5 +71,14 @@ class ThemeUtil {
                 darkModeFlag == Configuration.UI_MODE_NIGHT_YES
             }
         }
+
+        fun setNightMode() {
+            when (getTheme()) {
+                "dark", "black" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+                "light" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+                else -> if (Utils.isTvBox()) AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_TIME) else
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) // phones
+            }
+        }
     }
 }