mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-22 01:16:02 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update all current dependencies and include new "surface" colors (#79)

Browse source
This commit is contained in:
Brian Yencho 2023-10-02 13:22:15 -05:00 committed by Álison Fernandes
parent 11b8ab4105
commit 5c81560514
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/Theme.kt
View file

@ -78,6 +78,13 @@ private fun darkColorScheme(context: Context): ColorScheme =
errorContainer = R.color.dark_error_container.toColor(context), errorContainer = R.color.dark_error_container.toColor(context),
onErrorContainer = R.color.dark_on_error_container.toColor(context), onErrorContainer = R.color.dark_on_error_container.toColor(context),
surface = R.color.dark_surface.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), onSurface = R.color.dark_on_surface.toColor(context),
onSurfaceVariant = R.color.dark_on_surface_variant.toColor(context), onSurfaceVariant = R.color.dark_on_surface_variant.toColor(context),
outline = R.color.dark_outline.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), errorContainer = R.color.error_container.toColor(context),
onErrorContainer = R.color.on_error_container.toColor(context), onErrorContainer = R.color.on_error_container.toColor(context),
surface = R.color.surface.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), onSurface = R.color.on_surface.toColor(context),
onSurfaceVariant = R.color.on_surface_variant.toColor(context), onSurfaceVariant = R.color.on_surface_variant.toColor(context),
outline = R.color.outline.toColor(context), outline = R.color.outline.toColor(context),

15
gradle/libs.versions.toml
View file

@ -10,18 +10,21 @@ minSdk = "28"
accompanist = "0.30.1" accompanist = "0.30.1"
androidGradlePlugin = "8.1.0" androidGradlePlugin = "8.1.0"
androidxActivity = "1.7.2" androidxActivity = "1.7.2"
androidxComposeBom = "2023.06.01" androidxComposeBom = "2023.09.02"
androidxCore = "1.10.1" # 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" androidxHiltNavigationCompose = "1.0.0"
androidxLifecycle = "2.6.1" androidxLifecycle = "2.6.2"
androidxNavigation = "2.7.2" androidxNavigation = "2.7.3"
androidxRoom = "2.5.2" androidxRoom = "2.5.2"
androidxSplash = "1.1.0-alpha02" androidxSplash = "1.1.0-alpha02"
# Once the app and SDK reach a critical point of completeness we should begin fixing the version # Once the app and SDK reach a critical point of completeness we should begin fixing the version
# here (BIT-311). # here (BIT-311).
bitwardenSdk = "0.3.0-SNAPSHOT" bitwardenSdk = "0.3.0-SNAPSHOT"
detekt = "1.23.1" detekt = "1.23.1"
firebaseBom = "32.2.2" firebaseBom = "32.3.1"
glide = "4.15.1" glide = "4.15.1"
hilt = "2.47" hilt = "2.47"
junit5 = "5.8.2" junit5 = "5.8.2"
@ -45,7 +48,7 @@ zxing = "3.5.2"
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" }
androidx-compose-animation = { module = "androidx.compose.animation:animation" } androidx-compose-animation = { module = "androidx.compose.animation:animation" }
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidxComposeBom" } 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-runtime = { module = "androidx.compose.runtime:runtime" }
androidx-compose-ui = { module = "androidx.compose.ui:ui" } androidx-compose-ui = { module = "androidx.compose.ui:ui" }
androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" } androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }