Make signatureMode less brittle

Example/UXMPDFKit.xcodeproj/project.pbxproj

@@ -160,7 +160,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
@@ -294,14 +294,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;
@@ -342,14 +350,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;
@@ -399,7 +415,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.uxmstudio.uxmpdfit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -428,7 +444,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.uxmstudio.uxmpdfit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

Example/UXMPDFKit.xcodeproj/xcshareddata/xcschemes/UXMPDFKit-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/UXMPDFKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Example/UXMPDFKit/AppDelegate.swift

@@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
+    private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
 
         let dirPaths = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)
         print("App Path: \(dirPaths)")

Pod/Classes/Annotations/PDFAnnotationController.swift

@@ -18,7 +18,7 @@ open class PDFAnnotationController: UIViewController {
     var document: PDFDocument!
 
     /// Store containing all annotations for document
-    var annotations = PDFAnnotationStore()
+    private (set) open var annotations = PDFAnnotationStore()
 
     /// References to pages within view
     var allPages = [PDFPageContentView]()
@@ -119,7 +119,8 @@ open class PDFAnnotationController: UIViewController {
         view.isOpaque = false
         view.backgroundColor = UIColor.clear
 
-        self.loadButtons(for: self.annotationTypes)
+        loadButtons(for: self.annotationTypes)
+        undoButton.isEnabled = (annotations.annotations.count > 0)
     }
 
     //MARK: - Annotation handling
@@ -136,7 +137,7 @@ open class PDFAnnotationController: UIViewController {
         for annotation in annotationsForPage {
             let view = annotation.mutableView()
             contentView.contentView.addSubview(view)
-            contentView.contentView.bringSubview(toFront: view)
+            contentView.contentView.bringSubviewToFront(view)
         }
     }
 
@@ -145,13 +146,16 @@ open class PDFAnnotationController: UIViewController {
         annotationType = type
 
         view.isUserInteractionEnabled = annotationType != nil
+        undoButton.isEnabled = (annotationType != nil || annotations.annotations.count > 0)
     }
 
     open func finishAnnotation() {
 
         annotationType = .none
         addCurrentAnnotationToStore()
+
         view.isUserInteractionEnabled = false
+        undoButton.isEnabled = (annotations.annotations.count > 0)
     }
 
     //MARK: - Bar button actions
@@ -176,9 +180,15 @@ open class PDFAnnotationController: UIViewController {
     }
 
     @IBAction func selectedUndo(_ button: PDFBarButton) {
+        //keep track of what kind of annotation we're adding
+        let currentAnnotationType = annotationType
 
+        //finish and undo it
         finishAnnotation()
         undo()
+
+        //then start a new annotation of the same type
+        startAnnotation(currentAnnotationType)
     }
 
     func select(annotation: PDFAnnotation?) {
@@ -188,7 +198,7 @@ open class PDFAnnotationController: UIViewController {
     }
 
     func loadButtons(for annotations: [PDFAnnotation.Type]) {
-        self.buttons = self.annotationTypes.flatMap {
+        self.buttons = self.annotationTypes.compactMap {
 
             if let annotation = $0 as? PDFAnnotationButtonable.Type {
                 return PDFAnnotationBarButton(
@@ -231,7 +241,13 @@ open class PDFAnnotationController: UIViewController {
 
     //MARK: - Touches methods to pass to annotation
     open override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
-        guard let touch = touches.first else { return }
+        // We only allow one-finger touches to start annotations, as otherwise
+        // when you are pen-editing then try to zoom, one of your fingers will draw instead of zooming
+        // This is a HACK, as IDEALLY the two-finger pinch would zoom while still in
+        // annotation editing mode, but for the life of me I could not get that to go, forwarding
+        // events/touches to pretty much anything.
+        guard let touch = touches.first, event?.allTouches?.count == 1
+            else { return }
 
         let page = annotationDelegate?.annotationWillStart(touch: touch)
 
@@ -252,14 +268,16 @@ open class PDFAnnotationController: UIViewController {
 
 
     open override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
-        guard let touch = touches.first else { return }
+        guard let touch = touches.first, event?.allTouches?.count == 1
+            else { return }
         let point = touch.location(in: pageView)
 
         currentAnnotation?.touchMoved(touch, point: point)
     }
 
     open override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
-        guard let touch = touches.first else { return }
+        guard let touch = touches.first, event?.allTouches?.count == 1
+            else { return }
         let point = touch.location(in: pageView)
 
         currentAnnotation?.touchEnded(touch, point: point)

Pod/Classes/Annotations/PDFAnnotationStore.swift

@@ -17,7 +17,7 @@ public protocol PDFAnnotationStoreDelegate {
 
 open class PDFAnnotationStore: NSObject, NSCoding {
 
-    var annotations: [PDFAnnotation] = []
+    private (set) open var annotations: [PDFAnnotation] = []
     var delegate: PDFAnnotationStoreDelegate?
 
 

Pod/Classes/Annotations/PDFPathAnnotation.swift

@@ -65,6 +65,7 @@ open class PDFPathAnnotation: NSObject, NSCoding {
 
     func drawRect(_ frame: CGRect, point: CGPoint = CGPoint.zero) {
         self.incrementalImage?.draw(at: point)
+        self.path.lineWidth = self.lineWidth
         self.color.setStroke()
         self.path.stroke()
     }

Pod/Classes/Annotations/PDFTextAnnotation.swift

@@ -95,15 +95,15 @@ extension PDFTextAnnotation: PDFAnnotation {
         paragraphStyle.alignment = NSTextAlignment.left
 
         let attributes: [String:AnyObject] = [
-            NSFontAttributeName: font,
-            NSForegroundColorAttributeName: UIColor.black,
-            NSParagraphStyleAttributeName: paragraphStyle
+            convertFromNSAttributedStringKey(NSAttributedString.Key.font): font,
+            convertFromNSAttributedStringKey(NSAttributedString.Key.foregroundColor): UIColor.black,
+            convertFromNSAttributedStringKey(NSAttributedString.Key.paragraphStyle): paragraphStyle
         ]
 
-        let size = nsText.size(attributes: attributes)
+        let size = nsText.size(withAttributes: convertToOptionalNSAttributedStringKeyDictionary(attributes))
         let textRect = CGRect(origin: rect.origin, size: size)
 
-        nsText.draw(in: textRect, withAttributes: attributes)
+        nsText.draw(in: textRect, withAttributes: convertToOptionalNSAttributedStringKeyDictionary(attributes))
 
         UIGraphicsPopContext()
     }
@@ -209,7 +209,7 @@ class PDFTextAnnotationView: ResizableView, PDFAnnotationView {
         self.addSubview(textView)
     }
 
-    func menuActionEdit(_ sender: Any!) {
+    @objc func menuActionEdit(_ sender: Any!) {
         self.delegate?.resizableViewDidSelectAction(view: self, action: "edit")
 
         self.isLocked = true
@@ -225,3 +225,14 @@ class PDFTextAnnotationView: ResizableView, PDFAnnotationView {
         return super.canPerformAction(action, withSender: sender)
     }
 }
+
+// Helper function inserted by Swift 4.2 migrator.
+fileprivate func convertFromNSAttributedStringKey(_ input: NSAttributedString.Key) -> String {
+	return input.rawValue
+}
+
+// Helper function inserted by Swift 4.2 migrator.
+fileprivate func convertToOptionalNSAttributedStringKeyDictionary(_ input: [String: Any]?) -> [NSAttributedString.Key: Any]? {
+	guard let input = input else { return nil }
+	return Dictionary(uniqueKeysWithValues: input.map { key, value in (NSAttributedString.Key(rawValue: key), value)})
+}

Pod/Classes/Extensions/CGPoint.swift

@@ -19,8 +19,8 @@ extension CGPoint {
     func rect(from point: CGPoint) -> CGRect {
         return CGRect(x: min(self.x, point.x),
                       y: min(self.y, point.y),
-                      width: fabs(self.x - point.x),
-                      height: fabs(self.y - point.y))
+                      width: abs(self.x - point.x),
+                      height: abs(self.y - point.y))
     }
 
     /// Get the distance between two points

Pod/Classes/Extensions/CGRect.swift

@@ -55,8 +55,8 @@ extension CGRect {
         return CGRect(
             x: minX,
             y: minY,
-            width: fabs(maxX - minX),
-            height: fabs(maxY - minY)
+            width: abs(maxX - minX),
+            height: abs(maxY - minY)
         )
     }
 }

Pod/Classes/Form/PDFArray.swift

@@ -163,7 +163,7 @@ internal class PDFArray: PDFObject {
 
 extension PDFArray: NSCopying {
     func copy(with zone: NSZone?) -> Any {
-        return type(of: self).init(arrayRef: arr)
+        return Swift.type(of: self).init(arrayRef: arr)
     }
 }