From f692e996944a63ac4fa80c30ef5967654f525108 Mon Sep 17 00:00:00 2001 From: Nathan Chiu Date: Tue, 12 Apr 2022 11:52:15 -0500 Subject: [PATCH] Resolving merge conflicts --- Example/Example.xcodeproj/project.pbxproj | 16 + Example/Sources/Base.lproj/Main.storyboard | 31 +- .../Map Deeplinking/MapDeeplinks.storyboard | 338 ++++++++++++++++++ .../MapDeeplinksViewController.swift | 208 +++++++++++ README.md | 59 +++ .../ExternalMappingURLBuilder.swift | 99 +++++ .../Implementations/AppleMapsURLBuilder.swift | 275 ++++++++++++++ .../GoogleMapsURLBuilder.swift | 235 ++++++++++++ .../Implementations/WazeURLBuilder.swift | 142 ++++++++ .../MapAppURLBuilder/MapAppURLBuilder.swift | 55 +++ .../Supporting Types/MapStyle.swift | 15 + .../Supporting Types/MappingCoordinate.swift | 27 ++ .../Supporting Types/NavigationMode.swift | 16 + Sources/General/ClosedRange+Extensions.swift | 19 + Sources/General/String+Extensions.swift | 22 ++ .../UISegmentedControl+Extensions.swift | 17 + .../General/URLComponents+Extensions.swift | 29 ++ Tests/ClosedRangeTests.swift | 40 +++ Tests/ExternalMappingURLBuilderTests.swift | 92 +++++ UtiliKit.xcodeproj/project.pbxproj | 98 ++++- 20 files changed, 1818 insertions(+), 15 deletions(-) create mode 100644 Example/Sources/ViewController Configuration/Map Deeplinking/MapDeeplinks.storyboard create mode 100644 Example/Sources/ViewController Configuration/Map Deeplinking/MapDeeplinksViewController.swift create mode 100644 Sources/ExternalMapping/ExternalMappingURLBuilder.swift create mode 100644 Sources/ExternalMapping/MapAppURLBuilder/Implementations/AppleMapsURLBuilder.swift create mode 100644 Sources/ExternalMapping/MapAppURLBuilder/Implementations/GoogleMapsURLBuilder.swift create mode 100644 Sources/ExternalMapping/MapAppURLBuilder/Implementations/WazeURLBuilder.swift create mode 100644 Sources/ExternalMapping/MapAppURLBuilder/MapAppURLBuilder.swift create mode 100644 Sources/ExternalMapping/Supporting Types/MapStyle.swift create mode 100644 Sources/ExternalMapping/Supporting Types/MappingCoordinate.swift create mode 100644 Sources/ExternalMapping/Supporting Types/NavigationMode.swift create mode 100644 Sources/General/ClosedRange+Extensions.swift create mode 100644 Sources/General/String+Extensions.swift create mode 100644 Sources/General/UISegmentedControl+Extensions.swift create mode 100644 Sources/General/URLComponents+Extensions.swift create mode 100644 Tests/ClosedRangeTests.swift create mode 100644 Tests/ExternalMappingURLBuilderTests.swift diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index 4ba3051..8ed916d 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -43,6 +43,8 @@ 0EC7EFD227922FE200F712F3 /* ActiveLabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EC7EFAF27922FE200F712F3 /* ActiveLabelViewController.swift */; }; 0EC7F0AD2792322F00F712F3 /* UtiliKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EC7F0AC2792322F00F712F3 /* UtiliKit.framework */; }; 0EC7F0AE2792323600F712F3 /* UtiliKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0EC7F0AC2792322F00F712F3 /* UtiliKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 59DAD1252805E26A0097B7FF /* MapDeeplinksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59DAD1232805E26A0097B7FF /* MapDeeplinksViewController.swift */; }; + 59DAD1262805E26A0097B7FF /* MapDeeplinks.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 59DAD1242805E26A0097B7FF /* MapDeeplinks.storyboard */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -96,6 +98,8 @@ 0EC7EFAD27922FE200F712F3 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 0EC7EFAF27922FE200F712F3 /* ActiveLabelViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActiveLabelViewController.swift; sourceTree = ""; }; 0EC7F0AC2792322F00F712F3 /* UtiliKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UtiliKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 59DAD1232805E26A0097B7FF /* MapDeeplinksViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapDeeplinksViewController.swift; sourceTree = ""; }; + 59DAD1242805E26A0097B7FF /* MapDeeplinks.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MapDeeplinks.storyboard; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -149,6 +153,7 @@ 0EC7EF8127922FE200F712F3 /* ViewController Configuration */ = { isa = PBXGroup; children = ( + 59DAD1222805E26A0097B7FF /* Map Deeplinking */, 0EC7EF8227922FE200F712F3 /* VCViewController.swift */, 0EC7EF8327922FE200F712F3 /* UIStoryboard+Identifiers.swift */, 0EC7EF8427922FE200F712F3 /* InitialViewController.swift */, @@ -265,6 +270,15 @@ name = Frameworks; sourceTree = ""; }; + 59DAD1222805E26A0097B7FF /* Map Deeplinking */ = { + isa = PBXGroup; + children = ( + 59DAD1232805E26A0097B7FF /* MapDeeplinksViewController.swift */, + 59DAD1242805E26A0097B7FF /* MapDeeplinks.storyboard */, + ); + path = "Map Deeplinking"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -327,6 +341,7 @@ files = ( 0EC7EFC027922FE200F712F3 /* LaunchScreen.xib in Resources */, 0EC7EFD027922FE200F712F3 /* XibView.xib in Resources */, + 59DAD1262805E26A0097B7FF /* MapDeeplinks.storyboard in Resources */, 0EC7EFCD27922FE200F712F3 /* Images.xcassets in Resources */, 0EC7EFB427922FE200F712F3 /* VCTest.storyboard in Resources */, 0EC7EFC127922FE200F712F3 /* Main.storyboard in Resources */, @@ -345,6 +360,7 @@ files = ( 0EC7EFC827922FE200F712F3 /* WipeTransitionAnimator.swift in Sources */, 0EC7EFD227922FE200F712F3 /* ActiveLabelViewController.swift in Sources */, + 59DAD1252805E26A0097B7FF /* MapDeeplinksViewController.swift in Sources */, 0EC7EFCB27922FE200F712F3 /* MapController.swift in Sources */, 0EC7EFBF27922FE200F712F3 /* CollectionViewController.swift in Sources */, 0EC7EFB527922FE200F712F3 /* NamedViewController.swift in Sources */, diff --git a/Example/Sources/Base.lproj/Main.storyboard b/Example/Sources/Base.lproj/Main.storyboard index 78b77fb..a794279 100644 --- a/Example/Sources/Base.lproj/Main.storyboard +++ b/Example/Sources/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - + @@ -24,6 +24,7 @@ + @@ -112,7 +113,7 @@ - + - + - + - +