Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix paddings with mini player #357

Merged
merged 1 commit into from
Feb 6, 2025
Merged

Fix paddings with mini player #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/src/main/java/ru/stersh/youamp/main/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.windowInsetsPadding
Expand Down Expand Up @@ -476,7 +477,11 @@ internal fun ScreenWithMiniPlayer(
content: @Composable () -> Unit
) {
Column {
Box(modifier = Modifier.weight(1f)) {
Box(
modifier = Modifier
.weight(1f)
.consumeWindowInsets(WindowInsets.navigationBars)
) {
content.invoke()
}
MiniPlayer(
Expand Down
9 changes: 7 additions & 2 deletions feature/explore/src/main/java/ru/stresh/youamp/feature/explore/ui/ExploreScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredHeight
import androidx.compose.foundation.layout.requiredWidth
Expand Down Expand Up @@ -113,7 +115,6 @@ private fun Content(
modifier = modifier
.fillMaxSize()
.background(color = MaterialTheme.colorScheme.background)
.padding(bottom = 12.dp)
) {
item {
SearchBar(
Expand All @@ -137,7 +138,7 @@ private fun Content(
flingBehavior = rememberSnapFlingBehavior(lazyListState = lazyListState),
modifier = Modifier.fillMaxWidth()
) {
randomSongs.forEach { songChunk ->
randomSongs.forEachIndexed { index, songChunk ->
item {
Column(
verticalArrangement = Arrangement.spacedBy(4.dp),
Expand Down Expand Up @@ -167,6 +168,10 @@ private fun Content(
}
}
}

item {
Spacer(modifier = Modifier.height(12.dp))
}
}
}
}
Expand Down
Loading