Skip to content

fix: Padding for new mini player #49

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

Merged
LarveyOfficial merged 1 commit into from
Jul 15, 2026
Merged

fix: Padding for new mini player #49

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
19 changes: 17 additions & 2 deletions app/src/main/java/com/larvey/azuracastplayer/ui/mainActivity/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.calculateEndPadding
import androidx.compose.foundation.layout.calculateStartPadding
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
Expand Down Expand Up @@ -94,6 +96,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.media3.session.MediaController
Expand Down Expand Up @@ -672,6 +675,18 @@ class MainActivity : ComponentActivity() {
}
}
}) { innerPadding ->
// The mini / expanding player is an OVERLAY (not in the Scaffold's bottomBar),
// so the Scaffold reserves no space for it. Add its footprint to the scroll
// content's bottom inset so the last list/grid items clear it instead of
// scrolling behind it (matches the FAB's 84dp mini inset).
val layoutDirection = LocalLayoutDirection.current
val contentInnerPadding = PaddingValues(
start = innerPadding.calculateStartPadding(layoutDirection),
top = innerPadding.calculateTopPadding(),
end = innerPadding.calculateEndPadding(layoutDirection),
bottom = innerPadding.calculateBottomPadding() +
(if (!isWide && playerState?.currentMediaItem?.mediaId != null) 84.dp else 0.dp)
)
AnimatedVisibility(
radioListMode != null,
enter = slideInVertically(initialOffsetY = { fullHeight -> -fullHeight * 2 }),
Expand Down Expand Up @@ -707,7 +722,7 @@ class MainActivity : ComponentActivity() {
when (destination) {
AppDestinations.STATIONS -> {
MyRadios(
innerPadding = innerPadding,
innerPadding = contentInnerPadding,
deleteRadio = { station ->
mainActivityViewModel?.deleteStation(station)
},
Expand All @@ -728,7 +743,7 @@ class MainActivity : ComponentActivity() {

AppDestinations.DISCOVER -> {
Discovery(
innerPadding,
contentInnerPadding,
discoveryViewingStation,
isWide
)
Expand Down
Loading