Merge pull request #515 from synonymdev/fix/restore-back-button

fix: navigation issues

Author: ovitrif

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

@@ -36,6 +36,8 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
+import dev.chrisbanes.haze.hazeSource
+import dev.chrisbanes.haze.rememberHazeState
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
@@ -86,7 +88,9 @@ import to.bitkit.ui.screens.transfer.external.ExternalFeeCustomScreen
 import to.bitkit.ui.screens.transfer.external.ExternalNodeViewModel
 import to.bitkit.ui.screens.transfer.external.ExternalSuccessScreen
 import to.bitkit.ui.screens.transfer.external.LnurlChannelScreen
-import to.bitkit.ui.screens.wallets.HomeNav
+import to.bitkit.ui.screens.wallets.HomeScreen
+import to.bitkit.ui.screens.wallets.SavingsWalletScreen
+import to.bitkit.ui.screens.wallets.SpendingWalletScreen
 import to.bitkit.ui.screens.wallets.activity.ActivityDetailScreen
 import to.bitkit.ui.screens.wallets.activity.ActivityExploreScreen
 import to.bitkit.ui.screens.wallets.activity.AllActivityScreen
@@ -166,6 +170,7 @@ import to.bitkit.ui.sheets.SendSheet
 import to.bitkit.ui.sheets.UpdateSheet
 import to.bitkit.ui.theme.TRANSITION_SHEET_MS
 import to.bitkit.ui.utils.AutoReadClipboardHandler
+import to.bitkit.ui.utils.RequestNotificationPermissions
 import to.bitkit.ui.utils.Transitions
 import to.bitkit.ui.utils.composableWithDefaultTransitions
 import to.bitkit.ui.utils.navigationWithDefaultTransitions
@@ -195,6 +200,7 @@ fun ContentView(
     modifier: Modifier = Modifier,
 ) {
     val navController = rememberNavController()
+
     val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
     val context = LocalContext.current
     val lifecycle = LocalLifecycleOwner.current.lifecycle
@@ -494,7 +500,7 @@ private fun RootNavHost(
             activityListViewModel = activityListViewModel,
             settingsViewModel = settingsViewModel,
             navController = navController,
-            drawerState = drawerState
+            drawerState = drawerState,
         )
         allActivity(
             activityListViewModel = activityListViewModel,
@@ -541,6 +547,7 @@ private fun RootNavHost(
                         navController.navigateToTransferFunding()
                         settingsViewModel.setHasSeenTransferIntro(true)
                     },
+                    onBackClick = {},
                 )
             }
             composableWithDefaultTransitions<Routes.SavingsIntro> {
@@ -630,7 +637,9 @@ private fun RootNavHost(
             composableWithDefaultTransitions<Routes.SettingUp> {
                 SettingUpScreen(
                     viewModel = transferViewModel,
-                    onContinueClick = { navController.popBackStack<Routes.TransferRoot>(inclusive = true) },
+                    onContinueClick = {
+                        navController.navigateToHome()
+                    }
                 )
             }
             composableWithDefaultTransitions<Routes.Funding> {
@@ -744,13 +753,77 @@ private fun NavGraphBuilder.home(
     drawerState: DrawerState,
 ) {
     composable<Routes.Home> {
-        HomeNav(
-            walletViewModel = walletViewModel,
-            appViewModel = appViewModel,
-            activityListViewModel = activityListViewModel,
-            settingsViewModel = settingsViewModel,
-            rootNavController = navController,
-            drawerState = drawerState,
+        val uiState by walletViewModel.uiState.collectAsStateWithLifecycle()
+        val hazeState = rememberHazeState()
+
+        RequestNotificationPermissions(
+            onPermissionChange = { granted ->
+                settingsViewModel.setNotificationPreference(granted)
+            }
+        )
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .hazeSource(hazeState)
+        ) {
+            HomeScreen(
+                mainUiState = uiState,
+                drawerState = drawerState,
+                rootNavController = navController,
+                walletNavController = navController,
+                settingsViewModel = settingsViewModel,
+                walletViewModel = walletViewModel,
+                appViewModel = appViewModel,
+                activityListViewModel = activityListViewModel,
+            )
+        }
+    }
+    composable<Routes.Savings>(
+        enterTransition = { Transitions.slideInHorizontally },
+        exitTransition = { Transitions.slideOutHorizontally },
+    ) {
+        val hasSeenSpendingIntro by settingsViewModel.hasSeenSpendingIntro.collectAsStateWithLifecycle()
+        val isGeoBlocked by appViewModel.isGeoBlocked.collectAsStateWithLifecycle()
+        val onchainActivities by activityListViewModel.onchainActivities.collectAsStateWithLifecycle()
+
+        SavingsWalletScreen(
+            isGeoBlocked = isGeoBlocked,
+            onchainActivities = onchainActivities.orEmpty(),
+            onAllActivityButtonClick = { navController.navigateToAllActivity() },
+            onActivityItemClick = { navController.navigateToActivityItem(it) },
+            onEmptyActivityRowClick = { appViewModel.showSheet(Sheet.Receive) },
+            onTransferToSpendingClick = {
+                if (!hasSeenSpendingIntro) {
+                    navController.navigateToTransferSpendingIntro()
+                } else {
+                    navController.navigateToTransferSpendingAmount()
+                }
+            },
+            onBackClick = { navController.popBackStack() },
+        )
+    }
+    composable<Routes.Spending>(
+        enterTransition = { Transitions.slideInHorizontally },
+        exitTransition = { Transitions.slideOutHorizontally },
+    ) {
+        val hasSeenSavingsIntro by settingsViewModel.hasSeenSavingsIntro.collectAsStateWithLifecycle()
+        val uiState by walletViewModel.uiState.collectAsStateWithLifecycle()
+        val lightningActivities by activityListViewModel.lightningActivities.collectAsStateWithLifecycle()
+
+        SpendingWalletScreen(
+            uiState = uiState,
+            lightningActivities = lightningActivities.orEmpty(),
+            onAllActivityButtonClick = { navController.navigateToAllActivity() },
+            onActivityItemClick = { navController.navigateToActivityItem(it) },
+            onEmptyActivityRowClick = { appViewModel.showSheet(Sheet.Receive) },
+            onTransferToSavingsClick = {
+                if (!hasSeenSavingsIntro) {
+                    navController.navigateToTransferSavingsIntro()
+                } else {
+                    navController.navigateToTransferSavingsAvailability()
+                }
+            },
+            onBackClick = { navController.popBackStack() },
         )
     }
 }
@@ -818,7 +891,8 @@ private fun NavGraphBuilder.profile(
             onContinue = {
                 settingsViewModel.setHasSeenProfileIntro(true)
                 navController.navigate(Routes.CreateProfile)
-            }
+            },
+            onBackClick = { navController.popBackStack() }
         )
     }
     composableWithDefaultTransitions<Routes.CreateProfile> {
@@ -838,6 +912,9 @@ private fun NavGraphBuilder.shop(
             onContinue = {
                 settingsViewModel.setHasSeenShopIntro(true)
                 navController.navigate(Routes.ShopDiscover)
+            },
+            onBackClick = {
+                navController.popBackStack()
             }
         )
     }
@@ -1228,7 +1305,8 @@ private fun NavGraphBuilder.widgets(
             onContinue = {
                 settingsViewModel.setHasSeenWidgetsIntro(true)
                 navController.navigate(Routes.AddWidget)
-            }
+            },
+            onBackClick = {},
         )
     }
     composableWithDefaultTransitions<Routes.AddWidget> {
@@ -1244,6 +1322,7 @@ private fun NavGraphBuilder.widgets(
                 }
             },
             fiatSymbol = LocalCurrencies.current.currencySymbol,
