Merge pull request #2462 from VASHvic/fix_theme_bug

Fix: Theme change does not apply until app restart

Author: hussainmohd-a

app/src/full/java/com/celzero/bravedns/ui/activity/MiscSettingsActivity.kt

@@ -37,6 +37,7 @@ import android.widget.CompoundButton
 import android.widget.LinearLayout
 import android.widget.ScrollView
 import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
@@ -106,6 +107,7 @@ class MiscSettingsActivity : AppCompatActivity(R.layout.activity_misc_settings)
     private val rdb by inject<RefreshDatabase>()
     private val eventLogger by inject<EventLogger>()
 
+    private var isThemeChanged: Boolean = false
     private lateinit var notificationPermissionResult: ActivityResultLauncher<String>
     private lateinit var bubbleSettingsResult: ActivityResultLauncher<Intent>
 
@@ -128,11 +130,16 @@ class MiscSettingsActivity : AppCompatActivity(R.layout.activity_misc_settings)
 
     companion object {
         private const val SCHEME_PACKAGE = "package"
+        const val THEME_CHANGED_RESULT = 24
+        private const val KEY_THEME_CHANGE = "key_theme_change"
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         theme.applyStyle(getCurrentTheme(isDarkThemeOn(), persistentState.theme), true)
         super.onCreate(savedInstanceState)
+        if (savedInstanceState != null) {
+            isThemeChanged = savedInstanceState.getBoolean(KEY_THEME_CHANGE, false)
+        }
 
         handleFrostEffectIfNeeded(persistentState.theme)
 
@@ -145,6 +152,25 @@ class MiscSettingsActivity : AppCompatActivity(R.layout.activity_misc_settings)
         registerForActivityResult()
         initView()
         setupClickListeners()
+        setupOnBackPressed()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putBoolean(KEY_THEME_CHANGE, isThemeChanged)
+    }
+
+    private fun setupOnBackPressed() {
+        val callback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                if (isThemeChanged) {
+                    setResult(THEME_CHANGED_RESULT)
+                }
+                isEnabled = false
+                onBackPressedDispatcher.onBackPressed()
+            }
+        }
+        onBackPressedDispatcher.addCallback(this, callback)
     }
 
     private fun initView() {
@@ -988,6 +1014,7 @@ class MiscSettingsActivity : AppCompatActivity(R.layout.activity_misc_settings)
             }
 
             persistentState.theme = which
+            isThemeChanged = true
             logEvent("App theme changed, theme id: $theme")
             when (which) {
                 Themes.SYSTEM_DEFAULT.id -> {

app/src/full/java/com/celzero/bravedns/ui/fragment/ConfigureFragment.kt

@@ -18,6 +18,7 @@ package com.celzero.bravedns.ui.fragment
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.celzero.bravedns.R
@@ -37,6 +38,13 @@ class ConfigureFragment : Fragment(R.layout.fragment_configure) {
 
     private val b by viewBinding(FragmentConfigureBinding::bind)
 
+    private val miscSettingsResultLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == MiscSettingsActivity.THEME_CHANGED_RESULT) {
+                requireActivity().recreate()
+            }
+        }
+
     enum class ScreenType {
         APPS,
         DNS,
@@ -128,6 +136,11 @@ class ConfigureFragment : Fragment(R.layout.fragment_configure) {
                 ScreenType.ANTI_CENSORSHIP -> Intent(requireContext(), AntiCensorshipActivity::class.java)
                 ScreenType.ADVANCED -> Intent(requireContext(), AdvancedSettingActivity::class.java)
             }
-        startActivity(intent)
+
+        if (type == ScreenType.OTHERS) {
+            miscSettingsResultLauncher.launch(intent)
+        } else {
+            startActivity(intent)
+        }
     }
 }