From 4e460a1427ab333ba9d1947f19e990f558e66263 Mon Sep 17 00:00:00 2001 From: vfsfitvnm Date: Wed, 27 Jul 2022 17:28:18 +0200 Subject: [PATCH] Remove shadows --- .../kotlin/it/vfsfitvnm/vimusic/ui/screens/ArtistScreen.kt | 5 +---- .../vimusic/ui/screens/settings/BackupAndRestoreScreen.kt | 5 +---- .../kotlin/it/vfsfitvnm/vimusic/ui/styling/ColorPalette.kt | 4 ++-- .../it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt | 1 - 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/ArtistScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/ArtistScreen.kt index 82fa682..d240e58 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/ArtistScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/ArtistScreen.kt @@ -26,7 +26,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip -import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp @@ -156,7 +155,6 @@ fun ArtistScreen(browseId: String) { } } } - .shadow(elevation = 2.dp, shape = CircleShape) .background( color = colorPalette.elevatedBackground, shape = CircleShape @@ -185,8 +183,7 @@ fun ArtistScreen(browseId: String) { } } } - .shadow(elevation = 2.dp, shape = CircleShape) - .background( + .background( color = colorPalette.elevatedBackground, shape = CircleShape ) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/BackupAndRestoreScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/BackupAndRestoreScreen.kt index df3d3d9..a9590e5 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/BackupAndRestoreScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/BackupAndRestoreScreen.kt @@ -27,7 +27,6 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource @@ -177,7 +176,6 @@ fun BackupAndRestoreScreen() { val dateFormat = SimpleDateFormat("yyyyMMddHHmmss") backupLauncher.launch("vimusic_${dateFormat.format(Date())}.db") } - .shadow(elevation = 8.dp, shape = CircleShape) .background( color = colorPalette.elevatedBackground, shape = CircleShape @@ -212,8 +210,7 @@ fun BackupAndRestoreScreen() { .clickable { isShowingRestoreDialog = true } - .shadow(elevation = 8.dp, shape = CircleShape) - .background( + .background( color = colorPalette.elevatedBackground, shape = CircleShape ) 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 14645cd..2533e1d 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 @@ -61,8 +61,8 @@ val BlackColorPalette = DarkColorPalette.copy( val LightColorPalette = ColorPalette( background = Color(0xfffdfdfe), - lightBackground = Color(0xFFf8f8fc), - elevatedBackground = Color(0xfffdfdfe), + lightBackground = Color(0xfff8f8fc), + elevatedBackground = Color(0xfff8f8fc), backgroundContainer = Color(0xffeaeaf5), lightGray = Color(0xfff8f8f8), gray = Color(0xFFE5E5E5), diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt index 01c00ad..02b7e15 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt @@ -212,7 +212,6 @@ fun CurrentPlaylistView( interactionSource = remember { MutableInteractionSource() }, onClick = layoutState::collapseSoft ) - .shadow(elevation = 8.dp) .height(64.dp) .background(colorPalette.elevatedBackground) .fillMaxWidth()