From b61e67405185168e7b7ab557de64aaa44f035327 Mon Sep 17 00:00:00 2001 From: aleksey-saenko Date: Sat, 18 Nov 2023 20:21:01 +0300 Subject: [PATCH] Padding adjustments. --- .../feature/library/presentation/library/TrackLazyColumn.kt | 6 +++--- .../feature/library/presentation/library/TrackLazyGrid.kt | 3 +-- .../feature/library/presentation/search/TrackSearchItem.kt | 2 +- .../recognition/presentation/queuescreen/QueueScreen.kt | 6 ++++-- .../feature/track/presentation/track/ShareBottomSheet.kt | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/feature/library/src/main/java/com/mrsep/musicrecognizer/feature/library/presentation/library/TrackLazyColumn.kt b/feature/library/src/main/java/com/mrsep/musicrecognizer/feature/library/presentation/library/TrackLazyColumn.kt index 118c1f78..d77e596b 100644 --- a/feature/library/src/main/java/com/mrsep/musicrecognizer/feature/library/presentation/library/TrackLazyColumn.kt +++ b/feature/library/src/main/java/com/mrsep/musicrecognizer/feature/library/presentation/library/TrackLazyColumn.kt @@ -54,8 +54,8 @@ internal fun TrackLazyColumn( LazyColumn( modifier = modifier, state = lazyListState, - contentPadding = PaddingValues(top = 6.dp, start = 10.dp, end = 10.dp, bottom = 10.dp), - verticalArrangement = Arrangement.spacedBy(8.dp), + contentPadding = PaddingValues(top = 6.dp, start = 12.dp, end = 12.dp, bottom = 12.dp), + verticalArrangement = Arrangement.spacedBy(10.dp), horizontalAlignment = Alignment.CenterHorizontally ) { items(count = trackList.size, key = { trackList[it].mbId }) { index -> @@ -111,7 +111,7 @@ internal fun LazyListTrackItem( indication = if (multiselectEnabled) null else LocalIndication.current, interactionSource = remember { MutableInteractionSource() } ) - .height(120.dp) + .height(112.dp) .fillMaxWidth() ) { val placeholder = forwardingPainter( diff --git a/feature/library/src/main/java/com/mrsep/musicrecognizer/feature/library/presentation/library/TrackLazyGrid.kt b/feature/library/src/main/java/com/mrsep/musicrecognizer/feature/library/presentation/library/TrackLazyGrid.kt index 545a17c9..fc390856 100644 --- a/feature/library/src/main/java/com/mrsep/musicrecognizer/feature/library/presentation/library/TrackLazyGrid.kt +++ b/feature/library/src/main/java/com/mrsep/musicrecognizer/feature/library/presentation/library/TrackLazyGrid.kt @@ -15,7 +15,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.graphics.Shape import androidx.compose.ui.layout.ContentScale @@ -129,7 +128,7 @@ internal fun LazyGridTrackItem( contentDescription = stringResource(StringsR.string.artwork), contentScale = ContentScale.Crop, modifier = Modifier - .shadow(elevation = 1.dp, shape = shape) +// .shadow(elevation = 1.dp, shape = shape) .background( color = MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp), shape = shape diff --git a/feature/library/src/main/java/com/mrsep/musicrecognizer/feature/library/presentation/search/TrackSearchItem.kt b/feature/library/src/main/java/com/mrsep/musicrecognizer/feature/library/presentation/search/TrackSearchItem.kt index a40ef8e3..a60949d4 100644 --- a/feature/library/src/main/java/com/mrsep/musicrecognizer/feature/library/presentation/search/TrackSearchItem.kt +++ b/feature/library/src/main/java/com/mrsep/musicrecognizer/feature/library/presentation/search/TrackSearchItem.kt @@ -45,7 +45,7 @@ internal fun TrackSearchItem( ) .clip(shape) .clickable { onTrackClick(track.mbId) } - .height(120.dp) + .height(112.dp) .fillMaxWidth() ) { val placeholder = forwardingPainter( diff --git a/feature/recognition/src/main/java/com/mrsep/musicrecognizer/feature/recognition/presentation/queuescreen/QueueScreen.kt b/feature/recognition/src/main/java/com/mrsep/musicrecognizer/feature/recognition/presentation/queuescreen/QueueScreen.kt index d83e311e..98c8a990 100644 --- a/feature/recognition/src/main/java/com/mrsep/musicrecognizer/feature/recognition/presentation/queuescreen/QueueScreen.kt +++ b/feature/recognition/src/main/java/com/mrsep/musicrecognizer/feature/recognition/presentation/queuescreen/QueueScreen.kt @@ -112,8 +112,10 @@ internal fun QueueScreen( EmptyQueueMessage(modifier = Modifier.fillMaxSize()) } else { LazyColumn( - contentPadding = PaddingValues(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp), + contentPadding = PaddingValues( + start = 16.dp, end = 16.dp, top = 8.dp, bottom = 16.dp + ), + verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.nestedScroll(topBarBehaviour.nestedScrollConnection) ) { items( diff --git a/feature/track/src/main/java/com/mrsep/musicrecognizer/feature/track/presentation/track/ShareBottomSheet.kt b/feature/track/src/main/java/com/mrsep/musicrecognizer/feature/track/presentation/track/ShareBottomSheet.kt index 36d65185..1e6765d3 100644 --- a/feature/track/src/main/java/com/mrsep/musicrecognizer/feature/track/presentation/track/ShareBottomSheet.kt +++ b/feature/track/src/main/java/com/mrsep/musicrecognizer/feature/track/presentation/track/ShareBottomSheet.kt @@ -132,7 +132,7 @@ internal fun ShareBottomSheet( } Spacer(modifier = Modifier.height(16.dp)) Divider(modifier = Modifier.fillMaxWidth()) - Spacer(modifier = Modifier.height(16.dp)) + Spacer(modifier = Modifier.height(8.dp)) Row( horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.End), verticalAlignment = Alignment.CenterVertically,