Skip to content

fix: onboarding screens transition #433

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 2 commits into from
Oct 13, 2025
Merged

fix: onboarding screens transition #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbf042a
feat: add insets param to screen modifier
ovitrif Oct 10, 2025
bae7d8d
fix: screen transition issues in onboarding #398
ovitrif Oct 10, 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
8 changes: 4 additions & 4 deletions app/src/main/java/to/bitkit/ui/onboarding/CreateWalletScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
Expand All @@ -29,6 +28,7 @@ import to.bitkit.ui.components.FillHeight
import to.bitkit.ui.components.PrimaryButton
import to.bitkit.ui.components.SecondaryButton
import to.bitkit.ui.components.VerticalSpacer
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
Expand All @@ -42,7 +42,7 @@ fun CreateWalletScreen(
Box(
contentAlignment = Alignment.TopCenter,
modifier = modifier
.fillMaxSize()
.screen(insets = null)
) {
Image(
painter = painterResource(id = R.drawable.wallet),
Expand All @@ -55,7 +55,7 @@ fun CreateWalletScreen(
Column(
modifier = Modifier
.fillMaxWidth()
.align(Alignment.BottomCenter),
.align(Alignment.BottomCenter)
) {
FillHeight()
Display(text = stringResource(R.string.onboarding__slide4_header).withAccent())
Expand Down Expand Up @@ -106,7 +106,7 @@ private fun CreateWalletScreenPreview() {

@Preview(showSystemUi = true, device = NEXUS_5)
@Composable
private fun CreateWalletScreenPreview2() {
private fun PreviewSmall() {
AppThemeSurface {
CreateWalletScreen(
onCreateClick = {},
Expand Down
8 changes: 5 additions & 3 deletions app/src/main/java/to/bitkit/ui/onboarding/CreateWalletWithPassphraseScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.imePadding
Expand Down Expand Up @@ -37,8 +36,10 @@ import to.bitkit.ui.components.Display
import to.bitkit.ui.components.HighlightLabel
import to.bitkit.ui.components.PrimaryButton
import to.bitkit.ui.components.TopBarSpacer
import to.bitkit.ui.components.VerticalSpacer
import to.bitkit.ui.components.mainRectHeight
import to.bitkit.ui.scaffold.AppTopBar
import to.bitkit.ui.shared.util.screen
import to.bitkit.ui.theme.AppTextFieldDefaults
import to.bitkit.ui.theme.AppThemeSurface
import to.bitkit.ui.theme.Colors
Expand All @@ -53,7 +54,8 @@ fun CreateWalletWithPassphraseScreen(
var bip39Passphrase by remember { mutableStateOf("") }

Box(
modifier = Modifier.fillMaxSize(),
modifier = Modifier
.screen()
) {
Row(
verticalAlignment = Alignment.Bottom,
Expand Down Expand Up @@ -117,7 +119,7 @@ fun CreateWalletWithPassphraseScreen(
enabled = bip39Passphrase.isNotBlank(),
modifier = Modifier.testTag("CreateNewWallet")
)
Spacer(modifier = Modifier.height(32.dp))
VerticalSpacer(16.dp)
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/to/bitkit/ui/onboarding/IntroScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -25,6 +24,7 @@ import to.bitkit.ui.components.BodyM
import to.bitkit.ui.components.Display
import to.bitkit.ui.components.PrimaryButton
import to.bitkit.ui.components.SecondaryButton
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
Expand All @@ -46,8 +46,7 @@ fun IntroScreen(
)
Box(
modifier = Modifier
.fillMaxSize()
.systemBarsPadding()
.screen(noBackground = true)
) {
Image(
painter = painterResource(id = R.drawable.logo),
Expand Down
7 changes: 3 additions & 4 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 @@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.foundation.shape.CircleShape
Expand Down Expand Up @@ -46,6 +45,7 @@ import to.bitkit.ui.components.Display
import to.bitkit.ui.components.Footnote
import to.bitkit.ui.components.VerticalSpacer
import to.bitkit.ui.scaffold.AppTopBar
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
Expand All @@ -63,8 +63,7 @@ fun OnboardingSlidesScreen(

Box(
modifier = Modifier
.fillMaxSize()
.systemBarsPadding()
.screen()
) {
HorizontalPager(
state = pagerState,
Expand Down Expand Up @@ -195,8 +194,8 @@ fun OnboardingTab(
title: String,
titleAccentColor: Color,
text: String,
disclaimerText: String? = null,
modifier: Modifier = Modifier,
disclaimerText: String? = null,
Comment on lines 197 to +198
Copy link

Copilot AI Oct 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parameter reordering should be avoided unless necessary for API consistency. The disclaimerText parameter was moved from before modifier to after it, which could break existing callers that rely on positional arguments.

Suggested change
modifier: Modifier = Modifier,
disclaimerText: String? = null,
disclaimerText: String? = null,
modifier: Modifier = Modifier,

Copilot uses AI. Check for mistakes.
) {
Box(
contentAlignment = Alignment.TopCenter,
Expand Down
9 changes: 6 additions & 3 deletions app/src/main/java/to/bitkit/ui/shared/util/Modifiers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.interaction.collectIsPressedAsState
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.foundation.layout.systemBars
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
Expand Down Expand Up @@ -89,8 +91,9 @@ fun Modifier.blockPointerInputPassthrough(): Modifier {

@Composable
fun Modifier.screen(
noBackground: Boolean = false
noBackground: Boolean = false,
insets: WindowInsets? = WindowInsets.systemBars,
): Modifier = this
.fillMaxSize()
.then(if (noBackground) Modifier else Modifier.background(MaterialTheme.colorScheme.background))
.systemBarsPadding()
.then(if (insets == null) Modifier else Modifier.windowInsetsPadding(insets))
Loading