Merge pull request #45 from tavisbones/uiwebview-removal

Uiwebview removal

Author: iclems

HTMLtoPDF-Demo/HTMLtoPDF-Demo.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		081B228024F7FA1400F172E1 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 081B227F24F7FA1400F172E1 /* WebKit.framework */; };
 		19A2C6AB1651029B00803EF5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 19A2C6AA1651029B00803EF5 /* UIKit.framework */; };
 		19A2C6AD1651029B00803EF5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 19A2C6AC1651029B00803EF5 /* Foundation.framework */; };
 		19A2C6AF1651029B00803EF5 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 19A2C6AE1651029B00803EF5 /* CoreGraphics.framework */; };
@@ -23,6 +24,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		081B227F24F7FA1400F172E1 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		19A2C6A61651029B00803EF5 /* HTMLtoPDF-Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HTMLtoPDF-Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		19A2C6AA1651029B00803EF5 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		19A2C6AC1651029B00803EF5 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -51,6 +53,7 @@
 			files = (
 				19A2C6AB1651029B00803EF5 /* UIKit.framework in Frameworks */,
 				19A2C6AD1651029B00803EF5 /* Foundation.framework in Frameworks */,
+				081B228024F7FA1400F172E1 /* WebKit.framework in Frameworks */,
 				19A2C6AF1651029B00803EF5 /* CoreGraphics.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -80,6 +83,7 @@
 		19A2C6A91651029B00803EF5 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				081B227F24F7FA1400F172E1 /* WebKit.framework */,
 				19A2C6AA1651029B00803EF5 /* UIKit.framework */,
 				19A2C6AC1651029B00803EF5 /* Foundation.framework */,
 				19A2C6AE1651029B00803EF5 /* CoreGraphics.framework */,
@@ -242,7 +246,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -264,7 +268,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

HTMLtoPDF-Demo/HTMLtoPDF-Demo/HTMLtoPDF-Demo-Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.nurves.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+	<string>8.0</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>

NDHTMLtoPDF.h

@@ -23,7 +23,7 @@ typedef void (^NDHTMLtoPDFCompletionBlock)(NDHTMLtoPDF* htmlToPDF);
 - (void)HTMLtoPDFDidFail:(NDHTMLtoPDF*)htmlToPDF;
 @end
 
-@interface NDHTMLtoPDF : UIViewController <UIWebViewDelegate>
+@interface NDHTMLtoPDF : UIViewController
 
 @property (nonatomic, copy) NDHTMLtoPDFCompletionBlock successBlock;
 @property (nonatomic, copy) NDHTMLtoPDFCompletionBlock errorBlock;

NDHTMLtoPDF.m

@@ -13,14 +13,15 @@
 //  Addons : http://developer.apple.com/library/ios/#samplecode/PrintWebView/Listings/MyPrintPageRenderer_m.html#//apple_ref/doc/uid/DTS40010311-MyPrintPageRenderer_m-DontLinkElementID_7
 
 #import "NDHTMLtoPDF.h"
+#import <WebKit/WebKit.h>
 
-@interface NDHTMLtoPDF ()
+@interface NDHTMLtoPDF ()<WKNavigationDelegate>
 
 @property (nonatomic, strong) NSURL *URL;
 @property (nonatomic, strong) NSString *HTML;
 @property (nonatomic, strong) NSString *PDFpath;
 @property (nonatomic, strong) NSData *PDFdata;
-@property (nonatomic, strong) UIWebView *webview;
+@property (nonatomic, strong) WKWebView *webview;
 @property (nonatomic, assign) CGSize pageSize;
 @property (nonatomic, assign) UIEdgeInsets pageMargins;
 
@@ -143,8 +144,8 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
-    self.webview = [[UIWebView alloc] initWithFrame:self.view.frame];
-    webview.delegate = self;
+    self.webview = [[WKWebView alloc] initWithFrame:self.view.frame];
+    webview.navigationDelegate = self;
 
     [self.view addSubview:webview];
 
@@ -155,7 +156,7 @@ - (void)viewDidLoad
     }
 }
 
-- (void)webViewDidFinishLoad:(UIWebView *)webView
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
 {
     if (webView.isLoading) return;
 
@@ -191,7 +192,7 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView
 
 }
 
-- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
+- (void)webView:(WKWebView *)webView didFailNavigation:(WKNavigation *)navigation withError:(NSError *)error
 {
     if (webView.isLoading) return;
 
@@ -209,7 +210,7 @@ - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
 - (void)terminateWebTask
 {
     [self.webview stopLoading];
-    self.webview.delegate = nil;
+    self.webview.navigationDelegate = nil;
     [self.webview removeFromSuperview];
 
     [self.view removeFromSuperview];

iOS-htmltopdf.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "iOS-htmltopdf"
-  s.version      = "1.0.3"
+  s.version      = "1.1.0"
   s.summary      = "This class enables simple URL-based PDF creation."
   s.description  = "Pages are created the exact same way they would be if the user printed the content on an iOS device (very similar as well as OS X print output)."
   s.homepage     = "https://github.com/iclems/iOS-htmltopdf"