[Bug]: OLED toggle ignores color theme mode

[therealresonix]

Before submitting

• I am using the latest available TypeType Android release.
• I searched for an existing issue describing the same problem.

What happened?

The new OLED toggle ignores the theme mode. Dynamic mode is ignored and therefore the accent color is preferred.

Steps to reproduce

1. Open Appearance Settings in App
2. Select Dynamic color theme
3. Toggle OLED mode
4. Play arround with colors

TypeType Android version

1.6.1

Android version and device

Android 17

TypeType instance version or revision

not relevant

Video URL

No response

Network

Not relevant or not sure

Redacted diagnostics

Anything else?

No response

[Priveetee]

Thanks! Confirmed. Here is the simple problem.

Dynamic Color asks Android for a color palette. The OLED toggle should not replace that palette. It should only make the background surfaces black.

The current code checks OLED first, so the Dynamic Color branch is never reached.

Before:

// OLED is checked first, so this stops the normal dynamic theme.
dark && effectiveAmoled -> themedDarkScheme(...)

// Dynamic Color never runs when OLED is enabled.
dynamic && dark -> dynamicDarkColorScheme(context)

After:

// First, build the normal Dynamic Color palette from Android.
val dynamicScheme = when {
    dynamic && dark -> dynamicDarkColorScheme(context)
    dynamic -> dynamicLightColorScheme(context)
    else -> null
}

// If OLED is enabled, keep the dynamic colors,
// then replace only the backgrounds and surfaces with black.
dynamicScheme != null && effectiveAmoled -> dynamicScheme.withAmoledSurfaces()

// Otherwise, use the dynamic palette normally.
dynamicScheme != null -> dynamicScheme

internal fun ColorScheme.withAmoledSurfaces(): ColorScheme = copy(
    // Keep the dynamic accent colors.
    // Make only the backgrounds and surfaces black.
    background = Color.Black,
    surface = Color.Black,
    surfaceContainerLowest = Color.Black,
    surfaceContainerLow = Color.Black,
    surfaceContainer = Color.Black,
    surfaceContainerHigh = Color.Black,
    surfaceContainerHighest = Color.Black,
    surfaceDim = Color.Black,
    surfaceBright = Color.Black,
)

So the accent colors stay dynamic, and OLED only controls the black surfaces.