From 84745b0b5dc2663e1d1157880797957d05f5a325 Mon Sep 17 00:00:00 2001 From: Ian Wagner Date: Sat, 19 Oct 2024 17:44:16 +0900 Subject: [PATCH] Address open thread re: iOS uturn image name --- .github/workflows/gradle-publish.yml | 2 +- Package.resolved | 12 ++++++------ .../Contents.json | 0 .../uturn.svg | 0 .../Maneuver/ManeuverInstructionView.swift | 11 +++++++++++ .../Views/ManeuverImageTests.swift | 10 ++++++++++ .../testManeuverImageDefaultTheme.3.png | Bin 0 -> 81223 bytes .../testManeuverImageDefaultTheme.4.png | Bin 0 -> 81329 bytes 8 files changed, 28 insertions(+), 7 deletions(-) rename apple/Sources/FerrostarSwiftUI/Resources/Directions.xcassets/{uturn.imageset => turn_uturn.imageset}/Contents.json (100%) rename apple/Sources/FerrostarSwiftUI/Resources/Directions.xcassets/{uturn.imageset => turn_uturn.imageset}/uturn.svg (100%) create mode 100644 apple/Tests/FerrostarSwiftUITests/Views/__Snapshots__/ManeuverImageTests/testManeuverImageDefaultTheme.3.png create mode 100644 apple/Tests/FerrostarSwiftUITests/Views/__Snapshots__/ManeuverImageTests/testManeuverImageDefaultTheme.4.png 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 0000000000000000000000000000000000000000..af60e69680d7936950fcee1164570777dfeedec4 GIT binary patch literal 81223 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a16ebacede5e0558df721b277dccc7300d69daa0 GIT binary patch literal 81329 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 YxApWK--B@s4D#bSd(o^^4@&fZ0hYv`*Z=?k literal 0 HcmV?d00001