Address open thread re: iOS uturn image name

stadiamaps · Oct 19, 2024 · 84745b0 · 84745b0
1 parent 57e21d2
commit 84745b0
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 7 deletions.
diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Install cargo-ndk
       run: cargo install cargo-ndk
 
-    - name: Creat local.properties (required for cargo-ndk and the demo app)
+    - name: Create local.properties (required for cargo-ndk and the demo app)
       run: echo 'stadiaApiKey=' > local.properties
       working-directory: android
 

diff --git a/Package.resolved b/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/stadiamaps/maplibre-swift-macros.git",
       "state" : {
-        "revision" : "236215c13bff962009e0f0257d6d8349be33442f",
-        "version" : "0.0.4"
+        "revision" : "9e27e62dff7fd727aebd0a7c8aa74e7635a5583e",
+        "version" : "0.0.5"
       }
     },
     {
@@ -41,17 +41,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swiftlang/swift-syntax.git",
       "state" : {
-        "revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
-        "version" : "509.1.1"
+        "revision" : "2bc86522d115234d1f588efe2bcb4ce4be8f8b82",
+        "version" : "510.0.3"
       }
     },
     {
       "identity" : "swiftui-dsl",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/maplibre/swiftui-dsl",
       "state" : {
-        "revision" : "5ba75ef1e4382fcc7ee71e274eb9c2a50906b14e",
-        "version" : "0.1.0"
+        "revision" : "c39688db3aac50b523ea062b286c584123022093",
+        "version" : "0.3.0"
       }
     }
   ],

diff --git a/...ons.xcassets/uturn.imageset/Contents.json → ...cassets/turn_uturn.imageset/Contents.json b/...ons.xcassets/uturn.imageset/Contents.json → ...cassets/turn_uturn.imageset/Contents.json
diff --git a/...ections.xcassets/uturn.imageset/uturn.svg → ...ns.xcassets/turn_uturn.imageset/uturn.svg b/...ections.xcassets/uturn.imageset/uturn.svg → ...ns.xcassets/turn_uturn.imageset/uturn.svg
diff --git a/apple/Sources/FerrostarSwiftUI/Views/Maneuver/ManeuverInstructionView.swift b/apple/Sources/FerrostarSwiftUI/Views/Maneuver/ManeuverInstructionView.swift
@@ -94,6 +94,17 @@ public struct ManeuverInstructionView<ManeuverView: View>: View {
         .font(.body)
         .foregroundColor(.blue)
 
+        ManeuverInstructionView(
+            text: "Make a legal u-turn",
+            distanceFormatter: MKDistanceFormatter(),
+            distanceToNextManeuver: 152.4
+        ) {
+            ManeuverImage(maneuverType: .turn, maneuverModifier: .uTurn)
+                .frame(width: 24)
+        }
+        .font(.body)
+        .foregroundColor(.blue)
+
         // Demonstrate a Right to Left
         ManeuverInstructionView(
             text: "ادمج يسارًا",

diff --git a/apple/Tests/FerrostarSwiftUITests/Views/ManeuverImageTests.swift b/apple/Tests/FerrostarSwiftUITests/Views/ManeuverImageTests.swift
@@ -14,6 +14,16 @@ final class ManeuverImageTests: XCTestCase {
             ManeuverImage(maneuverType: .fork, maneuverModifier: .left)
                 .frame(width: 32)
         }
+
+        assertView {
+            ManeuverImage(maneuverType: .turn, maneuverModifier: .uTurn)
+                .frame(width: 32)
+        }
+
+        assertView {
+            ManeuverImage(maneuverType: .continue, maneuverModifier: .uTurn)
+                .frame(width: 32)
+        }
     }
 
     func testManeuverImageLarge() {

diff --git a/...ests/Views/__Snapshots__/ManeuverImageTests/testManeuverImageDefaultTheme.3.png b/...ests/Views/__Snapshots__/ManeuverImageTests/testManeuverImageDefaultTheme.3.png
diff --git a/...ests/Views/__Snapshots__/ManeuverImageTests/testManeuverImageDefaultTheme.4.png b/...ests/Views/__Snapshots__/ManeuverImageTests/testManeuverImageDefaultTheme.4.png