mirror of
https://github.com/KRTirtho/spotube.git
synced 2026-11-04 10:13:59 +00:00
fix(settings): palette swatches follow the active light/dark appearance
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
79266fd483
commit
ea01dec6ea
@ -44,11 +44,11 @@ import androidx.compose.ui.Alignment
|
|||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.luminance
|
|
||||||
import androidx.compose.ui.semantics.contentDescription
|
import androidx.compose.ui.semantics.contentDescription
|
||||||
import androidx.compose.ui.semantics.semantics
|
import androidx.compose.ui.semantics.semantics
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import org.spotube.spotube.core.ui.theming.AppTheme
|
import org.spotube.spotube.core.ui.theming.AppTheme
|
||||||
|
import org.spotube.spotube.core.ui.theming.isLightAppearance
|
||||||
import org.spotube.spotube.modules.settings.SettingsViewModel
|
import org.spotube.spotube.modules.settings.SettingsViewModel
|
||||||
import org.spotube.spotube.modules.settings.Theme
|
import org.spotube.spotube.modules.settings.Theme
|
||||||
import org.spotube.spotube.modules.settings.UserSettings
|
import org.spotube.spotube.modules.settings.UserSettings
|
||||||
@ -206,7 +206,8 @@ private fun PaletteSwatch(
|
|||||||
label: String,
|
label: String,
|
||||||
selected: Boolean,
|
selected: Boolean,
|
||||||
onClick: () -> Unit) {
|
onClick: () -> Unit) {
|
||||||
val scheme = remember(palette) { MillenniumColorSchemes().resolve(palette, dark = false) }
|
val dark = !isLightAppearance()
|
||||||
|
val scheme = remember(palette, dark) { MillenniumColorSchemes().resolve(palette, dark = dark) }
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.size(40.dp)
|
.size(40.dp)
|
||||||
@ -222,7 +223,8 @@ private fun PaletteSwatch(
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun PaletteTrailingSwatch(palette: MillenniumPalette) {
|
private fun PaletteTrailingSwatch(palette: MillenniumPalette) {
|
||||||
val scheme = remember(palette) { MillenniumColorSchemes().resolve(palette, dark = false) }
|
val dark = !isLightAppearance()
|
||||||
|
val scheme = remember(palette, dark) { MillenniumColorSchemes().resolve(palette, dark = dark) }
|
||||||
Row(
|
Row(
|
||||||
horizontalArrangement = Arrangement.spacedBy(6.dp),
|
horizontalArrangement = Arrangement.spacedBy(6.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically) {
|
verticalAlignment = Alignment.CenterVertically) {
|
||||||
@ -241,7 +243,7 @@ private fun PaletteTrailingSwatch(palette: MillenniumPalette) {
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun PalettePreview(palette: MillenniumPalette) {
|
private fun PalettePreview(palette: MillenniumPalette) {
|
||||||
val dark = AppTheme.colors.background.luminance() < 0.5f
|
val dark = !isLightAppearance()
|
||||||
MillenniumTheme(dark = dark, config = MillenniumThemeConfig(palette = palette)) {
|
MillenniumTheme(dark = dark, config = MillenniumThemeConfig(palette = palette)) {
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user