From 5c81560514522c2696d835690488987d220cb585 Mon Sep 17 00:00:00 2001
From: Brian Yencho <brian@livefront.com>
Date: Mon, 2 Oct 2023 13:22:15 -0500
Subject: [PATCH] Update all current dependencies and include new "surface"
 colors (#79)

---
 .../x8bit/bitwarden/ui/platform/theme/Theme.kt    | 14 ++++++++++++++
 gradle/libs.versions.toml                         | 15 +++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/Theme.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/Theme.kt
index 0eb3b43d3..8f29894a6 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/Theme.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/Theme.kt
@@ -78,6 +78,13 @@ private fun darkColorScheme(context: Context): ColorScheme =
         errorContainer = R.color.dark_error_container.toColor(context),
         onErrorContainer = R.color.dark_on_error_container.toColor(context),
         surface = R.color.dark_surface.toColor(context),
+        surfaceBright = R.color.dark_surface_bright.toColor(context),
+        surfaceContainer = R.color.dark_surface_container.toColor(context),
+        surfaceContainerHigh = R.color.dark_surface_container_high.toColor(context),
+        surfaceContainerHighest = R.color.dark_surface_container_highest.toColor(context),
+        surfaceContainerLow = R.color.dark_surface_container_low.toColor(context),
+        surfaceContainerLowest = R.color.dark_surface_container_lowest.toColor(context),
+        surfaceDim = R.color.dark_surface_dim.toColor(context),
         onSurface = R.color.dark_on_surface.toColor(context),
         onSurfaceVariant = R.color.dark_on_surface_variant.toColor(context),
         outline = R.color.dark_outline.toColor(context),
@@ -107,6 +114,13 @@ private fun lightColorScheme(context: Context): ColorScheme =
         errorContainer = R.color.error_container.toColor(context),
         onErrorContainer = R.color.on_error_container.toColor(context),
         surface = R.color.surface.toColor(context),
+        surfaceBright = R.color.surface_bright.toColor(context),
+        surfaceContainer = R.color.surface_container.toColor(context),
+        surfaceContainerHigh = R.color.surface_container_high.toColor(context),
+        surfaceContainerHighest = R.color.surface_container_highest.toColor(context),
+        surfaceContainerLow = R.color.surface_container_low.toColor(context),
+        surfaceContainerLowest = R.color.surface_container_lowest.toColor(context),
+        surfaceDim = R.color.surface_dim.toColor(context),
         onSurface = R.color.on_surface.toColor(context),
         onSurfaceVariant = R.color.on_surface_variant.toColor(context),
         outline = R.color.outline.toColor(context),
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0fe03c1d0..fe748d1d4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,18 +10,21 @@ minSdk = "28"
 accompanist = "0.30.1"
 androidGradlePlugin = "8.1.0"
 androidxActivity = "1.7.2"
-androidxComposeBom = "2023.06.01"
-androidxCore = "1.10.1"
+androidxComposeBom = "2023.09.02"
+# 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-alpha08"
+androidxCore = "1.12.0"
 androidxHiltNavigationCompose = "1.0.0"
-androidxLifecycle = "2.6.1"
-androidxNavigation = "2.7.2"
+androidxLifecycle = "2.6.2"
+androidxNavigation = "2.7.3"
 androidxRoom = "2.5.2"
 androidxSplash = "1.1.0-alpha02"
 # Once the app and SDK reach a critical point of completeness we should begin fixing the version
 # here (BIT-311).
 bitwardenSdk = "0.3.0-SNAPSHOT"
 detekt = "1.23.1"
-firebaseBom = "32.2.2"
+firebaseBom = "32.3.1"
 glide = "4.15.1"
 hilt = "2.47"
 junit5 = "5.8.2"
@@ -45,7 +48,7 @@ zxing = "3.5.2"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" }
 androidx-compose-animation = { module = "androidx.compose.animation:animation" }
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidxComposeBom" }
-androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
+androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "androidxComposeMaterial3" }
 androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui" }
 androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }