Replace close button with drawer on TopBar

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

@@ -1,6 +1,11 @@
 package to.bitkit.ui
 
 import android.content.Intent
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.DrawerState
+import androidx.compose.material3.DrawerValue
+import androidx.compose.material3.rememberDrawerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
@@ -12,6 +17,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.net.toUri
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -38,6 +45,7 @@ import to.bitkit.models.Toast
 import to.bitkit.models.WidgetType
 import to.bitkit.ui.Routes.ExternalConnection
 import to.bitkit.ui.components.AuthCheckScreen
+import to.bitkit.ui.components.DrawerMenu
 import to.bitkit.ui.components.Sheet
 import to.bitkit.ui.components.SheetHost
 import to.bitkit.ui.components.TimedSheetType
@@ -183,6 +191,7 @@ fun ContentView(
     backupsViewModel: BackupsViewModel,
 ) {
     val navController = rememberNavController()
+    val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
     val context = LocalContext.current
     val lifecycle = LocalLifecycleOwner.current.lifecycle
 
@@ -337,99 +346,118 @@ fun ContentView(
             LocalTransferViewModel provides transferViewModel,
             LocalSettingsViewModel provides settingsViewModel,
             LocalBackupsViewModel provides backupsViewModel,
+            LocalDrawerState provides drawerState,
             LocalBalances provides balance,
             LocalCurrencies provides currencies,
         ) {
             AutoReadClipboardHandler()
 
-            val currentSheet by appViewModel.currentSheet.collectAsStateWithLifecycle()
-            SheetHost(
-                shouldExpand = currentSheet != null,
-                onDismiss = { appViewModel.hideSheet() },
-                sheets = {
-                    when (val sheet = currentSheet) {
-                        null -> Unit
-                        is Sheet.Send -> {
-                            SendSheet(
-                                appViewModel = appViewModel,
-                                walletViewModel = walletViewModel,
-                                startDestination = sheet.route,
-                            )
-                        }
-
-                        is Sheet.Receive -> {
-                            val walletUiState by walletViewModel.uiState.collectAsState()
-                            ReceiveSheet(
-                                walletState = walletUiState,
-                                navigateToExternalConnection = {
-                                    navController.navigate(ExternalConnection())
-                                    appViewModel.hideSheet()
-                                }
-                            )
-                        }
+            val hasSeenWidgetsIntro by settingsViewModel.hasSeenWidgetsIntro.collectAsStateWithLifecycle()
+            val hasSeenShopIntro by settingsViewModel.hasSeenShopIntro.collectAsStateWithLifecycle()
 
-                        is Sheet.ActivityDateRangeSelector -> DateRangeSelectorSheet()
-                        is Sheet.ActivityTagSelector -> TagSelectorSheet()
-                        is Sheet.Pin -> PinSheet(sheet, appViewModel)
-                        is Sheet.Backup -> BackupSheet(sheet, onDismiss = { appViewModel.hideSheet() })
-                        is Sheet.LnurlAuth -> LnurlAuthSheet(sheet, appViewModel)
-                        Sheet.ForceTransfer -> ForceTransferSheet(appViewModel, transferViewModel)
-                        is Sheet.Gift -> GiftSheet(sheet, appViewModel)
-                        is Sheet.TimedSheet -> {
-                            when (sheet.type) {
-                                TimedSheetType.APP_UPDATE -> {
-                                    UpdateSheet(onCancel = { appViewModel.dismissTimedSheet() })
-                                }
-
-                                TimedSheetType.BACKUP -> {
-                                    BackupSheet(
-                                        sheet = Sheet.Backup(BackupRoute.Intro),
-                                        onDismiss = { appViewModel.dismissTimedSheet() }
-                                    )
-                                }
-
-                                TimedSheetType.NOTIFICATIONS -> {
-                                    BackgroundPaymentsIntroSheet(
-                                        onContinue = {
-                                            appViewModel.dismissTimedSheet(skipQueue = true)
-                                            navController.navigate(Routes.BackgroundPaymentsSettings)
-                                            settingsViewModel.setBgPaymentsIntroSeen(true)
-                                        },
-                                    )
-                                }
+            val currentSheet by appViewModel.currentSheet.collectAsStateWithLifecycle()
+            Box(
+                modifier = Modifier.fillMaxSize()
+            ) {
+                SheetHost(
+                    shouldExpand = currentSheet != null,
+                    onDismiss = { appViewModel.hideSheet() },
+                    sheets = {
+                        when (val sheet = currentSheet) {
+                            null -> Unit
+                            is Sheet.Send -> {
+                                SendSheet(
+                                    appViewModel = appViewModel,
+                                    walletViewModel = walletViewModel,
+                                    startDestination = sheet.route,
+                                )
+                            }
 
-                                TimedSheetType.QUICK_PAY -> {
-                                    QuickPayIntroSheet(
-                                        onContinue = {
-                                            appViewModel.dismissTimedSheet(skipQueue = true)
-                                            navController.navigate(Routes.QuickPaySettings)
-                                        },
-                                    )
-                                }
+                            is Sheet.Receive -> {
+                                val walletUiState by walletViewModel.uiState.collectAsState()
+                                ReceiveSheet(
+                                    walletState = walletUiState,
+                                    navigateToExternalConnection = {
+                                        navController.navigate(ExternalConnection())
+                                        appViewModel.hideSheet()
+                                    }
+                                )
+                            }
 
-                                TimedSheetType.HIGH_BALANCE -> {
-                                    HighBalanceWarningSheet(
-                                        understoodClick = { appViewModel.dismissTimedSheet() },
-                                        learnMoreClick = {
-                                            val intent = Intent(Intent.ACTION_VIEW, Env.STORING_BITCOINS_URL.toUri())
-                                            context.startActivity(intent)
-                                            appViewModel.dismissTimedSheet(skipQueue = true)
-                                        }
-                                    )
+                            is Sheet.ActivityDateRangeSelector -> DateRangeSelectorSheet()
+                            is Sheet.ActivityTagSelector -> TagSelectorSheet()
+                            is Sheet.Pin -> PinSheet(sheet, appViewModel)
+                            is Sheet.Backup -> BackupSheet(sheet, onDismiss = { appViewModel.hideSheet() })
+                            is Sheet.LnurlAuth -> LnurlAuthSheet(sheet, appViewModel)
+                            Sheet.ForceTransfer -> ForceTransferSheet(appViewModel, transferViewModel)
+                            is Sheet.Gift -> GiftSheet(sheet, appViewModel)
+                            is Sheet.TimedSheet -> {
+                                when (sheet.type) {
+                                    TimedSheetType.APP_UPDATE -> {
+                                        UpdateSheet(onCancel = { appViewModel.dismissTimedSheet() })
+                                    }
+
+                                    TimedSheetType.BACKUP -> {
+                                        BackupSheet(
+                                            sheet = Sheet.Backup(BackupRoute.Intro),
+                                            onDismiss = { appViewModel.dismissTimedSheet() }
+                                        )
+                                    }
+
+                                    TimedSheetType.NOTIFICATIONS -> {
+                                        BackgroundPaymentsIntroSheet(
+                                            onContinue = {
+                                                appViewModel.dismissTimedSheet(skipQueue = true)
+                                                navController.navigate(Routes.BackgroundPaymentsSettings)
+                                                settingsViewModel.setBgPaymentsIntroSeen(true)
+                                            },
+                                        )
+                                    }
+
+                                    TimedSheetType.QUICK_PAY -> {
+                                        QuickPayIntroSheet(
+                                            onContinue = {
+                                                appViewModel.dismissTimedSheet(skipQueue = true)
+                                                navController.navigate(Routes.QuickPaySettings)
+                                            },
+                                        )
+                                    }
+
+                                    TimedSheetType.HIGH_BALANCE -> {
+                                        HighBalanceWarningSheet(
+                                            understoodClick = { appViewModel.dismissTimedSheet() },
+                                            learnMoreClick = {
+                                                val intent =
+                                                    Intent(Intent.ACTION_VIEW, Env.STORING_BITCOINS_URL.toUri())
+                                                context.startActivity(intent)
+                                                appViewModel.dismissTimedSheet(skipQueue = true)
+                                            }
+                                        )
+                                    }
                                 }
                             }
                         }
                     }
+                ) {
+                    RootNavHost(
+                        navController = navController,
+                        drawerState = drawerState,
+                        walletViewModel = walletViewModel,
+                        appViewModel = appViewModel,
+                        activityListViewModel = activityListViewModel,
+                        settingsViewModel = settingsViewModel,
+                        currencyViewModel = currencyViewModel,
+                        transferViewModel = transferViewModel,
+                    )
                 }
-            ) {
-                RootNavHost(
-                    navController = navController,
-                    walletViewModel = walletViewModel,
-                    appViewModel = appViewModel,
-                    activityListViewModel = activityListViewModel,
-                    settingsViewModel = settingsViewModel,
-                    currencyViewModel = currencyViewModel,
-                    transferViewModel = transferViewModel,
+
+                DrawerMenu(
+                    drawerState = drawerState,
+                    walletNavController = null,
+                    rootNavController = navController,
+                    hasSeenWidgetsIntro = hasSeenWidgetsIntro,
+                    hasSeenShopIntro = hasSeenShopIntro,
+                    modifier = Modifier.align(Alignment.TopEnd),
                 )
             }
         }
@@ -439,6 +467,7 @@ fun ContentView(
 @Composable
 private fun RootNavHost(
     navController: NavHostController,
+    drawerState: DrawerState,
     walletViewModel: WalletViewModel,
     appViewModel: AppViewModel,
     activityListViewModel: ActivityListViewModel,
@@ -449,7 +478,7 @@ private fun RootNavHost(
     val scope = rememberCoroutineScope()
 
     NavHost(navController, startDestination = Routes.Home) {
-        home(walletViewModel, appViewModel, activityListViewModel, settingsViewModel, navController)
+        home(walletViewModel, appViewModel, activityListViewModel, settingsViewModel, navController, drawerState)
         settings(navController, settingsViewModel)
         profile(navController, settingsViewModel)
         shop(navController, settingsViewModel, appViewModel)
@@ -589,7 +618,6 @@ private fun RootNavHost(
             composableWithDefaultTransitions<Routes.SettingUp> {
                 SettingUpScreen(
                     viewModel = transferViewModel,
-                    onCloseClick = { navController.popBackStack<Routes.TransferRoot>(inclusive = true) },
                     onContinueClick = { navController.popBackStack<Routes.TransferRoot>(inclusive = true) },
                 )
             }
@@ -628,11 +656,11 @@ private fun RootNavHost(
                 )
             }
             navigationWithDefaultTransitions<Routes.ExternalNav>(
-                startDestination = Routes.ExternalConnection(),
+                startDestination = ExternalConnection(),
             ) {
-                composableWithDefaultTransitions<Routes.ExternalConnection> {
+                composableWithDefaultTransitions<ExternalConnection> {
                     val parentEntry = remember(it) { navController.getBackStackEntry(Routes.ExternalNav) }
-                    val route = it.toRoute<Routes.ExternalConnection>()
+                    val route = it.toRoute<ExternalConnection>()
                     val viewModel = hiltViewModel<ExternalNodeViewModel>(parentEntry)
 
                     ExternalConnectionScreen(
@@ -707,6 +735,7 @@ private fun NavGraphBuilder.home(
     activityListViewModel: ActivityListViewModel,
     settingsViewModel: SettingsViewModel,
     navController: NavHostController,
+    drawerState: DrawerState,
 ) {
     composable<Routes.Home> {
         HomeNav(
@@ -715,6 +744,7 @@ private fun NavGraphBuilder.home(
             activityListViewModel = activityListViewModel,
             settingsViewModel = settingsViewModel,
             rootNavController = navController,
+            drawerState = drawerState,
         )
     }
 }
@@ -788,7 +818,6 @@ private fun NavGraphBuilder.shop(
 ) {
     composableWithDefaultTransitions<Routes.ShopIntro> {
         ShopIntroScreen(
-            onClose = { navController.navigateToHome() },
             onContinue = {
                 settingsViewModel.setHasSeenShopIntro(true)
                 navController.navigate(Routes.ShopDiscover)

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

@@ -1,5 +1,6 @@
 package to.bitkit.ui
 
+import androidx.compose.material3.DrawerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.staticCompositionLocalOf
@@ -19,6 +20,7 @@
 val LocalCurrencies = compositionLocalOf { CurrencyState() }
 
 // Statics
+val LocalDrawerState = staticCompositionLocalOf<DrawerState?> { null }
 val LocalAppViewModel = staticCompositionLocalOf<AppViewModel?> { null }
 val LocalWalletViewModel = staticCompositionLocalOf<WalletViewModel?> { null }
 val LocalBlocktankViewModel = staticCompositionLocalOf<BlocktankViewModel?> { null }
@@ -51,3 +53,6 @@
 
 val backupsViewModel: BackupsViewModel?
     @Composable get() = LocalBackupsViewModel.current
+
+val drawerState: DrawerState?
+    @Composable get() = LocalDrawerState.current

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

@@ -60,7 +60,7 @@ import to.bitkit.ui.components.rememberMoneyText
 import to.bitkit.ui.components.settings.SectionHeader
 import to.bitkit.ui.components.settings.SettingsTextButtonRow
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.shared.util.clickableAlpha
 import to.bitkit.ui.theme.AppThemeSurface
@@ -88,7 +88,6 @@ fun NodeInfoScreen(
         isDevModeEnabled = isDevModeEnabled,
         balanceDetails = lightningState.balances,
         onBack = { navController.popBackStack() },
-        onClose = { navController.navigateToHome() },
         onRefresh = { wallet.onPullToRefresh() },
         onDisconnectPeer = { wallet.disconnectPeer(it) },
         onCopy = { text ->
@@ -108,7 +107,6 @@ private fun Content(
     isDevModeEnabled: Boolean,
     balanceDetails: BalanceDetails? = null,
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
     onRefresh: () -> Unit = {},
     onDisconnectPeer: (PeerDetails) -> Unit = {},
     onCopy: (String) -> Unit = {},
@@ -117,7 +115,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.lightning__node_info),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClose) },
+            actions = { DrawerNavIcon() },
         )
         PullToRefreshBox(
             isRefreshing = uiState.isRefreshing,

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

@@ -60,7 +60,7 @@ private val drawerWidth = 200.dp
 @Composable
 fun DrawerMenu(
     drawerState: DrawerState,
-    walletNavController: NavController,
+    walletNavController: NavController?,
     rootNavController: NavController,
     hasSeenWidgetsIntro: Boolean,
     hasSeenShopIntro: Boolean,
@@ -119,7 +119,7 @@ fun DrawerMenu(
 
 @Composable
 private fun Menu(
-    walletNavController: NavController,
+    walletNavController: NavController?,
     rootNavController: NavController,
     drawerState: DrawerState,
     onClickAddWidget: () -> Unit,
@@ -140,6 +140,7 @@ private fun Menu(
             label = stringResource(R.string.wallet__drawer__wallet),
             iconRes = R.drawable.ic_coins,
             onClick = {
+                rootNavController.navigate(Routes.Home)
                 scope.launch { drawerState.close() }
             },
             modifier = Modifier.testTag("DrawerWallet")
@@ -149,7 +150,11 @@ private fun Menu(
             label = stringResource(R.string.wallet__drawer__activity),
             iconRes = R.drawable.ic_heartbeat,
             onClick = {
-                walletNavController.navigate(HomeRoutes.AllActivity)
+                if (walletNavController != null) {
+                    walletNavController.navigate(HomeRoutes.AllActivity)
+                } else {
+                    rootNavController.navigate(Routes.Home)
+                }
                 scope.launch { drawerState.close() }
             },
             modifier = Modifier.testTag("DrawerActivity")