Przeglądaj źródła

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)
arkon 1 rok temu
rodzic
commit
cc56fde9fe

+ 1 - 3
app/src/main/java/eu/kanade/presentation/more/onboarding/OnboardingScreen.kt

@@ -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,
                     )
                 },

+ 9 - 7
presentation-core/src/main/java/tachiyomi/presentation/core/screens/InfoScreen.kt

@@ -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)
+                    }
                 }
             }
         },