devol
/
keyguard-app-Bitwarden-Vaultwarden
mirror of https://github.com/AChep/keyguard-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Show syncing indicator on top of the nav bar

This commit is contained in:
Artem Chepurnoy 2024-02-26 13:03:50 +02:00
parent 92718d2fab
commit 2ef74f5310
No known key found for this signature in database
GPG Key ID: FAC37D0CF674043E
1 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
common/src/commonMain/kotlin/com/artemchep/keyguard/feature/home/HomeScreen.kt
View File

@ -351,44 +351,46 @@ fun HomeScreenContent(
AnimatedVisibility( AnimatedVisibility(
visible = bottomNavBarVisible, visible = bottomNavBarVisible,
) { ) {
Column( Box {
modifier = Modifier, Column(
) { modifier = Modifier,
BannerStatusBadge(
modifier = Modifier
.fillMaxWidth(),
statusState = accountStatusState,
)
Row(
modifier = Modifier
.fillMaxWidth()
.padding(bottomInsets.asPaddingValues())
.height(80.dp)
.selectableGroup(),
horizontalArrangement = Arrangement.SpaceBetween,
) { ) {
routes.forEach { r -> BannerStatusBadge(
BottomNavigationControllerItem( modifier = Modifier
backStack = backStack, .fillMaxWidth(),
route = r.route, statusState = accountStatusState,
icon = r.icon, )
iconSelected = r.iconSelected, Row(
label = if (navLabelState.value) { modifier = Modifier
// composable .fillMaxWidth()
{ .padding(bottomInsets.asPaddingValues())
Text( .height(80.dp)
text = textResource(r.label), .selectableGroup(),
maxLines = 1, horizontalArrangement = Arrangement.SpaceBetween,
textAlign = TextAlign.Center, ) {
// Default style does not fit on devices with small routes.forEach { r ->
// screens. BottomNavigationControllerItem(
style = MaterialTheme.typography.labelSmall, backStack = backStack,
) route = r.route,
} icon = r.icon,
} else { iconSelected = r.iconSelected,
null label = if (navLabelState.value) {
}, // composable
) {
Text(
text = textResource(r.label),
maxLines = 1,
textAlign = TextAlign.Center,
// Default style does not fit on devices with small
// screens.
style = MaterialTheme.typography.labelSmall,
)
}
} else {
null
},
)
}
} }
} }
@ -400,7 +402,7 @@ fun HomeScreenContent(
accountStatusState.value.pending != null accountStatusState.value.pending != null
} }
} }
AnimatedVisibility( androidx.compose.animation.AnimatedVisibility(
visible = isSyncingState.value, visible = isSyncingState.value,
) { ) {
LinearProgressIndicator( LinearProgressIndicator(