bbara/Purefin
1
0
Fork 0
mirror of https://github.com/bbara04/Purefin.git synced 2026-03-31 17:10:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace Column with Box in PlayerControlsOverlay for improved layout management

Browse Source
This commit is contained in:
Barnabas Balogh
2026-01-26 19:15:29 +01:00
parent 71812f076f
commit 985c0028c9
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/hu/bbara/purefin/player/ui/components/PlayerControlsOverlay.kt
View File

@@ -80,11 +80,10 @@ fun PlayerControlsOverlay(
) )
) )
) { ) {
Column( Box(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(horizontal = 16.dp, vertical = 12.dp), .padding(horizontal = 16.dp, vertical = 12.dp),
verticalArrangement = Arrangement.SpaceBetween
) { ) {
TopBar( TopBar(
title = uiState.title ?: "Playing", title = uiState.title ?: "Playing",
@@ -92,9 +91,9 @@ fun PlayerControlsOverlay(
onBack = onBack, onBack = onBack,
onCast = { }, onCast = { },
onMore = { }, onMore = { },
onOpenQueue = onOpenQueue onOpenQueue = onOpenQueue,
modifier = Modifier.align(Alignment.TopCenter)
) )
CenterControls( CenterControls(
isPlaying = uiState.isPlaying, isPlaying = uiState.isPlaying,
isLive = uiState.isLive, isLive = uiState.isLive,
@@ -103,9 +102,9 @@ fun PlayerControlsOverlay(
onSeekBackward = { onSeekRelative(-10_000) }, onSeekBackward = { onSeekRelative(-10_000) },
onLongSeekForward = { onSeekRelative(30_000) }, onLongSeekForward = { onSeekRelative(30_000) },
onLongSeekBackward = { onSeekRelative(-30_000) }, onLongSeekBackward = { onSeekRelative(-30_000) },
onSeekLiveEdge = onSeekLiveEdge onSeekLiveEdge = onSeekLiveEdge,
modifier = Modifier.align(Alignment.Center)
) )
BottomSection( BottomSection(
uiState = uiState, uiState = uiState,
scrubbing = scrubbing, scrubbing = scrubbing,
@@ -116,7 +115,8 @@ fun PlayerControlsOverlay(
onPrevious = onPrevious, onPrevious = onPrevious,
onToggleCaptions = onToggleCaptions, onToggleCaptions = onToggleCaptions,
onShowSettings = onShowSettings, onShowSettings = onShowSettings,
onQueueSelected = onQueueSelected onQueueSelected = onQueueSelected,
modifier = Modifier.align(Alignment.BottomCenter)
) )
} }
} }
@@ -129,11 +129,12 @@ private fun TopBar(
onBack: () -> Unit, onBack: () -> Unit,
onCast: () -> Unit, onCast: () -> Unit,
onMore: () -> Unit, onMore: () -> Unit,
onOpenQueue: () -> Unit onOpenQueue: () -> Unit,
modifier: Modifier = Modifier
) { ) {
val scheme = MaterialTheme.colorScheme val scheme = MaterialTheme.colorScheme
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween horizontalArrangement = Arrangement.SpaceBetween
) { ) {
@@ -171,11 +172,12 @@ private fun CenterControls(
onSeekBackward: () -> Unit, onSeekBackward: () -> Unit,
onLongSeekForward: () -> Unit, onLongSeekForward: () -> Unit,
onLongSeekBackward: () -> Unit, onLongSeekBackward: () -> Unit,
onSeekLiveEdge: () -> Unit onSeekLiveEdge: () -> Unit,
modifier: Modifier = Modifier
) { ) {
val scheme = MaterialTheme.colorScheme val scheme = MaterialTheme.colorScheme
Column( Column(
modifier = Modifier.fillMaxWidth(), modifier = modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {
Row( Row(
@@ -258,10 +260,11 @@ private fun BottomSection(
onPrevious: () -> Unit, onPrevious: () -> Unit,
onToggleCaptions: () -> Unit, onToggleCaptions: () -> Unit,
onShowSettings: () -> Unit, onShowSettings: () -> Unit,
onQueueSelected: (String) -> Unit onQueueSelected: (String) -> Unit,
modifier: Modifier = Modifier
) { ) {
val scheme = MaterialTheme.colorScheme val scheme = MaterialTheme.colorScheme
Column { Column(modifier = modifier) {
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()