Merge branch 'feature/swift-ui' into develop

Author: kamaal111

Package.swift

@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "PassLibrary",
     platforms: [
-        .iOS(.v8)
+        .iOS(.v9)
     ],
     products: [
         .library(
@@ -17,9 +17,9 @@ let package = Package(
     targets: [
         .target(
             name: "PassLibrary",
-            dependencies: [])
+            dependencies: []),
         .testTarget(
             name: "PassLibraryTests",
-            dependencies: ["PassLibrary"])
+            dependencies: ["PassLibrary"]),
     ]
 )

PassLibrary.xcodeproj/project.pbxproj

@@ -21,6 +21,7 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		6004D8E424C4A1FD00ACDCE0 /* AddPKPassView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6004D8E324C4A1FD00ACDCE0 /* AddPKPassView.swift */; };
 		OBJ_23 /* Networker.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* Networker.swift */; };
 		OBJ_24 /* PassLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* PassLibrary.swift */; };
 		OBJ_31 /* Package.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_6 /* Package.swift */; };
@@ -47,6 +48,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		6004D8E324C4A1FD00ACDCE0 /* AddPKPassView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddPKPassView.swift; sourceTree = "<group>"; };
 		OBJ_10 /* PassLibrary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PassLibrary.swift; sourceTree = "<group>"; };
 		OBJ_13 /* PassLibraryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PassLibraryTests.swift; sourceTree = "<group>"; };
 		OBJ_14 /* XCTestManifests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCTestManifests.swift; sourceTree = "<group>"; };
@@ -125,6 +127,7 @@
 			children = (
 				OBJ_9 /* Networker.swift */,
 				OBJ_10 /* PassLibrary.swift */,
+				6004D8E324C4A1FD00ACDCE0 /* AddPKPassView.swift */,
 			);
 			name = PassLibrary;
 			path = Sources/PassLibrary;
