Merge pull request #6264 from element-hq/feature/bma/bottomBarIteration

Bottom bar iteration
This commit is contained in:
Benoit Marty
2026-02-27 16:16:00 +01:00
committed by GitHub
28 changed files with 58 additions and 58 deletions

View File

@@ -23,7 +23,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.FabPosition
import androidx.compose.material3.FloatingToolbarDefaults.ScreenOffset
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.rememberTopAppBarState
import androidx.compose.runtime.Composable
@@ -239,12 +238,14 @@ private fun HomeScaffold(
}
},
)
} else {
HomeFloatingActionButton(onStartChatClick, CommonStrings.action_create_room)
}
},
floatingActionButtonPosition = FabPosition.Center,
floatingActionButtonPosition = if (state.showNavigationBar) FabPosition.Center else FabPosition.End,
content = { padding ->
val contentPadding = PaddingValues(
bottom = 112.dp,
bottom = 96.dp,
)
when (state.currentHomeNavigationBarItem) {
HomeNavigationBarItem.Chats -> {
@@ -324,7 +325,6 @@ private fun HomeBottomBar(
HorizontalFloatingToolbar(
floatingActionButton = floatingActionButton,
modifier = modifier
.padding(bottom = ScreenOffset)
.zIndex(1f),
) {
HomeNavigationBarItem.entries.forEachIndexed { index, item ->