mirror of
https://github.com/bitwarden/android.git
synced 2025-03-16 19:28:44 +03:00
Update compose BOM and material 3 library (#957)
This commit is contained in:
parent
300190a520
commit
f823e07f5d
2 changed files with 6 additions and 8 deletions
|
@ -270,7 +270,6 @@ private fun VaultBottomAppBar(
|
|||
val navBackStackEntry by navController.currentBackStackEntryAsState()
|
||||
val currentDestination = navBackStackEntry?.destination
|
||||
destinations.forEach { destination ->
|
||||
|
||||
val isSelected = currentDestination?.hierarchy?.any {
|
||||
it.route == destination.route
|
||||
} == true
|
||||
|
@ -288,11 +287,6 @@ private fun VaultBottomAppBar(
|
|||
contentDescription = stringResource(
|
||||
id = destination.contentDescriptionRes,
|
||||
),
|
||||
tint = if (isSelected) {
|
||||
MaterialTheme.colorScheme.onSecondaryContainer
|
||||
} else {
|
||||
MaterialTheme.colorScheme.onSurface
|
||||
},
|
||||
)
|
||||
},
|
||||
label = {
|
||||
|
@ -309,6 +303,10 @@ private fun VaultBottomAppBar(
|
|||
},
|
||||
colors = NavigationBarItemDefaults.colors(
|
||||
indicatorColor = MaterialTheme.colorScheme.secondaryContainer,
|
||||
selectedIconColor = MaterialTheme.colorScheme.onSecondaryContainer,
|
||||
unselectedIconColor = MaterialTheme.colorScheme.onSurface,
|
||||
selectedTextColor = MaterialTheme.colorScheme.onSecondaryContainer,
|
||||
unselectedTextColor = MaterialTheme.colorScheme.onSurface,
|
||||
),
|
||||
)
|
||||
}
|
||||
|
|
|
@ -13,10 +13,10 @@ androidxActivity = "1.8.2"
|
|||
androidXBiometrics = "1.2.0-alpha05"
|
||||
androidxBrowser = "1.7.0"
|
||||
androidxCamera = "1.3.1"
|
||||
androidxComposeBom = "2023.10.01"
|
||||
androidxComposeBom = "2024.01.00"
|
||||
# TODO: Once the Material3 color scheme changes are no longer in alpha, we should remove this
|
||||
# individual dependency version and use the Compose BOM version (BIT-702).
|
||||
androidxComposeMaterial3 = "1.2.0-beta01"
|
||||
androidxComposeMaterial3 = "1.2.0-rc01"
|
||||
androidxCore = "1.12.0"
|
||||
androidxHiltNavigationCompose = "1.1.0"
|
||||
androidxLifecycle = "2.6.2"
|
||||
|
|
Loading…
Add table
Reference in a new issue