fix: move AllActivities to top navigation graph

jvsena42 · jvsena42 · commit bd4295c00b9c · 2025-11-27T10:15:12.000-03:00
diff --git a/app/src/main/java/to/bitkit/ui/ContentView.kt b/app/src/main/java/to/bitkit/ui/ContentView.kt
@@ -88,6 +88,7 @@ import to.bitkit.ui.screens.transfer.external.LnurlChannelScreen
 import to.bitkit.ui.screens.wallets.HomeNav
 import to.bitkit.ui.screens.wallets.activity.ActivityDetailScreen
 import to.bitkit.ui.screens.wallets.activity.ActivityExploreScreen
+import to.bitkit.ui.screens.wallets.activity.AllActivityScreenWithTabBar
 import to.bitkit.ui.screens.wallets.activity.DateRangeSelectorSheet
 import to.bitkit.ui.screens.wallets.activity.TagSelectorSheet
 import to.bitkit.ui.screens.wallets.receive.ReceiveSheet
@@ -490,6 +491,11 @@ private fun RootNavHost(
             walletNavController = walletNavHostController,
             drawerState = drawerState
         )
+        allActivity(
+            activityListViewModel = activityListViewModel,
+            appViewModel = appViewModel,
+            navController = navController,
+        )
         settings(navController, settingsViewModel)
         profile(navController, settingsViewModel)
         shop(navController, settingsViewModel, appViewModel)
@@ -759,6 +765,25 @@ private fun NavGraphBuilder.home(
     }
 }
 
+private fun NavGraphBuilder.allActivity(
+    activityListViewModel: ActivityListViewModel,
+    appViewModel: AppViewModel,
+    navController: NavHostController,
+) {
+    composableWithDefaultTransitions<Routes.AllActivity> {
+        AllActivityScreenWithTabBar(
+            viewModel = activityListViewModel,
+            appViewModel = appViewModel,
+            onBack = {
+                activityListViewModel.clearFilters()
+                navController.navigateToHome()
+            },
+            onScanClick = { navController.navigateToScanner() },
+            onActivityItemClick = { id -> navController.navigateToActivityItem(id) },
+        )
+    }
+}
+
 private fun NavGraphBuilder.settings(
     navController: NavHostController,
     settingsViewModel: SettingsViewModel,
@@ -1385,6 +1410,12 @@ fun NavController.navigateToHome() {
     }
 }
 
+fun NavController.navigateToAllActivity() {
+    navigate(Routes.AllActivity) {
+        launchSingleTop = true
+    }
+}
+
 /**
  * Navigates to the specified route only if not already on that route.
  */
@@ -1845,4 +1876,7 @@ sealed interface Routes {
 
     @Serializable
     data object BackgroundPaymentsSettings : Routes
+
+    @Serializable
+    data object AllActivity : Routes
 }
diff --git a/app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt b/app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt
@@ -45,8 +45,8 @@ import kotlinx.coroutines.launch
 import to.bitkit.R
 import to.bitkit.ui.Routes
 import to.bitkit.ui.navigateIfNotCurrent
+import to.bitkit.ui.navigateToAllActivity
 import to.bitkit.ui.navigateToHome
-import to.bitkit.ui.screens.wallets.HomeRoutes
 import to.bitkit.ui.shared.util.blockPointerInputPassthrough
 import to.bitkit.ui.shared.util.clickableAlpha
 import to.bitkit.ui.theme.AppThemeSurface