@@ -237,6 +240,7 @@
 			files = (
 				OBJ_23 /* Networker.swift in Sources */,
 				OBJ_24 /* PassLibrary.swift in Sources */,
+				6004D8E424C4A1FD00ACDCE0 /* AddPKPassView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -283,7 +287,7 @@
 				);
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = PassLibrary.xcodeproj/PassLibrary_Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				OTHER_CFLAGS = "$(inherited)";
@@ -311,7 +315,7 @@
 				);
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = PassLibrary.xcodeproj/PassLibrary_Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				OTHER_CFLAGS = "$(inherited)";

README.md

@@ -125,42 +125,42 @@ import UIKit
 @objc(RNPassLibrary)
 class RNPassLibrary: NSObject {
 
-  private let passLibrary = PassLibrary()
+    private let passLibrary = PassLibrary()
 
-  @objc
-  func constantsToExport() -> [AnyHashable: Any]! {
-      return ["name": "RNPassLibrary"]
-  }
+    @objc
+    func constantsToExport() -> [AnyHashable: Any]! {
+        return ["name": "RNPassLibrary"]
+    }
 
-  @objc
-  func getRemotePKPassAndPresentPKPassView(_ url: String,
-                                           resolver resolve: @escaping RCTPromiseResolveBlock,
-                                           rejecter reject: @escaping RCTPromiseRejectBlock) {
-      self.passLibrary.getRemotePKPass(from: url) { (result: Result<Data, Error>) in
-          switch result {
-          case .failure(let failure):
-            reject("error", failure.localizedDescription, NSError(domain: failure.localizedDescription, code: 400, userInfo: nil))
-          case .success(let pkpassData):
-              DispatchQueue.main.async {
-                  guard let keyWindow = UIApplication.shared.keyWindow else {
-                    reject("error", "Could not get key window", NSError(domain: "Could not get key window", code: 400, userInfo: nil))
-                      return
-                  }
-                  do {
-                    try self.passLibrary.presentAddPKPassViewController(window: keyWindow, pkpassData: pkpassData)
-                      resolve(true)
-                  } catch {
-                    reject("error", error.localizedDescription, NSError(domain: error.localizedDescription, code: 400, userInfo: nil))
-                  }
-              }
-          }
-      }
-  }
+    @objc
+    func getRemotePKPassAndPresentPKPassView(_ url: String,
+                                            resolver resolve: @escaping RCTPromiseResolveBlock,
+                                            rejecter reject: @escaping RCTPromiseRejectBlock) {
+        self.passLibrary.getRemotePKPass(from: url) { (result: Result<Data, Error>) in
+            switch result {
+            case .failure(let failure):
+                reject("error", failure.localizedDescription, NSError(domain: failure.localizedDescription, code: 400, userInfo: nil))
+            case .success(let pkpassData):
+                DispatchQueue.main.async {
+                    guard let keyWindow = UIApplication.shared.keyWindow else {
+                        reject("error", "Could not get key window", NSError(domain: "Could not get key window", code: 400, userInfo: nil))
+                        return
+                    }
+                    do {
+                        try self.passLibrary.presentAddPKPassViewController(window: keyWindow, pkpassData: pkpassData)
+                        resolve(true)
+                    } catch {
+                        reject("error", error.localizedDescription, NSError(domain: error.localizedDescription, code: 400, userInfo: nil))
+                    }
+                }
+            }
+        }
+    }
 
-  @objc
-  static func requiresMainQueueSetup() -> Bool {
-      return true
-  }
+    @objc
+    static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
 
 }
 ```

Sources/PassLibrary/AddPKPassView.swift

@@ -0,0 +1,115 @@
+//
+//  AddPKPassView.swift
+//  PassLibrary
+//
+//  Created by Kamaal Farah on 19/07/2020.
+//
+
+import SwiftUI
+import PassKit
+
+@available(iOS 13.0, *)
+public final class AddPKPassHandler: ObservableObject {
+    @Published public var showAddPassView = false
+    @Published public var pass: PKPass?
+    @Published public var lastFailures: Error? {
+        didSet {
+            #if DEBUG
+            if let lastFailures = self.lastFailures {
+                print("AddPKPassHandler ERROR:", lastFailures)
+            }
+            #endif
+        }
+    }
+
+    private let networker = Networker()
+
+    public init() { }
+
+    public enum AddPKPassHandlerErrors: Error {
+        case failedToUnwrap(message: String)
+    }
+
+    public func getAndSetPKPass(from urlPath: String) {
+        self.networker.getPKPass(from: urlPath) { (result: Result<Data, Error>) in
+            switch result {
+            case .failure(let error):
+                self.lastFailures = error
+            case .success(let data):
+                var pass: PKPass?
+                do {
+                    pass = try PKPass(data: data)
+                } catch {
+                    self.lastFailures = error
+                }
+                guard pass != nil else {
+                    self.lastFailures = AddPKPassHandlerErrors.failedToUnwrap(message: "Failed to unwrap value of pass")
+                    return
+                }
+                DispatchQueue.main.async {
+                    self.pass = pass
+                    self.showAddPassView = true
+                }
+            }
+        }
+    }
+}
+
+internal struct AddPKPassViewContent: UIViewControllerRepresentable {
+    internal let passes: [PKPass]
+
+    internal init(passes: [PKPass]?) {
+        self.passes = passes ?? []
+    }
+
+    internal init(pass: PKPass?) {
+        if let pass = pass {
+            self.passes = [pass]
+        } else {
+            self.passes = []
+        }
+    }
+
+    func makeUIViewController(context: Context) -> UIViewControllerType {
+        let pkAddPassViewController = PKAddPassesViewController(passes: self.passes)
+        return pkAddPassViewController ?? PKAddPassesViewController()
+    }
+
+    func updateUIViewController(_ uiViewController: UIViewControllerType, context: Context) { }
+
+    typealias UIViewControllerType = PKAddPassesViewController
+}
+
+@available(iOS 13.0, *)
+public struct AddPKPassView<Presenting>: View where Presenting: View {
+    @Binding public var isShowing: Bool
+
+    public var presenting: () -> Presenting
+    public var passes: [PKPass]?
+
+    public init(isShowing: Binding<Bool>, presenting: @escaping () -> Presenting, passes: [PKPass]?) {
+        self._isShowing = isShowing
+        self.presenting = presenting
+        self.passes = passes
+    }
+
+    public var body: some View {
+        self.presenting()
+            .sheet(isPresented: self.$isShowing) {
+                ZStack {
+                    AddPKPassViewContent(passes: self.passes)
+                }
+        }
+    }
+}
+
+@available(iOS 13.0, *)
+public extension View {
+    func addPKPassSheet(isShowing: Binding<Bool>, pass: PKPass? = nil) -> some View {
+        var passes: [PKPass] = []
+        if let pass = pass {
+            passes.append(pass)
+        }
+        return AddPKPassView(isShowing: isShowing, presenting: { self }, passes: passes)
+    }
+}