Merge pull request #1 from dart-flitter/master

Update

Author: long1eu

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.5
+
+- iOS use WKWebView instead of UIWebView
+
 # 0.1.4
 
 - support localstorage for ANDROID

README.md

@@ -5,6 +5,10 @@
 
 Plugin that allow Flutter to communicate with a native WebView.
 
+***Warning:***
+The webview is not integrated in the widget tree, it is a native view on top of the flutter view.
+you won't be able to use snackbars, dialogs ...
+
 ## Getting Started
 
 For help getting started with Flutter, view our online [documentation](http://flutter.io/).

example/ios/Flutter/flutter_assets/LICENSE

@@ -1,8 +1,9 @@
 #import <Flutter/Flutter.h>
+#import <WebKit/WebKit.h>
 
 static FlutterMethodChannel *channel;
 
 @interface FlutterWebviewPlugin : NSObject<FlutterPlugin>
 @property (nonatomic, retain) UIViewController *viewController;
-@property (nonatomic, retain) UIWebView *webview;
+@property (nonatomic, retain) WKWebView *webview;
 @end

example/ios/Flutter/flutter_assets/snapshot_blob.bin

@@ -3,8 +3,9 @@
 static NSString *const CHANNEL_NAME = @"flutter_webview_plugin";
 
 // UIWebViewDelegate
-@interface FlutterWebviewPlugin() <UIWebViewDelegate> {
+@interface FlutterWebviewPlugin() <WKNavigationDelegate, UIScrollViewDelegate> {
     BOOL _enableAppScheme;
+    BOOL _enableZoom;
 }
 @end
 
@@ -39,7 +40,9 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
         [self closeWebView];
         result(nil);
     } else if ([@"eval" isEqualToString:call.method]) {
-        result([self evalJavascript:call]);
+        [self evalJavascript:call completionHandler:^(NSString * response) {
+            result(response);
+        }];
     } else if ([@"resize" isEqualToString:call.method]) {
         [self resize:call];
         result(nil);
@@ -49,7 +52,6 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
 }
 
 - (void)initWebview:(FlutterMethodCall*)call {
-    // NSNumber *withJavascript = call.arguments[@"withJavascript"];
     NSNumber *clearCache = call.arguments[@"clearCache"];
     NSNumber *clearCookies = call.arguments[@"clearCookies"];
     NSNumber *hidden = call.arguments[@"hidden"];
@@ -58,7 +60,6 @@ - (void)initWebview:(FlutterMethodCall*)call {
     NSString *userAgent = call.arguments[@"userAgent"];
     NSNumber *withZoom = call.arguments[@"withZoom"];
 
-    //
     if (clearCache != (id)[NSNull null] && [clearCache boolValue]) {
         [[NSURLCache sharedURLCache] removeAllCachedResponses];
     }
@@ -79,18 +80,15 @@ - (void)initWebview:(FlutterMethodCall*)call {
         rc = self.viewController.view.bounds;
     }
 
-    self.webview = [[UIWebView alloc] initWithFrame:rc];
-    self.webview.delegate = self;
-    
-    if (withZoom != (id)[NSNull null] && [withZoom boolValue]) {
-        self.webview.scalesPageToFit = YES;
-    }
-    
-    if (hidden != (id)[NSNull null] && [hidden boolValue]) {
-        self.webview.hidden = YES;
-    }
+    self.webview = [[WKWebView alloc] initWithFrame:rc];
+    self.webview.navigationDelegate = self;
+    self.webview.scrollView.delegate = self;
+    self.webview.hidden = [hidden boolValue];
+
+    _enableZoom = [withZoom boolValue];
+
     [self.viewController.view addSubview:self.webview];
-    
+
     [self navigate:call];
 }
 
@@ -102,73 +100,92 @@ - (CGRect)parseRect:(NSDictionary *)rect {
 }
 
 - (void)navigate:(FlutterMethodCall*)call {
-    NSString *url = call.arguments[@"url"];
-    
-    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url]];
-    [self.webview loadRequest:request];
+    if (self.webview != nil) {
+        NSString *url = call.arguments[@"url"];
+        NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url]];
+        [self.webview loadRequest:request];
+    }
 }
 
