Apply theme changing without restarting

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt

@@ -43,9 +43,13 @@ abstract class BaseActivity<B : ViewBinding> :
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		val settings = get<AppSettings>()
+		val isAmoled = settings.isAmoledTheme
+		val isDynamic = settings.isDynamicTheme
+		// TODO support DialogWhenLarge theme
 		when {
-			settings.isAmoledTheme -> setTheme(R.style.ThemeOverlay_Kotatsu_AMOLED)
-			settings.isDynamicTheme -> setTheme(R.style.Theme_Kotatsu_Monet)
+			isAmoled && isDynamic -> setTheme(R.style.Theme_Kotatsu_Monet_Amoled)
+			isAmoled -> setTheme(R.style.Theme_Kotatsu_Amoled)
+			isDynamic -> setTheme(R.style.Theme_Kotatsu_Monet)
 		}
 		super.onCreate(savedInstanceState)
 		WindowCompat.setDecorFitsSystemWindows(window, false)

app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.net.ConnectivityManager
 import android.net.Uri
-import android.os.Build
 import android.provider.Settings
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.collection.arraySetOf
@@ -52,7 +51,7 @@ class AppSettings(context: Context) {
 		get() = prefs.getString(KEY_THEME, null)?.toIntOrNull() ?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 
 	val isDynamicTheme: Boolean
-		get() = prefs.getBoolean(KEY_DYNAMIC_THEME, false)
+		get() = DynamicColors.isDynamicColorAvailable() && prefs.getBoolean(KEY_DYNAMIC_THEME, false)
 
 	val isAmoledTheme: Boolean
 		get() = prefs.getBoolean(KEY_THEME_AMOLED, false)
@@ -324,12 +323,5 @@ class AppSettings(context: Context) {
 		private const val NETWORK_NEVER = 0
 		private const val NETWORK_ALWAYS = 1
 		private const val NETWORK_NON_METERED = 2
-
-		val isDynamicColorAvailable: Boolean
-			get() = DynamicColors.isDynamicColorAvailable() ||
-				(isSamsung && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
-
-		private val isSamsung
-			get() = Build.MANUFACTURER.equals("samsung", ignoreCase = true)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt

@@ -5,10 +5,11 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.view.postDelayed
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
-import java.util.*
+import com.google.android.material.color.DynamicColors
 import org.koin.android.ext.android.get
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
@@ -19,6 +20,7 @@ import org.koitharu.kotatsu.parsers.util.names
 import org.koitharu.kotatsu.settings.protect.ProtectSetupActivity
 import org.koitharu.kotatsu.settings.utils.SliderPreference
 import org.koitharu.kotatsu.utils.ext.setDefaultValueCompat
+import java.util.*
 
 class AppearanceSettingsFragment :
 	BasePreferenceFragment(R.string.appearance),
@@ -38,7 +40,7 @@ class AppearanceSettingsFragment :
 			entryValues = ListMode.values().names()
 			setDefaultValueCompat(ListMode.GRID.name)
 		}
-		findPreference<Preference>(AppSettings.KEY_DYNAMIC_THEME)?.isVisible = AppSettings.isDynamicColorAvailable
+		findPreference<Preference>(AppSettings.KEY_DYNAMIC_THEME)?.isVisible = DynamicColors.isDynamicColorAvailable()
 		findPreference<ListPreference>(AppSettings.KEY_DATE_FORMAT)?.run {
 			entryValues = resources.getStringArray(R.array.date_formats)
 			val now = Date().time
@@ -73,10 +75,10 @@ class AppearanceSettingsFragment :
 				AppCompatDelegate.setDefaultNightMode(settings.theme)
 			}
 			AppSettings.KEY_DYNAMIC_THEME -> {
-				get<ActivityRecreationHandle>().recreateAll()
+				postRestart()
 			}
 			AppSettings.KEY_THEME_AMOLED -> {
-				get<ActivityRecreationHandle>().recreateAll()
+				postRestart()
 			}
 			AppSettings.KEY_APP_PASSWORD -> {
 				findPreference<TwoStatePreference>(AppSettings.KEY_PROTECT_APP)
@@ -100,4 +102,10 @@ class AppearanceSettingsFragment :
 			else -> super.onPreferenceTreeClick(preference)
 		}
 	}
+
+	private fun postRestart() {
+		view?.postDelayed(400) {
+			get<ActivityRecreationHandle>().recreateAll()
+		}
+	}
 }

app/src/main/java/org/koitharu/kotatsu/settings/SettingsHeadersFragment.kt

@@ -33,7 +33,7 @@ class SettingsHeadersFragment : PreferenceHeaderFragmentCompat(), SlidingPaneLay
 
 	fun setTitle(title: CharSequence?) {
 		currentTitle = title
-		if (slidingPaneLayout.isSlideable && slidingPaneLayout.isOpen) {
+		if (slidingPaneLayout.isOpen) {
 			activity?.title = title
 		}
 	}

app/src/main/res/values-night/themes.xml

@@ -3,9 +3,12 @@
 
 	<style name="ThemeOverlay.Kotatsu" parent="ThemeOverlay.Material3.Dark" />
 
-	<!--== AMOLED Mode Overlay ==-->
-	<style name="ThemeOverlay.Kotatsu.AMOLED" parent="">
-		<!-- Theme Colors -->
+	<style name="Theme.Kotatsu.Amoled">
+		<item name="colorSurface">@color/surface_amoled</item>
+		<item name="android:colorBackground">@color/background_amoled</item>
+	</style>
+
+	<style name="Theme.Kotatsu.Monet.Amoled">
 		<item name="colorSurface">@color/surface_amoled</item>
 		<item name="android:colorBackground">@color/background_amoled</item>
 	</style>

app/src/main/res/values/themes.xml

@@ -86,9 +86,11 @@
 	<!-- Monet theme only support S+ -->
 	<style name="Theme.Kotatsu.Monet" />
 
-	<style name="ThemeOverlay.Kotatsu" parent="ThemeOverlay.Material3.Light" />
+	<style name="Theme.Kotatsu.Amoled" />
 
-	<style name="ThemeOverlay.Kotatsu.AMOLED" parent="" />
+	<style name="Theme.Kotatsu.Monet.Amoled" />
+
+	<style name="ThemeOverlay.Kotatsu" parent="ThemeOverlay.Material3.Light" />
 
 	<style name="Theme.Kotatsu.Dialog" parent="">
 		<item name="android:windowNoTitle">true</item>