feat: migrate to Nav3

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

apps/flipcash/app/build.gradle.kts

@@ -200,6 +200,7 @@ dependencies {
     implementation(project(":libs:quickresponse"))
     implementation(project(":ui:biometrics"))
     implementation(project(":ui:components"))
+    implementation(project(":ui:navigation"))
     implementation(project(":ui:scanner"))
     implementation(project(":ui:resources"))
     implementation(project(":ui:theme"))

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/App.kt

@@ -1,43 +1,28 @@
 package com.flipcash.app.internal.ui.navigation
 
-import android.os.Parcelable
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
-import cafe.adriel.voyager.core.registry.ScreenRegistry
-import cafe.adriel.voyager.core.screen.Screen
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.internal.ui.HomeViewModel
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.extensions.getActivityScopedViewModel
-import com.getcode.navigation.screens.AppScreen
 import com.getcode.ui.components.restrictions.ContentRestrictedView
 import com.getcode.ui.core.RestrictionType
 import kotlinx.coroutines.launch
-import kotlinx.parcelize.IgnoredOnParcel
-import kotlinx.parcelize.Parcelize
 
-@Parcelize
-class AppRestrictedScreen(private val restrictionType: RestrictionType): AppScreen, Parcelable {
-
-    @IgnoredOnParcel
-    override val testTag: String = "app_restricted_screen"
-
-    @Composable
-    override fun ScreenContent() {
-        val homeViewModel = getActivityScopedViewModel<HomeViewModel>()
-        val navigator = LocalCodeNavigator.current
-        val coroutineScope = rememberCoroutineScope()
-        ContentRestrictedView(restrictionType) {
-            coroutineScope.launch {
-                homeViewModel.logout()
-                    .onSuccess {
-                        navigator.replaceAll(
-                            ScreenRegistry.get(
-                                AppRoute.Onboarding.Login()
-                            )
-                        )
-                    }
-            }
+@Composable
+fun AppRestrictedScreen(restrictionType: RestrictionType) {
+    val homeViewModel = getActivityScopedViewModel<HomeViewModel>()
+    val navigator = LocalCodeNavigator.current
+    val coroutineScope = rememberCoroutineScope()
+    ContentRestrictedView(restrictionType) {
+        coroutineScope.launch {
+            homeViewModel.logout()
+                .onSuccess {
+                    navigator.replaceAll(
+                        AppRoute.Onboarding.Login()
+                    )
+                }
         }
     }
-}
+}

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/navigation/AppRestrictedScreen.kt

@@ -1,8 +1,16 @@
 package com.flipcash.app.internal.ui.navigation
 
+import androidx.activity.compose.BackHandler
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
 import androidx.compose.runtime.Composable
-import cafe.adriel.voyager.core.registry.ScreenRegistry
-import cafe.adriel.voyager.core.screen.Screen
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
+import androidx.navigation3.runtime.NavEntry
+import androidx.navigation3.runtime.NavKey
+import androidx.navigation3.runtime.rememberNavBackStack
+import androidx.navigation3.scene.SinglePaneSceneStrategy
 import com.flipcash.app.advanced.AdvancedFeaturesScreen
 import com.flipcash.app.appsettings.AppSettingsScreen
 import com.flipcash.app.backupkey.BackupKeyScreen
@@ -13,6 +21,7 @@ import com.flipcash.app.contact.verification.VerificationFlowScreen
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.currency.RegionSelectionScreen
 import com.flipcash.app.deposit.DepositScreen
+import com.flipcash.app.internal.ui.navigation.decorators.rememberNavMessagingEntryDecorator
 import com.flipcash.app.lab.LabsScreen
 import com.flipcash.app.lab.PreloadLabs
 import com.flipcash.app.lab.StandaloneLabsScreen
@@ -39,151 +48,211 @@ import com.flipcash.app.withdrawal.WithdrawalConfirmationScreen
 import com.flipcash.app.withdrawal.WithdrawalDestinationScreen
 import com.flipcash.app.withdrawal.WithdrawalEntryScreen
 import com.flipcash.app.withdrawal.WithdrawalFlow
-import com.getcode.navigation.screens.ModalScreen
+import com.getcode.navigation.AppNavHost
+import com.getcode.navigation.core.LocalCodeNavigator
+import com.getcode.navigation.core.rememberCodeNavigator
+import com.getcode.navigation.metadata
+import com.getcode.navigation.results.NavResultStateRegistry
+import com.getcode.navigation.scenes.LocalBottomSheetDismissDispatcher
+import com.getcode.navigation.scenes.ModalBottomSheetSceneStrategy
+import com.getcode.ui.components.bars.BarManager
+import dev.theolm.rinku.DeepLink
 
 @Composable
-internal fun AppScreenContent(content: @Composable () -> Unit) {
-    ScreenRegistry {
-        register<AppRoute.Onboarding.Login> {
-            LoginRouter(it.seed, it.fromDeeplink)
+fun AppPreloads() {
+    PreloadBalance()
+    PreloadLabs()
+}
+
+fun appEntryProvider(
+    key: NavKey,
+    resultStateRegistry: NavResultStateRegistry,
+    barManager: BarManager,
+    deepLink: () -> DeepLink?,
+): NavEntry<NavKey> {
+    return when (key) {
+        is AppRoute.Loading -> NavEntry(key = key, metadata = key.metadata()) {
+            MainRoot(deepLink)
         }
 
-        register<AppRoute.Onboarding.SeedInput> {
+        is AppRoute.Onboarding.Login -> NavEntry(key = key, metadata = key.metadata()) {
+            LoginRouter(key.seed, key.fromDeeplink)
+        }
+        is AppRoute.Onboarding.SeedInput -> NavEntry(key = key, metadata = key.metadata()) {
             SeedInputScreen()
         }
-
-        register<AppRoute.Onboarding.AccessKey> {
+        is AppRoute.Onboarding.AccessKey -> NavEntry(key = key, metadata = key.metadata()) {
             AccessKeyScreen()
         }
-
-        register<AppRoute.Onboarding.AccessKeySavedLocation> {
+        is AppRoute.Onboarding.AccessKeySavedLocation -> NavEntry(key = key, metadata = key.metadata()) {
             PhotoAccessKeyScreen()
         }
-
-        register<AppRoute.Onboarding.Purchase> {
-            PurchaseAccountScreen(it.fromLogin)
+        is AppRoute.Onboarding.Purchase -> NavEntry(key = key, metadata = key.metadata()) {
+            PurchaseAccountScreen(key.fromLogin)
         }
-
-        register<AppRoute.Sheets.Lab> {
-            StandaloneLabsScreen()
+        is AppRoute.Onboarding.NotificationPermission,
+        is AppRoute.Onboarding.CameraPermission -> NavEntry(key = key, metadata = key.metadata()) {
+            // Deprecated — permissions requested at time of use
         }
 
-        register<AppRoute.Main.AppRestricted> {
-            AppRestrictedScreen(it.restrictionType)
+        is AppRoute.Main.Sheet -> sheetEntry(key, resultStateRegistry, barManager)
+        is AppRoute.Main.AppRestricted -> NavEntry(key = key, metadata = key.metadata()) {
+            AppRestrictedScreen(key.restrictionType)
         }
-
-        register<AppRoute.Main.Scanner> {
-            ScannerScreen(it.deeplink)
+        is AppRoute.Main.Scanner -> NavEntry(key = key, metadata = key.metadata()) {
+            ScannerScreen(key.deeplink)
         }
-
-        register<AppRoute.Main.Give> {
-            CashScreen(it.mint, it.fromTokenInfo)
+        is AppRoute.Sheets.Give -> NavEntry(key = key, metadata = key.metadata()) {
+            CashScreen(key.mint, key.fromTokenInfo)
         }
-
-        register<AppRoute.Token.Info> {
-            TokenInfoScreen(it.mint, it.forNeededFunds, it.fromDeeplink)
+        is AppRoute.Main.RegionSelection -> NavEntry(key = key, metadata = key.metadata()) {
+            RegionSelectionScreen(key.kind)
         }
 
-        register<AppRoute.Token.Transactions> {
-            TransactionHistoryScreen(it.mint)
+        is AppRoute.Token.Info -> NavEntry(key = key, metadata = key.metadata()) {
+            TokenInfoScreen(key.mint, key.forNeededFunds, key.fromDeeplink)
         }
-
-        register<AppRoute.Token.SwapTransact> {
-            BuySellFlow.start(it.forNeededFunds)
-            TokenBuySellEntryScreen(it.purpose)
+        is AppRoute.Token.Transactions -> NavEntry(key = key, metadata = key.metadata()) {
+            TransactionHistoryScreen(key.mint)
         }
-
-        register<AppRoute.Token.TxProcessing> {
-            TokenTxProcessingScreen(it.swapId, it.awaitExternalWallet)
+        is AppRoute.Token.SwapTransact -> NavEntry(key = key, metadata = key.metadata()) {
+            remember { BuySellFlow.start(key.forNeededFunds) }
+            TokenBuySellEntryScreen(key.purpose)
         }
-
-        register<AppRoute.Token.SellReceipt> {
+        is AppRoute.Token.TxProcessing -> NavEntry(key = key, metadata = key.metadata()) {
+            TokenTxProcessingScreen(key.swapId, key.awaitExternalWallet)
+        }
+        is AppRoute.Token.SellReceipt -> NavEntry(key = key, metadata = key.metadata()) {
             TokenSellReceiptScreen()
         }
 
-        register<AppRoute.Sheets.TokenSelection> {
-            TokenSelectScreen(it.purpose)
+        is AppRoute.Sheets.TokenSelection -> NavEntry(key = key, metadata = key.metadata()) {
+            TokenSelectScreen(key.purpose)
         }
-
-        register<AppRoute.Sheets.Wallet> {
+        is AppRoute.Sheets.Wallet -> NavEntry(key = key, metadata = key.metadata()) {
             BalanceScreen()
         }
-
-        register<AppRoute.Main.RegionSelection> {
-            RegionSelectionScreen(it.kind)
-        }
-        
-        register<AppRoute.Sheets.ShareApp> {
+        is AppRoute.Sheets.ShareApp -> NavEntry(key = key, metadata = key.metadata()) {
             ShareAppScreen()
         }
+        is AppRoute.Sheets.Menu -> NavEntry(key = key, metadata = key.metadata()) {
+            MenuScreen()
+        }
+        is AppRoute.Sheets.Lab -> NavEntry(key = key, metadata = key.metadata()) {
+            StandaloneLabsScreen()
+        }
 
-        register<AppRoute.Verification> {
+        is AppRoute.Verification -> NavEntry(key = key, metadata = key.metadata()) {
             VerificationFlowScreen(
-                origin = it.origin,
-                target = it.target,
-                includePhone = it.includePhone,
-                includeEmail = it.includeEmail,
-                emailAddress = it.email,
-                emailVerificationCode = it.emailVerificationCode
+                origin = key.origin,
+                target = key.target,
+                includePhone = key.includePhone,
+                includeEmail = key.includeEmail,
+                emailAddress = key.email,
+                emailVerificationCode = key.emailVerificationCode,
             )
         }
 
-        register<AppRoute.OnRamp.ProviderList> {
-            OnRampFlowTracker.start(it.from)
+        is AppRoute.OnRamp.ProviderList -> NavEntry(key = key, metadata = key.metadata()) {
+            remember { OnRampFlowTracker.start(key.from) }
             OnRampProviderListScreen(
-                neededAmount = it.neededAmount?.quarks,
-                neededCurrency = it.neededAmount?.currencyCode
+                neededAmount = key.neededAmount?.quarks,
+                neededCurrency = key.neededAmount?.currencyCode,
             )
         }
-
-        register<AppRoute.OnRamp.AmountEntry> {
+        is AppRoute.OnRamp.AmountEntry -> NavEntry(key = key, metadata = key.metadata()) {
             OnRampCustomAmountScreen()
         }
 
-        register<AppRoute.Sheets.Menu> {
-            MenuScreen()
-        }
-
-        register<AppRoute.Menu.AppSettings> {
+        is AppRoute.Menu.AppSettings -> NavEntry(key = key, metadata = key.metadata()) {
             AppSettingsScreen()
         }
-
-        register<AppRoute.Menu.Lab> {
+        is AppRoute.Menu.Lab -> NavEntry(key = key, metadata = key.metadata()) {
             LabsScreen()
         }
-
-        register<AppRoute.Transfers.Withdrawal.Amount> {
-            WithdrawalFlow.start()
-            WithdrawalEntryScreen(it.mint)
+        is AppRoute.Menu.MyAccount -> NavEntry(key = key, metadata = key.metadata()) {
+            MyAccountScreen()
+        }
+        is AppRoute.Menu.Deposit -> NavEntry(key = key, metadata = key.metadata()) {
+            DepositScreen(key.mint)
+        }
+        is AppRoute.Menu.BackupKey -> NavEntry(key = key, metadata = key.metadata()) {
+            BackupKeyScreen()
+        }
+        is AppRoute.Menu.AdvancedFeatures -> NavEntry(key = key, metadata = key.metadata()) {
+            AdvancedFeaturesScreen()
         }
 
-        register<AppRoute.Transfers.Withdrawal.Destination> {
+        is AppRoute.Transfers.Withdrawal.Amount -> NavEntry(key = key, metadata = key.metadata()) {
+            remember { WithdrawalFlow.start() }
+            WithdrawalEntryScreen(key.mint)
+        }
+        is AppRoute.Transfers.Withdrawal.Destination -> NavEntry(key = key, metadata = key.metadata()) {
             WithdrawalDestinationScreen()
         }
-
-        register<AppRoute.Transfers.Withdrawal.Confirmation> {
+        is AppRoute.Transfers.Withdrawal.Confirmation -> NavEntry(key = key, metadata = key.metadata()) {
             WithdrawalConfirmationScreen()
         }
 
-        register<AppRoute.Menu.MyAccount> {
-            MyAccountScreen()
-        }
-
-        register<AppRoute.Menu.Deposit> {
-            DepositScreen(it.mint)
+        else -> error("Unknown route: $key")
+    }
+}
+
+/**
+ * Sheet entry with nested [AppNavHost] for inner-sheet navigation.
+ * Uses slide transitions for intra-sheet navigation.
+ */
+private fun sheetEntry(
+    key: AppRoute.Main.Sheet,
+    resultStateRegistry: NavResultStateRegistry,
+    barManager: BarManager,
+): NavEntry<NavKey> {
+    return NavEntry(key = key, metadata = key.metadata()) {
+        val sheetDismissDispatcher = LocalBottomSheetDismissDispatcher.current
+        val backStack = rememberNavBackStack(key.initialRoute)
+        val navigator = rememberCodeNavigator(
+            backStack = backStack,
+            resultStateRegistry = resultStateRegistry,
+            onRootReached = { sheetDismissDispatcher() },
+        )
+
+        val onBack = {
+            if (backStack.size > 1) {
+                backStack.removeAt(backStack.lastIndex)
+            } else {
+                sheetDismissDispatcher()
+            }
         }
 
-        register<AppRoute.Menu.BackupKey> {
-            BackupKeyScreen()
-        }
+        CompositionLocalProvider(LocalCodeNavigator provides navigator) {
+            AppNavHost(
+                navigator = navigator,
+                resultStateRegistry = resultStateRegistry,
+                decorators = listOf(
+                    rememberNavMessagingEntryDecorator(navigator.backStack, barManager)
+                ),
+                sceneStrategy = ModalBottomSheetSceneStrategy<NavKey>(navigator.resultStore) {
+                    navigator.backStack.getOrNull(navigator.backStack.lastIndex - 1)
+                } then SinglePaneSceneStrategy(),
+                transitionSpec = {
+                    slideInHorizontally(initialOffsetX = { it }) togetherWith
+                            slideOutHorizontally(targetOffsetX = { -it })
+                },
+                popTransitionSpec = {
+                    slideInHorizontally(initialOffsetX = { -it }) togetherWith
+                            slideOutHorizontally(targetOffsetX = { it })
+                },
+                predictivePopTransitionSpec = {
+                    slideInHorizontally(initialOffsetX = { -it }) togetherWith
+                            slideOutHorizontally(targetOffsetX = { it })
+                },
+                onBack = { onBack() },
+                entryProvider = { innerKey ->
+                    appEntryProvider(innerKey, resultStateRegistry, barManager, deepLink = { null })
+                }
+            )
 
-        register<AppRoute.Menu.AdvancedFeatures> {
-            AdvancedFeaturesScreen()
+            BackHandler { onBack() }
         }
     }
-
-    PreloadBalance()
-    PreloadLabs()
-
-    content()
-}
+}