Skip to content

Commit 881b50e

Browse files
committed
fix(home): restore Classic top header bar and remove opaque sheet overlay
1 parent be399ab commit 881b50e

1 file changed

Lines changed: 14 additions & 9 deletions

File tree

  • app/src/main/java/com/darkxvenom/airbeats/ui/screens

app/src/main/java/com/darkxvenom/airbeats/ui/screens/HomeScreen.kt

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,6 @@ fun HomeScreen(
238238
}
239239
}
240240

241-
val isDark = MaterialTheme.colorScheme.surface.luminance() < 0.5f
242-
val screenBg = if (isDark) Color.Black else MaterialTheme.colorScheme.background
243241
val hazeState = remember { HazeState() }
244242
val isAtTop by remember {
245243
derivedStateOf {
@@ -441,14 +439,21 @@ fun HomeScreen(
441439

442440
LazyColumn(
443441
state = lazylistState,
442+
contentPadding = LocalPlayerAwareWindowInsets.current
443+
.only(WindowInsetsSides.Bottom + WindowInsetsSides.Horizontal)
444+
.asPaddingValues(),
444445
modifier = Modifier
445446
.fillMaxSize()
446-
.haze(state = hazeState),
447-
contentPadding = PaddingValues(
448-
top = WindowInsets.statusBars.asPaddingValues().calculateTopPadding() + 16.dp,
449-
bottom = LocalPlayerAwareWindowInsets.current.asPaddingValues().calculateBottomPadding()
450-
)
447+
.haze(state = hazeState)
451448
) {
449+
// ModernHomeTopBarInline is now inside the LazyColumn
450+
item(key = "home_top_bar") {
451+
ModernHomeTopBarInline(
452+
navController = navController,
453+
onSearchClick = onSearchClick
454+
)
455+
}
456+
452457
item(key = "home_chips") {
453458
val isFrosted = isFrostedGlassUiEnabled()
454459
if (isFrosted) {
@@ -1028,8 +1033,8 @@ fun HomeScreen(
10281033

10291034
com.darkxvenom.airbeats.ui.component.TopFadeBlur(
10301035
hazeState = hazeState,
1031-
pageColor = screenBg,
1032-
scrimColor = screenBg,
1036+
pageColor = Color.Transparent,
1037+
scrimColor = Color.Transparent,
10331038
alpha = blurAlpha,
10341039
modifier = Modifier.align(Alignment.TopCenter)
10351040
)

0 commit comments

Comments
 (0)