refactor: Introduce nav routes hierarchy

Author: ovitrif

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

@@ -144,19 +144,19 @@ fun ContentView(
     LaunchedEffect(appViewModel, navigator) {
         appViewModel.sendEffect.collect { effect ->
             when (effect) {
-                is SendEffect.NavigateToAddress -> navigator.navigate(Routes.SendAddress)
-                is SendEffect.NavigateToAmount -> navigator.navigate(Routes.SendAmount())
-                is SendEffect.NavigateToScan -> navigator.navigate(Routes.SendQrScanner)
-                is SendEffect.NavigateToCoinSelection -> navigator.navigate(Routes.SendCoinSelection)
-                is SendEffect.NavigateToConfirm -> navigator.navigate(Routes.SendConfirm)
-                is SendEffect.NavigateToQuickPay -> navigator.navigate(Routes.SendQuickPay)
-                is SendEffect.NavigateToWithdrawConfirm -> navigator.navigate(Routes.SendWithdrawConfirm)
-                is SendEffect.NavigateToWithdrawError -> navigator.navigate(Routes.SendWithdrawError)
-                is SendEffect.NavigateToFee -> navigator.navigate(Routes.SendFeeRate)
-                is SendEffect.NavigateToFeeCustom -> navigator.navigate(Routes.SendFeeCustom)
+                is SendEffect.NavigateToAddress -> navigator.navigate(Routes.Send.Address)
+                is SendEffect.NavigateToAmount -> navigator.navigate(Routes.Send.Amount())
+                is SendEffect.NavigateToScan -> navigator.navigate(Routes.Send.QrScanner)
+                is SendEffect.NavigateToCoinSelection -> navigator.navigate(Routes.Send.CoinSelection)
+                is SendEffect.NavigateToConfirm -> navigator.navigate(Routes.Send.Confirm)
+                is SendEffect.NavigateToQuickPay -> navigator.navigate(Routes.Send.QuickPay)
+                is SendEffect.NavigateToWithdrawConfirm -> navigator.navigate(Routes.Send.WithdrawConfirm)
+                is SendEffect.NavigateToWithdrawError -> navigator.navigate(Routes.Send.WithdrawError)
+                is SendEffect.NavigateToFee -> navigator.navigate(Routes.Send.FeeRate)
+                is SendEffect.NavigateToFeeCustom -> navigator.navigate(Routes.Send.FeeCustom)
                 is SendEffect.PaymentSuccess -> {
                     appViewModel.clearClipboardForAutoRead()
-                    navigator.navigate(Routes.SendSuccess)
+                    navigator.navigate(Routes.Send.Success)
                 }
 
                 is SendEffect.PopBack -> navigator.popBackTo(effect.route)
@@ -310,8 +310,8 @@ fun ContentView(
                     modifier = Modifier.align(Alignment.BottomCenter),
                 ) {
                     TabBar(
-                        onSendClick = { navigator.navigate(Routes.SendRecipient) },
-                        onReceiveClick = { navigator.navigate(Routes.ReceiveQr) },
+                        onSendClick = { navigator.navigate(Routes.Send.Recipient) },
+                        onReceiveClick = { navigator.navigate(Routes.Receive.Qr) },
                         onScanClick = { navigator.navigate(Routes.QrScanner) },
                     )
                 }

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

@@ -217,7 +217,7 @@ private fun OnboardingContent(
     appViewModel: AppViewModel,
     walletViewModel: WalletViewModel,
 ) {
-    val backStack = rememberNavBackStack(Routes.Terms)
+    val backStack = rememberNavBackStack(Routes.Onboarding.Terms)
     val navigator = remember(backStack) { Navigator(backStack) }
     val isGeoBlocked by appViewModel.isGeoBlocked.collectAsStateWithLifecycle()
 

app/src/main/java/to/bitkit/ui/components/AuthCheckScreen.kt

@@ -54,7 +54,7 @@ fun AuthCheckScreen(
                 }
 
                 AuthCheckAction.NAV_TO_RESET -> {
-                    navigator.navigate(Routes.ResetAndRestoreSettings)
+                    navigator.navigate(Routes.Settings.ResetAndRestore)
                 }
             }
         },

app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt

@@ -96,29 +96,29 @@ fun DrawerMenu(
                 scope.launch { drawerState.close() }
             },
             onActivityClick = {
-                navigator.navigate(Routes.AllActivity)
+                navigator.navigate(Routes.Activity.All)
                 scope.launch { drawerState.close() }
             },
             onContactsClick = null, // TODO IMPLEMENT CONTACTS
             onProfileClick = null, // TODO IMPLEMENT PROFILE
             onWidgetsClick = {
                 if (!hasSeenWidgetsIntro) {
-                    navigator.navigate(Routes.WidgetsIntro)
+                    navigator.navigate(Routes.Widgets.Intro)
                 } else {
-                    navigator.navigate(Routes.AddWidget)
+                    navigator.navigate(Routes.Widgets.Add)
                 }
                 scope.launch { drawerState.close() }
             },
             onShopClick = {
                 if (!hasSeenShopIntro) {
-                    navigator.navigate(Routes.ShopIntro)
+                    navigator.navigate(Routes.Shop.Intro)
                 } else {
-                    navigator.navigate(Routes.ShopDiscover)
+                    navigator.navigate(Routes.Shop.Discover)
                 }
                 scope.launch { drawerState.close() }
             },
             onSettingsClick = {
-                navigator.navigate(Routes.Settings)
+                navigator.navigate(Routes.Settings.Main)
                 scope.launch { drawerState.close() }
             },
             onAppStatusClick = {

app/src/main/java/to/bitkit/ui/nav/DeepLinks.kt

@@ -108,42 +108,42 @@ class DeepLinkMatcher<T : Routes>(
 object DeepLinkPatterns {
     // bitkit:// scheme patterns
     val RECOVERY_MODE = DeepLinkPattern(
-        routeClass = Routes.RecoveryMode::class,
+        routeClass = Routes.Recovery.Mode::class,
         uriPattern = "${UriScheme.BITKIT.withSlashes}recovery-mode".toUri()
     )
 
     // bitcoin:// scheme patterns (BIP21)
     // Note: bitcoin: URIs use address as "host" not path
     val SEND_BITCOIN = DeepLinkPattern(
-        routeClass = Routes.SendAddress::class,
+        routeClass = Routes.Send.Address::class,
         uriPattern = "${UriScheme.BITCOIN.withSlashes}{address}".toUri()
     )
 
     // lightning:// scheme patterns
     val SEND_LIGHTNING = DeepLinkPattern(
-        routeClass = Routes.SendAddress::class,
+        routeClass = Routes.Send.Address::class,
         uriPattern = "${UriScheme.LIGHTNING.withSlashes}{invoice}".toUri()
     )
 
     // lnurl:// scheme patterns
     val LNURL_PAY = DeepLinkPattern(
-        routeClass = Routes.SendAddress::class,
+        routeClass = Routes.Send.Address::class,
         uriPattern = "${UriScheme.LNURL_PAY.withSlashes}{data}".toUri()
     )
 
     val LNURL_WITHDRAW = DeepLinkPattern(
-        routeClass = Routes.ReceiveQr::class,
+        routeClass = Routes.Receive.Qr::class,
         uriPattern = "${UriScheme.LNURL_WITHDRAW.withSlashes}{data}".toUri()
     )
 
     val LNURL_CHANNEL = DeepLinkPattern(
-        routeClass = Routes.LnurlChannel::class,
+        routeClass = Routes.Sheet.LnurlChannel::class,
         uriPattern = "${UriScheme.LNURL_CHANNEL.withSlashes}{data}".toUri()
     )
 
     // https:// scheme patterns (App Links)
     val TREASURE_HUNT = DeepLinkPattern(
-        routeClass = Routes.GiftLoading::class,
+        routeClass = Routes.Gift.Loading::class,
         uriPattern = "${UriScheme.HTTPS.withSlashes}www.bitkit.to/treasure-hunt".toUri()
     )
 

app/src/main/java/to/bitkit/ui/nav/Navigator.kt

@@ -51,10 +51,9 @@ class Navigator(@PublishedApi internal val backStack: NavBackStack<NavKey>) {
     fun isAtHome(): Boolean = backStack.lastOrNull() is Routes.Home
 
     fun shouldShowTabBar(): Boolean = when (backStack.lastOrNull()) {
-        is Routes.Home, is Routes.Savings, is Routes.Spending, is Routes.AllActivity -> true
+        is Routes.Home, is Routes.Savings, is Routes.Spending, is Routes.Activity.All -> true
         else -> false
     }
-
 }
 
 const val MS_NAV_DELAY = 100L