Skip to content

Commit 074c035

Browse files
committed
Update to material3-adaptive 1.1
Change-Id: I4b3b68face17149ab87135df28baa41cd5bacb0f
1 parent 717f2db commit 074c035

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,19 @@ package com.google.samples.apps.nowinandroid.ui.interests2pane
1818

1919
import androidx.activity.compose.BackHandler
2020
import androidx.annotation.Keep
21+
import androidx.compose.material3.MaterialTheme
2122
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
2223
import androidx.compose.material3.adaptive.WindowAdaptiveInfo
2324
import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
2425
import androidx.compose.material3.adaptive.layout.AnimatedPane
2526
import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
2627
import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
2728
import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
29+
import androidx.compose.material3.adaptive.layout.PaneExpansionAnchor
30+
import androidx.compose.material3.adaptive.layout.PaneExpansionDragHandle
2831
import androidx.compose.material3.adaptive.layout.ThreePaneScaffoldDestinationItem
2932
import androidx.compose.material3.adaptive.layout.calculatePaneScaffoldDirective
33+
import androidx.compose.material3.adaptive.layout.rememberPaneExpansionState
3034
import androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigator
3135
import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
3236
import androidx.compose.runtime.Composable
@@ -126,6 +130,14 @@ internal fun InterestsListDetailScreen(
126130
listDetailNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail)
127131
}
128132

133+
val paneExpansionState = rememberPaneExpansionState(
134+
anchors = listOf(
135+
PaneExpansionAnchor.Proportion(0f),
136+
PaneExpansionAnchor.Proportion(0.5f),
137+
PaneExpansionAnchor.Proportion(1f),
138+
)
139+
)
140+
129141
ListDetailPaneScaffold(
130142
value = listDetailNavigator.scaffoldValue,
131143
directive = listDetailNavigator.scaffoldDirective,
@@ -157,6 +169,13 @@ internal fun InterestsListDetailScreen(
157169
}
158170
}
159171
},
172+
paneExpansionState = paneExpansionState,
173+
paneExpansionDragHandle = {
174+
PaneExpansionDragHandle(
175+
state = it,
176+
color = MaterialTheme.colorScheme.onSurface,
177+
)
178+
}
160179
)
161180
}
162181

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ internal fun Project.configureKotlinAndroid(
3636
commonExtension: CommonExtension<*, *, *, *, *, *>,
3737
) {
3838
commonExtension.apply {
39-
compileSdk = 34
39+
compileSdk = 35
4040

4141
defaultConfig {
4242
minSdk = 21

gradle/libs.versions.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ androidxActivity = "1.9.3"
88
androidxAppCompat = "1.7.0"
99
androidxBrowser = "1.8.0"
1010
androidxComposeBom = "2024.11.00"
11+
androidxComposeMaterial3Adaptive = "1.1.0-alpha03"
1112
androidxComposeRuntimeTracing = "1.7.5"
1213
androidxCore = "1.13.1"
1314
androidxCoreSplashscreen = "1.0.1"
@@ -73,9 +74,9 @@ androidx-compose-foundation-layout = { group = "androidx.compose.foundation", na
7374
androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
7475
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
7576
androidx-compose-material3-navigationSuite = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite" }
76-
androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive" }
77-
androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout" }
78-
androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation" }
77+
androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive", version.ref = "androidxComposeMaterial3Adaptive" }
78+
androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout", version.ref = "androidxComposeMaterial3Adaptive" }
79+
androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation", version.ref = "androidxComposeMaterial3Adaptive" }
7980
androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
8081
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
8182
androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" }

0 commit comments

Comments
 (0)