Merge pull request #14 from PSPDFKit/rad/update-to-pspdfkit7

radazzouz · web-flow · commit abffa0c6472f · 2017-10-04T17:05:18.000-04:00
Update to PSPDFKit 7.0.0 and Titanium SDK 6.2.2.GA
diff --git a/.gitignore b/.gitignore
@@ -25,5 +25,6 @@ com.pspdfkit*
 PSPDFKit
 
 PSPDFKit.framework
+PSPDFKitUI.framework
 
 metadata.json
diff --git a/Classes/ComPspdfkitModule.m b/Classes/ComPspdfkitModule.m
@@ -121,10 +121,22 @@ - (TIPSPDFViewControllerProxy *)pspdf_displayPdfInternal:(NSArray *)pdfNames ani
             PSPDFAESCryptoDataProvider *cryptoWrapper = [[PSPDFAESCryptoDataProvider alloc] initWithURL:pdfURL passphraseProvider:^NSString *{
                 return passphrase;
             } salt:salt rounds:PSPDFDefaultPBKDFNumberOfRounds];
-            document = [PSPDFDocument documentWithDataProvider:cryptoWrapper];
+            document = [[PSPDFDocument alloc] initWithDataProviders:@[cryptoWrapper]];
         }
 
-        if (!document) document = [[PSPDFDocument alloc] initWithBaseURL:nil files:pdfNames];
+        if (!document) {
+            NSMutableArray<PSPDFCoordinatedFileDataProvider *> *dataProviders = [NSMutableArray array];
+            for (NSString *pdfPath in pdfNames) {
+                NSURL *pdfURL = [NSURL fileURLWithPath:pdfPath isDirectory:NO];
+                if ([pdfURL.pathExtension.lowercaseString isEqualToString:@"pdf"]) {
+                    PSPDFCoordinatedFileDataProvider *coordinatedFileDataProvider = [[PSPDFCoordinatedFileDataProvider alloc] initWithFileURL:pdfURL];
+                    if (coordinatedFileDataProvider) {
+                        [dataProviders addObject:coordinatedFileDataProvider];
+                    }
+                }
+            }
+            document = [[PSPDFDocument alloc] initWithDataProviders:dataProviders];
+        }
 
         TIPSPDFViewController *pdfController = [[TIPSPDFViewController alloc] initWithDocument:document];
 
@@ -217,9 +229,7 @@ - (void)cacheDocument:(id)args {
     NSArray *documents = [PSPDFUtils documentsFromArgs:args];
     for (PSPDFDocument *document in documents) {
         [[PSPDFKit sharedInstance].cache cacheDocument:document
-                                             pageSizes:@[[NSValue valueWithCGSize:CGSizeMake(170.f, 220.f)], [NSValue valueWithCGSize:UIScreen.mainScreen.bounds.size]]
-                                 withDiskCacheStrategy:PSPDFDiskCacheStrategyEverything
-                                            aroundPageAtIndex:0];
+                                             withPageSizes:@[[NSValue valueWithCGSize:CGSizeMake(170.f, 220.f)], [NSValue valueWithCGSize:UIScreen.mainScreen.bounds.size]]];
     }
 }
 
diff --git a/Classes/ComPspdfkitView.h b/Classes/ComPspdfkitView.h
@@ -11,7 +11,7 @@
 //
 
 #import "TIPSPDFViewControllerProxy.h"
-#import "TiUiViewProxy.h"
+#import "TiUIViewProxy.h"
 
 @interface ComPspdfkitView : TiUIView
 @property (nonatomic) TIPSPDFViewControllerProxy *controllerProxy;