@@ -156,11 +156,7 @@ private fun Menu(
             label = stringResource(R.string.wallet__drawer__activity),
             iconRes = R.drawable.ic_heartbeat,
             onClick = {
-                if (walletNavController != null) {
-                    walletNavController.navigateIfNotCurrent(HomeRoutes.AllActivity)
-                } else {
-                    rootNavController.navigateIfNotCurrent(Routes.Home)
-                }
+                rootNavController.navigateIfNotCurrent(Routes.AllActivity)
                 scope.launch { drawerState.close() }
             },
             modifier = Modifier.testTag("DrawerActivity")
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/HomeNav.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/HomeNav.kt
@@ -21,12 +21,12 @@ import kotlinx.serialization.Serializable
 import to.bitkit.ui.components.Sheet
 import to.bitkit.ui.components.TabBar
 import to.bitkit.ui.navigateToActivityItem
+import to.bitkit.ui.navigateToAllActivity
 import to.bitkit.ui.navigateToScanner
 import to.bitkit.ui.navigateToTransferSavingsAvailability
 import to.bitkit.ui.navigateToTransferSavingsIntro
 import to.bitkit.ui.navigateToTransferSpendingAmount
 import to.bitkit.ui.navigateToTransferSpendingIntro
-import to.bitkit.ui.screens.wallets.activity.AllActivityScreen
 import to.bitkit.ui.utils.RequestNotificationPermissions
 import to.bitkit.ui.utils.Transitions
 import to.bitkit.viewmodels.ActivityListViewModel
@@ -122,7 +122,7 @@ private fun NavContent(
             SavingsWalletScreen(
                 isGeoBlocked = isGeoBlocked,
                 onchainActivities = onchainActivities.orEmpty(),
-                onAllActivityButtonClick = { walletNavController.navigate(HomeRoutes.AllActivity) },
+                onAllActivityButtonClick = { rootNavController.navigateToAllActivity() },
                 onActivityItemClick = { rootNavController.navigateToActivityItem(it) },
                 onEmptyActivityRowClick = { appViewModel.showSheet(Sheet.Receive) },
                 onTransferToSpendingClick = {
@@ -144,7 +144,7 @@ private fun NavContent(
             SpendingWalletScreen(
                 uiState = mainUiState,
                 lightningActivities = lightningActivities.orEmpty(),
-                onAllActivityButtonClick = { walletNavController.navigate(HomeRoutes.AllActivity) },
+                onAllActivityButtonClick = { rootNavController.navigateToAllActivity() },
                 onActivityItemClick = { rootNavController.navigateToActivityItem(it) },
                 onEmptyActivityRowClick = { appViewModel.showSheet(Sheet.Receive) },
                 onTransferToSavingsClick = {
@@ -157,19 +157,6 @@ private fun NavContent(
                 onBackClick = { walletNavController.popBackStack() },
             )
         }
-        composable<HomeRoutes.AllActivity>(
-            enterTransition = { Transitions.slideInHorizontally },
-            exitTransition = { Transitions.slideOutHorizontally },
-        ) {
-            AllActivityScreen(
-                viewModel = activityListViewModel,
-                onBack = {
-                    activityListViewModel.clearFilters()
-                    walletNavController.popBackStack()
-                },
-                onActivityItemClick = { rootNavController.navigateToActivityItem(it) },
-            )
-        }
     }
 }
 
@@ -182,7 +169,4 @@ object HomeRoutes {
 
     @Serializable
     data object Spending
-
-    @Serializable
-    data object AllActivity
 }
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt
@@ -90,6 +90,7 @@ import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.components.WalletBalanceView
 import to.bitkit.ui.currencyViewModel
 import to.bitkit.ui.navigateToActivityItem
+import to.bitkit.ui.navigateToAllActivity
 import to.bitkit.ui.navigateToTransferFunding
 import to.bitkit.ui.navigateToTransferIntro
 import to.bitkit.ui.scaffold.AppAlertDialog
@@ -482,7 +483,7 @@ private fun Content(
                     Spacer(modifier = Modifier.height(16.dp))
                     ActivityListSimple(
                         items = latestActivities,
-                        onAllActivityClick = { walletNavController.navigate(HomeRoutes.AllActivity) },
+                        onAllActivityClick = { rootNavController.navigateToAllActivity() },
                         onActivityItemClick = { rootNavController.navigateToActivityItem(it) },
                         onEmptyActivityRowClick = onClickEmptyActivityRow,
                     )
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/AllActivityScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/AllActivityScreen.kt
@@ -23,10 +23,13 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.synonym.bitkitcore.Activity
+import dev.chrisbanes.haze.hazeSource
 import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
+import dev.chrisbanes.haze.rememberHazeState
 import to.bitkit.R
 import to.bitkit.ui.appViewModel
 import to.bitkit.ui.components.Sheet
+import to.bitkit.ui.components.TabBar
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.screens.wallets.activity.components.ActivityListFilter
@@ -36,6 +39,7 @@ import to.bitkit.ui.screens.wallets.activity.utils.previewActivityItems
 import to.bitkit.ui.shared.util.screen
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.viewmodels.ActivityListViewModel
+import to.bitkit.viewmodels.AppViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -76,6 +80,39 @@ fun AllActivityScreen(
     )
 }
 
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalHazeMaterialsApi::class)
+@Composable
+fun AllActivityScreenWithTabBar(
+    viewModel: ActivityListViewModel,
+    appViewModel: AppViewModel,
+    onBack: () -> Unit,
+    onScanClick: () -> Unit,
+    onActivityItemClick: (String) -> Unit,
+) {
+    val hazeState = rememberHazeState()
+
+    Box(modifier = Modifier.fillMaxSize()) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .hazeSource(hazeState)
+        ) {
+            AllActivityScreen(
+                viewModel = viewModel,
+                onBack = onBack,
+                onActivityItemClick = onActivityItemClick,
+            )
+        }
+
+        TabBar(
+            hazeState = hazeState,
+            onSendClick = { appViewModel.showSheet(Sheet.Send()) },
+            onReceiveClick = { appViewModel.showSheet(Sheet.Receive) },
+            onScanClick = onScanClick,
+        )
+    }
+}
+
 @Composable
 @OptIn(ExperimentalHazeMaterialsApi::class)
 private fun AllActivityScreenContent(
