diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/PrimaryButton.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/PrimaryButton.kt index 294b520..6ad94f7 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/PrimaryButton.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/PrimaryButton.kt @@ -15,6 +15,7 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import it.vfsfitvnm.vimusic.ui.styling.LocalAppearance +import it.vfsfitvnm.vimusic.ui.styling.primaryButton @Composable fun PrimaryButton( @@ -29,7 +30,7 @@ fun PrimaryButton( modifier = modifier .clip(RoundedCornerShape(16.dp)) .clickable(enabled = enabled, onClick = onClick) - .background(colorPalette.background2) + .background(colorPalette.primaryButton) .size(62.dp) ) { Image( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/SecondaryButton.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/SecondaryButton.kt index 894b7e7..9f0fb22 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/SecondaryButton.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/SecondaryButton.kt @@ -15,6 +15,7 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import it.vfsfitvnm.vimusic.ui.styling.LocalAppearance +import it.vfsfitvnm.vimusic.ui.styling.primaryButton @Composable fun SecondaryButton( @@ -29,7 +30,7 @@ fun SecondaryButton( modifier = modifier .clip(CircleShape) .clickable(enabled = enabled, onClick = onClick) - .background(colorPalette.background2) + .background(colorPalette.primaryButton) .size(48.dp) ) { Image( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/SecondaryTextButton.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/SecondaryTextButton.kt index 1a2727d..240f3b6 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/SecondaryTextButton.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/SecondaryTextButton.kt @@ -10,6 +10,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import it.vfsfitvnm.vimusic.ui.styling.LocalAppearance +import it.vfsfitvnm.vimusic.ui.styling.primaryButton import it.vfsfitvnm.vimusic.utils.medium @Composable @@ -28,7 +29,7 @@ fun SecondaryTextButton( modifier = modifier .clip(RoundedCornerShape(16.dp)) .clickable(enabled = enabled, onClick = onClick) - .background(if (alternative) colorPalette.background0 else colorPalette.background2) + .background(if (alternative) colorPalette.background0 else colorPalette.primaryButton) .padding(all = 8.dp) .padding(horizontal = 8.dp) ) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/ColorPalette.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/ColorPalette.kt index 017786f..4135ea5 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/ColorPalette.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/ColorPalette.kt @@ -113,26 +113,33 @@ private fun dynamicColorPaletteOf(hsl: FloatArray, isDark: Boolean): ColorPalett } inline val ColorPalette.collapsedPlayerProgressBar: Color - get() = if (this === DefaultDarkColorPalette || this === DefaultLightColorPalette || this == PureBlackColorPalette) { + get() = if (this === DefaultDarkColorPalette || this === DefaultLightColorPalette || this === PureBlackColorPalette) { text } else { accent } inline val ColorPalette.favoritesIcon: Color - get() = if (this === DefaultDarkColorPalette || this === DefaultLightColorPalette || this == PureBlackColorPalette) { + get() = if (this === DefaultDarkColorPalette || this === DefaultLightColorPalette || this === PureBlackColorPalette) { red } else { accent } inline val ColorPalette.shimmer: Color - get() = if (this === DefaultDarkColorPalette || this === DefaultLightColorPalette || this == PureBlackColorPalette) { + get() = if (this === DefaultDarkColorPalette || this === DefaultLightColorPalette || this === PureBlackColorPalette) { Color(0xff838383) } else { accent } +inline val ColorPalette.primaryButton: Color + get() = if (this === PureBlackColorPalette) { + Color(0xFF272727) + } else { + background2 + } + inline val ColorPalette.overlay: Color get() = PureBlackColorPalette.background0.copy(alpha = 0.75f)