Skip to content

feat(ui): support AMOLED mode with system theme and preserve selection #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ravindu644 merged 1 commit into from
Jul 12, 2026
Merged

feat(ui): support AMOLED mode with system theme and preserve selection #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 14 additions & 24 deletions Android/app/src/main/java/com/droidspaces/app/ui/screen/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,6 @@ fun SettingsScreen(
checked = followSystemTheme,
onCheckedChange = { checked ->
prefsManager.followSystemTheme = checked
// Disable AMOLED mode when enabling follow system theme
// Theme state updates automatically via SharedPreferences listener
if (checked && amoledMode) {
prefsManager.amoledMode = false
}
}
)

Expand All @@ -349,28 +344,23 @@ fun SettingsScreen(
checked = darkTheme,
onCheckedChange = { checked ->
prefsManager.darkTheme = checked
// Disable AMOLED if dark theme is disabled
// Theme state updates automatically via SharedPreferences listener
if (!checked && amoledMode) {
prefsManager.amoledMode = false
}
}
)
}

// AMOLED Mode (only shown when dark theme is explicitly enabled, directly beneath Dark Theme)
if (darkTheme) {
SwitchItem(
icon = Icons.Default.RadioButtonUnchecked,
title = context.getString(R.string.amoled_mode),
summary = context.getString(R.string.amoled_mode_description),
checked = amoledMode,
enabled = true,
onCheckedChange = { checked ->
prefsManager.amoledMode = checked
// Theme state updates automatically via SharedPreferences listener
}
)
}
// AMOLED Mode (shown when followSystemTheme is true OR manual darkTheme is true)
if (followSystemTheme || darkTheme) {
SwitchItem(
icon = Icons.Default.RadioButtonUnchecked,
title = context.getString(R.string.amoled_mode),
summary = context.getString(R.string.amoled_mode_description),
checked = amoledMode,
enabled = true,
onCheckedChange = { checked ->
prefsManager.amoledMode = checked
// Theme state updates automatically via SharedPreferences listener
}
)
}

// Use Dynamic Color (Monet theming) - Only show on Android 12+
Expand Down
3 changes: 1 addition & 2 deletions Android/app/src/main/java/com/droidspaces/app/ui/theme/ThemeStateHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,13 @@ fun rememberThemeState(): ThemeState {

val systemDark = isSystemInDarkTheme()
val effectiveDarkTheme = if (followSystemTheme) systemDark else darkTheme
val effectiveAmoledMode = amoledMode && effectiveDarkTheme // AMOLED only works with dark theme

// Return state that triggers recomposition when any theme preference changes
return remember(followSystemTheme, darkTheme, amoledMode, useDynamicColor, systemDark, themePalette) {
ThemeState(
followSystemTheme = followSystemTheme,
darkTheme = effectiveDarkTheme,
amoledMode = effectiveAmoledMode,
amoledMode = amoledMode,
useDynamicColor = useDynamicColor,
themePalette = themePalette
)
Expand Down
Loading