Remove UIWebView

Author: 0x0c

Example/M2DWebViewController/Base.lproj/Main.storyboard

@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="rN7-5n-qBa">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="rN7-5n-qBa">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -15,43 +16,43 @@
                         <viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XrB-vd-6Xg">
-                                <rect key="frame" x="94" y="306" width="132" height="30"/>
+                                <rect key="frame" x="141" y="470" width="132" height="30"/>
                                 <state key="normal" title="show action button">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
                                     <action selector="show2:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="SQQ-oF-Ozh"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CUn-xZ-2cR">
-                                <rect key="frame" x="137" y="255" width="37" height="30"/>
+                                <rect key="frame" x="184" y="419" width="37" height="30"/>
                                 <state key="normal" title="show">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
                                     <action selector="show:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="fa5-Oa-Wie"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XGM-5e-D8s">
-                                <rect key="frame" x="113" y="352" width="85" height="30"/>
+                                <rect key="frame" x="160" y="516" width="85" height="30"/>
                                 <state key="normal" title="arrow image">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
                                     <action selector="showWithArrowImage:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="dV2-vy-m0m"/>
                                 </connections>
                             </button>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="URL" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8qF-nt-LQt">
-                                <rect key="frame" x="16" y="212" width="288" height="30"/>
+                                <rect key="frame" x="20" y="374" width="374" height="34"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="centerY" secondItem="CUn-xZ-2cR" secondAttribute="centerY" constant="14" id="8kA-83-yxi"/>
                             <constraint firstItem="8qF-nt-LQt" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="DZi-8j-Kbq"/>
@@ -72,15 +73,15 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1789" y="521"/>
+            <point key="canvasLocation" x="2592.753623188406" y="348.88392857142856"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="wHR-h9-bFF">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="rN7-5n-qBa" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="teO-LE-H5Y">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -90,12 +91,7 @@
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="i1c-eh-eqE" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1257" y="521"/>
+            <point key="canvasLocation" x="1821.7391304347827" y="348.88392857142856"/>
         </scene>
     </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>

Example/M2DWebViewController/M2DViewController.m

@@ -39,7 +39,7 @@ - (IBAction)show:(id)sender
 	else {
 		url = [NSURL URLWithString:@"https://github.com/0x0c/M2DWebViewController"];
 	}
-	M2DWebViewController *viewController = [[M2DWebViewController alloc] initWithURL:url type:M2DWebViewTypeWebKit];
+	M2DWebViewController *viewController = [[M2DWebViewController alloc] initWithURL:url];
 	viewController.delegate = self;
 	NSLog(@"%@", [viewController.webView description]);
 	[self.navigationController pushViewController:viewController animated:YES];
@@ -54,7 +54,7 @@ - (IBAction)show2:(id)sender
 	else {
 		url = [NSURL URLWithString:@"https://github.com/0x0c/M2DWebViewController"];
 	}
-	M2DWebViewController *viewController = [[M2DWebViewController alloc] initWithURL:url type:M2DWebViewTypeUIKit];
+	M2DWebViewController *viewController = [[M2DWebViewController alloc] initWithURL:url];
 	viewController.delegate = self;
 	__weak typeof(viewController) bviewcontroller = viewController;
 	viewController.actionButtonPressedHandler = ^(NSString *pageTitle, NSURL *url){
@@ -94,7 +94,7 @@ - (IBAction)showWithArrowImage:(id)sender
 	else {
 		url = [NSURL URLWithString:@"https://github.com/0x0c/M2DWebViewController"];
 	}
-	M2DWebViewController *viewController = [[M2DWebViewController alloc] initWithURL:url type:M2DWebViewTypeUIKit backArrowImage:icon forwardArrowImage:icon];
+	M2DWebViewController *viewController = [[M2DWebViewController alloc] initWithURL:url backArrowImage:icon forwardArrowImage:icon];
 	[self.navigationController pushViewController:viewController animated:YES];
 }
 

M2DWebViewController.podspec

@@ -9,15 +9,15 @@
 
 Pod::Spec.new do |s|
   s.name             = "M2DWebViewController"
