merge the settings into the tab bar and add a status bar scrim

This commit is contained in:
austinried
2026-10-04 00:29:57 +00:00
parent f07d1a66c9
commit efd7518fc3
@@ -84,6 +84,7 @@ import androidx.compose.ui.geometry.CornerRadius
import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.geometry.Rect import androidx.compose.ui.geometry.Rect
import androidx.compose.ui.geometry.Size import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.ClipOp import androidx.compose.ui.graphics.ClipOp
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Path import androidx.compose.ui.graphics.Path
@@ -388,6 +389,19 @@ fun LibraryScreen(
} }
} }
Spacer(
modifier =
Modifier
.align(Alignment.TopStart)
.fillMaxWidth()
.height(statusBarTop + 8.dp)
.background(
Brush.verticalGradient(
listOf(Color.Black.copy(alpha = 0.55f), Color.Transparent),
),
),
)
Column( Column(
modifier = modifier =
Modifier Modifier
@@ -670,15 +684,10 @@ private fun LibraryTabs(
val indicatorColor = artwork?.scheme?.primary ?: MaterialTheme.colorScheme.onBackground val indicatorColor = artwork?.scheme?.primary ?: MaterialTheme.colorScheme.onBackground
Box(Modifier.fillMaxWidth()) { Box(Modifier.fillMaxWidth()) {
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
Box( Box(
modifier = modifier =
Modifier Modifier
.clip(RoundedCornerShape(topEnd = 8.dp, bottomEnd = 8.dp)) .fillMaxWidth()
.background(headerColor) .background(headerColor)
.padding(6.dp), .padding(6.dp),
) { ) {
@@ -696,6 +705,7 @@ private fun LibraryTabs(
}, },
) { ) {
Row( Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp), horizontalArrangement = Arrangement.spacedBy(4.dp),
) { ) {
@@ -718,9 +728,6 @@ private fun LibraryTabs(
}, },
) )
} }
}
}
}
Spacer(Modifier.weight(1f)) Spacer(Modifier.weight(1f))
if (syncing) { if (syncing) {
CircularProgressIndicator( CircularProgressIndicator(
@@ -728,12 +735,6 @@ private fun LibraryTabs(
strokeWidth = 2.dp, strokeWidth = 2.dp,
) )
} }
Box(
modifier =
Modifier
.clip(RoundedCornerShape(topStart = 8.dp, bottomStart = 8.dp))
.background(headerColor),
) {
IconButton(onClick = onOpenSettings) { IconButton(onClick = onOpenSettings) {
Icon( Icon(
imageVector = Icons.Rounded.Settings, imageVector = Icons.Rounded.Settings,
@@ -745,6 +746,7 @@ private fun LibraryTabs(
} }
} }
} }
}
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable