fix(ci): fix trailing spaces and revert visibility/padding changes
This commit is contained in:
1 parent
9e3a7ab339
commit
3a610c7c80
3 files changed
+5
-4
No files matched your search
@@ -193,7 +193,7 @@ fun MainNavigation() {
|
|||||||
NavigationController.updatePrimaryScreens(bottomNavKeys)
|
NavigationController.updatePrimaryScreens(bottomNavKeys)
|
||||||
}
|
}
|
||||||
|
|
||||||
val showBottomBar = currentScreen != ConnectScreen
|
val isPrimaryScreen = currentScreen in bottomNavKeys
|
||||||
val gesturesEnabled = currentScreen in DRAWER_GESTURE_SCREENS
|
val gesturesEnabled = currentScreen in DRAWER_GESTURE_SCREENS
|
||||||
val openDrawer = { scope.launch { drawerState.open() } }
|
val openDrawer = { scope.launch { drawerState.open() } }
|
||||||
|
|
||||||
@@ -293,7 +293,7 @@ fun MainNavigation() {
|
|||||||
Scaffold(
|
Scaffold(
|
||||||
contentWindowInsets = WindowInsets.navigationBars,
|
contentWindowInsets = WindowInsets.navigationBars,
|
||||||
bottomBar = {
|
bottomBar = {
|
||||||
if (showBottomBar) {
|
if (isPrimaryScreen) {
|
||||||
NavigationBar {
|
NavigationBar {
|
||||||
bottomNavItems.forEach { item ->
|
bottomNavItems.forEach { item ->
|
||||||
NavigationBarItem(
|
NavigationBarItem(
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ object AuthManager {
|
|||||||
EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
|
EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
|
||||||
EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM,
|
EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM,
|
||||||
)
|
)
|
||||||
|
|
||||||
_bottomNavItemsFlow.value = getBottomNavItems()
|
_bottomNavItemsFlow.value = getBottomNavItems()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -322,11 +322,12 @@ fun ChatScreen(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
) { _ ->
|
) { paddingValues ->
|
||||||
Column(
|
Column(
|
||||||
modifier =
|
modifier =
|
||||||
Modifier
|
Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
|
.padding(paddingValues)
|
||||||
.background(backgroundGradient)
|
.background(backgroundGradient)
|
||||||
.imePadding(),
|
.imePadding(),
|
||||||
) {
|
) {
|
||||||
|
|||||||
Reference in new issue
Block a user