-- (NSString *)evalJavascript:(FlutterMethodCall*)call {
-    NSString *code = call.arguments[@"code"];
-    
-    NSString *result = [self.webview stringByEvaluatingJavaScriptFromString:code];
-    return result;
+- (void)evalJavascript:(FlutterMethodCall*)call
+     completionHandler:(void (^_Nullable)(NSString * response))completionHandler {
+    if (self.webview != nil) {
+        NSString *code = call.arguments[@"code"];
+        [self.webview evaluateJavaScript:code
+                       completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+            completionHandler([NSString stringWithFormat:@"%@", response]);
+        }];
+    } else {
+        completionHandler(nil);
+    }
 }
 
 - (void)resize:(FlutterMethodCall*)call {
-    NSDictionary *rect = call.arguments[@"rect"];
-    CGRect rc = [self parseRect:rect];
-    self.webview.frame = rc;
+    if (self.webview != nil) {
+        NSDictionary *rect = call.arguments[@"rect"];
+        CGRect rc = [self parseRect:rect];
+        self.webview.frame = rc;
+    }
 }
 
 - (void)closeWebView {
-    [self.webview stopLoading];
-    [self.webview removeFromSuperview];
-    self.webview.delegate = nil;
-    self.webview = nil;
-    
-    // manually trigger onDestroy
-    [channel invokeMethod:@"onDestroy" arguments:nil];
+    if (self.webview != nil) {
+        [self.webview stopLoading];
+        [self.webview removeFromSuperview];
+        self.webview.navigationDelegate = nil;
+        self.webview = nil;
+
+        // manually trigger onDestroy
+        [channel invokeMethod:@"onDestroy" arguments:nil];
+    }
 }
 
+#pragma mark -- WkWebView Delegate
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
+    decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
 
-#pragma mark -- WebView Delegate
-- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType {
-    id data = @{@"url": request.URL.absoluteString,
+    id data = @{@"url": navigationAction.request.URL.absoluteString,
                 @"type": @"shouldStart",
-                @"navigationType": [NSNumber numberWithInt:navigationType]};
+                @"navigationType": [NSNumber numberWithInt:navigationAction.navigationType]};
     [channel invokeMethod:@"onState" arguments:data];
-    
-    if (navigationType == UIWebViewNavigationTypeBackForward)
+
+    if (navigationAction.navigationType == WKNavigationTypeBackForward) {
         [channel invokeMethod:@"onBackPressed" arguments:nil];
-    else {
-        id data = @{@"url": request.URL.absoluteString};
+    } else {
+        id data = @{@"url": navigationAction.request.URL.absoluteString};
         [channel invokeMethod:@"onUrlChanged" arguments:data];
     }
-    
-    if (_enableAppScheme)
-        return YES;
 
-    // disable some scheme
-    return [request.URL.scheme isEqualToString:@"http"] ||
-            [request.URL.scheme isEqualToString:@"https"] ||
-            [request.URL.scheme isEqualToString:@"about"];
+    if (_enableAppScheme ||
+        ([webView.URL.scheme isEqualToString:@"http"] ||
+         [webView.URL.scheme isEqualToString:@"https"] ||
+         [webView.URL.scheme isEqualToString:@"about"])) {
+        decisionHandler(WKNavigationActionPolicyAllow);
+    } else {
+        decisionHandler(WKNavigationActionPolicyCancel);
+    }
 }
 
--(void)webViewDidStartLoad:(UIWebView *)webView {
-    [channel invokeMethod:@"onState" arguments:@{@"type": @"startLoad", @"url": webView.request.URL.absoluteString}];
+- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation {
+    [channel invokeMethod:@"onState" arguments:@{@"type": @"startLoad", @"url": webView.URL.absoluteString}];
 }
 
-- (void)webViewDidFinishLoad:(UIWebView *)webView {
-    [channel invokeMethod:@"onState" arguments:@{@"type": @"finishLoad", @"url": webView.request.URL.absoluteString}];
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
+    [channel invokeMethod:@"onState" arguments:@{@"type": @"finishLoad", @"url": webView.URL.absoluteString}];
 }
 
-- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
+- (void)webView:(WKWebView *)webView didFailNavigation:(WKNavigation *)navigation withError:(NSError *)error {
     id data = [FlutterError errorWithCode:[NSString stringWithFormat:@"%ld", error.code]
                                   message:error.localizedDescription
                                   details:error.localizedFailureReason];
     [channel invokeMethod:@"onError" arguments:data];
 }
 
-#pragma mark -- WkWebView Delegate
+#pragma mark -- UIScrollViewDelegate
+- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
+    if (scrollView.pinchGestureRecognizer.isEnabled != _enableZoom) {
+        scrollView.pinchGestureRecognizer.enabled = _enableZoom;
+    }
+}
+
 @end

ios/Classes/FlutterWebviewPlugin.h

@@ -5,7 +5,7 @@ authors:
 - Toufik Zitouni <[email protected]>
 - Pedia <[email protected]>
 homepage: https://github.com/dart-flitter/flutter_webview_plugin
-version: 0.1.4
+version: 0.1.5
 
 environment:
   sdk: ">=1.8.0 <2.0.0"