From f823e07f5d8bb15c698ad8102f0185dd150aaa86 Mon Sep 17 00:00:00 2001 From: David Perez Date: Mon, 5 Feb 2024 16:21:50 -0600 Subject: [PATCH] Update compose BOM and material 3 library (#957) --- .../vaultunlockednavbar/VaultUnlockedNavBarScreen.kt | 10 ++++------ gradle/libs.versions.toml | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt index eff7074cbb..f7e8790e50 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt @@ -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, ), ) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b1d706c1ff..91817e104f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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"