Skip to content

Geoblocking warning onboarding #280

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 5, 2025
Merged

Geoblocking warning onboarding #280

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
1 change: 1 addition & 0 deletions app/src/main/java/to/bitkit/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ class MainActivity : FragmentActivity() {
val route = navBackEntry.toRoute<StartupRoutes.Slides>()
OnboardingSlidesScreen(
currentTab = route.tab,
isGeoBlocked = appViewModel.isGeoBlocked == true,
onAdvancedSetupClick = { startupNavController.navigate(StartupRoutes.Advanced) },
onCreateClick = {
scope.launch {
Expand Down
32 changes: 31 additions & 1 deletion app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import to.bitkit.ui.utils.withAccent
@Composable
fun OnboardingSlidesScreen(
currentTab: Int = 0,
isGeoBlocked: Boolean,
onAdvancedSetupClick: () -> Unit,
onCreateClick: () -> Unit,
onRestoreClick: () -> Unit,
Expand Down Expand Up @@ -86,7 +87,7 @@ fun OnboardingSlidesScreen(
title = stringResource(R.string.onboarding__slide1_header),
titleAccentColor = Colors.Purple,
text = stringResource(R.string.onboarding__slide1_text),
disclaimerText = stringResource(R.string.onboarding__slide1_note), // TODO use GeoBlocking state
disclaimerText = stringResource(R.string.onboarding__slide1_note).takeIf { isGeoBlocked },
modifier = Modifier.testTag("Slide1")
)

Expand Down Expand Up @@ -239,6 +240,35 @@ private fun OnboardingViewPreview() {
onAdvancedSetupClick = {},
onCreateClick = {},
onRestoreClick = {},
isGeoBlocked = true
)
}
}

@Preview(showSystemUi = true)
@Composable
private fun OnboardingViewPreview2() {
AppThemeSurface {
OnboardingSlidesScreen(
currentTab = 1,
onAdvancedSetupClick = {},
onCreateClick = {},
onRestoreClick = {},
isGeoBlocked = true
)
}
}

@Preview(showSystemUi = true)
@Composable
private fun OnboardingViewPreview3() {
AppThemeSurface {
OnboardingSlidesScreen(
currentTab = 1,
onAdvancedSetupClick = {},
onCreateClick = {},
onRestoreClick = {},
isGeoBlocked = false
)
}
}