Skip to content

Commit cc02c30

Browse files
committed
Update material3-adaptive to 1.0.0-alpha08
Change-Id: Ic218c6b061b5cea4e56b544073541421862bc1d0
1 parent 0c9f0dd commit cc02c30

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ dependencies {
9090

9191
implementation(libs.androidx.activity.compose)
9292
implementation(libs.androidx.compose.material3.adaptive)
93+
implementation(libs.androidx.compose.material3.adaptive.layout)
94+
implementation(libs.androidx.compose.material3.adaptive.navigation)
9395
implementation(libs.androidx.compose.material3.windowSizeClass)
9496
implementation(libs.androidx.compose.runtime.tracing)
9597
implementation(libs.androidx.core.ktx)

app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import androidx.activity.compose.BackHandler
2020
import androidx.compose.foundation.layout.Box
2121
import androidx.compose.material3.Text
2222
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
23-
import androidx.compose.material3.adaptive.ListDetailPaneScaffold
24-
import androidx.compose.material3.adaptive.ListDetailPaneScaffoldRole
25-
import androidx.compose.material3.adaptive.PaneAdaptedValue
26-
import androidx.compose.material3.adaptive.ThreePaneScaffoldNavigator
27-
import androidx.compose.material3.adaptive.rememberListDetailPaneScaffoldNavigator
23+
import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
24+
import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
25+
import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
26+
import androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigator
27+
import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
2828
import androidx.compose.runtime.Composable
2929
import androidx.compose.runtime.LaunchedEffect
3030
import androidx.compose.runtime.getValue
@@ -93,7 +93,8 @@ internal fun InterestsListDetailScreen(
9393
}
9494

9595
ListDetailPaneScaffold(
96-
scaffoldState = listDetailNavigator.scaffoldState,
96+
value = listDetailNavigator.scaffoldValue,
97+
directive = listDetailNavigator.scaffoldDirective,
9798
listPane = {
9899
InterestsRoute(
99100
onTopicClick = ::onTopicClickShowDetailPane,
@@ -129,8 +130,8 @@ internal fun InterestsListDetailScreen(
129130

130131
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
131132
private fun <T> ThreePaneScaffoldNavigator<T>.isListPaneVisible(): Boolean =
132-
scaffoldState.scaffoldValue[ListDetailPaneScaffoldRole.List] == PaneAdaptedValue.Expanded
133+
scaffoldValue[ListDetailPaneScaffoldRole.List] == PaneAdaptedValue.Expanded
133134

134135
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
135136
private fun <T> ThreePaneScaffoldNavigator<T>.isDetailPaneVisible(): Boolean =
136-
scaffoldState.scaffoldValue[ListDetailPaneScaffoldRole.Detail] == PaneAdaptedValue.Expanded
137+
scaffoldValue[ListDetailPaneScaffoldRole.Detail] == PaneAdaptedValue.Expanded

gradle/libs.versions.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ androidTools = "31.3.0"
77
androidxActivity = "1.8.0"
88
androidxAppCompat = "1.6.1"
99
androidxBrowser = "1.8.0"
10-
androidxComposeBom = "2024.02.01"
10+
androidxComposeBom = "2024.02.02"
1111
androidxComposeCompiler = "1.5.8"
12-
androidxComposeMaterial3Adaptive = "1.0.0-alpha06"
12+
androidxComposeMaterial3Adaptive = "1.0.0-alpha08"
1313
androidxComposeRuntimeTracing = "1.0.0-beta01"
1414
androidxCore = "1.12.0"
1515
androidxCoreSplashscreen = "1.0.1"
@@ -71,7 +71,9 @@ androidx-compose-foundation = { group = "androidx.compose.foundation", name = "f
7171
androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
7272
androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
7373
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
74-
androidx-compose-material3-adaptive = { group = "androidx.compose.material3", name = "material3-adaptive", version.ref = "androidxComposeMaterial3Adaptive" }
74+
androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive", version.ref = "androidxComposeMaterial3Adaptive" }
75+
androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout", version.ref = "androidxComposeMaterial3Adaptive" }
76+
androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation", version.ref = "androidxComposeMaterial3Adaptive" }
7577
androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
7678
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
7779
androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" }

0 commit comments

Comments
 (0)