Skip to content

Adapt onboarding to short screens #304

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
jvsena42 merged 5 commits into from
Aug 19, 2025
Merged

Adapt onboarding to short screens #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d83056e
fix: adapt CreateWalletScreen.kt to small screens
jvsena42 Aug 19, 2025
6993b38
fix: slides layout to short screens
jvsena42 Aug 19, 2025
301a9a3
chore: add minLines parameter
jvsena42 Aug 19, 2025
07ea662
fix: bottom padding
jvsena42 Aug 19, 2025
38716a5
chore: lint
jvsena42 Aug 19, 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
4 changes: 4 additions & 0 deletions app/src/main/java/to/bitkit/ui/components/Text.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ fun BodyM(
color: Color = MaterialTheme.colorScheme.primary,
textAlign: TextAlign = TextAlign.Start,
maxLines: Int = Int.MAX_VALUE,
minLines: Int = 1,
overflow: TextOverflow = if (maxLines == 1) TextOverflow.Ellipsis else TextOverflow.Clip,
) {
BodyM(
Expand All @@ -135,6 +136,7 @@ fun BodyM(
modifier = modifier,
textAlign = textAlign,
maxLines = maxLines,
minLines = minLines,
overflow = overflow,
)
}
Expand All @@ -146,6 +148,7 @@ fun BodyM(
color: Color = MaterialTheme.colorScheme.primary,
textAlign: TextAlign = TextAlign.Start,
maxLines: Int = Int.MAX_VALUE,
minLines: Int = 1,
overflow: TextOverflow = if (maxLines == 1) TextOverflow.Ellipsis else TextOverflow.Clip,
) {
Text(
Expand All @@ -155,6 +158,7 @@ fun BodyM(
textAlign = textAlign,
),
maxLines = maxLines,
minLines = minLines,
overflow = overflow,
modifier = modifier,
)
Expand Down
21 changes: 18 additions & 3 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 @@ -19,13 +19,16 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Devices.NEXUS_5
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import to.bitkit.R
import to.bitkit.ui.components.BodyM
import to.bitkit.ui.components.Display
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.theme.AppThemeSurface
import to.bitkit.ui.theme.Colors
import to.bitkit.ui.utils.withAccent
Expand All @@ -52,19 +55,20 @@ fun CreateWalletScreen(
Column(
modifier = Modifier
.fillMaxWidth()
.height(264.dp)
.align(Alignment.BottomCenter),
) {
FillHeight()
Display(text = stringResource(R.string.onboarding__slide4_header).withAccent())
Spacer(modifier = Modifier.height(8.dp))
VerticalSpacer(8.dp)
BodyM(
text = stringResource(R.string.onboarding__slide4_text).withAccent(
defaultColor = Colors.White64,
accentStyle = SpanStyle(fontWeight = FontWeight.Bold, color = Colors.White),
),
)

Spacer(modifier = Modifier.weight(1f))
VerticalSpacer(32.dp)

Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(16.dp)
Expand Down Expand Up @@ -99,3 +103,14 @@ private fun CreateWalletScreenPreview() {
)
}
}

@Preview(showSystemUi = true, device = NEXUS_5)
@Composable
private fun CreateWalletScreenPreview2() {
AppThemeSurface {
CreateWalletScreen(
onCreateClick = {},
onRestoreClick = {}
)
}
}
19 changes: 17 additions & 2 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 @@ -44,6 +44,7 @@ import to.bitkit.R
import to.bitkit.ui.components.BodyM
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.theme.AppThemeSurface
import to.bitkit.ui.theme.Colors
Expand Down Expand Up @@ -212,19 +213,19 @@ fun OnboardingTab(
Column(
modifier = Modifier
.fillMaxWidth()
.height(264.dp)
.align(Alignment.BottomCenter),
) {
Display(text = title.withAccent(accentColor = titleAccentColor))
Spacer(modifier = Modifier.height(8.dp))
BodyM(
text = text,
color = Colors.White64,
minLines = 3
)
disclaimerText?.let {
Spacer(modifier = Modifier.height(6.5.dp))
Footnote(text = it)
}
VerticalSpacer(70.dp)
}
}
}
Expand Down Expand Up @@ -270,3 +271,17 @@ private fun OnboardingViewPreview3() {
)
}
}

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