Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 06:21:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Onboarding screen tweaks

Browse Source 
- 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:
arkon 2023-12-10 17:28:34 -05:00
parent 3a0b3de175
commit cc56fde9fe
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/presentation/more/onboarding/OnboardingScreen.kt
View File

@ -73,8 +73,6 @@ fun OnboardingScreen(
} }
} }
}, },
rejectText = stringResource(MR.strings.onboarding_action_skip),
onRejectClick = onComplete,
) { ) {
Box( Box(
modifier = Modifier modifier = Modifier
@ -87,7 +85,7 @@ fun OnboardingScreen(
targetState = currentStep, targetState = currentStep,
transitionSpec = { transitionSpec = {
materialSharedAxisX( materialSharedAxisX(
forward = true, forward = targetState > initialState,
slideDistance = slideDistance, slideDistance = slideDistance,
) )
}, },

6
presentation-core/src/main/java/tachiyomi/presentation/core/screens/InfoScreen.kt
View File

@ -38,8 +38,8 @@ fun InfoScreen(
subtitleText: String, subtitleText: String,
acceptText: String, acceptText: String,
onAcceptClick: () -> Unit, onAcceptClick: () -> Unit,
rejectText: String, rejectText: String? = null,
onRejectClick: () -> Unit, onRejectClick: (() -> Unit)? = null,
content: @Composable ColumnScope.() -> Unit, content: @Composable ColumnScope.() -> Unit,
) { ) {
Scaffold( Scaffold(
@ -69,6 +69,7 @@ fun InfoScreen(
) { ) {
Text(text = acceptText) Text(text = acceptText)
} }
if (rejectText != null && onRejectClick != null) {
OutlinedButton( OutlinedButton(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
onClick = onRejectClick, onClick = onRejectClick,
@ -76,6 +77,7 @@ fun InfoScreen(
Text(text = rejectText) Text(text = rejectText)
} }
} }
}
}, },
) { paddingValues -> ) { paddingValues ->
// Status bar scrim // Status bar scrim