From 37c5f668017b8f8b97dc2488606d1ab081ee4d1d Mon Sep 17 00:00:00 2001 From: vfsfitvnm Date: Mon, 29 Aug 2022 15:55:02 +0200 Subject: [PATCH] Revert icon color in menus --- .../it/vfsfitvnm/vimusic/ui/components/themed/Menu.kt | 3 +-- .../kotlin/it/vfsfitvnm/vimusic/ui/styling/ColorPalette.kt | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/Menu.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/Menu.kt index 769baee..5ec56bc 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/Menu.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/Menu.kt @@ -28,7 +28,6 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.ui.styling.LocalAppearance -import it.vfsfitvnm.vimusic.ui.styling.menuEntryIcon import it.vfsfitvnm.vimusic.utils.medium import it.vfsfitvnm.vimusic.utils.secondary @@ -79,7 +78,7 @@ fun MenuEntry( Image( painter = painterResource(icon), contentDescription = null, - colorFilter = ColorFilter.tint(colorPalette.menuEntryIcon), + colorFilter = ColorFilter.tint(colorPalette.text), modifier = Modifier .size(15.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 90caa0d..017786f 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 @@ -133,13 +133,6 @@ inline val ColorPalette.shimmer: Color accent } -inline val ColorPalette.menuEntryIcon: Color - get() = if (this === DefaultDarkColorPalette || this === DefaultLightColorPalette || this == PureBlackColorPalette) { - text - } else { - accent - } - inline val ColorPalette.overlay: Color get() = PureBlackColorPalette.background0.copy(alpha = 0.75f)