Skip to content

Shop intro navigation from nav drawer #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ovitrif merged 1 commit into from
Aug 1, 2025
Merged

Shop intro navigation from nav drawer #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ fun DrawerMenu(
walletNavController: NavController,
rootNavController: NavController,
hasSeenWidgetsIntro: Boolean,
hasSeenShopIntro: Boolean,
modifier: Modifier = Modifier,
) {
val scope = rememberCoroutineScope()
Expand Down Expand Up @@ -103,7 +104,14 @@ fun DrawerMenu(
} else {
rootNavController.navigate(Routes.AddWidget)
}
}
},
onClickShop = {
if (!hasSeenShopIntro) {
rootNavController.navigate(Routes.ShopIntro)
} else {
rootNavController.navigate(Routes.ShopDiscover)
}
},
)
}
}
Expand All @@ -114,6 +122,7 @@ private fun Menu(
rootNavController: NavController,
drawerState: DrawerState,
onClickAddWidget: () -> Unit,
onClickShop: () -> Unit,
) {
val scope = rememberCoroutineScope()

Expand Down Expand Up @@ -168,7 +177,7 @@ private fun Menu(
label = stringResource(R.string.wallet__drawer__shop),
iconRes = R.drawable.ic_store_front,
onClick = {
rootNavController.navigate(Routes.ShopDiscover)
onClickShop()
scope.launch { drawerState.close() }
}
)
Expand Down Expand Up @@ -285,6 +294,7 @@ private fun Preview() {
rootNavController = navController,
drawerState = rememberDrawerState(initialValue = DrawerValue.Open),
hasSeenWidgetsIntro = false,
hasSeenShopIntro = false,
modifier = Modifier.align(Alignment.TopEnd),
)
}
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/to/bitkit/ui/screens/wallets/HomeNav.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ fun HomeNav(
val uiState: MainUiState by walletViewModel.uiState.collectAsStateWithLifecycle()
val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
val hasSeenWidgetsIntro: Boolean by settingsViewModel.hasSeenWidgetsIntro.collectAsStateWithLifecycle()
val hasSeenShopIntro: Boolean by settingsViewModel.hasSeenShopIntro.collectAsStateWithLifecycle()
val hazeState = rememberHazeState()

RequestNotificationPermissions()
Expand Down Expand Up @@ -87,6 +88,7 @@ fun HomeNav(
walletNavController = walletNavController,
rootNavController = rootNavController,
hasSeenWidgetsIntro = hasSeenWidgetsIntro,
hasSeenShopIntro = hasSeenShopIntro,
modifier = Modifier.align(Alignment.TopEnd)
)
}
Expand Down