Give the wizard previews room and scroll the Continue button (#163)
The view and month-style steps now show their preview at the size the Settings choosers use, at the cost of a short scroll, and the Continue button rides at the end of the scrolling column rather than pinned over it.
This commit is contained in:
@@ -163,6 +163,9 @@ private fun StepPickerScaffold(
|
|||||||
navigationIcon = navigationIcon,
|
navigationIcon = navigationIcon,
|
||||||
topSpacing = OnboardingSpace.xs,
|
topSpacing = OnboardingSpace.xs,
|
||||||
contentPadding = 0.dp,
|
contentPadding = 0.dp,
|
||||||
|
// The preview is worth more than a screenful of certainty: it gets the
|
||||||
|
// room it needs and Continue scrolls in under the options with it.
|
||||||
|
scrollingActions = true,
|
||||||
hero = {
|
hero = {
|
||||||
Text(
|
Text(
|
||||||
text = title,
|
text = title,
|
||||||
@@ -203,12 +206,8 @@ private fun <T> StepPreview(selected: T, content: @Composable (T) -> Unit) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sized so the preview plus its frame occupies what the unframed preview used to:
|
* The same size the Settings chooser gives it. The step no longer tries to fit a
|
||||||
* the bezel comes out of the picture, not out of the step, which still has to fit
|
* screen: showing the view properly is what the step is for, and a picture too
|
||||||
* without scrolling.
|
* small to read would cost more than the scroll does.
|
||||||
*
|
|
||||||
* Smaller than the Settings chooser's preview: this screen also carries the step
|
|
||||||
* counter and the Continue button, and the whole step has to fit without
|
|
||||||
* scrolling.
|
|
||||||
*/
|
*/
|
||||||
private val PREVIEW_HEIGHT: Dp = 184.dp
|
private val PREVIEW_HEIGHT: Dp = 280.dp
|
||||||
|
|||||||
Submodule floret-kit updated: 80ed899b55...63e27f290d
Reference in New Issue
Block a user