From 8128254bb0bf91c7bbbfb369887c7d713cc31ff3 Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Mon, 28 Aug 2017 19:12:54 -0500 Subject: [PATCH 1/3] Initial upgrade to Swift 4.0 --- Example/Pods/Pods.xcodeproj/project.pbxproj | 23 +++++++++++++--- .../xcshareddata/xcschemes/UXMPDFKit.xcscheme | 4 ++- Example/UXMPDFKit.xcodeproj/project.pbxproj | 26 ++++++++++++++----- .../xcschemes/UXMPDFKit-Example.xcscheme | 4 ++- .../Annotations/PDFTextAnnotation.swift | 12 ++++----- Pod/Classes/Form/PDFArray.swift | 2 +- Pod/Classes/Form/PDFFormButtonField.swift | 10 +++---- Pod/Classes/Form/PDFFormField.swift | 2 +- Pod/Classes/Form/PDFFormSignatureField.swift | 2 +- Pod/Classes/Form/PDFFormTextField.swift | 4 +-- Pod/Classes/Form/PDFToggleButton.swift | 2 +- Pod/Classes/Renderer/PDFPageContentView.swift | 8 +++--- Pod/Classes/Renderer/PDFPageScrubber.swift | 10 +++---- Pod/Classes/Renderer/PDFViewController.swift | 8 +++--- Pod/Classes/View/PDFBarButton.swift | 2 +- Pod/Classes/View/ResizeableView.swift | 2 +- 16 files changed, 78 insertions(+), 43 deletions(-) diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 28222e8..cde5cec 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -491,8 +491,11 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 0900; TargetAttributes = { + 806AC9F20336348B8F1E6138E470491D = { + LastSwiftMigration = 0900; + }; D7C77B95095598F2FFA1E9456D29905E = { LastSwiftMigration = 0820; }; @@ -680,7 +683,8 @@ PRODUCT_NAME = UXMPDFKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -713,7 +717,8 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -767,14 +772,20 @@ 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_DIRECT_OBJC_ISA_USAGE = YES; 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_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES; + 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; @@ -851,14 +862,20 @@ 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_DIRECT_OBJC_ISA_USAGE = YES; 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_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES; + 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; diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/UXMPDFKit.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/UXMPDFKit.xcscheme index a2f2807..1861623 100644 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/UXMPDFKit.xcscheme +++ b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/UXMPDFKit.xcscheme @@ -1,6 +1,6 @@ @@ -36,6 +37,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Example/UXMPDFKit.xcodeproj/project.pbxproj b/Example/UXMPDFKit.xcodeproj/project.pbxproj index 5b0f08d..0b08ab3 100644 --- a/Example/UXMPDFKit.xcodeproj/project.pbxproj +++ b/Example/UXMPDFKit.xcodeproj/project.pbxproj @@ -15,7 +15,6 @@ 607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; }; 614D2EE31C8C8A9A00A856CD /* sample.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 614D2EE21C8C8A9A00A856CD /* sample.pdf */; }; 616B61061CF7395100B743A7 /* sample2.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 616B61051CF7395100B743A7 /* sample2.pdf */; }; - 619D94B91EE7B5FA0009538F /* CHANGELOG.md in Sources */ = {isa = PBXBuildFile; fileRef = 619D94B81EE7B5FA0009538F /* CHANGELOG.md */; }; 61CBF9411D86EB7F00282554 /* sample3.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 61CBF9401D86EB7F00282554 /* sample3.pdf */; }; 61D3B3771CDE9C1600E7C3A6 /* ExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D3B3761CDE9C1600E7C3A6 /* ExampleViewController.swift */; }; /* End PBXBuildFile section */ @@ -160,13 +159,13 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 0900; ORGANIZATIONNAME = CocoaPods; TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; DevelopmentTeam = 9592M4L4J8; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; }; }; @@ -260,7 +259,6 @@ 607FACD81AFB9204008FA782 /* ViewController.swift in Sources */, 607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */, 61D3B3771CDE9C1600E7C3A6 /* ExampleViewController.swift in Sources */, - 619D94B91EE7B5FA0009538F /* CHANGELOG.md in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -294,14 +292,20 @@ 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_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_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; @@ -330,6 +334,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 3.0; }; name = Debug; @@ -342,14 +347,20 @@ 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_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_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; @@ -370,6 +381,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 3.0; VALIDATE_PRODUCT = YES; }; @@ -399,7 +411,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.uxmstudio.uxmpdfit; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -428,7 +441,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.uxmstudio.uxmpdfit; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Example/UXMPDFKit.xcodeproj/xcshareddata/xcschemes/UXMPDFKit-Example.xcscheme b/Example/UXMPDFKit.xcodeproj/xcshareddata/xcschemes/UXMPDFKit-Example.xcscheme index 180fa0a..f6b736e 100644 --- a/Example/UXMPDFKit.xcodeproj/xcshareddata/xcschemes/UXMPDFKit-Example.xcscheme +++ b/Example/UXMPDFKit.xcodeproj/xcshareddata/xcschemes/UXMPDFKit-Example.xcscheme @@ -1,6 +1,6 @@ @@ -59,6 +60,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Pod/Classes/Annotations/PDFTextAnnotation.swift b/Pod/Classes/Annotations/PDFTextAnnotation.swift index 32d95dd..a4f2f10 100644 --- a/Pod/Classes/Annotations/PDFTextAnnotation.swift +++ b/Pod/Classes/Annotations/PDFTextAnnotation.swift @@ -94,13 +94,13 @@ extension PDFTextAnnotation: PDFAnnotation { let paragraphStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle paragraphStyle.alignment = NSTextAlignment.left - let attributes: [String:AnyObject] = [ - NSFontAttributeName: font, - NSForegroundColorAttributeName: UIColor.black, - NSParagraphStyleAttributeName: paragraphStyle + let attributes: [NSAttributedStringKey:AnyObject] = [ + NSAttributedStringKey.font: font, + NSAttributedStringKey.foregroundColor: UIColor.black, + NSAttributedStringKey.paragraphStyle: paragraphStyle ] - let size = nsText.size(attributes: attributes) + let size = nsText.size(withAttributes: attributes) let textRect = CGRect(origin: rect.origin, size: size) nsText.draw(in: textRect, withAttributes: attributes) @@ -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 diff --git a/Pod/Classes/Form/PDFArray.swift b/Pod/Classes/Form/PDFArray.swift index 25bb87f..de00551 100644 --- a/Pod/Classes/Form/PDFArray.swift +++ b/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) } } diff --git a/Pod/Classes/Form/PDFFormButtonField.swift b/Pod/Classes/Form/PDFFormButtonField.swift index 82a4d93..b0fb0cc 100644 --- a/Pod/Classes/Form/PDFFormButtonField.swift +++ b/Pod/Classes/Form/PDFFormButtonField.swift @@ -66,7 +66,7 @@ open class PDFFormButtonField: PDFFormField { addSubview(button) } - func buttonPressed() { + @objc func buttonPressed() { value = (isSelected ? "" : exportValue) as AnyObject? delegate?.formFieldValueChanged(self) } @@ -105,10 +105,10 @@ open class PDFFormButtonField: PDFFormField { let paragraphStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle paragraphStyle.alignment = NSTextAlignment.center - let attributes: [String:AnyObject] = [ - NSFontAttributeName: font, - NSForegroundColorAttributeName: titleColor, - NSParagraphStyleAttributeName: paragraphStyle + let attributes: [NSAttributedStringKey:AnyObject] = [ + NSAttributedStringKey.font: font, + NSAttributedStringKey.foregroundColor: titleColor, + NSAttributedStringKey.paragraphStyle: paragraphStyle ] title.draw(in: frame, withAttributes: attributes) diff --git a/Pod/Classes/Form/PDFFormField.swift b/Pod/Classes/Form/PDFFormField.swift index e89a565..85a4dd9 100644 --- a/Pod/Classes/Form/PDFFormField.swift +++ b/Pod/Classes/Form/PDFFormField.swift @@ -32,7 +32,7 @@ open class PDFFormFieldObject { let flags: [PDFFormFlag] if let flagsObj = dict["Ff"] as? NSNumber { - flags = self.determineFlags(UInt(flagsObj)) + flags = self.determineFlags(UInt(truncating: flagsObj)) } else { flags = [] diff --git a/Pod/Classes/Form/PDFFormSignatureField.swift b/Pod/Classes/Form/PDFFormSignatureField.swift index e7a013c..3804882 100644 --- a/Pod/Classes/Form/PDFFormSignatureField.swift +++ b/Pod/Classes/Form/PDFFormSignatureField.swift @@ -61,7 +61,7 @@ open class PDFFormSignatureField: PDFFormField { } } - func addSignature() { + @objc func addSignature() { let vc = PDFFormSignatureViewController() vc.delegate = self diff --git a/Pod/Classes/Form/PDFFormTextField.swift b/Pod/Classes/Form/PDFFormTextField.swift index bb4040a..50e4eeb 100644 --- a/Pod/Classes/Form/PDFFormTextField.swift +++ b/Pod/Classes/Form/PDFFormTextField.swift @@ -120,13 +120,13 @@ open class PDFFormTextField: PDFFormField { /// UGLY (text as NSString!).draw(in: frame, withAttributes: [ - NSFontAttributeName: font + NSAttributedStringKey.font: font ]) } } extension PDFFormTextField: UITextFieldDelegate { - func textChanged() { + @objc func textChanged() { value = text as AnyObject? delegate?.formFieldValueChanged(self) } diff --git a/Pod/Classes/Form/PDFToggleButton.swift b/Pod/Classes/Form/PDFToggleButton.swift index 45a944c..557615c 100644 --- a/Pod/Classes/Form/PDFToggleButton.swift +++ b/Pod/Classes/Form/PDFToggleButton.swift @@ -28,7 +28,7 @@ class PDFToggleButton: UIButton { titleLabel?.font = UIFont(name: "ZapfDingbatsITC", size: 10) } - func buttonTapped() { + @objc func buttonTapped() { self.isSelected = !self.isSelected } } diff --git a/Pod/Classes/Renderer/PDFPageContentView.swift b/Pod/Classes/Renderer/PDFPageContentView.swift index 1ea7967..411a943 100644 --- a/Pod/Classes/Renderer/PDFPageContentView.swift +++ b/Pod/Classes/Renderer/PDFPageContentView.swift @@ -147,7 +147,7 @@ open class PDFPageContentView: UIScrollView, UIScrollViewDelegate { self.zoomReset() } - open func processSingleTap(_ recognizer: UITapGestureRecognizer) { + @objc open func processSingleTap(_ recognizer: UITapGestureRecognizer) { if let action = contentView.processSingleTap(recognizer) as? PDFAction { contentDelegate?.contentView(self, didSelect: action) } @@ -159,7 +159,7 @@ open class PDFPageContentView: UIScrollView, UIScrollViewDelegate { } } - open func processDoubleTap(_ recognizer: UITapGestureRecognizer) { + @objc open func processDoubleTap(_ recognizer: UITapGestureRecognizer) { contentDelegate?.contentView(self, doubleTapped: recognizer) } @@ -218,11 +218,11 @@ open class PDFPageContentView: UIScrollView, UIScrollViewDelegate { viewDidZoom?(scrollView.zoomScale) } - func keyboardWillShowNotification(_ notification: Notification) { + @objc func keyboardWillShowNotification(_ notification: Notification) { updateBottomLayoutConstraintWithNotification(notification, show: true) } - func keyboardWillHideNotification(_ notification: Notification) { + @objc func keyboardWillHideNotification(_ notification: Notification) { updateBottomLayoutConstraintWithNotification(notification, show: false) } diff --git a/Pod/Classes/Renderer/PDFPageScrubber.swift b/Pod/Classes/Renderer/PDFPageScrubber.swift index 46fe01c..9be8714 100644 --- a/Pod/Classes/Renderer/PDFPageScrubber.swift +++ b/Pod/Classes/Renderer/PDFPageScrubber.swift @@ -245,7 +245,7 @@ open class PDFPageScrubber: UIToolbar { } } - func trackTimerFired(_ timer: Timer) { + @objc func trackTimerFired(_ timer: Timer) { trackTimer?.invalidate() trackTimer = nil if scrubber.tag != document.currentPage { @@ -253,7 +253,7 @@ open class PDFPageScrubber: UIToolbar { } } - func enableTimerFired(_ timer: Timer) { + @objc func enableTimerFired(_ timer: Timer) { enableTimer?.invalidate() enableTimer = nil scrubber.isUserInteractionEnabled = true @@ -292,7 +292,7 @@ open class PDFPageScrubber: UIToolbar { return page + 1 } - func scrubberTouchDown(_ scrubber: PDFPageScrubberTrackControl) { + @objc func scrubberTouchDown(_ scrubber: PDFPageScrubberTrackControl) { let page = scrubberPageNumber(scrubber) if page != document.currentPage { @@ -304,7 +304,7 @@ open class PDFPageScrubber: UIToolbar { scrubber.tag = page } - func scrubberTouchUp(_ scrubber: PDFPageScrubberTrackControl) { + @objc func scrubberTouchUp(_ scrubber: PDFPageScrubberTrackControl) { if trackTimer != nil { trackTimer?.invalidate() trackTimer = nil @@ -319,7 +319,7 @@ open class PDFPageScrubber: UIToolbar { scrubber.tag = 0 } - func scrubberValueChanged(_ scrubber: PDFPageScrubberTrackControl) { + @objc func scrubberValueChanged(_ scrubber: PDFPageScrubberTrackControl) { let page = self.scrubberPageNumber(scrubber) if page != scrubber.tag { updatePageNumberText(page) diff --git a/Pod/Classes/Renderer/PDFViewController.swift b/Pod/Classes/Renderer/PDFViewController.swift index 9a964a2..98e9bdc 100644 --- a/Pod/Classes/Renderer/PDFViewController.swift +++ b/Pod/Classes/Renderer/PDFViewController.swift @@ -237,7 +237,7 @@ open class PDFViewController: UIViewController { return buttons } - func toggleAnnotations(_ button: PDFBarButton) { + @objc func toggleAnnotations(_ button: PDFBarButton) { showingAnnotations = !showingAnnotations reloadBarButtons() } @@ -261,7 +261,7 @@ open class PDFViewController: UIViewController { present(activityVC, animated: true, completion: nil) } - func showThumbnailView() { + @objc func showThumbnailView() { let vc = PDFThumbnailViewController(document: document) vc.delegate = self let nvc = UINavigationController(rootViewController: vc) @@ -296,11 +296,11 @@ open class PDFViewController: UIViewController { self.toggleBars() } - func shareDocument() { + @objc func shareDocument() { self.shareBarButtonAction() } - func dismissModal() { + @objc func dismissModal() { dismiss(animated: true, completion: nil) } } diff --git a/Pod/Classes/View/PDFBarButton.swift b/Pod/Classes/View/PDFBarButton.swift index 9a49462..20b4b86 100644 --- a/Pod/Classes/View/PDFBarButton.swift +++ b/Pod/Classes/View/PDFBarButton.swift @@ -57,7 +57,7 @@ open class PDFBarButton: UIBarButtonItem { } } - func tapped() { + @objc func tapped() { let _ = self.target?.perform(self.action, with: self) self.block?(self) } diff --git a/Pod/Classes/View/ResizeableView.swift b/Pod/Classes/View/ResizeableView.swift index cced88a..67162a7 100644 --- a/Pod/Classes/View/ResizeableView.swift +++ b/Pod/Classes/View/ResizeableView.swift @@ -344,7 +344,7 @@ open class ResizableView: UIView { self.resignFirstResponder() } - func menuActionDelete(_ sender: Any!) { + @objc func menuActionDelete(_ sender: Any!) { self.delegate?.resizableViewDidSelectAction(view: self, action: "delete") } From 12c6773ed41545069164ae026eadaa50c6e89062 Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Sun, 24 Sep 2017 10:30:33 -0500 Subject: [PATCH 2/3] Namespaces files to not conflict with PDFKit names (Fixes #71) --- Example/Pods/Pods.xcodeproj/project.pbxproj | 288 +++++++++--------- Example/UXMPDFKit/Base.lproj/Main.storyboard | 24 +- Example/UXMPDFKit/ExampleViewController.swift | 6 +- Example/UXMPDFKit/ViewController.swift | 4 +- ...DFAnnotation.swift => UXMAnnotation.swift} | 12 +- ...er.swift => UXMAnnotationController.swift} | 64 ++-- ...onStore.swift => UXMAnnotationStore.swift} | 24 +- ...notation.swift => UXMPathAnnotation.swift} | 18 +- ...notation.swift => UXMTextAnnotation.swift} | 16 +- Pod/Classes/Extensions/UIImage.swift | 2 +- .../Form/{PDFArray.swift => UXMArray.swift} | 20 +- ...DFDictionary.swift => UXMDictionary.swift} | 32 +- ...onField.swift => UXMFormButtonField.swift} | 8 +- ...{PDFFormField.swift => UXMFormField.swift} | 90 +++--- ...rmPageView.swift => UXMFormPageView.swift} | 56 ++-- ...ield.swift => UXMFormSignatureField.swift} | 26 +- ...TextField.swift => UXMFormTextField.swift} | 10 +- ...ller.swift => UXMFormViewController.swift} | 34 +-- ...jectParser.swift => UXMObjectParser.swift} | 10 +- ...ggleButton.swift => UXMToggleButton.swift} | 4 +- .../{PDFAction.swift => UXMAction.swift} | 12 +- ...DFActionGoTo.swift => UXMActionGoTo.swift} | 2 +- ...{PDFActionURL.swift => UXMActionURL.swift} | 4 +- ...cumentLink.swift => UXMDocumentLink.swift} | 4 +- ...PDFDocument.swift => UXMPDFDocument.swift} | 30 +- ...oller.swift => UXMPDFViewController.swift} | 80 ++--- ...PageContent.swift => UXMPageContent.swift} | 18 +- ...entView.swift => UXMPageContentView.swift} | 36 +-- ...geScrubber.swift => UXMPageScrubber.swift} | 46 +-- ...Thumb.swift => UXMPageScrubberThumb.swift} | 4 +- ...wift => UXMPageScrubberTrackControl.swift} | 4 +- ...TileLayer.swift => UXMPageTileLayer.swift} | 4 +- .../{PDFRenderer.swift => UXMRenderer.swift} | 12 +- ...PageCell.swift => UXMSinglePageCell.swift} | 8 +- ...Viewer.swift => UXMSinglePageViewer.swift} | 64 ++-- ...shotCache.swift => UXMSnapshotCache.swift} | 40 +-- ...bnailView.swift => UXMThumbnailView.swift} | 10 +- ...wCell.swift => UXMThumbnailViewCell.swift} | 10 +- ...swift => UXMThumbnailViewController.swift} | 26 +- ...DFTextParser.swift => UXMTextParser.swift} | 12 +- ...{PDFBarButton.swift => UXMBarButton.swift} | 16 +- 41 files changed, 593 insertions(+), 597 deletions(-) rename Pod/Classes/Annotations/{PDFAnnotation.swift => UXMAnnotation.swift} (83%) rename Pod/Classes/Annotations/{PDFAnnotationController.swift => UXMAnnotationController.swift} (82%) rename Pod/Classes/Annotations/{PDFAnnotationStore.swift => UXMAnnotationStore.swift} (67%) rename Pod/Classes/Annotations/{PDFPathAnnotation.swift => UXMPathAnnotation.swift} (92%) rename Pod/Classes/Annotations/{PDFTextAnnotation.swift => UXMTextAnnotation.swift} (94%) rename Pod/Classes/Form/{PDFArray.swift => UXMArray.swift} (90%) rename Pod/Classes/Form/{PDFDictionary.swift => UXMDictionary.swift} (89%) rename Pod/Classes/Form/{PDFFormButtonField.swift => UXMFormButtonField.swift} (93%) rename Pod/Classes/Form/{PDFFormField.swift => UXMFormField.swift} (61%) rename Pod/Classes/Form/{PDFFormPageView.swift => UXMFormPageView.swift} (65%) rename Pod/Classes/Form/{PDFFormSignatureField.swift => UXMFormSignatureField.swift} (91%) rename Pod/Classes/Form/{PDFFormTextField.swift => UXMFormTextField.swift} (95%) rename Pod/Classes/Form/{PDFFormViewController.swift => UXMFormViewController.swift} (73%) rename Pod/Classes/Form/{PDFObjectParser.swift => UXMObjectParser.swift} (57%) rename Pod/Classes/Form/{PDFToggleButton.swift => UXMToggleButton.swift} (87%) rename Pod/Classes/Model/{PDFAction.swift => UXMAction.swift} (96%) rename Pod/Classes/Model/{PDFActionGoTo.swift => UXMActionGoTo.swift} (84%) rename Pod/Classes/Model/{PDFActionURL.swift => UXMActionURL.swift} (81%) rename Pod/Classes/Renderer/{PDFDocumentLink.swift => UXMDocumentLink.swift} (82%) rename Pod/Classes/Renderer/{PDFDocument.swift => UXMPDFDocument.swift} (90%) rename Pod/Classes/Renderer/{PDFViewController.swift => UXMPDFViewController.swift} (81%) rename Pod/Classes/Renderer/{PDFPageContent.swift => UXMPageContent.swift} (94%) rename Pod/Classes/Renderer/{PDFPageContentView.swift => UXMPageContentView.swift} (88%) rename Pod/Classes/Renderer/{PDFPageScrubber.swift => UXMPageScrubber.swift} (88%) rename Pod/Classes/Renderer/{PDFPageScrubberThumb.swift => UXMPageScrubberThumb.swift} (90%) rename Pod/Classes/Renderer/{PDFPageScrubberTrackControl.swift => UXMPageScrubberTrackControl.swift} (94%) rename Pod/Classes/Renderer/{PDFPageTileLayer.swift => UXMPageTileLayer.swift} (92%) rename Pod/Classes/Renderer/{PDFRenderer.swift => UXMRenderer.swift} (87%) rename Pod/Classes/Renderer/{PDFSinglePageCell.swift => UXMSinglePageCell.swift} (78%) rename Pod/Classes/Renderer/{PDFSinglePageViewer.swift => UXMSinglePageViewer.swift} (78%) rename Pod/Classes/Renderer/{PDFSnapshotCache.swift => UXMSnapshotCache.swift} (79%) rename Pod/Classes/Renderer/{PDFThumbnailView.swift => UXMThumbnailView.swift} (85%) rename Pod/Classes/Renderer/{PDFThumbnailViewCell.swift => UXMThumbnailViewCell.swift} (79%) rename Pod/Classes/Renderer/{PDFThumbnailViewController.swift => UXMThumbnailViewController.swift} (81%) rename Pod/Classes/TextParser/{PDFTextParser.swift => UXMTextParser.swift} (84%) rename Pod/Classes/View/{PDFBarButton.swift => UXMBarButton.swift} (82%) diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index cde5cec..34384ce 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -7,57 +7,57 @@ objects = { /* Begin PBXBuildFile section */ - 00703477D03E535E1BFA3A7169814C2C /* PDFAnnotationStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68ECDBCA8C7CBFC7A4C746BEAA00756 /* PDFAnnotationStore.swift */; }; - 0168C787039F39EFC7CC717928780ECE /* PDFFormField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EC48780BD915E4D5ACCE82C88A1AB13 /* PDFFormField.swift */; }; - 026FEED112A93B09A02BE58F8F025312 /* PDFPageScrubberThumb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43266A476FB5C6ADDCCBECEB16E9D513 /* PDFPageScrubberThumb.swift */; }; - 02F91569195B82122C93CD73F89BF123 /* PDFDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E1B16E7B9A2A6B1300E0AE0B3DD0ED6 /* PDFDocument.swift */; }; - 075383BD36B769E863ED5F59FA08F555 /* PDFPathAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9875B88D900C485C9301E8616F19BC5 /* PDFPathAnnotation.swift */; }; - 14E3AEB11DD6ED3800CC9C60 /* PDFSinglePageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14E3AEB01DD6ED3800CC9C60 /* PDFSinglePageCell.swift */; }; - 14ED9AA74A5A2E807B36B928AAE04F32 /* PDFTextAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36255D8C8E8839365B8EB3FF153756B5 /* PDFTextAnnotation.swift */; }; - 1A6C84063FC233E27AEA75D7300DFD96 /* PDFFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E445E04379E4222CB9A066D36A01E7C /* PDFFormViewController.swift */; }; - 27F938F715132EBBE5F6903A0029CA2B /* PDFDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0671AD3DB0F8A78F7FA1753FD4D804 /* PDFDictionary.swift */; }; - 298424542AE0A9D498FF405DFA338D75 /* PDFSnapshotCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9FE943FC9A290F6F65198FF53EF96E6 /* PDFSnapshotCache.swift */; }; + 00703477D03E535E1BFA3A7169814C2C /* UXMAnnotationStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68ECDBCA8C7CBFC7A4C746BEAA00756 /* UXMAnnotationStore.swift */; }; + 0168C787039F39EFC7CC717928780ECE /* UXMFormField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EC48780BD915E4D5ACCE82C88A1AB13 /* UXMFormField.swift */; }; + 026FEED112A93B09A02BE58F8F025312 /* UXMPageScrubberThumb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43266A476FB5C6ADDCCBECEB16E9D513 /* UXMPageScrubberThumb.swift */; }; + 02F91569195B82122C93CD73F89BF123 /* UXMPDFDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E1B16E7B9A2A6B1300E0AE0B3DD0ED6 /* UXMPDFDocument.swift */; }; + 075383BD36B769E863ED5F59FA08F555 /* UXMPathAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9875B88D900C485C9301E8616F19BC5 /* UXMPathAnnotation.swift */; }; + 14E3AEB11DD6ED3800CC9C60 /* UXMSinglePageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14E3AEB01DD6ED3800CC9C60 /* UXMSinglePageCell.swift */; }; + 14ED9AA74A5A2E807B36B928AAE04F32 /* UXMTextAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36255D8C8E8839365B8EB3FF153756B5 /* UXMTextAnnotation.swift */; }; + 1A6C84063FC233E27AEA75D7300DFD96 /* UXMFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E445E04379E4222CB9A066D36A01E7C /* UXMFormViewController.swift */; }; + 27F938F715132EBBE5F6903A0029CA2B /* UXMDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0671AD3DB0F8A78F7FA1753FD4D804 /* UXMDictionary.swift */; }; + 298424542AE0A9D498FF405DFA338D75 /* UXMSnapshotCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9FE943FC9A290F6F65198FF53EF96E6 /* UXMSnapshotCache.swift */; }; 3718081077F2A6A3CB9DB4259C52A9A6 /* UXMPDFKit.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 36816B3ABA7674FDDFE94F22C8EC3FAB /* UXMPDFKit.bundle */; }; - 37C1CD56A692371828740DFCEE4A9128 /* PDFViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C998B073AF0AE6121E63EFF482E2E251 /* PDFViewController.swift */; }; + 37C1CD56A692371828740DFCEE4A9128 /* UXMPDFViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C998B073AF0AE6121E63EFF482E2E251 /* UXMPDFViewController.swift */; }; 38629AF01DDA548700DF2B43 /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38629AEF1DDA548700DF2B43 /* UIColor.swift */; }; - 38629AF21DDA55DF00DF2B43 /* PDFToggleButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38629AF11DDA55DF00DF2B43 /* PDFToggleButton.swift */; }; - 4226B8E079C7A46273F41F374F2D54EB /* PDFDocumentLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = E49FB5E98854EBDE8CCAB4C0137D1986 /* PDFDocumentLink.swift */; }; + 38629AF21DDA55DF00DF2B43 /* UXMToggleButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38629AF11DDA55DF00DF2B43 /* UXMToggleButton.swift */; }; + 4226B8E079C7A46273F41F374F2D54EB /* UXMDocumentLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = E49FB5E98854EBDE8CCAB4C0137D1986 /* UXMDocumentLink.swift */; }; 4431B8FC918BE6C9C21DCC72EDA860E6 /* Pods-UXMPDFKit_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 73B9DE7CB16631F30FAE38D53282A2FE /* Pods-UXMPDFKit_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4B1F57EBF4BECAEC47EEF57BD3CA1AD7 /* PDFAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69FD1010A27EE6442B7768D3B955DBF9 /* PDFAction.swift */; }; + 4B1F57EBF4BECAEC47EEF57BD3CA1AD7 /* UXMAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69FD1010A27EE6442B7768D3B955DBF9 /* UXMAction.swift */; }; 4DFC30C056451573A629F3EA2C9378B7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C22425B0A3F84BE18A46849E29C823A0 /* Images.xcassets */; }; - 536A83F7FA72186229EBF285914A5B78 /* PDFThumbnailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6C164216F04F2C8E8102F383F660F44 /* PDFThumbnailView.swift */; }; + 536A83F7FA72186229EBF285914A5B78 /* UXMThumbnailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6C164216F04F2C8E8102F383F660F44 /* UXMThumbnailView.swift */; }; 610688731E3A52BD00A85AF0 /* UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 610688711E3A4F9900A85AF0 /* UIViewController.swift */; }; 612E003F1E424A9E00C42D3E /* CGPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 612E003D1E424A7200C42D3E /* CGPoint.swift */; }; 612E00421E424F3E00C42D3E /* CGRect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 612E00401E424EBF00C42D3E /* CGRect.swift */; }; - 61561CB41DDA7C6100C314EB /* PDFThumbnailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61561CB21DDA7B4E00C314EB /* PDFThumbnailViewController.swift */; }; - 61561CB61DDA7F6200C314EB /* PDFThumbnailViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61561CB51DDA7F6200C314EB /* PDFThumbnailViewCell.swift */; }; + 61561CB41DDA7C6100C314EB /* UXMThumbnailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61561CB21DDA7B4E00C314EB /* UXMThumbnailViewController.swift */; }; + 61561CB61DDA7F6200C314EB /* UXMThumbnailViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61561CB51DDA7F6200C314EB /* UXMThumbnailViewCell.swift */; }; 61C3A26E1EC2859A00807C4B /* ResizeableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C3A26D1EC2859A00807C4B /* ResizeableView.swift */; }; - 61D72DBD1DDB705B003CE472 /* PDFActionURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D72DBC1DDB705B003CE472 /* PDFActionURL.swift */; }; - 61D72DBE1DDB7062003CE472 /* PDFActionGoTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D72DBA1DDB7039003CE472 /* PDFActionGoTo.swift */; }; - 61D72DC11DDB7C15003CE472 /* PDFTextParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D72DC01DDB7C15003CE472 /* PDFTextParser.swift */; }; + 61D72DBD1DDB705B003CE472 /* UXMActionURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D72DBC1DDB705B003CE472 /* UXMActionURL.swift */; }; + 61D72DBE1DDB7062003CE472 /* UXMActionGoTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D72DBA1DDB7039003CE472 /* UXMActionGoTo.swift */; }; + 61D72DC11DDB7C15003CE472 /* UXMTextParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D72DC01DDB7C15003CE472 /* UXMTextParser.swift */; }; 6CBA8437445A566C49E81E0FA15F8B89 /* Pods-UXMPDFKit_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = EF5680F0C21DEB74F7B47666298F36DB /* Pods-UXMPDFKit_Example-dummy.m */; }; - 75332EB7DF07634FEBA4DB30AED834DE /* PDFBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC1A9EB3AA234A93FFED5E5EC31C26C0 /* PDFBarButton.swift */; }; - 75EBCC5DA128D1197EE38C0D71ED2E61 /* PDFSinglePageViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F33BD08506077733D10565FD32AAE01D /* PDFSinglePageViewer.swift */; }; + 75332EB7DF07634FEBA4DB30AED834DE /* UXMBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC1A9EB3AA234A93FFED5E5EC31C26C0 /* UXMBarButton.swift */; }; + 75EBCC5DA128D1197EE38C0D71ED2E61 /* UXMSinglePageViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F33BD08506077733D10565FD32AAE01D /* UXMSinglePageViewer.swift */; }; A541F16F605856534EE1CB630D115E97 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */; }; AEBCD8510D17EB5BB1AF97C56DA3E0A4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */; }; - B564F9589CA9317A04F24F9DC40AC5AA /* PDFAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46276AA25C0911175B06F6F426E499D5 /* PDFAnnotation.swift */; }; - B6610EC0BB6FC688BE01E6A0CEDAC1E8 /* PDFPageScrubber.swift in Sources */ = {isa = PBXBuildFile; fileRef = C690BCEDB59958B45834FDDEEF382E58 /* PDFPageScrubber.swift */; }; - C02189E300C9F94935CFF78ECD34CA3B /* PDFPageTileLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE1C7B951EC7E6CED0390CF07A023630 /* PDFPageTileLayer.swift */; }; - C1EDA6F9A885F21D2887845369237062 /* PDFArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64082BD427D609690F7BB6818051DE3D /* PDFArray.swift */; }; - C4E224C0D0BFCC63723ACA2EDB266CC6 /* PDFFormButtonField.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4C067E14A9564492BD5FDF5871991B /* PDFFormButtonField.swift */; }; - C4ECF8B8556E26A1DF679C202AC9B641 /* PDFFormSignatureField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86698FA335844AF90C62A0038C5B4B9C /* PDFFormSignatureField.swift */; }; - CC2919A41AAA5F6BCC83D700E574345F /* PDFObjectParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71407B9D27B023DFC53AEEA70B040CB /* PDFObjectParser.swift */; }; - CE63E30770B2CDD35ED208AF2A284F5B /* PDFPageContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C363DF92B0BB7081898E123695AED3A2 /* PDFPageContent.swift */; }; - D09FB06765B5FCD7A81F58BE68B1BDED /* PDFRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7D9346501AFA05A330677D39DB1650F /* PDFRenderer.swift */; }; - DD3034BF3EE6DA6D91BBF74EAEAC456E /* PDFFormPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 315197F935F69EEBFF1F92849523A564 /* PDFFormPageView.swift */; }; + B564F9589CA9317A04F24F9DC40AC5AA /* UXMAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46276AA25C0911175B06F6F426E499D5 /* UXMAnnotation.swift */; }; + B6610EC0BB6FC688BE01E6A0CEDAC1E8 /* UXMPageScrubber.swift in Sources */ = {isa = PBXBuildFile; fileRef = C690BCEDB59958B45834FDDEEF382E58 /* UXMPageScrubber.swift */; }; + C02189E300C9F94935CFF78ECD34CA3B /* UXMPageTileLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE1C7B951EC7E6CED0390CF07A023630 /* UXMPageTileLayer.swift */; }; + C1EDA6F9A885F21D2887845369237062 /* UXMArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64082BD427D609690F7BB6818051DE3D /* UXMArray.swift */; }; + C4E224C0D0BFCC63723ACA2EDB266CC6 /* UXMFormButtonField.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4C067E14A9564492BD5FDF5871991B /* UXMFormButtonField.swift */; }; + C4ECF8B8556E26A1DF679C202AC9B641 /* UXMFormSignatureField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86698FA335844AF90C62A0038C5B4B9C /* UXMFormSignatureField.swift */; }; + CC2919A41AAA5F6BCC83D700E574345F /* UXMObjectParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71407B9D27B023DFC53AEEA70B040CB /* UXMObjectParser.swift */; }; + CE63E30770B2CDD35ED208AF2A284F5B /* UXMPageContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C363DF92B0BB7081898E123695AED3A2 /* UXMPageContent.swift */; }; + D09FB06765B5FCD7A81F58BE68B1BDED /* UXMRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7D9346501AFA05A330677D39DB1650F /* UXMRenderer.swift */; }; + DD3034BF3EE6DA6D91BBF74EAEAC456E /* UXMFormPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 315197F935F69EEBFF1F92849523A564 /* UXMFormPageView.swift */; }; DE4A344370F68EA63CCA245BB42FF44A /* UXMPDFKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 38A6B7046D88F318BCDF67B75969CABF /* UXMPDFKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; DEEE49CA145C9CAFCB54635C31D6F6E6 /* CGPDFDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76DA813643EF21961CF0953E75AD135F /* CGPDFDocument.swift */; }; - E2EE8D087924795726295ABA80B0079F /* PDFPageScrubberTrackControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC4678DC63259E1E556B22354639F826 /* PDFPageScrubberTrackControl.swift */; }; - E8C31B918E22C5EB41B659A64E076416 /* PDFAnnotationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9731359E2EA43A65C0297BACA691EFDC /* PDFAnnotationController.swift */; }; + E2EE8D087924795726295ABA80B0079F /* UXMPageScrubberTrackControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC4678DC63259E1E556B22354639F826 /* UXMPageScrubberTrackControl.swift */; }; + E8C31B918E22C5EB41B659A64E076416 /* UXMAnnotationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9731359E2EA43A65C0297BACA691EFDC /* UXMAnnotationController.swift */; }; EA02320D912547EAE5017330C7835B18 /* UXMPDFKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CC32D4C69A270C7F52DFE49BEE6E162 /* UXMPDFKit-dummy.m */; }; EF0C3B060264BDE888EFCB98B2E95088 /* UIImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EF790A1D01AB3417430203D9D7EFB14 /* UIImage.swift */; }; - F77D80C31A9B9DBED9D3A258932F9922 /* PDFPageContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A494B21C53F5EAC8E75CE8E354CAF951 /* PDFPageContentView.swift */; }; - F9C1E676BBEAC0A22212CD00437C1073 /* PDFFormTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = A83C4D21E86A879510E1AA0F444C9882 /* PDFFormTextField.swift */; }; + F77D80C31A9B9DBED9D3A258932F9922 /* UXMPageContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A494B21C53F5EAC8E75CE8E354CAF951 /* UXMPageContentView.swift */; }; + F9C1E676BBEAC0A22212CD00437C1073 /* UXMFormTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = A83C4D21E86A879510E1AA0F444C9882 /* UXMFormTextField.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -80,70 +80,70 @@ /* Begin PBXFileReference section */ 0E25E22600004B87F1FD6DE65F353057 /* Pods_UXMPDFKit_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_UXMPDFKit_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 0EF790A1D01AB3417430203D9D7EFB14 /* UIImage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UIImage.swift; sourceTree = ""; }; - 14E3AEB01DD6ED3800CC9C60 /* PDFSinglePageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFSinglePageCell.swift; sourceTree = ""; }; - 2E445E04379E4222CB9A066D36A01E7C /* PDFFormViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFFormViewController.swift; sourceTree = ""; }; - 315197F935F69EEBFF1F92849523A564 /* PDFFormPageView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFFormPageView.swift; sourceTree = ""; }; - 36255D8C8E8839365B8EB3FF153756B5 /* PDFTextAnnotation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFTextAnnotation.swift; sourceTree = ""; }; + 14E3AEB01DD6ED3800CC9C60 /* UXMSinglePageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMSinglePageCell.swift; sourceTree = ""; }; + 2E445E04379E4222CB9A066D36A01E7C /* UXMFormViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMFormViewController.swift; sourceTree = ""; }; + 315197F935F69EEBFF1F92849523A564 /* UXMFormPageView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMFormPageView.swift; sourceTree = ""; }; + 36255D8C8E8839365B8EB3FF153756B5 /* UXMTextAnnotation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMTextAnnotation.swift; sourceTree = ""; }; 36816B3ABA7674FDDFE94F22C8EC3FAB /* UXMPDFKit.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UXMPDFKit.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 38629AEF1DDA548700DF2B43 /* UIColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIColor.swift; sourceTree = ""; }; - 38629AF11DDA55DF00DF2B43 /* PDFToggleButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFToggleButton.swift; sourceTree = ""; }; + 38629AF11DDA55DF00DF2B43 /* UXMToggleButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMToggleButton.swift; sourceTree = ""; }; 38A6B7046D88F318BCDF67B75969CABF /* UXMPDFKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UXMPDFKit-umbrella.h"; sourceTree = ""; }; 3CC32D4C69A270C7F52DFE49BEE6E162 /* UXMPDFKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "UXMPDFKit-dummy.m"; sourceTree = ""; }; - 43266A476FB5C6ADDCCBECEB16E9D513 /* PDFPageScrubberThumb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPageScrubberThumb.swift; sourceTree = ""; }; - 46276AA25C0911175B06F6F426E499D5 /* PDFAnnotation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFAnnotation.swift; sourceTree = ""; }; - 4E1B16E7B9A2A6B1300E0AE0B3DD0ED6 /* PDFDocument.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFDocument.swift; sourceTree = ""; }; + 43266A476FB5C6ADDCCBECEB16E9D513 /* UXMPageScrubberThumb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPageScrubberThumb.swift; sourceTree = ""; }; + 46276AA25C0911175B06F6F426E499D5 /* UXMAnnotation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMAnnotation.swift; sourceTree = ""; }; + 4E1B16E7B9A2A6B1300E0AE0B3DD0ED6 /* UXMPDFDocument.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPDFDocument.swift; sourceTree = ""; }; 610688711E3A4F9900A85AF0 /* UIViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIViewController.swift; sourceTree = ""; }; 612E003D1E424A7200C42D3E /* CGPoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CGPoint.swift; sourceTree = ""; }; 612E00401E424EBF00C42D3E /* CGRect.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CGRect.swift; sourceTree = ""; }; 614525CCFB2767D95FE12EEEC2FD622C /* UXMPDFKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UXMPDFKit-prefix.pch"; sourceTree = ""; }; - 61561CB21DDA7B4E00C314EB /* PDFThumbnailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFThumbnailViewController.swift; sourceTree = ""; }; - 61561CB51DDA7F6200C314EB /* PDFThumbnailViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFThumbnailViewCell.swift; sourceTree = ""; }; + 61561CB21DDA7B4E00C314EB /* UXMThumbnailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMThumbnailViewController.swift; sourceTree = ""; }; + 61561CB51DDA7F6200C314EB /* UXMThumbnailViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMThumbnailViewCell.swift; sourceTree = ""; }; 61C3A26D1EC2859A00807C4B /* ResizeableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResizeableView.swift; sourceTree = ""; }; - 61D72DBA1DDB7039003CE472 /* PDFActionGoTo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFActionGoTo.swift; sourceTree = ""; }; - 61D72DBC1DDB705B003CE472 /* PDFActionURL.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFActionURL.swift; sourceTree = ""; }; - 61D72DC01DDB7C15003CE472 /* PDFTextParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFTextParser.swift; sourceTree = ""; }; - 64082BD427D609690F7BB6818051DE3D /* PDFArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFArray.swift; sourceTree = ""; }; - 69FD1010A27EE6442B7768D3B955DBF9 /* PDFAction.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFAction.swift; sourceTree = ""; }; - 6EC48780BD915E4D5ACCE82C88A1AB13 /* PDFFormField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFFormField.swift; sourceTree = ""; }; + 61D72DBA1DDB7039003CE472 /* UXMActionGoTo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMActionGoTo.swift; sourceTree = ""; }; + 61D72DBC1DDB705B003CE472 /* UXMActionURL.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMActionURL.swift; sourceTree = ""; }; + 61D72DC01DDB7C15003CE472 /* UXMTextParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMTextParser.swift; sourceTree = ""; }; + 64082BD427D609690F7BB6818051DE3D /* UXMArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMArray.swift; sourceTree = ""; }; + 69FD1010A27EE6442B7768D3B955DBF9 /* UXMAction.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMAction.swift; sourceTree = ""; }; + 6EC48780BD915E4D5ACCE82C88A1AB13 /* UXMFormField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMFormField.swift; sourceTree = ""; }; 73B9DE7CB16631F30FAE38D53282A2FE /* Pods-UXMPDFKit_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-UXMPDFKit_Example-umbrella.h"; sourceTree = ""; }; 75574BE886F738F3093CE3A2F50EDEC8 /* Pods-UXMPDFKit_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-UXMPDFKit_Example-acknowledgements.markdown"; sourceTree = ""; }; 76DA813643EF21961CF0953E75AD135F /* CGPDFDocument.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CGPDFDocument.swift; sourceTree = ""; }; - 7F0671AD3DB0F8A78F7FA1753FD4D804 /* PDFDictionary.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFDictionary.swift; sourceTree = ""; }; + 7F0671AD3DB0F8A78F7FA1753FD4D804 /* UXMDictionary.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMDictionary.swift; sourceTree = ""; }; 84EF34252AF2C6686B91CF82C433AF97 /* Pods-UXMPDFKit_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-UXMPDFKit_Example-resources.sh"; sourceTree = ""; }; - 86698FA335844AF90C62A0038C5B4B9C /* PDFFormSignatureField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFFormSignatureField.swift; sourceTree = ""; }; + 86698FA335844AF90C62A0038C5B4B9C /* UXMFormSignatureField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMFormSignatureField.swift; sourceTree = ""; }; 923C8A6AA6EF26F1AFCE47B4B4307540 /* Pods-UXMPDFKit_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-UXMPDFKit_Example.modulemap"; sourceTree = ""; }; 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 9731359E2EA43A65C0297BACA691EFDC /* PDFAnnotationController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFAnnotationController.swift; sourceTree = ""; }; + 9731359E2EA43A65C0297BACA691EFDC /* UXMAnnotationController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMAnnotationController.swift; sourceTree = ""; }; 98269C964ED3DBB303CBAA1006CEE6AC /* Pods-UXMPDFKit_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-UXMPDFKit_Example.debug.xcconfig"; sourceTree = ""; }; A0181833A6A33E2F39D632638FA039C1 /* UXMPDFKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = UXMPDFKit.modulemap; sourceTree = ""; }; A4813EE89CCCB14693E9B61A6CD6117F /* UXMPDFKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = UXMPDFKit.xcconfig; sourceTree = ""; }; - A494B21C53F5EAC8E75CE8E354CAF951 /* PDFPageContentView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPageContentView.swift; sourceTree = ""; }; + A494B21C53F5EAC8E75CE8E354CAF951 /* UXMPageContentView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPageContentView.swift; sourceTree = ""; }; A599D61A3B46FD09E6025DE6E91F8D66 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A83C4D21E86A879510E1AA0F444C9882 /* PDFFormTextField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFFormTextField.swift; sourceTree = ""; }; + A83C4D21E86A879510E1AA0F444C9882 /* UXMFormTextField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMFormTextField.swift; sourceTree = ""; }; A96B3532B35536E9DE978DE5DE13E668 /* ResourceBundle-UXMPDFKit-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "ResourceBundle-UXMPDFKit-Info.plist"; sourceTree = ""; }; - AE1C7B951EC7E6CED0390CF07A023630 /* PDFPageTileLayer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPageTileLayer.swift; sourceTree = ""; }; - B68ECDBCA8C7CBFC7A4C746BEAA00756 /* PDFAnnotationStore.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFAnnotationStore.swift; sourceTree = ""; }; - B7D9346501AFA05A330677D39DB1650F /* PDFRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFRenderer.swift; sourceTree = ""; }; - B9875B88D900C485C9301E8616F19BC5 /* PDFPathAnnotation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPathAnnotation.swift; sourceTree = ""; }; - BC1A9EB3AA234A93FFED5E5EC31C26C0 /* PDFBarButton.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFBarButton.swift; sourceTree = ""; }; + AE1C7B951EC7E6CED0390CF07A023630 /* UXMPageTileLayer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPageTileLayer.swift; sourceTree = ""; }; + B68ECDBCA8C7CBFC7A4C746BEAA00756 /* UXMAnnotationStore.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMAnnotationStore.swift; sourceTree = ""; }; + B7D9346501AFA05A330677D39DB1650F /* UXMRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMRenderer.swift; sourceTree = ""; }; + B9875B88D900C485C9301E8616F19BC5 /* UXMPathAnnotation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPathAnnotation.swift; sourceTree = ""; }; + BC1A9EB3AA234A93FFED5E5EC31C26C0 /* UXMBarButton.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMBarButton.swift; sourceTree = ""; }; C22425B0A3F84BE18A46849E29C823A0 /* Images.xcassets */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - C363DF92B0BB7081898E123695AED3A2 /* PDFPageContent.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPageContent.swift; sourceTree = ""; }; + C363DF92B0BB7081898E123695AED3A2 /* UXMPageContent.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPageContent.swift; sourceTree = ""; }; C427B08E12D2A5801438BEBFC96520BD /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C690BCEDB59958B45834FDDEEF382E58 /* PDFPageScrubber.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPageScrubber.swift; sourceTree = ""; }; - C6C164216F04F2C8E8102F383F660F44 /* PDFThumbnailView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFThumbnailView.swift; sourceTree = ""; }; - C71407B9D27B023DFC53AEEA70B040CB /* PDFObjectParser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFObjectParser.swift; sourceTree = ""; }; - C998B073AF0AE6121E63EFF482E2E251 /* PDFViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFViewController.swift; sourceTree = ""; }; - C9FE943FC9A290F6F65198FF53EF96E6 /* PDFSnapshotCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFSnapshotCache.swift; sourceTree = ""; }; + C690BCEDB59958B45834FDDEEF382E58 /* UXMPageScrubber.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPageScrubber.swift; sourceTree = ""; }; + C6C164216F04F2C8E8102F383F660F44 /* UXMThumbnailView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMThumbnailView.swift; sourceTree = ""; }; + C71407B9D27B023DFC53AEEA70B040CB /* UXMObjectParser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMObjectParser.swift; sourceTree = ""; }; + C998B073AF0AE6121E63EFF482E2E251 /* UXMPDFViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPDFViewController.swift; sourceTree = ""; }; + C9FE943FC9A290F6F65198FF53EF96E6 /* UXMSnapshotCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMSnapshotCache.swift; sourceTree = ""; }; CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; CF95F142877C93B0BAB858F7187F7D1C /* Pods-UXMPDFKit_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-UXMPDFKit_Example.release.xcconfig"; sourceTree = ""; }; D7B61F1F28653D99DFE37D252E1BD160 /* Pods-UXMPDFKit_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-UXMPDFKit_Example-acknowledgements.plist"; sourceTree = ""; }; - E49FB5E98854EBDE8CCAB4C0137D1986 /* PDFDocumentLink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFDocumentLink.swift; sourceTree = ""; }; + E49FB5E98854EBDE8CCAB4C0137D1986 /* UXMDocumentLink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMDocumentLink.swift; sourceTree = ""; }; EC338060A25E46404C16949C136E122D /* UXMPDFKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = UXMPDFKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - EC4678DC63259E1E556B22354639F826 /* PDFPageScrubberTrackControl.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPageScrubberTrackControl.swift; sourceTree = ""; }; + EC4678DC63259E1E556B22354639F826 /* UXMPageScrubberTrackControl.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPageScrubberTrackControl.swift; sourceTree = ""; }; EF5680F0C21DEB74F7B47666298F36DB /* Pods-UXMPDFKit_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-UXMPDFKit_Example-dummy.m"; sourceTree = ""; }; - F33BD08506077733D10565FD32AAE01D /* PDFSinglePageViewer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFSinglePageViewer.swift; sourceTree = ""; }; + F33BD08506077733D10565FD32AAE01D /* UXMSinglePageViewer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMSinglePageViewer.swift; sourceTree = ""; }; F5E1EF2045F8CAE079FBBD1B47009647 /* Pods-UXMPDFKit_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-UXMPDFKit_Example-frameworks.sh"; sourceTree = ""; }; - FB4C067E14A9564492BD5FDF5871991B /* PDFFormButtonField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFFormButtonField.swift; sourceTree = ""; }; + FB4C067E14A9564492BD5FDF5871991B /* UXMFormButtonField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMFormButtonField.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -202,11 +202,11 @@ 0D5534176FDA413966A2FA057AB7673C /* Annotations */ = { isa = PBXGroup; children = ( - 46276AA25C0911175B06F6F426E499D5 /* PDFAnnotation.swift */, - 9731359E2EA43A65C0297BACA691EFDC /* PDFAnnotationController.swift */, - B68ECDBCA8C7CBFC7A4C746BEAA00756 /* PDFAnnotationStore.swift */, - B9875B88D900C485C9301E8616F19BC5 /* PDFPathAnnotation.swift */, - 36255D8C8E8839365B8EB3FF153756B5 /* PDFTextAnnotation.swift */, + 46276AA25C0911175B06F6F426E499D5 /* UXMAnnotation.swift */, + 9731359E2EA43A65C0297BACA691EFDC /* UXMAnnotationController.swift */, + B68ECDBCA8C7CBFC7A4C746BEAA00756 /* UXMAnnotationStore.swift */, + B9875B88D900C485C9301E8616F19BC5 /* UXMPathAnnotation.swift */, + 36255D8C8E8839365B8EB3FF153756B5 /* UXMTextAnnotation.swift */, ); path = Annotations; sourceTree = ""; @@ -226,16 +226,16 @@ 2267295D4FF13F19ED68658643D87819 /* Form */ = { isa = PBXGroup; children = ( - 64082BD427D609690F7BB6818051DE3D /* PDFArray.swift */, - 7F0671AD3DB0F8A78F7FA1753FD4D804 /* PDFDictionary.swift */, - FB4C067E14A9564492BD5FDF5871991B /* PDFFormButtonField.swift */, - 6EC48780BD915E4D5ACCE82C88A1AB13 /* PDFFormField.swift */, - 315197F935F69EEBFF1F92849523A564 /* PDFFormPageView.swift */, - 86698FA335844AF90C62A0038C5B4B9C /* PDFFormSignatureField.swift */, - A83C4D21E86A879510E1AA0F444C9882 /* PDFFormTextField.swift */, - 2E445E04379E4222CB9A066D36A01E7C /* PDFFormViewController.swift */, - C71407B9D27B023DFC53AEEA70B040CB /* PDFObjectParser.swift */, - 38629AF11DDA55DF00DF2B43 /* PDFToggleButton.swift */, + 64082BD427D609690F7BB6818051DE3D /* UXMArray.swift */, + 7F0671AD3DB0F8A78F7FA1753FD4D804 /* UXMDictionary.swift */, + FB4C067E14A9564492BD5FDF5871991B /* UXMFormButtonField.swift */, + 6EC48780BD915E4D5ACCE82C88A1AB13 /* UXMFormField.swift */, + 315197F935F69EEBFF1F92849523A564 /* UXMFormPageView.swift */, + 86698FA335844AF90C62A0038C5B4B9C /* UXMFormSignatureField.swift */, + A83C4D21E86A879510E1AA0F444C9882 /* UXMFormTextField.swift */, + 2E445E04379E4222CB9A066D36A01E7C /* UXMFormViewController.swift */, + C71407B9D27B023DFC53AEEA70B040CB /* UXMObjectParser.swift */, + 38629AF11DDA55DF00DF2B43 /* UXMToggleButton.swift */, ); path = Form; sourceTree = ""; @@ -260,22 +260,22 @@ isa = PBXGroup; children = ( 76DA813643EF21961CF0953E75AD135F /* CGPDFDocument.swift */, - 4E1B16E7B9A2A6B1300E0AE0B3DD0ED6 /* PDFDocument.swift */, - E49FB5E98854EBDE8CCAB4C0137D1986 /* PDFDocumentLink.swift */, - C363DF92B0BB7081898E123695AED3A2 /* PDFPageContent.swift */, - A494B21C53F5EAC8E75CE8E354CAF951 /* PDFPageContentView.swift */, - C690BCEDB59958B45834FDDEEF382E58 /* PDFPageScrubber.swift */, - 43266A476FB5C6ADDCCBECEB16E9D513 /* PDFPageScrubberThumb.swift */, - EC4678DC63259E1E556B22354639F826 /* PDFPageScrubberTrackControl.swift */, - AE1C7B951EC7E6CED0390CF07A023630 /* PDFPageTileLayer.swift */, - B7D9346501AFA05A330677D39DB1650F /* PDFRenderer.swift */, - 14E3AEB01DD6ED3800CC9C60 /* PDFSinglePageCell.swift */, - F33BD08506077733D10565FD32AAE01D /* PDFSinglePageViewer.swift */, - C9FE943FC9A290F6F65198FF53EF96E6 /* PDFSnapshotCache.swift */, - C6C164216F04F2C8E8102F383F660F44 /* PDFThumbnailView.swift */, - 61561CB21DDA7B4E00C314EB /* PDFThumbnailViewController.swift */, - 61561CB51DDA7F6200C314EB /* PDFThumbnailViewCell.swift */, - C998B073AF0AE6121E63EFF482E2E251 /* PDFViewController.swift */, + 4E1B16E7B9A2A6B1300E0AE0B3DD0ED6 /* UXMPDFDocument.swift */, + E49FB5E98854EBDE8CCAB4C0137D1986 /* UXMDocumentLink.swift */, + C363DF92B0BB7081898E123695AED3A2 /* UXMPageContent.swift */, + A494B21C53F5EAC8E75CE8E354CAF951 /* UXMPageContentView.swift */, + C690BCEDB59958B45834FDDEEF382E58 /* UXMPageScrubber.swift */, + 43266A476FB5C6ADDCCBECEB16E9D513 /* UXMPageScrubberThumb.swift */, + EC4678DC63259E1E556B22354639F826 /* UXMPageScrubberTrackControl.swift */, + AE1C7B951EC7E6CED0390CF07A023630 /* UXMPageTileLayer.swift */, + B7D9346501AFA05A330677D39DB1650F /* UXMRenderer.swift */, + 14E3AEB01DD6ED3800CC9C60 /* UXMSinglePageCell.swift */, + F33BD08506077733D10565FD32AAE01D /* UXMSinglePageViewer.swift */, + C9FE943FC9A290F6F65198FF53EF96E6 /* UXMSnapshotCache.swift */, + C6C164216F04F2C8E8102F383F660F44 /* UXMThumbnailView.swift */, + 61561CB21DDA7B4E00C314EB /* UXMThumbnailViewController.swift */, + 61561CB51DDA7F6200C314EB /* UXMThumbnailViewCell.swift */, + C998B073AF0AE6121E63EFF482E2E251 /* UXMPDFViewController.swift */, ); path = Renderer; sourceTree = ""; @@ -319,7 +319,7 @@ 61C3A26F1EC3C0DF00807C4B /* View */ = { isa = PBXGroup; children = ( - BC1A9EB3AA234A93FFED5E5EC31C26C0 /* PDFBarButton.swift */, + BC1A9EB3AA234A93FFED5E5EC31C26C0 /* UXMBarButton.swift */, 61C3A26D1EC2859A00807C4B /* ResizeableView.swift */, ); path = View; @@ -328,7 +328,7 @@ 61D72DBF1DDB7BEF003CE472 /* TextParser */ = { isa = PBXGroup; children = ( - 61D72DC01DDB7C15003CE472 /* PDFTextParser.swift */, + 61D72DC01DDB7C15003CE472 /* UXMTextParser.swift */, ); path = TextParser; sourceTree = ""; @@ -355,9 +355,9 @@ 81336BCA9643382D6508CC16CB35EE81 /* Model */ = { isa = PBXGroup; children = ( - 69FD1010A27EE6442B7768D3B955DBF9 /* PDFAction.swift */, - 61D72DBA1DDB7039003CE472 /* PDFActionGoTo.swift */, - 61D72DBC1DDB705B003CE472 /* PDFActionURL.swift */, + 69FD1010A27EE6442B7768D3B955DBF9 /* UXMAction.swift */, + 61D72DBA1DDB7039003CE472 /* UXMActionGoTo.swift */, + 61D72DBC1DDB705B003CE472 /* UXMActionURL.swift */, ); path = Model; sourceTree = ""; @@ -560,48 +560,48 @@ buildActionMask = 2147483647; files = ( DEEE49CA145C9CAFCB54635C31D6F6E6 /* CGPDFDocument.swift in Sources */, - 4B1F57EBF4BECAEC47EEF57BD3CA1AD7 /* PDFAction.swift in Sources */, - B564F9589CA9317A04F24F9DC40AC5AA /* PDFAnnotation.swift in Sources */, - E8C31B918E22C5EB41B659A64E076416 /* PDFAnnotationController.swift in Sources */, - 61D72DBD1DDB705B003CE472 /* PDFActionURL.swift in Sources */, - 00703477D03E535E1BFA3A7169814C2C /* PDFAnnotationStore.swift in Sources */, - C1EDA6F9A885F21D2887845369237062 /* PDFArray.swift in Sources */, - 61561CB41DDA7C6100C314EB /* PDFThumbnailViewController.swift in Sources */, - 75332EB7DF07634FEBA4DB30AED834DE /* PDFBarButton.swift in Sources */, - 27F938F715132EBBE5F6903A0029CA2B /* PDFDictionary.swift in Sources */, + 4B1F57EBF4BECAEC47EEF57BD3CA1AD7 /* UXMAction.swift in Sources */, + B564F9589CA9317A04F24F9DC40AC5AA /* UXMAnnotation.swift in Sources */, + E8C31B918E22C5EB41B659A64E076416 /* UXMAnnotationController.swift in Sources */, + 61D72DBD1DDB705B003CE472 /* UXMActionURL.swift in Sources */, + 00703477D03E535E1BFA3A7169814C2C /* UXMAnnotationStore.swift in Sources */, + C1EDA6F9A885F21D2887845369237062 /* UXMArray.swift in Sources */, + 61561CB41DDA7C6100C314EB /* UXMThumbnailViewController.swift in Sources */, + 75332EB7DF07634FEBA4DB30AED834DE /* UXMBarButton.swift in Sources */, + 27F938F715132EBBE5F6903A0029CA2B /* UXMDictionary.swift in Sources */, 612E003F1E424A9E00C42D3E /* CGPoint.swift in Sources */, - 02F91569195B82122C93CD73F89BF123 /* PDFDocument.swift in Sources */, + 02F91569195B82122C93CD73F89BF123 /* UXMPDFDocument.swift in Sources */, 610688731E3A52BD00A85AF0 /* UIViewController.swift in Sources */, - 4226B8E079C7A46273F41F374F2D54EB /* PDFDocumentLink.swift in Sources */, - C4E224C0D0BFCC63723ACA2EDB266CC6 /* PDFFormButtonField.swift in Sources */, - 0168C787039F39EFC7CC717928780ECE /* PDFFormField.swift in Sources */, + 4226B8E079C7A46273F41F374F2D54EB /* UXMDocumentLink.swift in Sources */, + C4E224C0D0BFCC63723ACA2EDB266CC6 /* UXMFormButtonField.swift in Sources */, + 0168C787039F39EFC7CC717928780ECE /* UXMFormField.swift in Sources */, 612E00421E424F3E00C42D3E /* CGRect.swift in Sources */, - 61D72DC11DDB7C15003CE472 /* PDFTextParser.swift in Sources */, - 14E3AEB11DD6ED3800CC9C60 /* PDFSinglePageCell.swift in Sources */, - DD3034BF3EE6DA6D91BBF74EAEAC456E /* PDFFormPageView.swift in Sources */, - 61D72DBE1DDB7062003CE472 /* PDFActionGoTo.swift in Sources */, - C4ECF8B8556E26A1DF679C202AC9B641 /* PDFFormSignatureField.swift in Sources */, - F9C1E676BBEAC0A22212CD00437C1073 /* PDFFormTextField.swift in Sources */, - 1A6C84063FC233E27AEA75D7300DFD96 /* PDFFormViewController.swift in Sources */, + 61D72DC11DDB7C15003CE472 /* UXMTextParser.swift in Sources */, + 14E3AEB11DD6ED3800CC9C60 /* UXMSinglePageCell.swift in Sources */, + DD3034BF3EE6DA6D91BBF74EAEAC456E /* UXMFormPageView.swift in Sources */, + 61D72DBE1DDB7062003CE472 /* UXMActionGoTo.swift in Sources */, + C4ECF8B8556E26A1DF679C202AC9B641 /* UXMFormSignatureField.swift in Sources */, + F9C1E676BBEAC0A22212CD00437C1073 /* UXMFormTextField.swift in Sources */, + 1A6C84063FC233E27AEA75D7300DFD96 /* UXMFormViewController.swift in Sources */, 61C3A26E1EC2859A00807C4B /* ResizeableView.swift in Sources */, - CC2919A41AAA5F6BCC83D700E574345F /* PDFObjectParser.swift in Sources */, - CE63E30770B2CDD35ED208AF2A284F5B /* PDFPageContent.swift in Sources */, - F77D80C31A9B9DBED9D3A258932F9922 /* PDFPageContentView.swift in Sources */, - B6610EC0BB6FC688BE01E6A0CEDAC1E8 /* PDFPageScrubber.swift in Sources */, - 026FEED112A93B09A02BE58F8F025312 /* PDFPageScrubberThumb.swift in Sources */, - E2EE8D087924795726295ABA80B0079F /* PDFPageScrubberTrackControl.swift in Sources */, + CC2919A41AAA5F6BCC83D700E574345F /* UXMObjectParser.swift in Sources */, + CE63E30770B2CDD35ED208AF2A284F5B /* UXMPageContent.swift in Sources */, + F77D80C31A9B9DBED9D3A258932F9922 /* UXMPageContentView.swift in Sources */, + B6610EC0BB6FC688BE01E6A0CEDAC1E8 /* UXMPageScrubber.swift in Sources */, + 026FEED112A93B09A02BE58F8F025312 /* UXMPageScrubberThumb.swift in Sources */, + E2EE8D087924795726295ABA80B0079F /* UXMPageScrubberTrackControl.swift in Sources */, 38629AF01DDA548700DF2B43 /* UIColor.swift in Sources */, - C02189E300C9F94935CFF78ECD34CA3B /* PDFPageTileLayer.swift in Sources */, - 075383BD36B769E863ED5F59FA08F555 /* PDFPathAnnotation.swift in Sources */, - D09FB06765B5FCD7A81F58BE68B1BDED /* PDFRenderer.swift in Sources */, - 75EBCC5DA128D1197EE38C0D71ED2E61 /* PDFSinglePageViewer.swift in Sources */, - 38629AF21DDA55DF00DF2B43 /* PDFToggleButton.swift in Sources */, - 298424542AE0A9D498FF405DFA338D75 /* PDFSnapshotCache.swift in Sources */, - 14ED9AA74A5A2E807B36B928AAE04F32 /* PDFTextAnnotation.swift in Sources */, - 536A83F7FA72186229EBF285914A5B78 /* PDFThumbnailView.swift in Sources */, - 37C1CD56A692371828740DFCEE4A9128 /* PDFViewController.swift in Sources */, + C02189E300C9F94935CFF78ECD34CA3B /* UXMPageTileLayer.swift in Sources */, + 075383BD36B769E863ED5F59FA08F555 /* UXMPathAnnotation.swift in Sources */, + D09FB06765B5FCD7A81F58BE68B1BDED /* UXMRenderer.swift in Sources */, + 75EBCC5DA128D1197EE38C0D71ED2E61 /* UXMSinglePageViewer.swift in Sources */, + 38629AF21DDA55DF00DF2B43 /* UXMToggleButton.swift in Sources */, + 298424542AE0A9D498FF405DFA338D75 /* UXMSnapshotCache.swift in Sources */, + 14ED9AA74A5A2E807B36B928AAE04F32 /* UXMTextAnnotation.swift in Sources */, + 536A83F7FA72186229EBF285914A5B78 /* UXMThumbnailView.swift in Sources */, + 37C1CD56A692371828740DFCEE4A9128 /* UXMPDFViewController.swift in Sources */, EF0C3B060264BDE888EFCB98B2E95088 /* UIImage.swift in Sources */, - 61561CB61DDA7F6200C314EB /* PDFThumbnailViewCell.swift in Sources */, + 61561CB61DDA7F6200C314EB /* UXMThumbnailViewCell.swift in Sources */, EA02320D912547EAE5017330C7835B18 /* UXMPDFKit-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Example/UXMPDFKit/Base.lproj/Main.storyboard b/Example/UXMPDFKit/Base.lproj/Main.storyboard index e077937..a8f72ad 100644 --- a/Example/UXMPDFKit/Base.lproj/Main.storyboard +++ b/Example/UXMPDFKit/Base.lproj/Main.storyboard @@ -1,11 +1,7 @@ - - - - + - - + @@ -18,11 +14,11 @@ - + - - + + @@ -57,27 +53,27 @@ - + - + - +