+            onBackCLick = { navController.popBackStack() }
         )
     }
     composableWithDefaultTransitions<Routes.CalculatorPreview> {
@@ -1558,6 +1637,12 @@ sealed interface Routes {
     @Serializable
     data object Home : Routes
 
+    @Serializable
+    data object Savings : Routes
+
+    @Serializable
+    data object Spending : Routes
+
     @Serializable
     data object Settings : Routes
 

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

@@ -138,11 +138,8 @@ private fun Menu(
             label = stringResource(R.string.wallet__drawer__wallet),
             iconRes = R.drawable.ic_coins,
             onClick = {
-                val isOnHome = rootNavController.currentBackStackEntry
-                    ?.destination?.hasRoute<Routes.Home>() ?: false
-                if (!isOnHome) {
-                    rootNavController.navigateToHome()
-                }
+                val isInHome = rootNavController.currentBackStackEntry?.destination?.hasRoute<Routes.Home>() ?: false
+                if (!isInHome) rootNavController.navigateToHome()
                 scope.launch { drawerState.close() }
             },
             modifier = Modifier.testTag("DrawerWallet")

app/src/main/java/to/bitkit/ui/screens/profile/ProfileIntroScreen.kt

@@ -26,11 +26,12 @@ import to.bitkit.ui.utils.withAccent
 @Composable
 fun ProfileIntroScreen(
     onContinue: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     ScreenColumn {
         AppTopBar(
             titleText = stringResource(R.string.slashtags__profile),
-            onBackClick = null,
+            onBackClick = onBackClick,
             actions = { DrawerNavIcon() },
         )
 
@@ -68,7 +69,8 @@ fun ProfileIntroScreen(
 private fun Preview() {
     AppThemeSurface {
         ProfileIntroScreen(
-            onContinue = {}
+            onContinue = {},
+            onBackClick = {}
         )
     }
 }

app/src/main/java/to/bitkit/ui/screens/shop/ShopIntroScreen.kt

@@ -26,11 +26,12 @@ import to.bitkit.ui.utils.withAccent
 @Composable
 fun ShopIntroScreen(
     onContinue: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     ScreenColumn {
         AppTopBar(
             titleText = "",
-            onBackClick = null,
+            onBackClick = onBackClick,
             actions = { DrawerNavIcon() },
         )
 
@@ -66,7 +67,8 @@ fun ShopIntroScreen(
 private fun Preview() {
     AppThemeSurface {
         ShopIntroScreen(
-            onContinue = {}
+            onContinue = {},
+            onBackClick = {},
         )
     }
 }

app/src/main/java/to/bitkit/ui/screens/transfer/TransferIntroScreen.kt

@@ -33,6 +33,7 @@ import to.bitkit.ui.utils.withAccent
 @Composable
 fun TransferIntroScreen(
     onContinueClick: () -> Unit = {},
+    onBackClick: () -> Unit,
 ) {
     Box(
         contentAlignment = Alignment.TopCenter,
@@ -51,7 +52,7 @@ fun TransferIntroScreen(
         )
         AppTopBar(
             titleText = null,
-            onBackClick = null,
+            onBackClick = onBackClick,
             actions = { DrawerNavIcon() },
         )
         Column(
@@ -79,6 +80,6 @@ fun TransferIntroScreen(
 @Composable
 private fun Preview() {
     AppThemeSurface {
-        TransferIntroScreen()
+        TransferIntroScreen(onBackClick = {})
     }
 }