Skip to content

Commit 645b70b

Browse files
committed
fix: widgets intro navigation
1 parent e3e375e commit 645b70b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,8 +1348,8 @@ fun NavController.navigateToCustomFeeSettings() = navigate(
13481348
route = Routes.CustomFeeSettings,
13491349
)
13501350

1351-
fun NavController.navigateToWidgetsSettings() = navigate(
1352-
route = Routes.WidgetsSettings,
1351+
fun NavController.navigateToWidgetsSettings(hasSeenIntro: Boolean = true) = navigate(
1352+
route = if (hasSeenIntro) Routes.WidgetsSettings else Routes.WidgetsIntro,
13531353
)
13541354

13551355
fun NavController.navigateToQuickPaySettings(hasSeenIntro: Boolean = true) = navigate(

app/src/main/java/to/bitkit/ui/settings/general/GeneralSettingsScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ fun GeneralSettingsScreen(
4242
val defaultTransactionSpeed by settings.defaultTransactionSpeed.collectAsStateWithLifecycle()
4343
val lastUsedTags by settings.lastUsedTags.collectAsStateWithLifecycle()
4444
val quickPayIntroSeen by settings.quickPayIntroSeen.collectAsStateWithLifecycle()
45+
val widgetsIntroSeen by settings.hasSeenWidgetsIntro.collectAsStateWithLifecycle()
4546

4647

4748
GeneralSettingsContent(
@@ -54,7 +55,7 @@ fun GeneralSettingsScreen(
5455
onLocalCurrencyClick = { navController.navigateToLocalCurrencySettings() },
5556
onDefaultUnitClick = { navController.navigateToDefaultUnitSettings() },
5657
onTransactionSpeedClick = { navController.navigateToTransactionSpeedSettings() },
57-
onWidgetsClick = { navController.navigateToWidgetsSettings() },
58+
onWidgetsClick = { navController.navigateToWidgetsSettings(widgetsIntroSeen) },
5859
onQuickPayClick = { navController.navigateToQuickPaySettings(quickPayIntroSeen) },
5960
onTagsClick = { navController.navigateToTagsSettings() },
6061
)

0 commit comments

Comments
 (0)