feat: add default screen transitions to nested navigation

Author: ovitrif

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -24,7 +24,6 @@ import androidx.navigation.NavHostController
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.navigation
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 import kotlinx.coroutines.delay
@@ -141,6 +140,7 @@ import to.bitkit.ui.theme.TRANSITION_SHEET_MS
 import to.bitkit.ui.utils.AutoReadClipboardHandler
 import to.bitkit.ui.utils.Transitions
 import to.bitkit.ui.utils.composableWithDefaultTransitions
+import to.bitkit.ui.utils.navigationWithDefaultTransitions
 import to.bitkit.utils.Logger
 import to.bitkit.viewmodels.ActivityListViewModel
 import to.bitkit.viewmodels.AppViewModel
@@ -410,7 +410,7 @@ private fun RootNavHost(
         widgets(navController, settingsViewModel, currencyViewModel)
 
         // TODO extract transferNavigation
-        navigation<Routes.TransferRoot>(
+        navigationWithDefaultTransitions<Routes.TransferRoot>(
             startDestination = Routes.TransferIntro,
         ) {
             composableWithDefaultTransitions<Routes.TransferIntro> {
@@ -549,7 +549,7 @@ private fun RootNavHost(
                     onCloseClick = { navController.navigateToHome() },
                 )
             }
-            navigation<Routes.ExternalNav>(
+            navigationWithDefaultTransitions<Routes.ExternalNav>(
                 startDestination = Routes.ExternalConnection(),
             ) {
                 composableWithDefaultTransitions<Routes.ExternalConnection> {
@@ -901,7 +901,7 @@ private fun NavGraphBuilder.cjitDetailSettings(
 private fun NavGraphBuilder.lightningConnections(
     navController: NavHostController,
 ) {
-    navigation<Routes.ConnectionsNav>(
+    navigationWithDefaultTransitions<Routes.ConnectionsNav>(
         startDestination = Routes.LightningConnections,
     ) {
         composableWithDefaultTransitions<Routes.LightningConnections> {
@@ -1084,7 +1084,7 @@ private fun NavGraphBuilder.widgets(
             currencyViewModel = currencyViewModel
         )
     }
-    navigation<Routes.Headlines>(
+    navigationWithDefaultTransitions<Routes.Headlines>(
         startDestination = Routes.HeadlinesPreview
     ) {
         composableWithDefaultTransitions<Routes.HeadlinesPreview> {
@@ -1112,7 +1112,7 @@ private fun NavGraphBuilder.widgets(
             )
         }
     }
-    navigation<Routes.Facts>(
+    navigationWithDefaultTransitions<Routes.Facts>(
         startDestination = Routes.FactsPreview
     ) {
         composableWithDefaultTransitions<Routes.FactsPreview> {
@@ -1138,7 +1138,7 @@ private fun NavGraphBuilder.widgets(
             )
         }
     }
-    navigation<Routes.Blocks>(
+    navigationWithDefaultTransitions<Routes.Blocks>(
         startDestination = Routes.BlocksPreview
     ) {
         composableWithDefaultTransitions<Routes.BlocksPreview> {
@@ -1164,7 +1164,7 @@ private fun NavGraphBuilder.widgets(
             )
         }
     }
-    navigation<Routes.Weather>(
+    navigationWithDefaultTransitions<Routes.Weather>(
         startDestination = Routes.WeatherPreview
     ) {
         composableWithDefaultTransitions<Routes.WeatherPreview> {
@@ -1190,7 +1190,7 @@ private fun NavGraphBuilder.widgets(
             )
         }
     }
-    navigation<Routes.Price>(
+    navigationWithDefaultTransitions<Routes.Price>(
         startDestination = Routes.PricePreview
     ) {
         composableWithDefaultTransitions<Routes.PricePreview> {

app/src/main/java/to/bitkit/ui/sheets/SendSheet.kt

@@ -12,7 +12,6 @@ import androidx.compose.ui.platform.testTag
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.navigation
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 import kotlinx.serialization.Serializable
@@ -36,6 +35,7 @@ import to.bitkit.ui.screens.wallets.withdraw.WithdrawErrorScreen
 import to.bitkit.ui.settings.support.SupportScreen
 import to.bitkit.ui.shared.modifiers.sheetHeight
 import to.bitkit.ui.utils.composableWithDefaultTransitions
+import to.bitkit.ui.utils.navigationWithDefaultTransitions
 import to.bitkit.viewmodels.AppViewModel
 import to.bitkit.viewmodels.SendEffect
 import to.bitkit.viewmodels.SendEvent
@@ -127,7 +127,7 @@ fun SendSheet(
                     onContinue = { utxos -> appViewModel.setSendEvent(SendEvent.CoinSelectionContinue(utxos)) },
                 )
             }
-            navigation<SendRoute.FeeNav>(
+            navigationWithDefaultTransitions<SendRoute.FeeNav>(
                 startDestination = SendRoute.FeeRate,
             ) {
                 composableWithDefaultTransitions<SendRoute.FeeRate> {

app/src/main/java/to/bitkit/ui/utils/Nav.kt

@@ -16,10 +16,12 @@ import androidx.compose.animation.slideOutVertically
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavDeepLink
+import androidx.navigation.NavGraph
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptionsBuilder
 import androidx.navigation.NavType
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.navigation
 import kotlin.reflect.KType
 
 fun NavOptionsBuilder.clearBackStack() = popUpTo(id = 0)
@@ -63,3 +65,37 @@ inline fun <reified T : Any> NavGraphBuilder.composableWithDefaultTransitions(
         content = content,
     )
 }
+
+
+/**
+ * Construct a nested [NavGraph] with the default screen transitions.
+ */
+inline fun <reified T : Any> NavGraphBuilder.navigationWithDefaultTransitions(
+    startDestination: Any,
+    typeMap: Map<KType, @JvmSuppressWildcards NavType<*>> = emptyMap(),
+    deepLinks: List<NavDeepLink> = emptyList(),
+    noinline enterTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?)? = {
+        Transitions.slideInHorizontally
+    },
+    noinline exitTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?)? = {
+        Transitions.scaleOut
+    },
+    noinline popEnterTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?)? = {
+        Transitions.scaleIn
+    },
+    noinline popExitTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?)? = {
+        Transitions.slideOutHorizontally
+    },
+    noinline builder: NavGraphBuilder.() -> Unit,
+) {
+    navigation<T>(
+        startDestination = startDestination,
+        typeMap = typeMap,
+        deepLinks = deepLinks,
+        enterTransition = enterTransition,
+        exitTransition = exitTransition,
+        popEnterTransition = popEnterTransition,
+        popExitTransition = popExitTransition,
+        builder = builder,
+    )
+}