Skip to content

chore: remove onboard page #555

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
piotr-iohk merged 5 commits into from
Dec 29, 2025
Merged

chore: remove onboard page #555

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f330ba6
chore: remove slide page and update test tag
jvsena42 Dec 23, 2025
84960be
fix: dots quantity
jvsena42 Dec 23, 2025
cab676d
chore: lint
jvsena42 Dec 23, 2025
3ddb028
Merge branch 'master' into chore/remove-onboard-slide
jvsena42 Dec 29, 2025
8d167a8
fix: page count
jvsena42 Dec 29, 2025
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
27 changes: 11 additions & 16 deletions 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 @@ -50,6 +50,9 @@ 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
private const val PAGE_COUNT = LAST_PAGE_INDEX + 1

@Composable
fun OnboardingSlidesScreen(
currentTab: Int = 0,
Expand All @@ -59,7 +62,7 @@ fun OnboardingSlidesScreen(
onRestoreClick: () -> Unit,
) {
val scope = rememberCoroutineScope()
val pagerState = rememberPagerState(initialPage = currentTab, pageCount = { 5 })
val pagerState = rememberPagerState(initialPage = currentTab, pageCount = { PAGE_COUNT })

Box(
modifier = Modifier
Expand Down Expand Up @@ -90,31 +93,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),
Expand All @@ -135,7 +130,7 @@ fun OnboardingSlidesScreen(
.offset { IntOffset(0, yOffset.roundToPx()) }
.alpha(alpha)
) {
repeat(5) { index ->
repeat(PAGE_COUNT) { index ->
val size by animateDpAsState(
targetValue = if (index == pagerState.currentPage) 10.dp else 7.dp,
animationSpec = tween(durationMillis = 300),
Expand All @@ -157,7 +152,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")
Expand Down Expand Up @@ -276,7 +271,7 @@ private fun OnboardingViewPreview3() {
private fun OnboardingViewPreview4() {
AppThemeSurface {
OnboardingSlidesScreen(
currentTab = 4,
currentTab = LAST_PAGE_INDEX,
onAdvancedSetupClick = {},
onCreateClick = {},
onRestoreClick = {},
Expand Down
Loading