@@ -332,11 +332,6 @@ fun SettingsScreen(
332332 checked = followSystemTheme,
333333 onCheckedChange = { checked ->
334334 prefsManager.followSystemTheme = checked
335- // Disable AMOLED mode when enabling follow system theme
336- // Theme state updates automatically via SharedPreferences listener
337- if (checked && amoledMode) {
338- prefsManager.amoledMode = false
339- }
340335 }
341336 )
342337
@@ -349,28 +344,23 @@ fun SettingsScreen(
349344 checked = darkTheme,
350345 onCheckedChange = { checked ->
351346 prefsManager.darkTheme = checked
352- // Disable AMOLED if dark theme is disabled
353- // Theme state updates automatically via SharedPreferences listener
354- if (! checked && amoledMode) {
355- prefsManager.amoledMode = false
356- }
357347 }
358348 )
349+ }
359350
360- // AMOLED Mode (only shown when dark theme is explicitly enabled, directly beneath Dark Theme)
361- if (darkTheme) {
362- SwitchItem (
363- icon = Icons .Default .RadioButtonUnchecked ,
364- title = context.getString(R .string.amoled_mode),
365- summary = context.getString(R .string.amoled_mode_description),
366- checked = amoledMode,
367- enabled = true ,
368- onCheckedChange = { checked ->
369- prefsManager.amoledMode = checked
370- // Theme state updates automatically via SharedPreferences listener
371- }
372- )
373- }
351+ // AMOLED Mode (shown when followSystemTheme is true OR manual darkTheme is true)
352+ if (followSystemTheme || darkTheme) {
353+ SwitchItem (
354+ icon = Icons .Default .RadioButtonUnchecked ,
355+ title = context.getString(R .string.amoled_mode),
356+ summary = context.getString(R .string.amoled_mode_description),
357+ checked = amoledMode,
358+ enabled = true ,
359+ onCheckedChange = { checked ->
360+ prefsManager.amoledMode = checked
361+ // Theme state updates automatically via SharedPreferences listener
362+ }
363+ )
374364 }
375365
376366 // Use Dynamic Color (Monet theming) - Only show on Android 12+
0 commit comments