rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AMOLED + custom

Browse source
This commit is contained in:
Finnley Somdahl 2023-11-26 22:05:27 -06:00
parent f01377f0b1
commit 32f918450a
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
View file

@ -117,7 +117,6 @@ class SettingsActivity : AppCompatActivity() {
binding.settingsUseCustomTheme.setOnCheckedChangeListener { _, isChecked -> binding.settingsUseCustomTheme.setOnCheckedChangeListener { _, isChecked ->
getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putBoolean("use_custom_theme", isChecked).apply() getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putBoolean("use_custom_theme", isChecked).apply()
if(isChecked) { if(isChecked) {
binding.settingsUseOLED.isChecked = false
binding.settingsUseMaterialYou.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.isChecked = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getBoolean("use_oled", false)
binding.settingsUseOLED.setOnCheckedChangeListener { _, isChecked -> binding.settingsUseOLED.setOnCheckedChangeListener { _, isChecked ->
getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putBoolean("use_oled", isChecked).apply() getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putBoolean("use_oled", isChecked).apply()
if(isChecked) binding.settingsUseCustomTheme.isChecked = false
restartApp() restartApp()
} }

9
app/src/main/java/ani/dantotsu/themes/ThemeManager.kt
View file

@ -68,7 +68,6 @@ class ThemeManager(private val context: Context) {
needMaterial = false needMaterial = false
} }
// Set the theme overlay based on conditions
if (useOLED) { if (useOLED) {
builder.setThemeOverlay(R.style.AppTheme_Amoled) builder.setThemeOverlay(R.style.AppTheme_Amoled)
} }
@ -80,6 +79,14 @@ class ThemeManager(private val context: Context) {
// Apply the dynamic colors to the activity // Apply the dynamic colors to the activity
val activity = context as Activity val activity = context as Activity
DynamicColors.applyToActivityIfAvailable(activity, options) DynamicColors.applyToActivityIfAvailable(activity, options)
if (useOLED) {
val options2 = DynamicColorsOptions.Builder()
.setThemeOverlay(R.style.AppTheme_Amoled)
.build()
DynamicColors.applyToActivityIfAvailable(activity, options2)
}
return false return false
} }

2
app/src/main/res/values/strings.xml
View file

@ -634,7 +634,7 @@
<string name="user_agent">User Agent</string> <string name="user_agent">User Agent</string>
<string name="custom_theme">Custom Theme</string> <string name="custom_theme">Custom Theme</string>
<string name="use_custom_theme">Custom theme</string> <string name="use_custom_theme">Custom theme</string>
<string name="use_unique_theme_for_each_item">Unique theme for each item</string> <string name="use_unique_theme_for_each_item">Use cover as theme for each entry</string>
<string name="oled_theme_variant">OLED theme variant</string> <string name="oled_theme_variant">OLED theme variant</string>
</resources> </resources>