Add contentZIndex for AnimatedNavHost

google · Aug 6, 2022 · 1fd5ad8 · 1fd5ad8
1 parent e69b0bf
commit 1fd5ad8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/navigation-animation/api/current.api b/navigation-animation/api/current.api
@@ -16,8 +16,8 @@ package com.google.accompanist.navigation.animation {
   }
 
   public final class NavGraphBuilderKt {
-    method @androidx.compose.animation.ExperimentalAnimationApi public static void composable(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition>? enterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition>? exitTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition>? popEnterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition>? popExitTransition, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedVisibilityScope,? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
-    method @androidx.compose.animation.ExperimentalAnimationApi public static void navigation(androidx.navigation.NavGraphBuilder, String startDestination, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition>? enterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition>? exitTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition>? popEnterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition>? popExitTransition, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method @androidx.compose.animation.ExperimentalAnimationApi public static void composable(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition>? enterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition>? exitTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition>? popEnterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition>? popExitTransition, optional float contentZIndex, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedVisibilityScope,? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
+    method @androidx.compose.animation.ExperimentalAnimationApi public static void navigation(androidx.navigation.NavGraphBuilder, String startDestination, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition>? enterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition>? exitTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition>? popEnterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition>? popExitTransition, optional float contentZIndex, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
   }
 
   public final class NavHostControllerKt {

diff --git a/...on-animation/src/main/java/com/google/accompanist/navigation/animation/AnimatedNavHost.kt b/...on-animation/src/main/java/com/google/accompanist/navigation/animation/AnimatedNavHost.kt
@@ -163,9 +163,14 @@ public fun AnimatedNavHost(
     val backStackEntry = visibleEntries.lastOrNull()
 
     if (backStackEntry != null) {
+        var contentZIndex = 0f
         val finalEnter: AnimatedContentScope<NavBackStackEntry>.() -> EnterTransition = {
             val targetDestination = targetState.destination as AnimatedComposeNavigator.Destination
 
+            targetDestination.hierarchy.firstNotNullOfOrNull { destination ->
+                contentZIndex = contentZIndices[destination.route] ?: 0f
+            }
+
             if (composeNavigator.isPop.value) {
                 targetDestination.hierarchy.firstNotNullOfOrNull { destination ->
                     popEnterTransitions[destination.route]?.invoke(this)
@@ -202,6 +207,8 @@ public fun AnimatedNavHost(
                     finalEnter(this) with finalExit(this)
                 } else {
                     EnterTransition.None with ExitTransition.None
+                }.apply {
+                    targetContentZIndex = contentZIndex
                 }
             },
             contentAlignment,
@@ -254,3 +261,6 @@ internal val popEnterTransitions =
 @ExperimentalAnimationApi
 internal val popExitTransitions =
     mutableMapOf<String?, (AnimatedContentScope<NavBackStackEntry>.() -> ExitTransition?)?>()
+
+@ExperimentalAnimationApi
+internal val contentZIndices = mutableMapOf<String?, Float>()
diff --git a/...on-animation/src/main/java/com/google/accompanist/navigation/animation/NavGraphBuilder.kt b/...on-animation/src/main/java/com/google/accompanist/navigation/animation/NavGraphBuilder.kt
@@ -55,6 +55,7 @@ public fun NavGraphBuilder.composable(
     popExitTransition: (
         AnimatedContentScope<NavBackStackEntry>.() -> ExitTransition?
     )? = exitTransition,
+    contentZIndex: Float = 0f,
     content: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit
 ) {
     addDestination(
@@ -73,6 +74,7 @@ public fun NavGraphBuilder.composable(
             exitTransition?.let { exitTransitions[route] = exitTransition }
             popEnterTransition?.let { popEnterTransitions[route] = popEnterTransition }
             popExitTransition?.let { popExitTransitions[route] = popExitTransition }
+            contentZIndices[route] = contentZIndex
         }
     )
 }
@@ -107,12 +109,14 @@ public fun NavGraphBuilder.navigation(
     popExitTransition: (
         AnimatedContentScope<NavBackStackEntry>.() -> ExitTransition?
     )? = exitTransition,
+    contentZIndex: Float = 0f,
     builder: NavGraphBuilder.() -> Unit
 ) {
     navigation(startDestination, route, arguments, deepLinks, builder).apply {
         enterTransition?.let { enterTransitions[route] = enterTransition }
         exitTransition?.let { exitTransitions[route] = exitTransition }
         popEnterTransition?.let { popEnterTransitions[route] = popEnterTransition }
         popExitTransition?.let { popExitTransitions[route] = popExitTransition }
+        contentZIndices[route] = contentZIndex
     }
 }