A fully functional Android app built entirely with Kotlin and Jetpack Compose
Add predictive back and pane expansion back handling
Alex Vanyoe25b3634ca6c
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 c33b1611b..71a341f72 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@@ -17,7 +17,6 @@package com.google.samples.apps.nowinandroid.ui.interests2paneimport androidx.activity.compose.BackHandler-import androidx.annotation.Keepimport androidx.compose.animation.AnimatedContentimport androidx.compose.foundation.interaction.MutableInteractionSourceimport androidx.compose.foundation.layout.Box@@ -27,23 +26,23 @@ import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApiimport androidx.compose.material3.adaptive.WindowAdaptiveInfoimport androidx.compose.material3.adaptive.currentWindowAdaptiveInfoimport androidx.compose.material3.adaptive.layout.AnimatedPane-import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldimport androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRoleimport androidx.compose.material3.adaptive.layout.PaneAdaptedValueimport androidx.compose.material3.adaptive.layout.PaneExpansionAnchorimport androidx.compose.material3.adaptive.layout.ThreePaneScaffoldDestinationItemimport androidx.compose.material3.adaptive.layout.calculatePaneScaffoldDirective+import androidx.compose.material3.adaptive.layout.defaultDragHandleSemanticsimport androidx.compose.material3.adaptive.layout.rememberPaneExpansionState+import androidx.compose.material3.adaptive.navigation.BackNavigationBehavior+import androidx.compose.material3.adaptive.navigation.NavigableListDetailPaneScaffoldimport androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigator+import androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldPredictiveBackHandlerimport androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigatorimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValue-import androidx.compose.runtime.keyimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.runtime.rememberCoroutineScope-import androidx.compose.runtime.saveable.Saver-import androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.runtime.setValueimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clipToBounds@@ -51,31 +50,20 @@ import androidx.compose.ui.layout.layoutimport androidx.compose.ui.unit.dpimport androidx.hilt.navigation.compose.hiltViewModelimport androidx.lifecycle.compose.collectAsStateWithLifecycle-import androidx.lifecycle.viewmodel.viewModelFactoryimport androidx.navigation.NavGraphBuilder-import androidx.navigation.compose.NavHostimport androidx.navigation.compose.composable-import androidx.navigation.compose.rememberNavControllerimport com.google.samples.apps.nowinandroid.feature.interests.InterestsRouteimport com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRouteimport com.google.samples.apps.nowinandroid.feature.topic.TopicDetailPlaceholderimport com.google.samples.apps.nowinandroid.feature.topic.TopicScreenimport com.google.samples.apps.nowinandroid.feature.topic.TopicViewModel-import com.google.samples.apps.nowinandroid.feature.topic.TopicViewModel_Factoryimport com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicRoute-import com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopic-import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreenimport kotlinx.coroutines.launchimport kotlinx.serialization.Serializable-import java.util.UUIDimport kotlin.math.max@Serializable internal object TopicPlaceholderRoute-// TODO: Remove @Keep when https://issuetracker.google.com/353898971 is fixed-@Keep-@Serializable internal object DetailPaneNavHostRoute-fun NavGraphBuilder.interestsListDetailScreen() {composable<InterestsRoute> {InterestsListDetailScreen()@@ -121,9 +109,17 @@ internal fun InterestsListDetailScreen(),)- BackHandler(listDetailNavigator.canNavigateBack()) {+ ThreePaneScaffoldPredictiveBackHandler(+ listDetailNavigator,+ BackNavigationBehavior.PopUntilScaffoldValueChange,+ )+ BackHandler(+ paneExpansionState.currentAnchor == PaneExpansionAnchor.Proportion(0f) &&+ listDetailNavigator.isListPaneVisible() &&+ listDetailNavigator.isDetailPaneVisible(),+ ) {coroutineScope.launch {- listDetailNavigator.navigateBack()+ paneExpansionState.animateTo(PaneExpansionAnchor.Proportion(1f))}}@@ -138,14 +134,18 @@ internal fun InterestsListDetailScreen(coroutineScope.launch {listDetailNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail)}+ if (paneExpansionState.currentAnchor == PaneExpansionAnchor.Proportion(1f)) {+ coroutineScope.launch {+ paneExpansionState.animateTo(PaneExpansionAnchor.Proportion(0f))+ }+ }}val mutableInteractionSource = remember { MutableInteractionSource() }val minPaneWidth = 300.dp- ListDetailPaneScaffold(- value = listDetailNavigator.scaffoldValue,- directive = listDetailNavigator.scaffoldDirective,+ NavigableListDetailPaneScaffold(+ navigator = listDetailNavigator,listPane = {AnimatedPane {Box(@@ -209,7 +209,7 @@ internal fun InterestsListDetailScreen(key = route.id,) { factory ->factory.create(route.id)- }+ },)}is TopicPlaceholderRoute -> {@@ -227,6 +227,7 @@ internal fun InterestsListDetailScreen(state = paneExpansionState,minTouchTargetSize = LocalMinimumInteractiveComponentSize.current,interactionSource = mutableInteractionSource,+ semanticsProperties = paneExpansionState.defaultDragHandleSemantics(),),interactionSource = mutableInteractionSource,)diff --git a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.ktindex fabb82b10..69059c81d 100644--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt+++ b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt@@ -16,11 +16,14 @@package com.google.samples.apps.nowinandroid.feature.topic.navigation+import androidx.hilt.navigation.compose.hiltViewModelimport androidx.navigation.NavControllerimport androidx.navigation.NavGraphBuilderimport androidx.navigation.NavOptionsBuilderimport androidx.navigation.compose.composable+import androidx.navigation.toRouteimport com.google.samples.apps.nowinandroid.feature.topic.TopicScreen+import com.google.samples.apps.nowinandroid.feature.topic.TopicViewModelimport kotlinx.serialization.Serializable@Serializable data class TopicRoute(val id: String)@@ -36,11 +39,17 @@ fun NavGraphBuilder.topicScreen(onBackClick: () -> Unit,onTopicClick: (String) -> Unit,) {- composable<TopicRoute> {+ composable<TopicRoute> { entry ->+ val id = entry.toRoute<TopicRoute>().idTopicScreen(showBackButton = showBackButton,onBackClick = onBackClick,onTopicClick = onTopicClick,+ viewModel = hiltViewModel<TopicViewModel, TopicViewModel.Factory>(+ key = id,+ ) { factory ->+ factory.create(id)+ },)}}diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 790b7a942..04eedd374 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -7,9 +7,9 @@ androidTools = "31.7.3"androidxActivity = "1.9.3"androidxAppCompat = "1.7.0"androidxBrowser = "1.8.0"-androidxComposeBom = "2024.12.01"+androidxComposeBom = "2025.02.00"androidxComposeFoundation = "1.8.0-alpha07"-androidxComposeMaterial3Adaptive = "1.1.0-alpha08"+androidxComposeMaterial3Adaptive = "1.1.0-rc01"androidxComposeRuntimeTracing = "1.7.6"androidxCore = "1.15.0"androidxCoreSplashscreen = "1.0.1"