Use readableFrame and OnboardingIconImage everywhere.

Fix order of accentColor modifier.
This commit is contained in:
Doug
2022-05-10 15:30:03 +01:00
committed by Doug
parent dcc6e0d3df
commit 870fc616c5
8 changed files with 24 additions and 38 deletions
@@ -39,19 +39,18 @@ struct OnboardingCelebrationScreen: View {
var body: some View {
GeometryReader { geometry in
VStack {
ScrollView(showsIndicators: false) {
ScrollView {
Spacer()
.frame(height: OnboardingMetrics.spacerHeight(in: geometry))
mainContent
.frame(maxWidth: OnboardingMetrics.maxContentWidth)
.readableFrame()
.padding(.top, OnboardingMetrics.breakerScreenTopPadding)
.padding(.horizontal, horizontalPadding)
}
.frame(maxWidth: .infinity)
buttons
.frame(maxWidth: OnboardingMetrics.maxContentWidth)
.readableFrame()
.padding(.horizontal, horizontalPadding)
.padding(.bottom, OnboardingMetrics.actionButtonBottomPadding)
.padding(.bottom, geometry.safeAreaInsets.bottom > 0 ? 0 : 16)
@@ -59,7 +58,7 @@ struct OnboardingCelebrationScreen: View {
Spacer()
.frame(height: OnboardingMetrics.spacerHeight(in: geometry))
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
.frame(maxHeight: .infinity)
}
.overlay(effects.ignoresSafeArea())
.background(theme.colors.background.ignoresSafeArea())