fix(ci): fix trailing spaces and revert visibility/padding changes
This commit is contained in:
@@ -193,7 +193,7 @@ fun MainNavigation() {
|
||||
NavigationController.updatePrimaryScreens(bottomNavKeys)
|
||||
}
|
||||
|
||||
val showBottomBar = currentScreen != ConnectScreen
|
||||
val isPrimaryScreen = currentScreen in bottomNavKeys
|
||||
val gesturesEnabled = currentScreen in DRAWER_GESTURE_SCREENS
|
||||
val openDrawer = { scope.launch { drawerState.open() } }
|
||||
|
||||
@@ -293,7 +293,7 @@ fun MainNavigation() {
|
||||
Scaffold(
|
||||
contentWindowInsets = WindowInsets.navigationBars,
|
||||
bottomBar = {
|
||||
if (showBottomBar) {
|
||||
if (isPrimaryScreen) {
|
||||
NavigationBar {
|
||||
bottomNavItems.forEach { item ->
|
||||
NavigationBarItem(
|
||||
|
||||
@@ -322,11 +322,12 @@ fun ChatScreen(
|
||||
)
|
||||
}
|
||||
},
|
||||
) { _ ->
|
||||
) { paddingValues ->
|
||||
Column(
|
||||
modifier =
|
||||
Modifier
|
||||
.fillMaxSize()
|
||||
.padding(paddingValues)
|
||||
.background(backgroundGradient)
|
||||
.imePadding(),
|
||||
) {
|
||||
|
||||
Reference in New Issue
Block a user