From fd3403b70c9099ebb277efad925a4d355be2da3d Mon Sep 17 00:00:00 2001 From: Joao Victor Sena Date: Tue, 5 Aug 2025 08:31:25 -0300 Subject: [PATCH] fix: geo block validation --- .../main/java/to/bitkit/ui/MainActivity.kt | 1 + .../ui/onboarding/OnboardingSlidesScreen.kt | 32 ++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/to/bitkit/ui/MainActivity.kt b/app/src/main/java/to/bitkit/ui/MainActivity.kt index a1646d7a7..e27e97954 100644 --- a/app/src/main/java/to/bitkit/ui/MainActivity.kt +++ b/app/src/main/java/to/bitkit/ui/MainActivity.kt @@ -121,6 +121,7 @@ class MainActivity : FragmentActivity() { val route = navBackEntry.toRoute() OnboardingSlidesScreen( currentTab = route.tab, + isGeoBlocked = appViewModel.isGeoBlocked == true, onAdvancedSetupClick = { startupNavController.navigate(StartupRoutes.Advanced) }, onCreateClick = { scope.launch { diff --git a/app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt b/app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt index 7e72e7cd7..4551e122c 100644 --- a/app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt +++ b/app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt @@ -54,6 +54,7 @@ import to.bitkit.ui.utils.withAccent @Composable fun OnboardingSlidesScreen( currentTab: Int = 0, + isGeoBlocked: Boolean, onAdvancedSetupClick: () -> Unit, onCreateClick: () -> Unit, onRestoreClick: () -> Unit, @@ -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") ) @@ -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 ) } }