fixup! [iOS] Pull down cue sheet shows remaining steps

stadiamaps · Sep 28, 2024 · a93d9e3 · a93d9e3
1 parent cd60f9c
commit a93d9e3
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/apple/Sources/FerrostarSwiftUI/Views/InstructionsView.swift b/apple/Sources/FerrostarSwiftUI/Views/InstructionsView.swift
@@ -17,7 +17,7 @@ public struct InstructionsView: View {
         visualInstruction.secondaryContent != nil
     }
 
-    private let handlePadding: CGFloat = 12
+    private let verticalPadding: CGFloat = 16
 
     @State
     private var isExpanded: Bool
@@ -106,8 +106,8 @@ public struct InstructionsView: View {
                     )
                     .font(.title2.bold())
                     .padding(.horizontal, 16)
-                    .padding(.top, 16)
-                    .padding(.bottom, hasSecondary || expandedContent == nil ? 16 : handlePadding)
+                    .padding(.top, verticalPadding)
+                    .padding(.bottom, hasSecondary ? 8 : verticalPadding)
 
                     if let secondaryContent = visualInstruction.secondaryContent {
                         DefaultIconographyManeuverInstructionView(
@@ -118,8 +118,8 @@ public struct InstructionsView: View {
                             theme: secondaryRowTheme
                         )
                         .padding(.horizontal, 16)
-                        .padding(.vertical, 8)
-                        .padding(.bottom, handlePadding)
+                        .padding(.top, 8)
+                        .padding(.bottom, verticalPadding)
                         .background(secondaryRowTheme.backgroundColor)
                     }
                 }.overlay(

diff --git a/...ts/Views/__Snapshots__/InstructionsViewTests/testExpandedInstructionsView.1.png b/...ts/Views/__Snapshots__/InstructionsViewTests/testExpandedInstructionsView.1.png
diff --git a/...__Snapshots__/InstructionsViewTests/testExpandedInstructionsView_darkMode.1.png b/...__Snapshots__/InstructionsViewTests/testExpandedInstructionsView_darkMode.1.png
diff --git a/...iftUITests/Views/__Snapshots__/InstructionsViewTests/testInstructionsView.1.png b/...iftUITests/Views/__Snapshots__/InstructionsViewTests/testInstructionsView.1.png
diff --git a/...s/Views/__Snapshots__/InstructionsViewTests/testInstructionsView_darkMode.1.png b/...s/Views/__Snapshots__/InstructionsViewTests/testInstructionsView_darkMode.1.png
diff --git a/.../__Snapshots__/InstructionsViewTests/testSingularInstructionsViewWithPill.1.png b/.../__Snapshots__/InstructionsViewTests/testSingularInstructionsViewWithPill.1.png
diff --git a/...ots__/InstructionsViewTests/testSingularInstructionsViewWithPill_darkMode.1.png b/...ots__/InstructionsViewTests/testSingularInstructionsViewWithPill_darkMode.1.png