Remove UIWebView and update from upstream repository

ExampleProject/KINWebBrowserExample.xcodeproj/project.pbxproj

@@ -230,6 +230,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 3BBECF1C18A1E58D00A2499D;
@@ -427,6 +428,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "KINWebBrowserExample/KINWebBrowserExample-Prefix.pch";
 				INFOPLIST_FILE = "KINWebBrowserExample/KINWebBrowserExample-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -441,6 +443,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "KINWebBrowserExample/KINWebBrowserExample-Prefix.pch";
 				INFOPLIST_FILE = "KINWebBrowserExample/KINWebBrowserExample-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

ExampleProject/KINWebBrowserExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

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

ExampleProject/KINWebBrowserExample/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -2,57 +2,97 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
       "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
       "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
       "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
       "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

ExampleProject/KINWebBrowserExample/KINWebBrowserExampleViewController.m

@@ -38,7 +38,7 @@ @interface KINWebBrowserExampleViewController ()
 
 @end
 
-static NSString *const defaultAddress = @"http://www.apple.com/";
+static NSString *const defaultAddress = @"https://www.apple.com";
 
 @implementation KINWebBrowserExampleViewController
 
@@ -87,6 +87,11 @@ - (void)webBrowser:(KINWebBrowserViewController *)webBrowser didFailToLoadURL:(N
     NSLog(@"Failed To Load URL : %@ With Error: %@", URL, error);
 }
 
+- (void)webBrowserViewControllerWillDismiss:(KINWebBrowserViewController*)viewController {
+	NSLog(@"View Controller will dismiss: %@", viewController);
+
+}
+
 
 #pragma mark - IBActions
 

ExampleProject/Podfile

@@ -1,6 +1,7 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
 xcodeproj 'KINWebBrowserExample.xcodeproj'
-platform :ios, :deployment_target => '7.0'
+platform :ios, :deployment_target => '8.0'
+
+pod 'KINWebBrowser'
 
-pod 'KINWebBrowser', '~> 1.1'

KINWebBrowser.podspec

@@ -2,21 +2,24 @@
 Pod::Spec.new do |s|
 
   s.name         = "KINWebBrowser"
-
-  s.version      = "1.1.0"
+  s.version      = "1.3.3"
   s.summary      = "A web browser module for your apps."
   s.description  = <<-DESC
-                   KINWebBrowser is a web browser module for your apps. Powered by WKWebView on iOS 8. Backwards compatible with iOS 7 using UIWebView. KINWebBrowser offers the simplest way to add a web browser to your apps.
+                   KINWebBrowser is a web browser module for your apps. Powered by WKWebView on iOS 8. KINWebBrowser offers the simplest way to add a web browser to your apps.
                    DESC
 
   s.homepage     = "https://github.com/dfmuir/KINWebBrowser"
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
   s.author             = { "David F. Muir V" => "[email protected]" }
-  s.platform     = :ios, '7.0'
+  s.platform     = :ios, '8.0'
   s.source       = { :git => "https://github.com/dfmuir/KINWebBrowser.git", :tag => s.version.to_s }
   s.source_files  = 'KINWebBrowser', 'KINWebBrowser/**/*.{h,m}'
   s.resources = "Assets/*.png"
   s.requires_arc = true
-  s.frameworks   = 'WebKit'
 
-end
+  s.weak_framework = 'WebKit'
+
+  s.dependency 'TUSafariActivity', '1.0.4'
+  s.dependency 'ARChromeActivity', '1.0.5'
+
+end

KINWebBrowser/KINWebBrowserViewController.h

@@ -36,9 +36,9 @@
 @class KINWebBrowserViewController;
 
 /*
- 
+
  UINavigationController+KINWebBrowserWrapper category enables access to casted KINWebBroswerViewController when set as rootViewController of UINavigationController
- 
+
  */
 @interface UINavigationController(KINWebBrowser)
 
@@ -54,18 +54,17 @@
 - (void)webBrowser:(KINWebBrowserViewController *)webBrowser didStartLoadingURL:(NSURL *)URL;
 - (void)webBrowser:(KINWebBrowserViewController *)webBrowser didFinishLoadingURL:(NSURL *)URL;
 - (void)webBrowser:(KINWebBrowserViewController *)webBrowser didFailToLoadURL:(NSURL *)URL error:(NSError *)error;
