From 3390dc7dae2f7cb24758c8aac05d814be3e385bd Mon Sep 17 00:00:00 2001 From: Jonathan Koren Date: Wed, 14 Feb 2024 15:09:56 -0800 Subject: [PATCH] Bump M3 adaptive navigation suite to alpha03 Change-Id: Ice4996331a1c44e5284839b2cdf2330c737361bf --- .../com/google/samples/apps/nowinandroid/ui/NiaApp.kt | 6 +++--- .../com/google/samples/apps/nowinandroid/ui/NiaAppState.kt | 4 ++-- .../apps/nowinandroid/core/designsystem/component/Chip.kt | 2 ++ gradle/libs.versions.toml | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt index 7c536668e..395d81035 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt @@ -31,9 +31,9 @@ import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.SnackbarResult.ActionPerformed import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.adaptive.navigation.suite.ExperimentalMaterial3AdaptiveNavigationSuiteApi -import androidx.compose.material3.adaptive.navigation.suite.NavigationSuiteDefaults -import androidx.compose.material3.adaptive.navigation.suite.NavigationSuiteScaffold +import androidx.compose.material3.adaptive.navigationsuite.ExperimentalMaterial3AdaptiveNavigationSuiteApi +import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults +import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt index f075b468f..aa2e7739c 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt @@ -16,8 +16,8 @@ package com.google.samples.apps.nowinandroid.ui -import androidx.compose.material3.adaptive.navigation.suite.ExperimentalMaterial3AdaptiveNavigationSuiteApi -import androidx.compose.material3.adaptive.navigation.suite.NavigationSuiteType +import androidx.compose.material3.adaptive.navigationsuite.ExperimentalMaterial3AdaptiveNavigationSuiteApi +import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable import androidx.compose.runtime.remember diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt index d1b7d124d..214797a40 100644 --- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt +++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt @@ -73,6 +73,8 @@ fun NiaFilterChip( }, shape = CircleShape, border = FilterChipDefaults.filterChipBorder( + enabled = enabled, + selected = selected, borderColor = MaterialTheme.colorScheme.onBackground, selectedBorderColor = MaterialTheme.colorScheme.onBackground, disabledBorderColor = MaterialTheme.colorScheme.onBackground.copy( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b37167090..3bfc90adf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ androidTools = "31.1.3" androidxActivity = "1.8.0" androidxAppCompat = "1.6.1" androidxBrowser = "1.6.0" -androidxComposeBom = "2023.10.01" +androidxComposeBom = "2024.02.00" androidxComposeCompiler = "1.5.3" androidxComposeRuntimeTracing = "1.0.0-alpha03" androidxCore = "1.12.0" @@ -19,7 +19,7 @@ androidxJunit = "1.1.5" androidxLifecycle = "2.6.2" androidxMacroBenchmark = "1.2.0" androidxComposeMaterial3Adaptive = "1.0.0-alpha06" -androidxComposeMaterial3AdaptiveNavigationSuite = "1.0.0-alpha01" +androidxComposeMaterial3AdaptiveNavigationSuite = "1.0.0-alpha03" androidxMetrics = "1.0.0-alpha04" androidxNavigation = "2.7.4" androidxProfileinstaller = "1.3.1"