mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-10 05:57:48 +01:00
Onboarding screen tweaks
- Opposite transition when going back a step - Don't allow skipping (I don't want to deal with an unset storage location in other places)
This commit is contained in:
parent
3a0b3de175
commit
cc56fde9fe
2 changed files with 10 additions and 10 deletions
|
@ -73,8 +73,6 @@ fun OnboardingScreen(
|
|||
}
|
||||
}
|
||||
},
|
||||
rejectText = stringResource(MR.strings.onboarding_action_skip),
|
||||
onRejectClick = onComplete,
|
||||
) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
|
@ -87,7 +85,7 @@ fun OnboardingScreen(
|
|||
targetState = currentStep,
|
||||
transitionSpec = {
|
||||
materialSharedAxisX(
|
||||
forward = true,
|
||||
forward = targetState > initialState,
|
||||
slideDistance = slideDistance,
|
||||
)
|
||||
},
|
||||
|
|
|
@ -38,8 +38,8 @@ fun InfoScreen(
|
|||
subtitleText: String,
|
||||
acceptText: String,
|
||||
onAcceptClick: () -> Unit,
|
||||
rejectText: String,
|
||||
onRejectClick: () -> Unit,
|
||||
rejectText: String? = null,
|
||||
onRejectClick: (() -> Unit)? = null,
|
||||
content: @Composable ColumnScope.() -> Unit,
|
||||
) {
|
||||
Scaffold(
|
||||
|
@ -69,11 +69,13 @@ fun InfoScreen(
|
|||
) {
|
||||
Text(text = acceptText)
|
||||
}
|
||||
OutlinedButton(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
onClick = onRejectClick,
|
||||
) {
|
||||
Text(text = rejectText)
|
||||
if (rejectText != null && onRejectClick != null) {
|
||||
OutlinedButton(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
onClick = onRejectClick,
|
||||
) {
|
||||
Text(text = rejectText)
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue