diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index dac95e6b..0f6f2bd8 100644 --- 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 index 2940eb9f..b44164b2 100644 --- 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,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-syntax.git", "state" : { - "revision" : "64889f0c732f210a935a0ad7cda38f77f876262d", - "version" : "509.1.1" + "revision" : "2bc86522d115234d1f588efe2bcb4ce4be8f8b82", + "version" : "510.0.3" } }, { @@ -50,8 +50,8 @@ "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/apple/Sources/FerrostarSwiftUI/Resources/Directions.xcassets/uturn.imageset/Contents.json b/apple/Sources/FerrostarSwiftUI/Resources/Directions.xcassets/turn_uturn.imageset/Contents.json similarity index 100% rename from apple/Sources/FerrostarSwiftUI/Resources/Directions.xcassets/uturn.imageset/Contents.json rename to apple/Sources/FerrostarSwiftUI/Resources/Directions.xcassets/turn_uturn.imageset/Contents.json diff --git a/apple/Sources/FerrostarSwiftUI/Resources/Directions.xcassets/uturn.imageset/uturn.svg b/apple/Sources/FerrostarSwiftUI/Resources/Directions.xcassets/turn_uturn.imageset/uturn.svg similarity index 100% rename from apple/Sources/FerrostarSwiftUI/Resources/Directions.xcassets/uturn.imageset/uturn.svg rename to apple/Sources/FerrostarSwiftUI/Resources/Directions.xcassets/turn_uturn.imageset/uturn.svg diff --git a/apple/Sources/FerrostarSwiftUI/Views/Maneuver/ManeuverInstructionView.swift b/apple/Sources/FerrostarSwiftUI/Views/Maneuver/ManeuverInstructionView.swift index 69c541cf..8389413e 100644 --- a/apple/Sources/FerrostarSwiftUI/Views/Maneuver/ManeuverInstructionView.swift +++ b/apple/Sources/FerrostarSwiftUI/Views/Maneuver/ManeuverInstructionView.swift @@ -94,6 +94,17 @@ public struct ManeuverInstructionView: 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 index b3dcbbbf..6efda9f6 100644 --- 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/apple/Tests/FerrostarSwiftUITests/Views/__Snapshots__/ManeuverImageTests/testManeuverImageDefaultTheme.3.png b/apple/Tests/FerrostarSwiftUITests/Views/__Snapshots__/ManeuverImageTests/testManeuverImageDefaultTheme.3.png new file mode 100644 index 00000000..af60e696 Binary files /dev/null and b/apple/Tests/FerrostarSwiftUITests/Views/__Snapshots__/ManeuverImageTests/testManeuverImageDefaultTheme.3.png differ diff --git a/apple/Tests/FerrostarSwiftUITests/Views/__Snapshots__/ManeuverImageTests/testManeuverImageDefaultTheme.4.png b/apple/Tests/FerrostarSwiftUITests/Views/__Snapshots__/ManeuverImageTests/testManeuverImageDefaultTheme.4.png new file mode 100644 index 00000000..a16ebace Binary files /dev/null and b/apple/Tests/FerrostarSwiftUITests/Views/__Snapshots__/ManeuverImageTests/testManeuverImageDefaultTheme.4.png differ