diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt index 33e75620..63ef0cd0 100644 --- a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt +++ b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt @@ -117,7 +117,6 @@ class SettingsActivity : AppCompatActivity() { binding.settingsUseCustomTheme.setOnCheckedChangeListener { _, isChecked -> getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putBoolean("use_custom_theme", isChecked).apply() if(isChecked) { - binding.settingsUseOLED.isChecked = false binding.settingsUseMaterialYou.isChecked = false } @@ -132,7 +131,6 @@ class SettingsActivity : AppCompatActivity() { binding.settingsUseOLED.isChecked = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getBoolean("use_oled", false) binding.settingsUseOLED.setOnCheckedChangeListener { _, isChecked -> getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putBoolean("use_oled", isChecked).apply() - if(isChecked) binding.settingsUseCustomTheme.isChecked = false restartApp() } diff --git a/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt b/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt index 8048cadf..69caa69a 100644 --- a/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt +++ b/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt @@ -68,7 +68,6 @@ class ThemeManager(private val context: Context) { needMaterial = false } - // Set the theme overlay based on conditions if (useOLED) { builder.setThemeOverlay(R.style.AppTheme_Amoled) } @@ -80,6 +79,14 @@ class ThemeManager(private val context: Context) { // Apply the dynamic colors to the activity val activity = context as Activity DynamicColors.applyToActivityIfAvailable(activity, options) + + if (useOLED) { + val options2 = DynamicColorsOptions.Builder() + .setThemeOverlay(R.style.AppTheme_Amoled) + .build() + DynamicColors.applyToActivityIfAvailable(activity, options2) + } + return false } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 72b64afd..0e20b79c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -634,7 +634,7 @@ User Agent Custom Theme Custom theme - Unique theme for each item + Use cover as theme for each entry OLED theme variant