-  s.version          = "0.2.6"
+  s.version          = "1.0.0"
   s.summary          = "Simple built-in web view controller."
   s.homepage         = "https://github.com/0x0c/M2DWebViewController"
   s.license          = 'MIT'
   s.author           = { "Akira Matsuda" => "[email protected]" }
   s.source           = { :git => "https://github.com/0x0c/M2DWebViewController.git", :tag => s.version.to_s }
   s.screenshots     = "https://raw.github.com/0x0c/M2DWebViewController/master/images/1.png", "https://raw.github.com/0x0c/M2DWebViewController/master/images/2.png", "https://raw.github.com/0x0c/M2DWebViewController/master/images/3.png"
 
-  s.platform     = :ios, '7.0'
+  s.platform     = :ios, '8.0'
   s.requires_arc = true
 
   s.source_files = 'Pod/Classes/**/*.{h,m}'

Pod/Classes/M2DWebViewController/M2DWebViewController.h

@@ -8,9 +8,7 @@
 
 #import <UIKit/UIKit.h>
 #import <QuartzCore/QuartzCore.h>
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
 #import <WebKit/WebKit.h>
-#endif
 
 @protocol M2DWebViewControllerDelegate <NSObject>
 @optional
@@ -37,36 +35,20 @@
 - (void)m2d_webView:(WKWebView * _Nonnull)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge * _Nonnull)challenge completionHandler:(void (^ _Nonnull)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * _Nullable credential))completionHandler;
 - (void)m2d_webViewWebContentProcessDidTerminate:(WKWebView * _Nonnull)webView API_AVAILABLE(macosx(10.11), ios(9.0));
 
-// UIWebViewDelegate
-- (BOOL)m2d_webView:(UIWebView * _Nonnull)webView shouldStartLoadWithRequest:(NSURLRequest * _Nonnull)request navigationType:(UIWebViewNavigationType)navigationType;
-- (void)m2d_webViewDidFinishLoad:(UIWebView * _Nonnull)webView;
-- (void)m2d_webViewDidStartLoad:(UIWebView * _Nonnull)webView;
-- (void)m2d_webView:(UIWebView * _Nonnull)webView didFailLoadWithError:(NSError * _Nullable)error;
-
 @end
 
 @class M2DWebViewController;
 
-typedef NS_ENUM(NSUInteger, M2DWebViewType) {
-	M2DWebViewTypeUIKit,
-	M2DWebViewTypeWebKit,
-	M2DWebViewTypeAutoSelect
-};
-
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
-@interface M2DWebViewController : UIViewController <WKUIDelegate, WKNavigationDelegate, UIWebViewDelegate>
-#else
-@interface M2DWebViewController : UIViewController <UIWebViewDelegate>
-#endif
+@interface M2DWebViewController : UIViewController <WKUIDelegate, WKNavigationDelegate>
 
 @property (nonatomic, readonly) id _Nullable webView;
 @property (nonatomic, assign) BOOL toolbarHidden;
 @property (nonatomic, assign) BOOL smoothScroll;
 @property (nonatomic, weak) id<M2DWebViewControllerDelegate> _Nullable delegate;
 @property (nonatomic, copy) void (^_Nonnull actionButtonPressedHandler)(NSString * _Nullable pageTitle, NSURL * _Nullable url);
 
-- (instancetype _Nonnull)initWithURL:(NSURL * _Nullable)url type:(M2DWebViewType)type;
-- (instancetype _Nonnull)initWithURL:(NSURL * _Nullable)url type:(M2DWebViewType)type backArrowImage:(UIImage * _Nullable)backArrowImage forwardArrowImage:(UIImage * _Nullable)forwardArrowImage;
+- (instancetype _Nonnull)initWithURL:(NSURL * _Nullable)url;
+- (instancetype _Nonnull)initWithURL:(NSURL * _Nullable)url backArrowImage:(UIImage * _Nullable)backArrowImage forwardArrowImage:(UIImage * _Nullable)forwardArrowImage;
 - (instancetype _Nonnull)initWithConfiguration:(WKWebViewConfiguration * _Nonnull)configuration url:(NSURL * _Nullable)url;
 - (instancetype _Nonnull)initWithConfiguration:(WKWebViewConfiguration * _Nonnull)configuration url:(NSURL * _Nullable)url backArrowImage:(UIImage * _Nullable)backArrowImage forwardArrowImage:(UIImage * _Nullable)forwardArrowImage;
 - (void)goForward:(id _Nonnull)sender;