From c02558579cfc7251a31f2adcd671c0a8d395ee36 Mon Sep 17 00:00:00 2001 From: hslightnin Date: Mon, 31 Oct 2016 22:12:02 +0300 Subject: [PATCH 01/21] Force landscape bool and localization --- Example/EPSignature/ViewController.swift | 1 + Pod/Classes/EPSignatureViewController.swift | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Example/EPSignature/ViewController.swift b/Example/EPSignature/ViewController.swift index 29bff46..840b680 100644 --- a/Example/EPSignature/ViewController.swift +++ b/Example/EPSignature/ViewController.swift @@ -17,6 +17,7 @@ class ViewController: UIViewController, EPSignatureDelegate { let signatureVC = EPSignatureViewController(signatureDelegate: self, showsDate: true, showsSaveSignatureOption: true) signatureVC.subtitleText = "I agree to the terms and conditions" signatureVC.title = "John Doe" + signatureVC.forceLandscape = true let nav = UINavigationController(rootViewController: signatureVC) present(nav, animated: true, completion: nil) } diff --git a/Pod/Classes/EPSignatureViewController.swift b/Pod/Classes/EPSignatureViewController.swift index 71e8aaa..96a08d5 100644 --- a/Pod/Classes/EPSignatureViewController.swift +++ b/Pod/Classes/EPSignatureViewController.swift @@ -27,18 +27,22 @@ open class EPSignatureViewController: UIViewController { @IBOutlet weak var signatureView: EPSignatureView! // MARK: - Public Vars - + open var forceLandscape: Bool = false + open var showsDate: Bool = true open var showsSaveSignatureOption: Bool = true open weak var signatureDelegate: EPSignatureDelegate? - open var subtitleText = "Sign Here" + open var subtitleText = NSLocalizedString("Sign Here", comment:"Sign Here") open var tintColor = UIColor.defaultTintColor() // MARK: - Life cycle methods override open func viewDidLoad() { super.viewDidLoad() + + forceLandscape ? UIDevice.current.setValue(UIInterfaceOrientation.landscapeLeft.rawValue, forKey: "orientation") : () + let cancelButton = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.cancel, target: self, action: #selector(EPSignatureViewController.onTouchCancelButton)) cancelButton.tintColor = tintColor self.navigationItem.leftBarButtonItem = cancelButton @@ -50,7 +54,8 @@ open class EPSignatureViewController: UIViewController { if showsDate { let dateFormatter = DateFormatter() - dateFormatter.dateFormat = "dd MMMM YYYY" + dateFormatter.dateStyle = DateFormatter.Style.short + dateFormatter.timeStyle = DateFormatter.Style.none lblDate.text = dateFormatter.string(from: Date()) } else { lblDate.isHidden = true @@ -115,25 +120,25 @@ open class EPSignatureViewController: UIViewController { signatureDelegate?.epSignature!(self, didSign: signature, boundingRect: signatureView.getSignatureBoundsInCanvas()) dismiss(animated: true, completion: nil) } else { - showAlert("You did not sign", andTitle: "Please draw your signature") + showAlert(NSLocalizedString("No signature", comment:"No signature"), andTitle:NSLocalizedString("Please sign on the line.", comment:"Please sign on the line.") ) } } func onTouchActionButton(_ barButton: UIBarButtonItem) { - let action = UIAlertController(title: "Action", message: "", preferredStyle: UIAlertControllerStyle.actionSheet) + let action = UIAlertController(title:NSLocalizedString("Default Signature", comment:"Default Signature"), message: "", preferredStyle: UIAlertControllerStyle.actionSheet) action.view.tintColor = tintColor - action.addAction(UIAlertAction(title: "Load default signature", style: UIAlertActionStyle.default, handler: { action in + action.addAction(UIAlertAction(title:NSLocalizedString("Load default signature", comment:"Load default signature" ), style: UIAlertActionStyle.default, handler: { action in let docPath = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true).first let filePath = (docPath! as NSString).appendingPathComponent("sig.data") self.signatureView.loadSignature(filePath) })) - action.addAction(UIAlertAction(title: "Delete default signature", style: UIAlertActionStyle.destructive, handler: { action in + action.addAction(UIAlertAction(title:NSLocalizedString( "Delete default signature", comment: "Delete default signature" ), style: UIAlertActionStyle.destructive, handler: { action in self.signatureView.removeSignature() })) - action.addAction(UIAlertAction(title: "Cancel", style: UIAlertActionStyle.cancel, handler: nil)) + action.addAction(UIAlertAction(title:NSLocalizedString( "Cancel", comment: "Cancel" ) , style: UIAlertActionStyle.cancel, handler: nil)) if let popOver = action.popoverPresentationController { popOver.barButtonItem = barButton From 5036d97b983d05d5e29bcbb9c37c11e0e7ad00a9 Mon Sep 17 00:00:00 2001 From: hslightnin Date: Tue, 1 Nov 2016 11:04:41 +0300 Subject: [PATCH 02/21] changedmethod --- Example/EPSignature/AppDelegate.swift | 23 +++++++++++ Example/EPSignature/ViewController.swift | 1 - Pod/Classes/EPExtensions.swift | 2 +- Pod/Classes/EPSignatureViewController.swift | 6 ++- Pod/Classes/EPSignatureViewController.xib | 42 +++++++++++---------- 5 files changed, 51 insertions(+), 23 deletions(-) diff --git a/Example/EPSignature/AppDelegate.swift b/Example/EPSignature/AppDelegate.swift index 3f1cbb9..15ba937 100644 --- a/Example/EPSignature/AppDelegate.swift +++ b/Example/EPSignature/AppDelegate.swift @@ -8,6 +8,7 @@ // import UIKit +import EPSignature @UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate { @@ -17,5 +18,27 @@ class AppDelegate: UIResponder, UIApplicationDelegate { // Application launch state return true } + func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask { + if let rootViewController = self.topViewControllerWithRootViewController(window?.rootViewController) { + if (rootViewController.responds(to:#selector(EPSignatureViewController.canRotate))) { + // Unlock landscape view orientations for this view controller + return .landscapeLeft; + } + } + + return .allButUpsideDown; + } + + fileprivate func topViewControllerWithRootViewController(_ rootViewController: UIViewController!) -> UIViewController? { + if (rootViewController == nil) { return nil } + if (rootViewController.isKind(of: UITabBarController.self)) { + return topViewControllerWithRootViewController((rootViewController as! UITabBarController).selectedViewController) + } else if (rootViewController.isKind(of: UINavigationController.self)) { + return topViewControllerWithRootViewController((rootViewController as! UINavigationController).visibleViewController) + } else if (rootViewController.presentedViewController != nil) { + return topViewControllerWithRootViewController(rootViewController.presentedViewController) + } + return rootViewController + } } diff --git a/Example/EPSignature/ViewController.swift b/Example/EPSignature/ViewController.swift index 840b680..29bff46 100644 --- a/Example/EPSignature/ViewController.swift +++ b/Example/EPSignature/ViewController.swift @@ -17,7 +17,6 @@ class ViewController: UIViewController, EPSignatureDelegate { let signatureVC = EPSignatureViewController(signatureDelegate: self, showsDate: true, showsSaveSignatureOption: true) signatureVC.subtitleText = "I agree to the terms and conditions" signatureVC.title = "John Doe" - signatureVC.forceLandscape = true let nav = UINavigationController(rootViewController: signatureVC) present(nav, animated: true, completion: nil) } diff --git a/Pod/Classes/EPExtensions.swift b/Pod/Classes/EPExtensions.swift index 17a3610..e8aa0bd 100644 --- a/Pod/Classes/EPExtensions.swift +++ b/Pod/Classes/EPExtensions.swift @@ -20,7 +20,7 @@ extension UIViewController { let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertControllerStyle.alert) // add an action (button) - alert.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.default, handler: nil)) + alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment:"OK"), style: UIAlertActionStyle.default, handler: nil)) // show the alert self.present(alert, animated: true, completion: nil) diff --git a/Pod/Classes/EPSignatureViewController.swift b/Pod/Classes/EPSignatureViewController.swift index 96a08d5..c764b63 100644 --- a/Pod/Classes/EPSignatureViewController.swift +++ b/Pod/Classes/EPSignatureViewController.swift @@ -27,7 +27,6 @@ open class EPSignatureViewController: UIViewController { @IBOutlet weak var signatureView: EPSignatureView! // MARK: - Public Vars - open var forceLandscape: Bool = false open var showsDate: Bool = true open var showsSaveSignatureOption: Bool = true @@ -40,7 +39,7 @@ open class EPSignatureViewController: UIViewController { override open func viewDidLoad() { super.viewDidLoad() - forceLandscape ? UIDevice.current.setValue(UIInterfaceOrientation.landscapeLeft.rawValue, forKey: "orientation") : () + let cancelButton = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.cancel, target: self, action: #selector(EPSignatureViewController.onTouchCancelButton)) @@ -81,6 +80,9 @@ open class EPSignatureViewController: UIViewController { // Dispose of any resources that can be recreated. } + // MARK: AppDelegate method to force rotation + public func canRotate() -> Void {} + // MARK: - Initializers public convenience init(signatureDelegate: EPSignatureDelegate) { diff --git a/Pod/Classes/EPSignatureViewController.xib b/Pod/Classes/EPSignatureViewController.xib index 115b399..03dd39e 100644 --- a/Pod/Classes/EPSignatureViewController.xib +++ b/Pod/Classes/EPSignatureViewController.xib @@ -1,8 +1,12 @@ - - + + + + + - + + @@ -19,65 +23,65 @@ - + - + - + - - + From b0849d421375c8a667cdc8b20c23ed89c41886d5 Mon Sep 17 00:00:00 2001 From: hslightnin Date: Tue, 1 Nov 2016 11:51:00 +0300 Subject: [PATCH 03/21] added pop view option --- Pod/Classes/EPSignatureViewController.swift | 8 +++++++- Pod/Classes/EPSignatureViewController.xib | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Pod/Classes/EPSignatureViewController.swift b/Pod/Classes/EPSignatureViewController.swift index c764b63..56ca520 100644 --- a/Pod/Classes/EPSignatureViewController.swift +++ b/Pod/Classes/EPSignatureViewController.swift @@ -120,7 +120,13 @@ open class EPSignatureViewController: UIViewController { signatureView.saveSignature(filePath) } signatureDelegate?.epSignature!(self, didSign: signature, boundingRect: signatureView.getSignatureBoundsInCanvas()) - dismiss(animated: true, completion: nil) + if self.navigationController == nil { + dismiss(animated: true, completion: nil) + + }else + { + self.navigationController?.popViewController(animated: true) + } } else { showAlert(NSLocalizedString("No signature", comment:"No signature"), andTitle:NSLocalizedString("Please sign on the line.", comment:"Please sign on the line.") ) } diff --git a/Pod/Classes/EPSignatureViewController.xib b/Pod/Classes/EPSignatureViewController.xib index 03dd39e..4e056d0 100644 --- a/Pod/Classes/EPSignatureViewController.xib +++ b/Pod/Classes/EPSignatureViewController.xib @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ - + From 0ff4d88ed1188174e0627e5df30ab9f3a586c4f5 Mon Sep 17 00:00:00 2001 From: hslightnin Date: Tue, 1 Nov 2016 12:01:18 +0300 Subject: [PATCH 04/21] added pop view to cancel --- Pod/Classes/EPSignatureViewController.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Pod/Classes/EPSignatureViewController.swift b/Pod/Classes/EPSignatureViewController.swift index 56ca520..1c18dfa 100644 --- a/Pod/Classes/EPSignatureViewController.swift +++ b/Pod/Classes/EPSignatureViewController.swift @@ -109,7 +109,13 @@ open class EPSignatureViewController: UIViewController { func onTouchCancelButton() { signatureDelegate?.epSignature!(self, didCancel: NSError(domain: "EPSignatureDomain", code: 1, userInfo: [NSLocalizedDescriptionKey:"User not signed"])) - dismiss(animated: true, completion: nil) + if self.navigationController == nil { + dismiss(animated: true, completion: nil) + + }else + { + self.navigationController?.popViewController(animated: true) + } } func onTouchDoneButton() { From e4349ba24a8f73f9166d97309789ff6cad4ec5d7 Mon Sep 17 00:00:00 2001 From: hslightnin Date: Tue, 1 Nov 2016 16:45:30 +0300 Subject: [PATCH 05/21] removedTint --- Pod/Classes/EPSignatureViewController.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Pod/Classes/EPSignatureViewController.swift b/Pod/Classes/EPSignatureViewController.swift index 1c18dfa..85263e2 100644 --- a/Pod/Classes/EPSignatureViewController.swift +++ b/Pod/Classes/EPSignatureViewController.swift @@ -140,7 +140,6 @@ open class EPSignatureViewController: UIViewController { func onTouchActionButton(_ barButton: UIBarButtonItem) { let action = UIAlertController(title:NSLocalizedString("Default Signature", comment:"Default Signature"), message: "", preferredStyle: UIAlertControllerStyle.actionSheet) - action.view.tintColor = tintColor action.addAction(UIAlertAction(title:NSLocalizedString("Load default signature", comment:"Load default signature" ), style: UIAlertActionStyle.default, handler: { action in let docPath = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true).first From 84fb7f9235ec8bb143313eaaa14e229dd0e65d2d Mon Sep 17 00:00:00 2001 From: hslightnin Date: Tue, 1 Nov 2016 16:48:00 +0300 Subject: [PATCH 06/21] removedTint from switch --- Pod/Classes/EPSignatureViewController.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Pod/Classes/EPSignatureViewController.swift b/Pod/Classes/EPSignatureViewController.swift index 85263e2..b6835aa 100644 --- a/Pod/Classes/EPSignatureViewController.swift +++ b/Pod/Classes/EPSignatureViewController.swift @@ -64,7 +64,6 @@ open class EPSignatureViewController: UIViewController { let actionButton = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.action, target: self, action: #selector(EPSignatureViewController.onTouchActionButton(_:))) actionButton.tintColor = tintColor self.navigationItem.rightBarButtonItems = [doneButton, clearButton, actionButton] - switchSaveSignature.onTintColor = tintColor } else { self.navigationItem.rightBarButtonItems = [doneButton, clearButton] lblDefaultSignature.isHidden = true From d231a5c273350d7521b2c7e91558b2ac72859eba Mon Sep 17 00:00:00 2001 From: robert jenkins Date: Sun, 11 Nov 2018 22:55:02 +0300 Subject: [PATCH 07/21] update to 4.2 4.2 --- Example/EPSignature.xcodeproj/project.pbxproj | 148 ++-- .../contents.xcworkspacedata | 0 .../xcschemes/EPSignature-Example.xcscheme | 2 +- .../xcschemes/xcschememanagement.plist | 0 .../contents.xcworkspacedata | 0 .../UserInterfaceState.xcuserstate | Bin .../xcdebugger/Breakpoints_v2.xcbkptlist | 0 Example/EPSignature/AppDelegate.swift | 25 +- .../EPSignature/Base.lproj/LaunchScreen.xib | 0 .../EPSignature/Base.lproj/Main.storyboard | 15 +- .../AppIcon.appiconset/Contents.json | 0 Example/EPSignature/Info.plist | 0 Example/EPSignature/ViewController.swift | 4 + Example/Podfile | 10 +- Example/Podfile.lock | 8 +- .../Local Podspecs/EPSignature.podspec.json | 6 +- Example/Pods/Manifest.lock | 8 +- Example/Pods/Pods.xcodeproj/project.pbxproj | 660 +++++++++--------- .../contents.xcworkspacedata | 7 - .../xcschemes/EPSignature.xcscheme | 99 --- .../Pods-EPSignature_Example.xcscheme | 60 -- .../xcschemes/Pods-EPSignature_Tests.xcscheme | 60 -- .../xcschemes/xcschememanagement.plist | 42 -- .../EPSignature/EPSignature-dummy.m | 0 .../EPSignature/EPSignature-prefix.pch | 8 + .../EPSignature/EPSignature-umbrella.h | 10 + .../EPSignature/EPSignature.modulemap | 0 .../EPSignature/EPSignature.xcconfig | 9 +- .../EPSignature/Info.plist | 40 +- .../Pods-EPSignature_Example/Info.plist | 40 +- ...ignature_Example-acknowledgements.markdown | 2 +- ...EPSignature_Example-acknowledgements.plist | 4 +- .../Pods-EPSignature_Example-dummy.m | 0 .../Pods-EPSignature_Example-frameworks.sh | 39 +- .../Pods-EPSignature_Example-resources.sh | 105 +-- .../Pods-EPSignature_Example-umbrella.h | 10 + .../Pods-EPSignature_Example.debug.xcconfig | 11 +- .../Pods-EPSignature_Example.modulemap | 0 .../Pods-EPSignature_Example.release.xcconfig | 11 +- .../Pods-EPSignature_Tests/Info.plist | 40 +- ...PSignature_Tests-acknowledgements.markdown | 2 +- ...s-EPSignature_Tests-acknowledgements.plist | 4 +- .../Pods-EPSignature_Tests-dummy.m | 0 .../Pods-EPSignature_Tests-frameworks.sh | 39 +- .../Pods-EPSignature_Tests-resources.sh | 105 +-- .../Pods-EPSignature_Tests-umbrella.h | 10 + .../Pods-EPSignature_Tests.debug.xcconfig | 11 +- .../Pods-EPSignature_Tests.modulemap | 0 .../Pods-EPSignature_Tests.release.xcconfig | 11 +- Example/Tests/Info.plist | 0 Example/Tests/Tests.swift | 0 Pod/Classes/EPExtensions.swift | 4 +- Pod/Classes/EPSignatureView.swift | 39 +- Pod/Classes/EPSignatureViewController.swift | 57 +- Pod/Classes/EPSignatureViewController.xib | 66 +- 55 files changed, 843 insertions(+), 988 deletions(-) mode change 100644 => 100755 Example/EPSignature.xcodeproj/project.pbxproj mode change 100644 => 100755 Example/EPSignature.xcodeproj/project.xcworkspace/contents.xcworkspacedata mode change 100644 => 100755 Example/EPSignature.xcodeproj/xcshareddata/xcschemes/EPSignature-Example.xcscheme mode change 100644 => 100755 Example/EPSignature.xcodeproj/xcuserdata/prabaharan.e.xcuserdatad/xcschemes/xcschememanagement.plist mode change 100644 => 100755 Example/EPSignature.xcworkspace/contents.xcworkspacedata mode change 100644 => 100755 Example/EPSignature.xcworkspace/xcuserdata/prabaharan.e.xcuserdatad/UserInterfaceState.xcuserstate mode change 100644 => 100755 Example/EPSignature.xcworkspace/xcuserdata/prabaharan.e.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist mode change 100644 => 100755 Example/EPSignature/AppDelegate.swift mode change 100644 => 100755 Example/EPSignature/Base.lproj/LaunchScreen.xib mode change 100644 => 100755 Example/EPSignature/Base.lproj/Main.storyboard mode change 100644 => 100755 Example/EPSignature/Images.xcassets/AppIcon.appiconset/Contents.json mode change 100644 => 100755 Example/EPSignature/Info.plist mode change 100644 => 100755 Example/EPSignature/ViewController.swift mode change 100644 => 100755 Example/Podfile mode change 100644 => 100755 Example/Podfile.lock mode change 100644 => 100755 Example/Pods/Local Podspecs/EPSignature.podspec.json mode change 100644 => 100755 Example/Pods/Manifest.lock mode change 100644 => 100755 Example/Pods/Pods.xcodeproj/project.pbxproj delete mode 100644 Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/EPSignature.xcscheme delete mode 100644 Example/Pods/Pods.xcodeproj/xcuserdata/prabaharan.e.xcuserdatad/xcschemes/Pods-EPSignature_Example.xcscheme delete mode 100644 Example/Pods/Pods.xcodeproj/xcuserdata/prabaharan.e.xcuserdatad/xcschemes/Pods-EPSignature_Tests.xcscheme delete mode 100644 Example/Pods/Pods.xcodeproj/xcuserdata/prabaharan.e.xcuserdatad/xcschemes/xcschememanagement.plist mode change 100644 => 100755 Example/Pods/Target Support Files/EPSignature/EPSignature-dummy.m mode change 100644 => 100755 Example/Pods/Target Support Files/EPSignature/EPSignature-prefix.pch mode change 100644 => 100755 Example/Pods/Target Support Files/EPSignature/EPSignature-umbrella.h mode change 100644 => 100755 Example/Pods/Target Support Files/EPSignature/EPSignature.modulemap mode change 100644 => 100755 Example/Pods/Target Support Files/EPSignature/EPSignature.xcconfig mode change 100644 => 100755 Example/Pods/Target Support Files/EPSignature/Info.plist mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Example/Info.plist mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example-acknowledgements.markdown mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example-acknowledgements.plist mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example-dummy.m mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example-umbrella.h mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example.debug.xcconfig mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example.modulemap mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example.release.xcconfig mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Tests/Info.plist mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests-acknowledgements.markdown mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests-acknowledgements.plist mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests-dummy.m mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests-umbrella.h mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests.debug.xcconfig mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests.modulemap mode change 100644 => 100755 Example/Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests.release.xcconfig mode change 100644 => 100755 Example/Tests/Info.plist mode change 100644 => 100755 Example/Tests/Tests.swift mode change 100644 => 100755 Pod/Classes/EPExtensions.swift mode change 100644 => 100755 Pod/Classes/EPSignatureView.swift mode change 100644 => 100755 Pod/Classes/EPSignatureViewController.swift mode change 100644 => 100755 Pod/Classes/EPSignatureViewController.xib diff --git a/Example/EPSignature.xcodeproj/project.pbxproj b/Example/EPSignature.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index 7cbed86..d153c6b --- a/Example/EPSignature.xcodeproj/project.pbxproj +++ b/Example/EPSignature.xcodeproj/project.pbxproj @@ -12,9 +12,9 @@ 607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; }; 607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; }; 607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; }; - D46ABFB2E6199B4F1D8B00FD /* Pods_EPSignature_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5A699D3F98BA092EEC579 /* Pods_EPSignature_Tests.framework */; }; + 826EE5F5028BB52B3B18CD8E /* Pods_EPSignature_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76334BC24A09F53C3E741719 /* Pods_EPSignature_Tests.framework */; }; + C777CECC23122F5F43D69A67 /* Pods_EPSignature_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9344E58733CDC0A7D5F89F5 /* Pods_EPSignature_Example.framework */; }; F4610E951C4E435800D093B5 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4610E931C4E435800D093B5 /* Tests.swift */; }; - FD2F4DBD994F6A970D127DFD /* Pods_EPSignature_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15E9D6DBDBE3EC5A2A4839C3 /* Pods_EPSignature_Example.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -28,11 +28,9 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 15E9D6DBDBE3EC5A2A4839C3 /* Pods_EPSignature_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_EPSignature_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0F8DB633D789A18A31700E0D /* Pods-EPSignature_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EPSignature_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests.release.xcconfig"; sourceTree = ""; }; 1A2C351F6862054EE1849CD1 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; - 1E1F1CEB9FE94501D18455C5 /* Pods-EPSignature_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EPSignature_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests.release.xcconfig"; sourceTree = ""; }; - 28C5A699D3F98BA092EEC579 /* Pods_EPSignature_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_EPSignature_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 468298BC80AC5F52E266174E /* Pods-EPSignature_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EPSignature_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests.debug.xcconfig"; sourceTree = ""; }; + 1CC0D063C0E6BB1DA5D21548 /* Pods-EPSignature_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EPSignature_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example.debug.xcconfig"; sourceTree = ""; }; 607FACD01AFB9204008FA782 /* EPSignature_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EPSignature_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -41,13 +39,15 @@ 607FACDC1AFB9204008FA782 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 607FACE51AFB9204008FA782 /* EPSignature_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EPSignature_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 658CF1F0E9BEF08F55584BFB /* Pods-EPSignature_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EPSignature_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example.release.xcconfig"; sourceTree = ""; }; + 76334BC24A09F53C3E741719 /* Pods_EPSignature_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_EPSignature_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 80B384D2F1FB9E801E17B03E /* EPSignature.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = EPSignature.podspec; path = ../EPSignature.podspec; sourceTree = ""; }; 9505CA2A7C08D1FAE19D88BE /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; + BADBD621301FD946BBB4C228 /* Pods-EPSignature_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EPSignature_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests.debug.xcconfig"; sourceTree = ""; }; + C9344E58733CDC0A7D5F89F5 /* Pods_EPSignature_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_EPSignature_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + EAC7FAB870C77D62CB94C285 /* Pods-EPSignature_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EPSignature_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example.release.xcconfig"; sourceTree = ""; }; F4610E921C4E435800D093B5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F4610E931C4E435800D093B5 /* Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = ""; }; F4670B2D1C4E58810093CD0F /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; name = .travis.yml; path = ../.travis.yml; sourceTree = ""; }; - FCA533009FE604848E395F85 /* Pods-EPSignature_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EPSignature_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -55,7 +55,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FD2F4DBD994F6A970D127DFD /* Pods_EPSignature_Example.framework in Frameworks */, + C777CECC23122F5F43D69A67 /* Pods_EPSignature_Example.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -63,29 +63,29 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D46ABFB2E6199B4F1D8B00FD /* Pods_EPSignature_Tests.framework in Frameworks */, + 826EE5F5028BB52B3B18CD8E /* Pods_EPSignature_Tests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1D85A18EA1ABDC83CA97653D /* Pods */ = { + 314B175D85F700BBC2CD61D4 /* Pods */ = { isa = PBXGroup; children = ( - FCA533009FE604848E395F85 /* Pods-EPSignature_Example.debug.xcconfig */, - 658CF1F0E9BEF08F55584BFB /* Pods-EPSignature_Example.release.xcconfig */, - 468298BC80AC5F52E266174E /* Pods-EPSignature_Tests.debug.xcconfig */, - 1E1F1CEB9FE94501D18455C5 /* Pods-EPSignature_Tests.release.xcconfig */, + 1CC0D063C0E6BB1DA5D21548 /* Pods-EPSignature_Example.debug.xcconfig */, + EAC7FAB870C77D62CB94C285 /* Pods-EPSignature_Example.release.xcconfig */, + BADBD621301FD946BBB4C228 /* Pods-EPSignature_Tests.debug.xcconfig */, + 0F8DB633D789A18A31700E0D /* Pods-EPSignature_Tests.release.xcconfig */, ); name = Pods; sourceTree = ""; }; - 4D5BF5E158227BBC15AC3ED9 /* Frameworks */ = { + 3D8E32AFD2A6091E2A06F30A /* Frameworks */ = { isa = PBXGroup; children = ( - 15E9D6DBDBE3EC5A2A4839C3 /* Pods_EPSignature_Example.framework */, - 28C5A699D3F98BA092EEC579 /* Pods_EPSignature_Tests.framework */, + C9344E58733CDC0A7D5F89F5 /* Pods_EPSignature_Example.framework */, + 76334BC24A09F53C3E741719 /* Pods_EPSignature_Tests.framework */, ); name = Frameworks; sourceTree = ""; @@ -97,8 +97,8 @@ 607FACD21AFB9204008FA782 /* Example for EPSignature */, F4610E911C4E435800D093B5 /* Tests */, 607FACD11AFB9204008FA782 /* Products */, - 1D85A18EA1ABDC83CA97653D /* Pods */, - 4D5BF5E158227BBC15AC3ED9 /* Frameworks */, + 314B175D85F700BBC2CD61D4 /* Pods */, + 3D8E32AFD2A6091E2A06F30A /* Frameworks */, ); sourceTree = ""; }; @@ -160,12 +160,12 @@ isa = PBXNativeTarget; buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "EPSignature_Example" */; buildPhases = ( - D4E216679CBC1B4C45AFC89E /* Check Pods Manifest.lock */, + C7F9A3E07A1D37DEC87BCADB /* [CP] Check Pods Manifest.lock */, 607FACCC1AFB9204008FA782 /* Sources */, 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, - 01ACA64EF8DA9597A2C448E9 /* Embed Pods Frameworks */, - 71D787B6958141EBF33F9B66 /* Copy Pods Resources */, + C365D2E715598F110C1F6304 /* [CP] Embed Pods Frameworks */, + DA52CB9707F47475E364E0B0 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -180,12 +180,12 @@ isa = PBXNativeTarget; buildConfigurationList = 607FACF21AFB9204008FA782 /* Build configuration list for PBXNativeTarget "EPSignature_Tests" */; buildPhases = ( - 55AA2DDDDFDAE7A2B934D60D /* Check Pods Manifest.lock */, + 69F1C89CB8034BF79DBABD20 /* [CP] Check Pods Manifest.lock */, 607FACE11AFB9204008FA782 /* Sources */, 607FACE21AFB9204008FA782 /* Frameworks */, 607FACE31AFB9204008FA782 /* Resources */, - 7260FC76980E7758E0CC3303 /* Embed Pods Frameworks */, - 079CC4BFA95CB347E1DD6164 /* Copy Pods Resources */, + 9FA7043A9F055B521A931F07 /* [CP] Embed Pods Frameworks */, + DC044E23ED185987EBDD0537 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -204,18 +204,18 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = CocoaPods; TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; DevelopmentTeam = DG779MAMM2; - LastSwiftMigration = 0800; + LastSwiftMigration = 1010; }; 607FACE41AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; DevelopmentTeam = DG779MAMM2; - LastSwiftMigration = 0800; + LastSwiftMigration = 1010; TestTargetID = 607FACCF1AFB9204008FA782; }; }; @@ -260,94 +260,106 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 01ACA64EF8DA9597A2C448E9 /* Embed Pods Frameworks */ = { + 69F1C89CB8034BF79DBABD20 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "Embed Pods Frameworks"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-EPSignature_Tests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 079CC4BFA95CB347E1DD6164 /* Copy Pods Resources */ = { + 9FA7043A9F055B521A931F07 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/EPSignature/EPSignature.framework", ); - name = "Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EPSignature.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 55AA2DDDDFDAE7A2B934D60D /* Check Pods Manifest.lock */ = { + C365D2E715598F110C1F6304 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/EPSignature/EPSignature.framework", ); - name = "Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EPSignature.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 71D787B6958141EBF33F9B66 /* Copy Pods Resources */ = { + C7F9A3E07A1D37DEC87BCADB /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-EPSignature_Example-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 7260FC76980E7758E0CC3303 /* Embed Pods Frameworks */ = { + DA52CB9707F47475E364E0B0 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EPSignature_Example/Pods-EPSignature_Example-resources.sh\"\n"; showEnvVarsInLog = 0; }; - D4E216679CBC1B4C45AFC89E /* Check Pods Manifest.lock */ = { + DC044E23ED185987EBDD0537 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EPSignature_Tests/Pods-EPSignature_Tests-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -408,14 +420,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -439,7 +459,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -455,14 +475,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -479,7 +507,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -489,43 +517,42 @@ }; 607FACF01AFB9204008FA782 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FCA533009FE604848E395F85 /* Pods-EPSignature_Example.debug.xcconfig */; + baseConfigurationReference = 1CC0D063C0E6BB1DA5D21548 /* Pods-EPSignature_Example.debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = DG779MAMM2; INFOPLIST_FILE = EPSignature/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; 607FACF11AFB9204008FA782 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 658CF1F0E9BEF08F55584BFB /* Pods-EPSignature_Example.release.xcconfig */; + baseConfigurationReference = EAC7FAB870C77D62CB94C285 /* Pods-EPSignature_Example.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = DG779MAMM2; INFOPLIST_FILE = EPSignature/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; 607FACF31AFB9204008FA782 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 468298BC80AC5F52E266174E /* Pods-EPSignature_Tests.debug.xcconfig */; + baseConfigurationReference = BADBD621301FD946BBB4C228 /* Pods-EPSignature_Tests.debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; DEVELOPMENT_TEAM = DG779MAMM2; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -537,16 +564,15 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EPSignature_Example.app/EPSignature_Example"; }; name = Debug; }; 607FACF41AFB9204008FA782 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1E1F1CEB9FE94501D18455C5 /* Pods-EPSignature_Tests.release.xcconfig */; + baseConfigurationReference = 0F8DB633D789A18A31700E0D /* Pods-EPSignature_Tests.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; DEVELOPMENT_TEAM = DG779MAMM2; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -554,7 +580,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EPSignature_Example.app/EPSignature_Example"; }; name = Release; diff --git a/Example/EPSignature.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example/EPSignature.xcodeproj/project.xcworkspace/contents.xcworkspacedata old mode 100644 new mode 100755 diff --git a/Example/EPSignature.xcodeproj/xcshareddata/xcschemes/EPSignature-Example.xcscheme b/Example/EPSignature.xcodeproj/xcshareddata/xcschemes/EPSignature-Example.xcscheme old mode 100644 new mode 100755 index f032d4d..493afb6 --- a/Example/EPSignature.xcodeproj/xcshareddata/xcschemes/EPSignature-Example.xcscheme +++ b/Example/EPSignature.xcodeproj/xcshareddata/xcschemes/EPSignature-Example.xcscheme @@ -1,6 +1,6 @@ Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { // Application launch state return true } - func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask { - if let rootViewController = self.topViewControllerWithRootViewController(window?.rootViewController) { - if (rootViewController.responds(to:#selector(EPSignatureViewController.canRotate))) { - // Unlock landscape view orientations for this view controller - return .landscapeLeft; - } - } - - return .allButUpsideDown; - } - - fileprivate func topViewControllerWithRootViewController(_ rootViewController: UIViewController!) -> UIViewController? { - if (rootViewController == nil) { return nil } - if (rootViewController.isKind(of: UITabBarController.self)) { - return topViewControllerWithRootViewController((rootViewController as! UITabBarController).selectedViewController) - } else if (rootViewController.isKind(of: UINavigationController.self)) { - return topViewControllerWithRootViewController((rootViewController as! UINavigationController).visibleViewController) - } else if (rootViewController.presentedViewController != nil) { - return topViewControllerWithRootViewController(rootViewController.presentedViewController) - } - return rootViewController - } } diff --git a/Example/EPSignature/Base.lproj/LaunchScreen.xib b/Example/EPSignature/Base.lproj/LaunchScreen.xib old mode 100644 new mode 100755 diff --git a/Example/EPSignature/Base.lproj/Main.storyboard b/Example/EPSignature/Base.lproj/Main.storyboard old mode 100644 new mode 100755 index cb820b4..1faee91 --- a/Example/EPSignature/Base.lproj/Main.storyboard +++ b/Example/EPSignature/Base.lproj/Main.storyboard @@ -1,8 +1,11 @@ - + + + + - + @@ -19,12 +22,14 @@ +