diff --git a/Classes/ComPspdfkitView.m b/Classes/ComPspdfkitView.m
@@ -29,7 +29,18 @@ - (void)createControllerProxy {
     
     if (!_controllerProxy) { // self triggers creation
         NSArray *pdfPaths = [PSPDFUtils resolvePaths:[self.proxy valueForKey:@"filename"]];
-        PSPDFDocument *pdfDocument = [[PSPDFDocument alloc] initWithBaseURL:nil files:pdfPaths];
+        NSMutableArray<PSPDFCoordinatedFileDataProvider *> *dataProviders = [NSMutableArray array];
+        for (NSString *pdfPath in pdfPaths) {
+            NSURL *pdfURL = [NSURL fileURLWithPath:pdfPath isDirectory:NO];
+            if ([pdfURL.pathExtension.lowercaseString isEqualToString:@"pdf"]) {
+                PSPDFCoordinatedFileDataProvider *coordinatedFileDataProvider = [[PSPDFCoordinatedFileDataProvider alloc] initWithFileURL:pdfURL];
+                if (coordinatedFileDataProvider) {
+                    [dataProviders addObject:coordinatedFileDataProvider];
+                }
+            }
+        }
+
+        PSPDFDocument *pdfDocument = [[PSPDFDocument alloc] initWithDataProviders:dataProviders];
         TIPSPDFViewController *pdfController = [[TIPSPDFViewController alloc] initWithDocument:pdfDocument];
 
         NSDictionary *options = [self.proxy valueForKey:@"options"];
@@ -51,7 +62,7 @@ - (void)createControllerProxy {
 
             // Support for tinting the navigation controller/bar
             if (options[@"barColor"]) {
-                UIColor *barColor = [[TiColor colorNamed:options[@"barColor"]] color];
+                UIColor *barColor = [[TiColor colorNamed:options[@"barColor"]] _color];
                 if (barColor) {
                     navController.navigationBar.tintColor = barColor;
                 }
diff --git a/Classes/ComPspdfkitViewProxy.h b/Classes/ComPspdfkitViewProxy.h
@@ -67,7 +67,7 @@
 - (void)setAllowedMenuActions:(id)arg;
 
 /// Expose the scrollingEnabled property
-- (void)setScrollingEnabled:(id)arg;
+- (void)setScrollEnabled:(id)arg;
 
 /// Return document path.
 - (id)documentPath;
diff --git a/Classes/ComPspdfkitViewProxy.m b/Classes/ComPspdfkitViewProxy.m
@@ -157,9 +157,9 @@ - (void)setEditableAnnotationTypes:(id)arg {
     [[[self pdfView] controllerProxy] setEditableAnnotationTypes:arg];
 }
 
-- (void)setScrollingEnabled:(id)arg {
-    ENSURE_UI_THREAD(setScrollingEnabled, arg);
-    [[[self pdfView] controllerProxy] setScrollingEnabled:arg];
+- (void)setScrollEnabled:(id)arg {
+    ENSURE_UI_THREAD(setScrollEnabled, arg);
+    [[[self pdfView] controllerProxy] setScrollEnabled:arg];
 }
 
 - (void)setPrintOptions:(id)arg {
diff --git a/Classes/PSPDFUtils.m b/Classes/PSPDFUtils.m
@@ -72,7 +72,7 @@ + (void)applyOptions:(NSDictionary *)options onObject:(id)object {
 
             // convert color
             if ([key rangeOfString:@"color" options:NSCaseInsensitiveSearch].length > 0) {
-                value = [[TiColor colorNamed:value] color];
+                value = [[TiColor colorNamed:value] _color];
             }
 
             // special handling for toolbar
diff --git a/Classes/TIPSPDFViewControllerProxy.h b/Classes/TIPSPDFViewControllerProxy.h
@@ -109,8 +109,8 @@
 /// Document's menu actions.
 - (void)setAllowedMenuActions:(id)arg;
 
-/// Expose the scrollingEnabled property
-- (void)setScrollingEnabled:(id)args;
+/// Expose the scrollEnabled property
+- (void)setScrollEnabled:(id)args;
 
 // Save changed annotations.
 - (void)saveAnnotations:(id)args;
diff --git a/Classes/TIPSPDFViewControllerProxy.m b/Classes/TIPSPDFViewControllerProxy.m
@@ -220,11 +220,11 @@ - (void)setAllowedMenuActions:(id)arg {
     }
 }
 
-- (void)setScrollingEnabled:(id)args {
-    ENSURE_UI_THREAD(setScrollingEnabled, args);
+- (void)setScrollEnabled:(id)args {
+    ENSURE_UI_THREAD(setScrollEnabled, args);
 
     NSUInteger pageValue = [PSPDFUtils intValue:args onPosition:0];
-    [_controller setScrollingEnabled:pageValue];
+    [_controller.documentViewController setScrollEnabled:pageValue];
 }
 
 - (void)scrollToPage:(id)args {
@@ -287,7 +287,7 @@ - (void)saveAnnotations:(id)args {
     ENSURE_UI_THREAD(saveAnnotations, args);
 
     NSError *error = nil;
-    BOOL success = [self.controller.document save:&error];
+    BOOL success = [self.controller.document saveWithOptions:nil error:&error];
     if (!success && self.controller.configuration.isTextSelectionEnabled)  {
         PSCLog(@"Saving annotations failed: %@", [error localizedDescription]);
     }
@@ -413,7 +413,7 @@ - (TiProxy *)eventProxy {
 }
 
 /// delegate for tapping on an annotation. If you don't implement this or return false, it will be processed by default action (scroll to page, ask to open Safari)
-- (BOOL)pdfViewController:(PSPDFViewController *)pdfController didTapOnAnnotation:(PSPDFAnnotation *)annotation annotationPoint:(CGPoint)annotationPoint annotationView:(UIView<PSPDFAnnotationViewProtocol> *)annotationView pageView:(PSPDFPageView *)pageView viewPoint:(CGPoint)viewPoint {
+- (BOOL)pdfViewController:(PSPDFViewController *)pdfController didTapOnAnnotation:(PSPDFAnnotation *)annotation annotationPoint:(CGPoint)annotationPoint annotationView:(UIView<PSPDFAnnotationPresenting> *)annotationView pageView:(PSPDFPageView *)pageView viewPoint:(CGPoint)viewPoint {
     NSParameterAssert([pdfController isKindOfClass:[TIPSPDFViewController class]]);
 
     NSMutableDictionary *eventDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInteger:pageView.pageIndex], @"page", nil];
@@ -482,7 +482,7 @@ - (void)pdfViewController:(PSPDFViewController *)pdfController didChangeViewMode
     }
 }
 
-- (UIView <PSPDFAnnotationViewProtocol> *)pdfViewController:(PSPDFViewController *)pdfController annotationView:(UIView <PSPDFAnnotationViewProtocol> *)annotationView forAnnotation:(PSPDFAnnotation *)annotation onPageView:(PSPDFPageView *)pageView {
+- (UIView <PSPDFAnnotationPresenting> *)pdfViewController:(PSPDFViewController *)pdfController annotationView:(UIView <PSPDFAnnotationPresenting> *)annotationView forAnnotation:(PSPDFAnnotation *)annotation onPageView:(PSPDFPageView *)pageView {
 
     if (annotation.type == PSPDFAnnotationTypeLink && [annotationView isKindOfClass:[PSPDFLinkAnnotationView class]]) {
         PSPDFLinkAnnotationView *linkAnnotation = (PSPDFLinkAnnotationView *)annotationView;
@@ -496,35 +496,35 @@ - (void)pdfViewController:(PSPDFViewController *)pdfController didChangeViewMode
     return annotationView;
 }
 
-- (BOOL)pdfViewController:(PSPDFViewController *)pdfController shouldShowHUD:(BOOL)animated {
-    if ([[self eventProxy] _hasListeners:@"shouldShowHUD"]) {
-        [[self eventProxy] fireEvent:@"shouldShowHUD" withObject:nil];
+- (BOOL)pdfViewController:(PSPDFViewController *)pdfController shouldShowUserInterface:(BOOL)animated {
+    if ([[self eventProxy] _hasListeners:@"shouldShowUserInterface"]) {
+        [[self eventProxy] fireEvent:@"shouldShowUserInterface" withObject:nil];
     }
-    if ([[self eventProxy] _hasListeners:@"willShowHUD"]) {
-        [[self eventProxy] fireEvent:@"willShowHUD" withObject:nil];
+    if ([[self eventProxy] _hasListeners:@"willShowUserInterface"]) {
+        [[self eventProxy] fireEvent:@"willShowUserInterface" withObject:nil];
     }
     return YES;
 }
 
-- (void)pdfViewController:(PSPDFViewController *)pdfController didShowHUD:(BOOL)animated {
-    if ([[self eventProxy] _hasListeners:@"didShowHUD"]) {
-        [[self eventProxy] fireEvent:@"didShowHUD" withObject:nil];
+- (void)pdfViewController:(PSPDFViewController *)pdfController didShowUserInterface:(BOOL)animated {
+    if ([[self eventProxy] _hasListeners:@"didShowUserInterface"]) {
+        [[self eventProxy] fireEvent:@"didShowUserInterface" withObject:nil];
     }
 }
 
-- (BOOL)pdfViewController:(PSPDFViewController *)pdfController shouldHideHUD:(BOOL)animated {
-    if ([[self eventProxy] _hasListeners:@"shouldHideHUD"]) {
-        [[self eventProxy] fireEvent:@"shouldHideHUD" withObject:nil];
+- (BOOL)pdfViewController:(PSPDFViewController *)pdfController shouldHideUserInterface:(BOOL)animated {
+    if ([[self eventProxy] _hasListeners:@"shouldHideUserInterface"]) {
+        [[self eventProxy] fireEvent:@"shouldHideUserInterface" withObject:nil];
     }
-    if ([[self eventProxy] _hasListeners:@"willHideHUD"]) {
-        [[self eventProxy] fireEvent:@"willHideHUD" withObject:nil];
+    if ([[self eventProxy] _hasListeners:@"willHideUserInterface"]) {
+        [[self eventProxy] fireEvent:@"willHideUserInterface" withObject:nil];
     }
     return YES;
 }
 
-- (void)pdfViewController:(PSPDFViewController *)pdfController didHideHUD:(BOOL)animated {
-    if ([[self eventProxy] _hasListeners:@"didHideHUD"]) {
-        [[self eventProxy] fireEvent:@"didHideHUD" withObject:nil];
+- (void)pdfViewController:(PSPDFViewController *)pdfController didHideUserInterface:(BOOL)animated {
+    if ([[self eventProxy] _hasListeners:@"didHideUserInterface"]) {
+        [[self eventProxy] fireEvent:@"didHideUserInterface" withObject:nil];
     }
 }
 
diff --git a/ComPspdfkit_Prefix.pch b/ComPspdfkit_Prefix.pch
@@ -5,6 +5,7 @@
 #import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
 #import "PSPDFKit.h"
+#import "PSPDFKitUI.h"
 #endif
 
 // Logging
diff --git a/PSPDFKit-Titanium.xcodeproj/project.pbxproj b/PSPDFKit-Titanium.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
 			isa = PBXAggregateTarget;
 			buildConfigurationList = 24416B8A11C4CA520047AFDD /* Build configuration list for PBXAggregateTarget "Build & Test" */;
 			buildPhases = (
-				24416B8011C4CA220047AFDD /* ShellScript */,
 			);
 			dependencies = (
 				24416B8511C4CA280047AFDD /* PBXTargetDependency */,
@@ -98,6 +97,7 @@
 		78ED7A55146F00FE002EE22C /* TIPSPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TIPSPDFViewController.h; path = Classes/TIPSPDFViewController.h; sourceTree = "<group>"; };
 		78ED7A56146F00FE002EE22C /* TIPSPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TIPSPDFViewController.m; path = Classes/TIPSPDFViewController.m; sourceTree = "<group>"; };
 		78FB05B9177304060006CE08 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
+		845DF1911F6EC09000CA6923 /* PSPDFKitUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = PSPDFKitUI.framework; sourceTree = "<group>"; };
 		AA747D9E0F9514B9006C5449 /* ComPspdfkit_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComPspdfkit_Prefix.pch; sourceTree = SOURCE_ROOT; };
 		AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		B963ECCE1D105EDB00AB1C8A /* PSPDFKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = PSPDFKit.framework; sourceTree = "<group>"; };
@@ -155,6 +155,7 @@
 			isa = PBXGroup;
 			children = (
 				B963ECCE1D105EDB00AB1C8A /* PSPDFKit.framework */,
+				845DF1911F6EC09000CA6923 /* PSPDFKitUI.framework */,
 				7884215214830D3700203926 /* System */,
 			);
 			name = Frameworks;
@@ -263,7 +264,7 @@
 				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = "Peter Steinberger";
 			};
-			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "pspdfkit-titanium" */;
+			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "PSPDFKit-Titanium" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
@@ -284,22 +285,6 @@
 		};
 /* End PBXProject section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		24416B8011C4CA220047AFDD /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# shell script goes here\n\npython \"${TITANIUM_SDK}/titanium.py\" run --dir=\"${PROJECT_DIR}\"\nexit $?\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		D2AAC07B0554694100DB518D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -345,6 +330,7 @@
 				GCC_PREFIX_HEADER = ComPspdfkit_Prefix.pch;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/PSPDFKit.framework/Headers/**",
+					"$(SRCROOT)/PSPDFKitUI.framework/Headers/**",
 					"$(TITANIUM_BASE_SDK)/**",
 					"$(TITANIUM_BASE_SDK2)/**",
 				);
@@ -435,6 +421,7 @@
 				GCC_PREFIX_HEADER = ComPspdfkit_Prefix.pch;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/PSPDFKit.framework/Headers/**",
+					"$(SRCROOT)/PSPDFKitUI.framework/Headers/**",
 					"$(TITANIUM_BASE_SDK)/**",
 					"$(TITANIUM_BASE_SDK2)/**",
 				);
@@ -474,7 +461,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "pspdfkit-titanium" */ = {
+		1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "PSPDFKit-Titanium" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1DEB922308733DC00010E9CD /* Debug */,
diff --git a/README.md b/README.md
@@ -8,13 +8,13 @@ PSPDFKit - The Leading Mobile PDF Framework for iOS and Android.
 **Note:** Read the [Alloy](#alloy) section before building the module if you're using the Alloy framework.
 
 1. Checkout the project: `git clone https://github.com/PSPDFKit/Appcelerator-iOS.git`
-2. Make sure you have Titanium 6.0.4 GA or later installed: http://www.appcelerator.com
+2. Make sure you have Titanium 6.2.2.GA or later installed: http://www.appcelerator.com
 3. Download the binary build of PSPDFKit from your customer portal: https://customers.pspdfkit.com
-4. Open the downloaded .dmg and copy `PSPDFKit.framework` into the checked out folder.
+4. Open the downloaded .dmg and copy `PSPDFKit.framework` and `PSPDFKitUI.framework` into the checked out folder.
 5. Call `appc ti build -p ios --build-only` in the `Appcelerator-iOS` folder.
 6. Unzip the created .zip into the Titanium folder (and optionally remove the .zip afterwards): 
-`unzip ./com.pspdfkit-iphone-6.x.x.zip -d ~/Library/Application\ Support/Titanium`
-7. Copy `PSPDFKit.framework` into your project's `Resources/iphone`.
+`unzip ./com.pspdfkit-iphone-7.x.x.zip -d ~/Library/Application\ Support/Titanium`
+7. Copy `PSPDFKit.framework` and `PSPDFKitUI.framework` into your project's `Resources/iphone`.
 8. Modify your project's `tiapp.xml` to contain the following entries:
 
 ```xml
@@ -28,9 +28,9 @@ PSPDFKit - The Leading Mobile PDF Framework for iOS and Android.
 </ti:app>
 ```
 
-Note: PSPDFKit 6 for iOS needs at least Xcode 8 or higher and supports iOS 9+.
+Note: PSPDFKit 7 for iOS needs at least Xcode 9 or higher and supports iOS 9+.
 
-The `ti.dynamiclib` module hook in [`hooks/ti.dynamiclib.js`](hooks/ti.dynamiclib.js) embeds `PSPDFKit.framework` into your app. 
+The `ti.dynamiclib` module hook in [`hooks/ti.dynamiclib.js`](hooks/ti.dynamiclib.js) embeds `PSPDFKit.framework` and `PSPDFKitUI.framework` into your app. 
 You can find more info about it [here](https://jira.appcelerator.org/browse/TIMOB-20557).
 
 ## Using the PSPDFKit module
@@ -55,7 +55,7 @@ var pdfView = pspdfkit.createView({
 
 #### 'PSPDFKit.h' file not found
 
-If `PSPDFKit.h` can't be found you need to add the directory that contains `PSPDFKit.h` to the "Header Search Paths" build setting in the Xcode project (`PSPDFKit-Titanium.xcodeproj`). The correct directory is `$(SRCROOT)/PSPDFKit.framework/Headers` (recursive).
+If `PSPDFKit.h` can't be found you need to add the directory that contains `PSPDFKit.h` to the "Header Search Paths" build setting in the Xcode project (`PSPDFKit-Titanium.xcodeproj`). The correct directories are `$(SRCROOT)/PSPDFKit.framework/Headers` and `$(SRCROOT)/PSPDFKitUI.framework/Headers` (recursive).
 
 #### Build error
 
@@ -76,10 +76,10 @@ If you get the above build error when running the project, you likely forgot to
 
 #### Alloy
 
-Alloy overwrites all files in the `Resources` folder everytime the application is built. This means you need to copy `PSPDFKit.framework` into a different folder than the default `Resources/iphone`, for example `Frameworks`. You also need to do the following before building the module:
+Alloy overwrites all files in the `Resources` folder everytime the application is built. This means you need to copy `PSPDFKit.framework` and `PSPDFKitUI.framework` into a different folder than the default `Resources/iphone`, for example `Frameworks`. You also need to do the following before building the module:
 
 * Modify `FRAMEWORK_SEARCH_PATHS` in [`module.xcconfig`](module.xcconfig) to point to the new folder, for example replace `"$(SRCROOT)/../../Resources/iphone"` with `"$(SRCROOT)/../../Frameworks"`.
-* Modify [`hooks/ti.dynamiclib.js`](hooks/ti.dynamiclib.js) to use the new framework path, for example replace `../../Resources/iphone/PSPDFKit.framework` with `../../Frameworks/PSPDFKit.framework`.
+* Modify [`hooks/ti.dynamiclib.js`](hooks/ti.dynamiclib.js) to use the new framework path, for example replace `../../Resources/iphone/PSPDFKit.framework` with `../../Frameworks/PSPDFKit.framework` and `../../Resources/iphone/PSPDFKitUI.framework` with `../../Frameworks/PSPDFKitUI.framework`.
 
 ## License
 
diff --git a/hooks/ti.dynamiclib.js b/hooks/ti.dynamiclib.js
@@ -39,7 +39,8 @@ exports.init = function (logger, config, cli, appc) {
 			var scriptPath = '$BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH/PSPDFKit.framework/strip-framework.sh'; // Or set to null if not required
 			var frameworkPaths = [
         			// Replace with the path of your embedded framework. Make sure the path is relative to `build/iphone`
-				'../../Resources/iphone/PSPDFKit.framework'
+				'../../Resources/iphone/PSPDFKit.framework',
+				'../../Resources/iphone/PSPDFKitUI.framework'
 			];
 			// ---
 			
diff --git a/manifest b/manifest
diff --git a/titanium.xcconfig b/titanium.xcconfig

Original file line number	Diff line number	Diff line change
`@@ -157,9 +157,9 @@ - (void)setEditableAnnotationTypes:(id)arg {`
`157`	`157`	`[[[self pdfView] controllerProxy] setEditableAnnotationTypes:arg];`
`158`	`158`	`}`
`159`	`159`
`160`		`-- (void)setScrollingEnabled:(id)arg {`
`161`		`- ENSURE_UI_THREAD(setScrollingEnabled, arg);`
`162`		`- [[[self pdfView] controllerProxy] setScrollingEnabled:arg];`
	`160`	`+- (void)setScrollEnabled:(id)arg {`
	`161`	`+ ENSURE_UI_THREAD(setScrollEnabled, arg);`
	`162`	`+ [[[self pdfView] controllerProxy] setScrollEnabled:arg];`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`- (void)setPrintOptions:(id)arg {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ + (void)applyOptions:(NSDictionary *)options onObject:(id)object {`
`72`	`72`
`73`	`73`	`// convert color`
`74`	`74`	`if ([key rangeOfString:@"color" options:NSCaseInsensitiveSearch].length > 0) {`
`75`		`- value = [[TiColor colorNamed:value] color];`
	`75`	`+ value = [[TiColor colorNamed:value] _color];`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`// special handling for toolbar`
Original file line number	Diff line number	Diff line change
`@@ -220,11 +220,11 @@ - (void)setAllowedMenuActions:(id)arg {`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
`223`		`-- (void)setScrollingEnabled:(id)args {`
`224`		`- ENSURE_UI_THREAD(setScrollingEnabled, args);`
	`223`	`+- (void)setScrollEnabled:(id)args {`
	`224`	`+ ENSURE_UI_THREAD(setScrollEnabled, args);`
`225`	`225`
`226`	`226`	`NSUInteger pageValue = [PSPDFUtils intValue:args onPosition:0];`
`227`		`- [_controller setScrollingEnabled:pageValue];`
	`227`	`+ [_controller.documentViewController setScrollEnabled:pageValue];`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`- (void)scrollToPage:(id)args {`
`@@ -287,7 +287,7 @@ - (void)saveAnnotations:(id)args {`
`287`	`287`	`ENSURE_UI_THREAD(saveAnnotations, args);`
`288`	`288`
`289`	`289`	`NSError *error = nil;`
`290`		`- BOOL success = [self.controller.document save:&error];`
	`290`	`+ BOOL success = [self.controller.document saveWithOptions:nil error:&error];`
`291`	`291`	`if (!success && self.controller.configuration.isTextSelectionEnabled) {`
`292`	`292`	`PSCLog(@"Saving annotations failed: %@", [error localizedDescription]);`
`293`	`293`	`}`
`@@ -413,7 +413,7 @@ - (TiProxy *)eventProxy {`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`/// delegate for tapping on an annotation. If you don't implement this or return false, it will be processed by default action (scroll to page, ask to open Safari)`
`416`		`-- (BOOL)pdfViewController:(PSPDFViewController )pdfController didTapOnAnnotation:(PSPDFAnnotation )annotation annotationPoint:(CGPoint)annotationPoint annotationView:(UIView<PSPDFAnnotationViewProtocol> )annotationView pageView:(PSPDFPageView )pageView viewPoint:(CGPoint)viewPoint {`
	`416`	`+- (BOOL)pdfViewController:(PSPDFViewController )pdfController didTapOnAnnotation:(PSPDFAnnotation )annotation annotationPoint:(CGPoint)annotationPoint annotationView:(UIView<PSPDFAnnotationPresenting> )annotationView pageView:(PSPDFPageView )pageView viewPoint:(CGPoint)viewPoint {`
`417`	`417`	`NSParameterAssert([pdfController isKindOfClass:[TIPSPDFViewController class]]);`
`418`	`418`
`419`	`419`	`NSMutableDictionary *eventDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInteger:pageView.pageIndex], @"page", nil];`
`@@ -482,7 +482,7 @@ - (void)pdfViewController:(PSPDFViewController *)pdfController didChangeViewMode`
`482`	`482`	`}`
`483`	`483`	`}`
`484`	`484`
`485`		`-- (UIView <PSPDFAnnotationViewProtocol> )pdfViewController:(PSPDFViewController )pdfController annotationView:(UIView <PSPDFAnnotationViewProtocol> )annotationView forAnnotation:(PSPDFAnnotation )annotation onPageView:(PSPDFPageView *)pageView {`
	`485`	`+- (UIView <PSPDFAnnotationPresenting> )pdfViewController:(PSPDFViewController )pdfController annotationView:(UIView <PSPDFAnnotationPresenting> )annotationView forAnnotation:(PSPDFAnnotation )annotation onPageView:(PSPDFPageView *)pageView {`
`486`	`486`
`487`	`487`	`if (annotation.type == PSPDFAnnotationTypeLink && [annotationView isKindOfClass:[PSPDFLinkAnnotationView class]]) {`
`488`	`488`	`PSPDFLinkAnnotationView linkAnnotation = (PSPDFLinkAnnotationView )annotationView;`
`@@ -496,35 +496,35 @@ - (void)pdfViewController:(PSPDFViewController *)pdfController didChangeViewMode`
`496`	`496`	`return annotationView;`
`497`	`497`	`}`
`498`	`498`
`499`		`-- (BOOL)pdfViewController:(PSPDFViewController *)pdfController shouldShowHUD:(BOOL)animated {`
`500`		`- if ([[self eventProxy] _hasListeners:@"shouldShowHUD"]) {`
`501`		`- [[self eventProxy] fireEvent:@"shouldShowHUD" withObject:nil];`
	`499`	`+- (BOOL)pdfViewController:(PSPDFViewController *)pdfController shouldShowUserInterface:(BOOL)animated {`
	`500`	`+ if ([[self eventProxy] _hasListeners:@"shouldShowUserInterface"]) {`
	`501`	`+ [[self eventProxy] fireEvent:@"shouldShowUserInterface" withObject:nil];`
`502`	`502`	`}`
`503`		`- if ([[self eventProxy] _hasListeners:@"willShowHUD"]) {`
`504`		`- [[self eventProxy] fireEvent:@"willShowHUD" withObject:nil];`
	`503`	`+ if ([[self eventProxy] _hasListeners:@"willShowUserInterface"]) {`
	`504`	`+ [[self eventProxy] fireEvent:@"willShowUserInterface" withObject:nil];`
`505`	`505`	`}`
`506`	`506`	`return YES;`
`507`	`507`	`}`
`508`	`508`
`509`		`-- (void)pdfViewController:(PSPDFViewController *)pdfController didShowHUD:(BOOL)animated {`
`510`		`- if ([[self eventProxy] _hasListeners:@"didShowHUD"]) {`
`511`		`- [[self eventProxy] fireEvent:@"didShowHUD" withObject:nil];`
	`509`	`+- (void)pdfViewController:(PSPDFViewController *)pdfController didShowUserInterface:(BOOL)animated {`
	`510`	`+ if ([[self eventProxy] _hasListeners:@"didShowUserInterface"]) {`
	`511`	`+ [[self eventProxy] fireEvent:@"didShowUserInterface" withObject:nil];`
`512`	`512`	`}`
`513`	`513`	`}`
`514`	`514`
`515`		`-- (BOOL)pdfViewController:(PSPDFViewController *)pdfController shouldHideHUD:(BOOL)animated {`
`516`		`- if ([[self eventProxy] _hasListeners:@"shouldHideHUD"]) {`
`517`		`- [[self eventProxy] fireEvent:@"shouldHideHUD" withObject:nil];`
	`515`	`+- (BOOL)pdfViewController:(PSPDFViewController *)pdfController shouldHideUserInterface:(BOOL)animated {`
	`516`	`+ if ([[self eventProxy] _hasListeners:@"shouldHideUserInterface"]) {`
	`517`	`+ [[self eventProxy] fireEvent:@"shouldHideUserInterface" withObject:nil];`
`518`	`518`	`}`
`519`		`- if ([[self eventProxy] _hasListeners:@"willHideHUD"]) {`
`520`		`- [[self eventProxy] fireEvent:@"willHideHUD" withObject:nil];`
	`519`	`+ if ([[self eventProxy] _hasListeners:@"willHideUserInterface"]) {`
	`520`	`+ [[self eventProxy] fireEvent:@"willHideUserInterface" withObject:nil];`
`521`	`521`	`}`
`522`	`522`	`return YES;`
`523`	`523`	`}`
`524`	`524`
`525`		`-- (void)pdfViewController:(PSPDFViewController *)pdfController didHideHUD:(BOOL)animated {`
`526`		`- if ([[self eventProxy] _hasListeners:@"didHideHUD"]) {`
`527`		`- [[self eventProxy] fireEvent:@"didHideHUD" withObject:nil];`
	`525`	`+- (void)pdfViewController:(PSPDFViewController *)pdfController didHideUserInterface:(BOOL)animated {`
	`526`	`+ if ([[self eventProxy] _hasListeners:@"didHideUserInterface"]) {`
	`527`	`+ [[self eventProxy] fireEvent:@"didHideUserInterface" withObject:nil];`
`528`	`528`	`}`
`529`	`529`	`}`
`530`	`530`