Merge pull request #44 from SchweizerischeBundesbahnen/develop

Onboarding: fix padding + accessibility element order
SchweizerischeBundesbahnen · Nov 8, 2022 · 2d39133 · 2d39133
2 parents 6aa721f + fe901c9
commit 2d39133
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 1 deletion.
diff --git a/...ignSystemMobileSwiftUI/Views/SBBOnboardingView/CardsView/OnboardingCardsWrapperView.swift b/...ignSystemMobileSwiftUI/Views/SBBOnboardingView/CardsView/OnboardingCardsWrapperView.swift
@@ -59,18 +59,21 @@ struct OnboardingCardsWrapperView: View {
     private var portraitView: some View {
         VStack(spacing: 0) {
             cardsView()
+                .accessibilitySortPriority(2)
             VStack(spacing: 16) {
                 HStack {
                     backButton
                         .buttonStyle(SBBIconButtonStyle(size: .small))
                         .accessibility(identifier: "onboardingPreviousCardButton")
+                        .accessibilitySortPriority(3)
                     Spacer()
                     SBBPaginationView(currentPageIndex: $viewModel.currentCardIndex, numberOfPages: viewModel.cardViews.count)
                         .accessibility(hidden: true)
                     Spacer()
                     nextButton
                         .buttonStyle(SBBIconButtonStyle(size: .small))
                         .accessibility(identifier: "onboardingNextCardButton")
+                        .accessibilitySortPriority(1)
                 }
                 Button(action: {
                     self.viewModel.state = .hidden
@@ -79,6 +82,7 @@ struct OnboardingCardsWrapperView: View {
                 }
                     .buttonStyle(SBBTertiaryButtonStyle(size: .small))
                     .accessibility(identifier: "onboardingAbortTourButton")
+                    .accessibilitySortPriority(0)
             }
                 .padding(.horizontal, 8)
                 .padding(.vertical, 24)
@@ -95,9 +99,11 @@ struct OnboardingCardsWrapperView: View {
                     backButton
                         .buttonStyle(SBBIconButtonStyle(size: .large, style: .negative))
                         .accessibility(identifier: "onboardingPreviousCardButton")
+                        .accessibilitySortPriority(3)
                     Spacer()
                 }
                 cardsView(safeAreaInsetsLeading: 44 + 10 + 8 + geometry.safeAreaInsets.leading)
+                    .accessibilitySortPriority(2)
                 ZStack {
                     VStack {
                         Button(action: {
@@ -110,17 +116,20 @@ struct OnboardingCardsWrapperView: View {
                             .buttonStyle(SBBIconButtonStyle(size: .large, style: .negative))
                             .accessibility(identifier: "onboardingAbortTourButton")
                             .padding(.top, 16)
+                            .accessibilitySortPriority(0)
                         Spacer()
                     }
                     VStack {
                         Spacer()
                         nextButton
                             .buttonStyle(SBBIconButtonStyle(size: .large, style: .negative))
                             .accessibility(identifier: "onboardingNextCardButton")
+                            .accessibilitySortPriority(1)
                         Spacer()
                     }
                 }
             }
+                .sbbScreenPadding(.horizontal)
                 .background(Color.sbbColor(.primary).edgesIgnoringSafeArea(.all))
         }
     }

diff --git a/...ignSystemMobileSwiftUI/Views/SBBOnboardingView/TitleView/OnboardingTitleWrapperView.swift b/...ignSystemMobileSwiftUI/Views/SBBOnboardingView/TitleView/OnboardingTitleWrapperView.swift
@@ -108,7 +108,7 @@ struct OnboardingTitleWrapperView: View {
                 }            
             }
         }
-            .sbbScreenPadding(.vertical)
+            .sbbScreenPadding()
     }
 
     var body: some View {

diff --git a/..._Snapshots__/Views/SBBOnboardingViewTests/testOnboardingCardViewLandscape.1.png b/..._Snapshots__/Views/SBBOnboardingViewTests/testOnboardingCardViewLandscape.1.png
diff --git a/..._Snapshots__/Views/SBBOnboardingViewTests/testOnboardingCardViewLandscape.2.png b/..._Snapshots__/Views/SBBOnboardingViewTests/testOnboardingCardViewLandscape.2.png
diff --git a/...Snapshots__/Views/SBBOnboardingViewTests/testOnboardingTitleViewLandscape.1.png b/...Snapshots__/Views/SBBOnboardingViewTests/testOnboardingTitleViewLandscape.1.png
diff --git a/...Snapshots__/Views/SBBOnboardingViewTests/testOnboardingTitleViewLandscape.2.png b/...Snapshots__/Views/SBBOnboardingViewTests/testOnboardingTitleViewLandscape.2.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,7 +108,7 @@ struct OnboardingTitleWrapperView: View { @@
                     }
                 }
             }
-                .sbbScreenPadding(.vertical)
+                .sbbScreenPadding()
         }
         var body: some View {
@@ Expand Down @@