Skip to content

Commit

Permalink
[Update] libs & bottombar colours
Browse files Browse the repository at this point in the history
  • Loading branch information
jeprubio committed Sep 10, 2024
1 parent 6c95a19 commit 82d1fed
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.rumosoft.marvelcompose.presentation.navigation
import androidx.compose.material3.Icon
import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.NavigationBarItemDefaults
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.painterResource
Expand Down Expand Up @@ -31,6 +32,13 @@ fun BottomNavigationBar(
selected = selected,
onClick = { onTabClick(tab) },
alwaysShowLabel = true,
colors = NavigationBarItemDefaults.colors().copy(
selectedIconColor = MarvelComposeTheme.colors.primary,
selectedIndicatorColor = MarvelComposeTheme.colors.onPrimary,
selectedTextColor = MarvelComposeTheme.colors.onPrimary,
unselectedIconColor = MarvelComposeTheme.colors.onPrimaryContainer,
unselectedTextColor = MarvelComposeTheme.colors.onPrimaryContainer,
),
)
}
}
Expand Down
27 changes: 13 additions & 14 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
[versions]
agp = "8.5.2"
compose-bom = "2024.08.00"
konsist = "0.15.1"
agp = "8.6.0"
compose-bom = "2024.09.00"
konsist = "0.16.1"
kotlin = "2.0.20"
appcompat = "1.7.0"
core-splashscreen = "1.0.1"
core-ktx = "1.13.1"
core-testing = "2.2.0"
lifecycle-runtime-ktx = "2.8.4"
lifecycle-compose = "2.8.4"
activity-compose = "1.9.1"
lifecycle-runtime-ktx = "2.8.5"
lifecycle-compose = "2.8.5"
activity-compose = "1.9.2"
retrofit = "2.11.0"
hilt = "2.52"
hilt-navigation-compose = "1.2.0"
coil-compose = "2.7.0"
window = "1.3.0"
kotlinx-serialization-json = "1.7.1"
navigation-runtime-ktx = "2.7.7"
nav_compose = "2.7.7"
kotlinx-serialization-json = "1.7.2"
nav-compose = "2.8.0"
gson = "2.11.0"
okio = "3.9.0"
okhttp = "4.12.0"
logging-interceptor = "4.12.0"
timber = "5.0.1"
material = "1.12.0"
lottie-compose = "6.5.0"
lottie-compose = "6.5.2"
androidx-test-ext-junit = "1.2.1"
espresso = "3.6.1"
junitparams = "1.1.1"
Expand All @@ -35,17 +34,17 @@ mockwebserver = "4.12.0"
secrets-gradle-plugin = "2.0.1"
shot = "6.1.0"
versions = "0.51.0"
ksp = "2.0.20-1.0.24"
ksp = "2.0.20-1.0.25"
glance = "1.1.0"
glance-experimental = "0.2.2"
ui-tooling-preview-android = "1.6.8"
ui-tooling-preview-android = "1.7.0"
test-core = "1.6.1"

[libraries]
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" }
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "core-splashscreen" }
androidx-navigation-runtime-ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "navigation-runtime-ktx" }
androidx-navigation-runtime-ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "nav-compose" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
androidx-window = { module = "androidx.window:window", version.ref = "window" }
core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
Expand All @@ -57,7 +56,7 @@ ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
material3 = { group = "androidx.compose.material3", name = "material3" }
material3-window-size = { group = "androidx.compose.material3", name = "material3-window-size-class" }
navigation-compose = { group = "androidx.navigation", name ="navigation-compose", version.ref = "nav_compose" }
navigation-compose = { group = "androidx.navigation", name ="navigation-compose", version.ref = "nav-compose" }
material = { group = "com.google.android.material", name ="material", version.ref = "material" }

lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle-compose" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ val DarkColorPalette = darkColorScheme(
onSecondary = Color.White,
onBackground = Color.White,
onSurface = Color.White,
surfaceContainer = Ribbon500,
onPrimaryContainer = Color.LightGray,
)

val LightColorPalette = lightColorScheme(
Expand All @@ -35,6 +37,8 @@ val LightColorPalette = lightColorScheme(
onBackground = MineShaft,
onSurface = Color.White,
onError = Color.White,
surfaceContainer = Ribbon500,
onPrimaryContainer = Color.LightGray,
)

@Composable
Expand Down

0 comments on commit 82d1fed

Please sign in to comment.