From f330ba6f5fea84bcd1ea86aea61af8736fda529a Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Tue, 23 Dec 2025 10:12:35 -0300 Subject: [PATCH 1/3] chore: remove slide page and update test tag --- .../ui/onboarding/OnboardingSlidesScreen.kt | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) 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 ff118f92e..f35796c2e 100644 --- a/app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt +++ b/app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt @@ -49,7 +49,7 @@ import to.bitkit.ui.shared.util.screen import to.bitkit.ui.theme.AppThemeSurface import to.bitkit.ui.theme.Colors import to.bitkit.ui.utils.withAccent - +private const val LAST_PAGE_INDEX = 3 @Composable fun OnboardingSlidesScreen( currentTab: Int = 0, @@ -90,31 +90,23 @@ fun OnboardingSlidesScreen( ) 2 -> OnboardingTab( - imageResId = R.drawable.spark, - title = stringResource(R.string.onboarding__slide2_header), - titleAccentColor = Colors.Yellow, - text = stringResource(R.string.onboarding__slide2_text), - modifier = Modifier.testTag("Slide2") - ) - - 3 -> OnboardingTab( imageResId = R.drawable.shield, title = stringResource(R.string.onboarding__slide3_header), titleAccentColor = Colors.Green, text = stringResource(R.string.onboarding__slide3_text), - modifier = Modifier.testTag("Slide3") + modifier = Modifier.testTag("Slide2") ) - 4 -> CreateWalletScreen( + LAST_PAGE_INDEX -> CreateWalletScreen( onCreateClick = onCreateClick, onRestoreClick = onRestoreClick, - modifier = Modifier.testTag("Slide4") + modifier = Modifier.testTag("Slide$LAST_PAGE_INDEX") ) } } // Dots indicator - val isIndicatorVisible = pagerState.currentPage != 4 + val isIndicatorVisible = pagerState.currentPage != LAST_PAGE_INDEX val yOffset by animateDpAsState( targetValue = if (isIndicatorVisible) 0.dp else 20.dp, animationSpec = tween(durationMillis = 300), @@ -157,7 +149,7 @@ fun OnboardingSlidesScreen( onBackClick = null, titleText = null, actions = { - if (pagerState.currentPage == 4) { + if (pagerState.currentPage == LAST_PAGE_INDEX) { TextButton( onClick = onAdvancedSetupClick, modifier = Modifier.testTag("Passphrase") @@ -276,7 +268,7 @@ private fun OnboardingViewPreview3() { private fun OnboardingViewPreview4() { AppThemeSurface { OnboardingSlidesScreen( - currentTab = 4, + currentTab = LAST_PAGE_INDEX, onAdvancedSetupClick = {}, onCreateClick = {}, onRestoreClick = {}, From 84960be06dbbca06678dfd85b989fec24d3c05f0 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Tue, 23 Dec 2025 10:16:37 -0300 Subject: [PATCH 2/3] fix: dots quantity --- .../main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f35796c2e..b54655a5a 100644 --- a/app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt +++ b/app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt @@ -127,7 +127,7 @@ fun OnboardingSlidesScreen( .offset { IntOffset(0, yOffset.roundToPx()) } .alpha(alpha) ) { - repeat(5) { index -> + repeat(LAST_PAGE_INDEX + 1) { index -> val size by animateDpAsState( targetValue = if (index == pagerState.currentPage) 10.dp else 7.dp, animationSpec = tween(durationMillis = 300), From cab676de4687de1e02f0f00e74051ff825680d71 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Tue, 23 Dec 2025 10:35:01 -0300 Subject: [PATCH 3/3] chore: lint --- .../main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt | 2 ++ 1 file changed, 2 insertions(+) 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 b54655a5a..4d2fa0c6d 100644 --- a/app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt +++ b/app/src/main/java/to/bitkit/ui/onboarding/OnboardingSlidesScreen.kt @@ -49,7 +49,9 @@ import to.bitkit.ui.shared.util.screen import to.bitkit.ui.theme.AppThemeSurface import to.bitkit.ui.theme.Colors import to.bitkit.ui.utils.withAccent + private const val LAST_PAGE_INDEX = 3 + @Composable fun OnboardingSlidesScreen( currentTab: Int = 0,