A fully functional Android app built entirely with Kotlin and Jetpack Compose
Update to material3-adaptive 1.1
Alex Vanyof3cf2379a341
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex 05212a28f..6aec2d1bc 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -86,6 +86,7 @@ dependencies {implementation(projects.sync.work)implementation(libs.androidx.activity.compose)+ implementation(libs.androidx.compose.material3)implementation(libs.androidx.compose.material3.adaptive)implementation(libs.androidx.compose.material3.adaptive.layout)implementation(libs.androidx.compose.material3.adaptive.navigation)diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.ktindex 669c6300a..93ed303b8 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt@@ -18,6 +18,10 @@ package com.google.samples.apps.nowinandroid.ui.interests2paneimport androidx.activity.compose.BackHandlerimport androidx.annotation.Keep+import androidx.compose.foundation.interaction.MutableInteractionSource+import androidx.compose.foundation.layout.Box+import androidx.compose.material3.LocalMinimumInteractiveComponentSize+import androidx.compose.material3.VerticalDragHandleimport androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApiimport androidx.compose.material3.adaptive.WindowAdaptiveInfoimport androidx.compose.material3.adaptive.currentWindowAdaptiveInfo@@ -25,8 +29,10 @@ import androidx.compose.material3.adaptive.layout.AnimatedPaneimport androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldimport androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRoleimport androidx.compose.material3.adaptive.layout.PaneAdaptedValue+import androidx.compose.material3.adaptive.layout.PaneExpansionAnchorimport androidx.compose.material3.adaptive.layout.ThreePaneScaffoldDestinationItemimport androidx.compose.material3.adaptive.layout.calculatePaneScaffoldDirective+import androidx.compose.material3.adaptive.layout.rememberPaneExpansionStateimport androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigatorimport androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigatorimport androidx.compose.runtime.Composable@@ -34,9 +40,14 @@ import androidx.compose.runtime.getValueimport androidx.compose.runtime.keyimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.remember+import androidx.compose.runtime.rememberCoroutineScopeimport androidx.compose.runtime.saveable.Saverimport androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.runtime.setValue+import androidx.compose.ui.Modifier+import androidx.compose.ui.draw.clipToBounds+import androidx.compose.ui.layout.layout+import androidx.compose.ui.unit.dpimport androidx.hilt.navigation.compose.hiltViewModelimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.navigation.NavGraphBuilder@@ -49,8 +60,10 @@ import com.google.samples.apps.nowinandroid.feature.topic.TopicDetailPlaceholderimport com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicRouteimport com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopicimport com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen+import kotlinx.coroutines.launchimport kotlinx.serialization.Serializableimport java.util.UUID+import kotlin.math.max@Serializable internal object TopicPlaceholderRoute@@ -93,8 +106,20 @@ internal fun InterestsListDetailScreen(},),)+ val coroutineScope = rememberCoroutineScope()++ val paneExpansionState = rememberPaneExpansionState(+ anchors = listOf(+ PaneExpansionAnchor.Proportion(0f),+ PaneExpansionAnchor.Proportion(0.5f),+ PaneExpansionAnchor.Proportion(1f),+ ),+ )+BackHandler(listDetailNavigator.canNavigateBack()) {- listDetailNavigator.navigateBack()+ coroutineScope.launch {+ listDetailNavigator.navigateBack()+ }}var nestedNavHostStartRoute by remember {@@ -123,40 +148,99 @@ internal fun InterestsListDetailScreen(nestedNavHostStartRoute = TopicRoute(id = topicId)nestedNavKey = UUID.randomUUID()}- listDetailNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail)+ coroutineScope.launch {+ listDetailNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail)+ }}+ val mutableInteractionSource = remember { MutableInteractionSource() }+ val minPaneWidth = 300.dp+ListDetailPaneScaffold(value = listDetailNavigator.scaffoldValue,directive = listDetailNavigator.scaffoldDirective,listPane = {AnimatedPane {- InterestsRoute(- onTopicClick = ::onTopicClickShowDetailPane,- highlightSelectedTopic = listDetailNavigator.isDetailPaneVisible(),- )+ Box(+ modifier = Modifier.clipToBounds()+ .layout { measurable, constraints ->+ val width = max(minPaneWidth.roundToPx(), constraints.maxWidth)+ val placeable = measurable.measure(+ constraints.copy(+ minWidth = minPaneWidth.roundToPx(),+ maxWidth = width,+ ),+ )+ layout(constraints.maxWidth, placeable.height) {+ placeable.placeRelative(+ x = 0,+ y = 0,+ )+ }+ },+ ) {+ InterestsRoute(+ onTopicClick = ::onTopicClickShowDetailPane,+ highlightSelectedTopic = listDetailNavigator.isDetailPaneVisible(),+ )+ }}},detailPane = {AnimatedPane {- key(nestedNavKey) {- NavHost(- navController = nestedNavController,- startDestination = nestedNavHostStartRoute,- route = DetailPaneNavHostRoute::class,- ) {- topicScreen(- showBackButton = !listDetailNavigator.isListPaneVisible(),- onBackClick = listDetailNavigator::navigateBack,- onTopicClick = ::onTopicClickShowDetailPane,- )- composable<TopicPlaceholderRoute> {- TopicDetailPlaceholder()+ Box(+ modifier = Modifier.clipToBounds()+ .layout { measurable, constraints ->+ val width = max(minPaneWidth.roundToPx(), constraints.maxWidth)+ val placeable = measurable.measure(+ constraints.copy(+ minWidth = minPaneWidth.roundToPx(),+ maxWidth = width,+ ),+ )+ layout(constraints.maxWidth, placeable.height) {+ placeable.placeRelative(+ x = constraints.maxWidth -+ max(constraints.maxWidth, placeable.width),+ y = 0,+ )+ }+ },+ ) {+ key(nestedNavKey) {+ NavHost(+ navController = nestedNavController,+ startDestination = nestedNavHostStartRoute,+ route = DetailPaneNavHostRoute::class,+ ) {+ topicScreen(+ showBackButton = !listDetailNavigator.isListPaneVisible(),+ onBackClick = {+ coroutineScope.launch {+ listDetailNavigator.navigateBack()+ }+ },+ onTopicClick = ::onTopicClickShowDetailPane,+ )+ composable<TopicPlaceholderRoute> {+ TopicDetailPlaceholder()+ }}}}}},+ paneExpansionState = paneExpansionState,+ paneExpansionDragHandle = {+ VerticalDragHandle(+ modifier = Modifier.paneExpansionDraggable(+ state = paneExpansionState,+ minTouchTargetSize = LocalMinimumInteractiveComponentSize.current,+ interactionSource = mutableInteractionSource,+ ),+ interactionSource = mutableInteractionSource,+ )+ },)}diff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.ktindex 468550878..75283942d 100644--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt@@ -70,7 +70,6 @@ internal fun InterestsScreen(when (uiState) {InterestsUiState.Loading ->NiaLoadingWheel(- modifier = modifier,contentDesc = stringResource(id = R.string.feature_interests_loading),)@@ -81,7 +80,6 @@ internal fun InterestsScreen(onFollowButtonClick = followTopic,selectedTopicId = uiState.selectedTopicId,highlightSelectedTopic = highlightSelectedTopic,- modifier = modifier,)is InterestsUiState.Empty -> InterestsEmptyScreen()diff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/TabContent.ktindex 83058c12e..715d61578 100644--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt@@ -75,6 +75,7 @@ fun TopicsTabContent(onClick = { onTopicClick(topicId) },onFollowButtonClick = { onFollowButtonClick(topicId, it) },isSelected = isSelected,+ modifier = Modifier.fillMaxWidth(),)}}diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 9357809b0..790b7a942 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -9,6 +9,7 @@ androidxAppCompat = "1.7.0"androidxBrowser = "1.8.0"androidxComposeBom = "2024.12.01"androidxComposeFoundation = "1.8.0-alpha07"+androidxComposeMaterial3Adaptive = "1.1.0-alpha08"androidxComposeRuntimeTracing = "1.7.6"androidxCore = "1.15.0"androidxCoreSplashscreen = "1.0.1"@@ -69,15 +70,15 @@ androidx-activity-compose = { group = "androidx.activity", name = "activity-compandroidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" }androidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" }androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidxBrowser" }-androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom-alpha", version.ref = "androidxComposeBom" }androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "androidxComposeFoundation" }androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }androidx-compose-material3-navigationSuite = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite" }-androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive" }-androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout" }-androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation" }+androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive", version.ref = "androidxComposeMaterial3Adaptive" }+androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout", version.ref = "androidxComposeMaterial3Adaptive" }+androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation", version.ref = "androidxComposeMaterial3Adaptive" }androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" }