Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable blur effect on the top bar too.

Browse source
This commit is contained in:
Benoit Marty 2025-07-08 16:28:16 +02:00 • committed by Benoit Marty
parent f4891c2047
commit 632de23b10
3 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt
View file

@ -12,6 +12,7 @@ package io.element.android.features.home.impl
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.calculateEndPadding
import androidx.compose.foundation.layout.calculateStartPadding
import androidx.compose.foundation.layout.consumeWindowInsets
@ -181,6 +182,10 @@ private fun HomeScaffold(
displayFilters = roomListState.displayFilters && state.currentHomeNavigationBarItem == HomeNavigationBarItem.Chats,
filtersState = roomListState.filtersState,
canReportBug = state.canReportBug,
modifier = Modifier.hazeEffect(
state = hazeState,
style = HazeMaterials.thick(),
)
)
},
bottomBar = {
@ -190,7 +195,7 @@ private fun HomeScaffold(
modifier = Modifier
.hazeEffect(
state = hazeState,
style = HazeMaterials.regular(),
style = HazeMaterials.thick(),
)
) {
HomeNavigationBarItem.entries.forEach { item ->
@ -227,15 +232,18 @@ private fun HomeScaffold(
onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
onRoomClick = ::onRoomClick,
onCreateRoomClick = onCreateRoomClick,
// FAB height is 56dp, bottom padding is 16dp, we add 8dp as extra margin -> 56+16+8 = 80,
// and include provided bottom padding
contentBottomPadding = 80.dp + padding.calculateBottomPadding(),
contentPadding = PaddingValues(
// FAB height is 56dp, bottom padding is 16dp, we add 8dp as extra margin -> 56+16+8 = 80,
// and include provided bottom padding
bottom = 80.dp + padding.calculateBottomPadding(),
top = padding.calculateTopPadding()
),
modifier = Modifier
.padding(
top = padding.calculateTopPadding(),
bottom = 0.dp,
start = padding.calculateStartPadding(LocalLayoutDirection.current),
end = padding.calculateEndPadding(LocalLayoutDirection.current),
PaddingValues(
start = padding.calculateStartPadding(LocalLayoutDirection.current),
end = padding.calculateEndPadding(LocalLayoutDirection.current),
)
)
.consumeWindowInsets(padding)
.hazeSource(state = hazeState)

15
features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListContentView.kt
View file

@ -31,7 +31,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme
import io.element.android.compound.tokens.generated.CompoundIcons
@ -67,7 +66,7 @@ fun RoomListContentView(
onConfirmRecoveryKeyClick: () -> Unit,
onRoomClick: (RoomListRoomSummary) -> Unit,
onCreateRoomClick: () -> Unit,
contentBottomPadding: Dp,
contentPadding: PaddingValues,
modifier: Modifier = Modifier,
) {
Box(modifier = modifier) {
@ -95,7 +94,7 @@ fun RoomListContentView(
onSetUpRecoveryClick = onSetUpRecoveryClick,
onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
onRoomClick = onRoomClick,
contentBottomPadding = contentBottomPadding,
contentPadding = contentPadding,
)
}
}
@ -167,7 +166,7 @@ private fun RoomsView(
onSetUpRecoveryClick: () -> Unit,
onConfirmRecoveryKeyClick: () -> Unit,
onRoomClick: (RoomListRoomSummary) -> Unit,
contentBottomPadding: Dp,
contentPadding: PaddingValues,
modifier: Modifier = Modifier,
) {
if (state.summaries.isEmpty() && filtersState.hasAnyFilterSelected) {
@ -183,7 +182,7 @@ private fun RoomsView(
onSetUpRecoveryClick = onSetUpRecoveryClick,
onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
onRoomClick = onRoomClick,
contentBottomPadding = contentBottomPadding,
contentPadding = contentPadding,
modifier = modifier.fillMaxSize(),
)
}
@ -197,7 +196,7 @@ private fun RoomsViewList(
onSetUpRecoveryClick: () -> Unit,
onConfirmRecoveryKeyClick: () -> Unit,
onRoomClick: (RoomListRoomSummary) -> Unit,
contentBottomPadding: Dp,
contentPadding: PaddingValues,
modifier: Modifier = Modifier,
) {
val lazyListState = rememberLazyListState()
@ -216,7 +215,7 @@ private fun RoomsViewList(
LazyColumn(
state = lazyListState,
modifier = modifier,
contentPadding = PaddingValues(bottom = contentBottomPadding)
contentPadding = contentPadding,
) {
when (state.securityBannerState) {
SecurityBannerState.SetUpRecovery -> {
@ -329,6 +328,6 @@ internal fun RoomListContentViewPreview(@PreviewParameter(RoomListContentStatePr
onConfirmRecoveryKeyClick = {},
onRoomClick = {},
onCreateRoomClick = {},
contentBottomPadding = 0.dp,
contentPadding = PaddingValues(0.dp),
)
}

1
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Gradient.kt
View file

@ -37,7 +37,6 @@ fun Modifier.backgroundVerticalGradient(
brush = Brush.verticalGradient(
colorStops = subtleColorStops(isEnterpriseBuild),
),
alpha = 0.75f,
)
}