Optimised Button's Layout

Onboarding footer was using the same settings for 3 buttons.
This commit is contained in:
Lukas Korba 2022-02-23 15:04:36 +01:00
parent 8931433f8e
commit 9df95ebc29
1 changed files with 50 additions and 43 deletions

View File

@ -13,7 +13,6 @@ struct OnboardingFooterView: View {
let animationDuration: CGFloat = 0.8
var body: some View {
GeometryReader { proxy in
WithViewStore(self.store) { viewStore in
VStack(spacing: 5) {
Spacer()
@ -24,10 +23,8 @@ struct OnboardingFooterView: View {
viewStore.send(.createNewWallet)
}
}
.primaryButtonStyle
.frame(height: proxy.size.height / 12)
.padding(.horizontal, 15)
.transition(.opacity)
.createButtonStyle
.buttonLayout()
Button("Import an Existing Wallet") {
withAnimation(.easeInOut(duration: animationDuration)) {
@ -35,9 +32,7 @@ struct OnboardingFooterView: View {
}
}
.secondaryButtonStyle
.frame(height: proxy.size.height / 12)
.padding(.horizontal, 15)
.transition(.opacity)
.buttonLayout()
} else {
Button("Next") {
withAnimation(.easeInOut(duration: animationDuration)) {
@ -45,9 +40,7 @@ struct OnboardingFooterView: View {
}
}
.primaryButtonStyle
.frame(height: 60)
.padding(.horizontal, 28)
.transition(.opacity)
.buttonLayout()
ProgressView(
"0\(viewStore.index + 1)",
@ -62,6 +55,20 @@ struct OnboardingFooterView: View {
}
}
}
struct OnboardingFooterButtonLayout: ViewModifier {
func body(content: Content) -> some View {
content
.frame(height: 60)
.padding(.horizontal, 28)
.transition(.opacity)
}
}
extension View {
func buttonLayout() -> some View {
modifier(OnboardingFooterButtonLayout())
}
}
struct OnboardingFooterView_Previews: PreviewProvider {