Makussu/subtracks
1
0
Fork 0
mirror of https://github.com/austinried/subtracks.git synced 2026-11-11 07:29:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
austinried
2026-10-04 00:29:57 +00:00
parent f07d1a66c9
commit efd7518fc3
1 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/subtracks/ui/library/LibraryScreen.kt
+66 -64
View File
@@ -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,76 +684,64 @@ 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( Box(
modifier = Modifier.fillMaxWidth(), modifier =
verticalAlignment = Alignment.CenterVertically, Modifier
horizontalArrangement = Arrangement.spacedBy(4.dp), .fillMaxWidth()
.background(headerColor)
.padding(6.dp),
) { ) {
Box( Box(
modifier = modifier =
Modifier Modifier.drawBehind {
.clip(RoundedCornerShape(topEnd = 8.dp, bottomEnd = 8.dp)) if (current != null && indicatorLeft != null && indicatorRight != null) {
.background(headerColor) drawRoundRect(
.padding(6.dp), color = indicatorColor,
) { topLeft = Offset(indicatorLeft, current.top),
Box( size = Size(indicatorRight - indicatorLeft, current.height),
modifier = cornerRadius = CornerRadius(8.dp.toPx()),
Modifier.drawBehind {
if (current != null && indicatorLeft != null && indicatorRight != null) {
drawRoundRect(
color = indicatorColor,
topLeft = Offset(indicatorLeft, current.top),
size = Size(indicatorRight - indicatorLeft, current.height),
cornerRadius = CornerRadius(8.dp.toPx()),
)
}
},
) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
LibraryTab.entries.forEachIndexed { index, tab ->
TabButton(
tab = tab,
artwork = artwork,
progress =
when (index) {
page -> 1f - transition
page + (if (fraction >= 0f) 1 else -1) -> transition
else -> 0f
},
indicatorLeft = indicatorLeft,
indicatorRight = indicatorRight,
onClick = { onTabSelected(tab) },
modifier =
Modifier.onGloballyPositioned { coordinates ->
bounds[index] = coordinates.boundsInParent()
},
) )
} }
} },
}
}
Spacer(Modifier.weight(1f))
if (syncing) {
CircularProgressIndicator(
modifier = Modifier.padding(end = 4.dp).size(20.dp),
strokeWidth = 2.dp,
)
}
Box(
modifier =
Modifier
.clip(RoundedCornerShape(topStart = 8.dp, bottomStart = 8.dp))
.background(headerColor),
) { ) {
IconButton(onClick = onOpenSettings) { Row(
Icon( modifier = Modifier.fillMaxWidth(),
imageVector = Icons.Rounded.Settings, verticalAlignment = Alignment.CenterVertically,
contentDescription = "Settings", horizontalArrangement = Arrangement.spacedBy(4.dp),
tint = MaterialTheme.colorScheme.onBackground, ) {
) LibraryTab.entries.forEachIndexed { index, tab ->
TabButton(
tab = tab,
artwork = artwork,
progress =
when (index) {
page -> 1f - transition
page + (if (fraction >= 0f) 1 else -1) -> transition
else -> 0f
},
indicatorLeft = indicatorLeft,
indicatorRight = indicatorRight,
onClick = { onTabSelected(tab) },
modifier =
Modifier.onGloballyPositioned { coordinates ->
bounds[index] = coordinates.boundsInParent()
},
)
}
Spacer(Modifier.weight(1f))
if (syncing) {
CircularProgressIndicator(
modifier = Modifier.padding(end = 4.dp).size(20.dp),
strokeWidth = 2.dp,
)
}
IconButton(onClick = onOpenSettings) {
Icon(
imageVector = Icons.Rounded.Settings,
contentDescription = "Settings",
tint = MaterialTheme.colorScheme.onBackground,
)
}
} }
} }
} }