beenull/ViMusic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix #419

Browse source
This commit is contained in:
vfsfitvnm 2022-10-13 11:08:22 +02:00
parent 83d559830f
commit 29878a6432
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/Header.kt
View file

@ -4,12 +4,11 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.BasicText import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -49,28 +48,24 @@ fun Header(
@Composable @Composable
fun Header( fun Header(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
titleContent: @Composable ColumnScope.() -> Unit, titleContent: @Composable () -> Unit,
actionsContent: @Composable RowScope.() -> Unit, actionsContent: @Composable RowScope.() -> Unit,
) { ) {
Column( Box(
horizontalAlignment = Alignment.End, contentAlignment = Alignment.CenterEnd,
modifier = modifier modifier = modifier
.padding(horizontal = 16.dp) .padding(horizontal = 16.dp)
.height(Dimensions.headerHeight) .height(Dimensions.headerHeight)
.fillMaxWidth() .fillMaxWidth()
) { ) {
Spacer(
modifier = Modifier
.height(48.dp),
)
titleContent() titleContent()
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier modifier = Modifier
.height(48.dp), .align(Alignment.BottomEnd)
.heightIn(min = 48.dp),
content = actionsContent, content = actionsContent,
) )
} }

2
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/Dimensions.kt
View file

@ -13,7 +13,7 @@ object Dimensions {
val navigationRailWidth = 64.dp val navigationRailWidth = 64.dp
val navigationRailWidthLandscape = 128.dp val navigationRailWidthLandscape = 128.dp
val navigationRailIconOffset = 6.dp val navigationRailIconOffset = 6.dp
val headerHeight = 128.dp val headerHeight = 140.dp
object thumbnails { object thumbnails {
val album = 128.dp val album = 128.dp