-- (BOOL)webBrowser:(KINWebBrowserViewController *)webBrowser shouldStartLoadWithRequest:(NSURLRequest *)request;
-- (void)willDismissWebBrowser:(KINWebBrowserViewController *)webBrowser;
+- (void)webBrowserViewControllerWillDismiss:(KINWebBrowserViewController*)viewController;
 @end
 
 
 /*
- 
+
  KINWebBrowserViewController is designed to be used inside of a UINavigationController.
  For convenience, two sets of static initializers are available.
- 
+
  */
-@interface KINWebBrowserViewController : UIViewController <WKNavigationDelegate, WKUIDelegate, UIWebViewDelegate>
+@interface KINWebBrowserViewController : UIViewController <WKNavigationDelegate, WKUIDelegate>
 
 #pragma mark - Public Properties
 
@@ -77,52 +76,63 @@
 // The web views
 // Depending on the version of iOS, one of these will be set
 @property (nonatomic, strong) WKWebView *wkWebView;
-@property (nonatomic, strong) UIWebView *uiWebView;
 
-- (id)initWithConfiguration:(WKWebViewConfiguration *)configuration NS_AVAILABLE_IOS(8_0);
+- (id)initWithConfiguration:(WKWebViewConfiguration *)configuration;
 
 #pragma mark - Static Initializers
 
 /*
  Initialize a basic KINWebBrowserViewController instance for push onto navigation stack
- 
+
  Ideal for use with UINavigationController pushViewController:animated: or initWithRootViewController:
- 
+
  Optionally specify KINWebBrowser options or WKWebConfiguration
  */
 
 + (KINWebBrowserViewController *)webBrowser;
-+ (KINWebBrowserViewController *)webBrowserWithConfiguration:(WKWebViewConfiguration *)configuration NS_AVAILABLE_IOS(8_0);
++ (KINWebBrowserViewController *)webBrowserWithConfiguration:(WKWebViewConfiguration *)configuration;
 
 /*
  Initialize a UINavigationController with a KINWebBrowserViewController for modal presentation.
- 
+
  Ideal for use with presentViewController:animated:
- 
+
  Optionally specify KINWebBrowser options or WKWebConfiguration
  */
 
 + (UINavigationController *)navigationControllerWithWebBrowser;
-+ (UINavigationController *)navigationControllerWithWebBrowserWithConfiguration:(WKWebViewConfiguration *)configuration NS_AVAILABLE_IOS(8_0);
-
++ (UINavigationController *)navigationControllerWithWebBrowserWithConfiguration:(WKWebViewConfiguration *)configuration;
 
 
+@property (nonatomic, strong) UIBarButtonItem *actionButton;
 @property (nonatomic, strong) UIColor *tintColor;
 @property (nonatomic, strong) UIColor *barTintColor;
 @property (nonatomic, assign) BOOL actionButtonHidden;
 @property (nonatomic, assign) BOOL showsURLInNavigationBar;
 @property (nonatomic, assign) BOOL showsPageTitleInNavigationBar;
 
+//Allow for custom activities in the browser by populating this optional array
+@property (nonatomic, strong) NSArray *customActivityItems;
+
 #pragma mark - Public Interface
 
-// Load a NSURL to webView
+
+// Load a NSURLURLRequest to web view
+// Can be called any time after initialization
+- (void)loadRequest:(NSURLRequest *)request;
+
+// Load a NSURL to web view
 // Can be called any time after initialization
 - (void)loadURL:(NSURL *)URL;
 
-// Loads a URL as NSString to webView
+// Loads a URL as NSString to web view
 // Can be called any time after initialization
 - (void)loadURLString:(NSString *)URLString;
 - (void)doneButtonPressed:(id)sender;
 
-@end
 
+// Loads an string containing HTML to web view
+// Can be called any time after initialization
+- (void)loadHTMLString:(NSString *)HTMLString;
+
+@end