Top-align onboarding content in all steps
This commit is contained in:
@@ -152,5 +152,6 @@ struct CalendarStepView: View {
|
|||||||
} message: {
|
} message: {
|
||||||
Text("calendar_permission_message")
|
Text("calendar_permission_message")
|
||||||
}
|
}
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -239,6 +239,7 @@ struct FirstDishesStepView: View {
|
|||||||
ensureDefaultTagsIfNeeded()
|
ensureDefaultTagsIfNeeded()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
||||||
}
|
}
|
||||||
|
|
||||||
private func suggestedDishes() -> [(name: String, tagHints: [String])] {
|
private func suggestedDishes() -> [(name: String, tagHints: [String])] {
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ struct MealWindowsStepView: View {
|
|||||||
.padding(.top, 8)
|
.padding(.top, 8)
|
||||||
.padding(.bottom, 40)
|
.padding(.bottom, 40)
|
||||||
}
|
}
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
||||||
}
|
}
|
||||||
|
|
||||||
private func optionTitle(_ option: MealWindows) -> String {
|
private func optionTitle(_ option: MealWindows) -> String {
|
||||||
|
|||||||
@@ -27,18 +27,21 @@ struct OnboardingView: View {
|
|||||||
|
|
||||||
TabView(selection: $viewModel.currentStep) {
|
TabView(selection: $viewModel.currentStep) {
|
||||||
WelcomeStepView(onNext: { viewModel.nextStep() })
|
WelcomeStepView(onNext: { viewModel.nextStep() })
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
||||||
.tag(0)
|
.tag(0)
|
||||||
|
|
||||||
MealWindowsStepView(
|
MealWindowsStepView(
|
||||||
selection: $viewModel.selectedMealWindows,
|
selection: $viewModel.selectedMealWindows,
|
||||||
onNext: { viewModel.nextStep() }
|
onNext: { viewModel.nextStep() }
|
||||||
)
|
)
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
||||||
.tag(1)
|
.tag(1)
|
||||||
|
|
||||||
WeekendsStepView(
|
WeekendsStepView(
|
||||||
includeWeekends: $viewModel.includeWeekends,
|
includeWeekends: $viewModel.includeWeekends,
|
||||||
onNext: { viewModel.nextStep() }
|
onNext: { viewModel.nextStep() }
|
||||||
)
|
)
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
||||||
.tag(2)
|
.tag(2)
|
||||||
|
|
||||||
CalendarStepView(
|
CalendarStepView(
|
||||||
@@ -53,6 +56,7 @@ struct OnboardingView: View {
|
|||||||
onNext: { viewModel.nextStep() },
|
onNext: { viewModel.nextStep() },
|
||||||
onSkip: { viewModel.nextStep() }
|
onSkip: { viewModel.nextStep() }
|
||||||
)
|
)
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
||||||
.tag(3)
|
.tag(3)
|
||||||
|
|
||||||
FirstDishesStepView(
|
FirstDishesStepView(
|
||||||
@@ -64,6 +68,7 @@ struct OnboardingView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
||||||
.tag(4)
|
.tag(4)
|
||||||
}
|
}
|
||||||
.tabViewStyle(.page(indexDisplayMode: .never))
|
.tabViewStyle(.page(indexDisplayMode: .never))
|
||||||
|
|||||||
@@ -45,5 +45,6 @@ struct WeekendsStepView: View {
|
|||||||
.padding(.top, 8)
|
.padding(.top, 8)
|
||||||
.padding(.bottom, 40)
|
.padding(.bottom, 40)
|
||||||
}
|
}
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ struct WelcomeStepView: View {
|
|||||||
.padding(.horizontal, 24)
|
.padding(.horizontal, 24)
|
||||||
.padding(.bottom, 40)
|
.padding(.bottom, 40)
|
||||||
}
|
}
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user