added support for iOS inline native WebView integrated in the flutter widget...

added support for iOS inline native WebView integrated in the flutter widget tree (#18, #45), fix #54 #38 #26 #32 #33 #29 #15

CHANGELOG.md

+## 0.6.0
+
+- added support for **iOS** inline native WebView integrated in the flutter widget tree
+- updated example folder (thanks to [marquesinijatinha](https://github.com/marquesinijatinha))
+- Fixed bug where passing null to expiresDate failed (thanks to [Sense545](https://github.com/Sense545)) 
+- Fixed iOS error: encode resourceURL (thanks to [igtm](https://github.com/igtm))
+- Fixed iOS error: Double value cannot be converted to Int because the result would be greater than Int.max in 32-bit devices (thanks to [huzhiren](https://github.com/huzhiren))
+- Fixed iOS error: problem in ChromeSafariBrowser (thanks to [marquesinijatinha](https://github.com/marquesinijatinha))
+- Fixed Android build error caused by gradle and build gradle versions (thanks to [tje3d](https://github.com/tje3d))
+
 ## 0.5.51
 
 - updated `pubspec.yaml`

README.md

@@ -15,12 +15,30 @@ This plugin is inspired by the popular [cordova-plugin-inappbrowser](https://git
 - Flutter: ">=0.10.1 <2.0.0"
 
 ### IMPORTANT Note for iOS
-To be able to use this plugin on iOS, you need to create the Flutter App with `flutter create -i swift` (see [flutter/flutter#13422 (comment)](https://github.com/flutter/flutter/issues/13422#issuecomment-392133780)), otherwise, you will get this message:
+If you are starting a new fresh app, you need to create the Flutter App with `flutter create -i swift` (see [flutter/flutter#13422 (comment)](https://github.com/flutter/flutter/issues/13422#issuecomment-392133780)), otherwise, you will get this message:
 ```
 === BUILD TARGET flutter_inappbrowser OF PROJECT Pods WITH CONFIGURATION Debug ===
 The “Swift Language Version” (SWIFT_VERSION) build setting must be set to a supported value for targets which use Swift. Supported values are: 3.0, 4.0, 4.2. This setting can be set in the build settings editor.
 ```
-that is not true! The Swift version that I have used is already a supported value: 4.0.
+
+If you still have this problem, try to edit iOS `Podfile` like this (see [#15](https://github.com/pichillilorenzo/flutter_inappbrowser/issues/15)):
+```
+target 'Runner' do
+  use_frameworks!  # required by simple_permission
+  ...
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['SWIFT_VERSION'] = '4.0'  # required by simple_permission
+      config.build_settings['ENABLE_BITCODE'] = 'NO'
+    end
+  end
+end
+```
+
+Instead, if you have already a non-swift project, you can check this issue to solve the problem: [Friction adding swift plugin to objective-c project](https://github.com/flutter/flutter/issues/16049).
 
 ## Getting Started
 
@@ -34,7 +52,7 @@ First, add `flutter_inappbrowser` as a [dependency in your pubspec.yaml file](ht
 
 ## Usage
 Classes:
-- [InAppWebView](#inappwebview-class): Flutter Widget for adding an **inline native WebView** integrated in the flutter widget tree. [**Available only for Android** ([AndroidView](https://docs.flutter.io/flutter/widgets/AndroidView-class.html)) at this moment. For iOS, it will be available as soon as the Flutter team will release the corresponding dart class.].
+- [InAppWebView](#inappwebview-class): Flutter Widget for adding an **inline native WebView** integrated in the flutter widget tree. To use `InAppWebView` class on iOS you need to opt-in for the embedded views preview by adding a boolean property to the app's `Info.plist` file, with the key `io.flutter.embedded_views_preview` and the value `YES`.
 - [InAppBrowser](#inappbrowser-class): In-App Browser using native WebView.
 - [ChromeSafariBrowser](#chromesafaribrowser-class): In-App Browser using [Chrome Custom Tabs](https://developer.android.com/reference/android/support/customtabs/package-summary) on Android / [SFSafariViewController](https://developer.apple.com/documentation/safariservices/sfsafariviewcontroller) on iOS.
 - [InAppLocalhostServer](#inapplocalhostserver-class): This class allows you to create a simple server on `http://localhost:[port]/`. The default `port` value is `8080`.
@@ -45,11 +63,10 @@ See the online [docs](https://pub.dartlang.org/documentation/flutter_inappbrowse
 ### `InAppWebView` class
 Flutter Widget for adding an **inline native WebView** integrated in the flutter widget tree.
 
-[AndroidView](https://docs.flutter.io/flutter/widgets/AndroidView-class.html) is not officially stable yet!
+[AndroidView](https://docs.flutter.io/flutter/widgets/AndroidView-class.html) and [UiKitView](https://docs.flutter.io/flutter/widgets/UiKitView-class.html) is not officially stable yet!
 So, if you want use it, you can but you will have some limitation such as the inability to use the keyboard!
 
-**Available only for Android** ([AndroidView](https://docs.flutter.io/flutter/widgets/AndroidView-class.html)) at this moment.
-For iOS, it will be available as soon as the Flutter team will release the corresponding dart class.
+To use `InAppWebView` class on iOS you need to opt-in for the embedded views preview by adding a boolean property to the app's `Info.plist` file, with the key `io.flutter.embedded_views_preview` and the value `YES`.
 
 Use `InAppWebViewController` to control the WebView instance.
 Example:
@@ -189,6 +206,10 @@ Screenshots:
 
 ![android](https://user-images.githubusercontent.com/5956938/47271038-7aebda80-d574-11e8-98fd-41e6bbc9fe2d.gif)
 
+- iOS:
+
+![ios](https://user-images.githubusercontent.com/5956938/54096363-e1e72000-43ab-11e9-85c2-983a830ab7a0.gif)
+
 #### InAppWebView.initialUrl
 Initial url that will be loaded.
 

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewClient.java

@@ -359,14 +359,15 @@ public class InAppWebViewClient extends WebViewClient {
 
       getChannel().invokeMethod("onLoadResource", obj);
 
-      return new WebResourceResponse(
-              response.header("content-type", "text/plain").split(";")[0].trim(),
-              response.header("content-encoding"),
-              response.code(),
-              reasonPhrase,
-              headersResponse,
-              dataStream
-      );
+      // this return is not working (it blocks some resources), so return null
+//      return new WebResourceResponse(
+//              response.header("content-type", "text/plain").split(";")[0].trim(),
+//              response.header("content-encoding", "utf-8"),
+//              response.code(),
+//              reasonPhrase,
+//              headersResponse,
+//              dataStream
+//      );
     } catch (IOException e) {
       e.printStackTrace();
       Log.d(LOG_TAG, e.getMessage());

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

example/ios/Runner.xcodeproj/project.pbxproj

@@ -446,7 +446,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -474,7 +474,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.pichillilorenzo.flutter_inappbrowserExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};

example/lib/webview_example.screen.dart

@@ -4,7 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_inappbrowser/flutter_inappbrowser.dart';
 
 class MyInappBrowser extends InAppBrowser {
-   @override
+
+ @override
  Future onBrowserCreated() async {
    print("\n\nBrowser Ready!\n\n");
  }
@@ -64,7 +65,7 @@ class MyInappBrowser extends InAppBrowser {
 }
 
 class WebviewExampleScreen extends StatefulWidget {
-  final InAppBrowser browser = new InAppBrowser();
+  final InAppBrowser browser = new MyInappBrowser();
   @override
   _WebviewExampleScreenState createState() => new _WebviewExampleScreenState();
 }

flutter_inappbrowser.iml

@@ -20,7 +20,7 @@
       <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_inappbrowser/example/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_inappbrowser/example/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_inappbrowser/example/build" />
-      <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_inappbrowser/example/ios/Flutter/flutter_assets/packages" />
+      <excludeFolder url="file://$MODULE_DIR$/example/ios/Flutter/App.framework/flutter_assets/packages" />
       <excludeFolder url="file://$MODULE_DIR$/example/ios/Flutter/flutter_assets/packages" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />

ios/Classes/InAppWebView.swift

@@ -8,6 +8,73 @@
 import Foundation
 import WebKit
 
+func currentTimeInMilliSeconds() -> Int64 {
+    let currentDate = Date()
+    let since1970 = currentDate.timeIntervalSince1970
+    return Int64(since1970 * 1000)
+}
+
+func convertToDictionary(text: String) -> [String: Any]? {
+    if let data = text.data(using: .utf8) {
+        do {
+            return try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any]
+        } catch {
+            print(error.localizedDescription)
+        }
+    }
+    return nil
+}
+
+// the message needs to be concatenated with '' in order to have the same behavior like on Android
+let consoleLogJS = """
+(function() {
+    var oldLogs = {
+        'consoleLog': console.log,
+        'consoleDebug': console.debug,
+        'consoleError': console.error,
+        'consoleInfo': console.info,
+        'consoleWarn': console.warn
+    };
+
+    for (var k in oldLogs) {
+        (function(oldLog) {
+            console[oldLog.replace('console', '').toLowerCase()] = function() {
+                var message = '';
+                for (var i in arguments) {
+                    if (message == '') {
+                        message += arguments[i];
+                    }
+                    else {
+                        message += ' ' + arguments[i];
+                    }
+                }
+                window.webkit.messageHandlers[oldLog].postMessage(message);
+            }
+        })(k);
+    }
+})();
+"""
+
+let resourceObserverJS = """
+(function() {
+    var observer = new PerformanceObserver(function(list) {
+        list.getEntries().forEach(function(entry) {
+            window.webkit.messageHandlers['resourceLoaded'].postMessage(JSON.stringify(entry));
+        });
+    });
+    observer.observe({entryTypes: ['resource', 'mark', 'measure']});
+})();
+"""
+
+let JAVASCRIPT_BRIDGE_NAME = "flutter_inappbrowser"
+
+let javaScriptBridgeJS = """
+window.\(JAVASCRIPT_BRIDGE_NAME) = {};
+window.\(JAVASCRIPT_BRIDGE_NAME).callHandler = function(handlerName, ...args) {
+    window.webkit.messageHandlers['callHandler'].postMessage( {'handlerName': handlerName, 'args': JSON.stringify(args)} );
+}
+"""
+
 public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavigationDelegate, WKScriptMessageHandler {
     
     var IABController: InAppBrowserWebViewController?
@@ -87,7 +154,6 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavi
             configuration.mediaPlaybackRequiresUserAction = (options?.mediaPlaybackRequiresUserGesture)!
         }
         
-        
         configuration.allowsInlineMediaPlayback = (options?.allowsInlineMediaPlayback)!
         
         //keyboardDisplayRequiresUserAction = browserOptions?.keyboardDisplayRequiresUserAction
@@ -436,6 +502,9 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavi
             
             if navigationAction.navigationType == .linkActivated || navigationAction.navigationType == .backForward {
                 currentURL = url
+                if IABController != nil {
+                    IABController!.updateUrlTextField(url: (currentURL?.absoluteString)!)
+                }
             }
         }
         
@@ -460,14 +529,66 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavi
         decisionHandler(.allow)
     }
     
+    //    func webView(_ webView: WKWebView,
+    //                 decidePolicyFor navigationResponse: WKNavigationResponse,
+    //                 decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
+    //        let mimeType = navigationResponse.response.mimeType
+    //        if mimeType != nil && !mimeType!.starts(with: "text/") {
+    //            download(url: webView.url)
+    //            decisionHandler(.cancel)
+    //            return
+    //        }
+    //        decisionHandler(.allow)
+    //    }
+    //
+    //    func download (url: URL?) {
+    //        let filename = url?.lastPathComponent
+    //
+    //        let destination: DownloadRequest.DownloadFileDestination = { _, _ in
+    //            let documentsURL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0]
+    //            let fileURL = documentsURL.appendingPathComponent(filename!)
+    //
+    //            return (fileURL, [.removePreviousFile, .createIntermediateDirectories])
+    //        }
+    //
+    //        Alamofire.download((url?.absoluteString)!, to: destination).downloadProgress { progress in
+    //            print("Download Progress: \(progress.fractionCompleted)")
+    //            }.response { response in
+    //                if response.error == nil, let path = response.destinationURL?.path {
+    //                    UIAlertView(title: nil, message: "File saved to " + path, delegate: nil, cancelButtonTitle: nil).show()
+    //                }
+    //                else {
+    //                   UIAlertView(title: nil, message: "Cannot save " + filename!, delegate: nil, cancelButtonTitle: nil).show()
+    //                }
+    //            }
+    //    }
+    
     public func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
         self.startPageTime = currentTimeInMilliSeconds()
         onLoadStart(url: (currentURL?.absoluteString)!)
+        
+        if IABController != nil {
+            // loading url, start spinner, update back/forward
+            IABController!.backButton.isEnabled = canGoBack
+            IABController!.forwardButton.isEnabled = canGoForward
+            
+            if (IABController!.browserOptions?.spinner)! {
+                IABController!.spinner.startAnimating()
+            }
+        }
     }
     
     public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         self.WKNavigationMap = [:]
-        onLoadStop(url: (url?.absoluteString)!)
+        currentURL = url
+        onLoadStop(url: (currentURL?.absoluteString)!)
+        
+        if IABController != nil {
+            IABController!.updateUrlTextField(url: (currentURL?.absoluteString)!)
+            IABController!.backButton.isEnabled = canGoBack
+            IABController!.forwardButton.isEnabled = canGoForward
+            IABController!.spinner.stopAnimating()
+        }
     }
     
     public func webView(_ view: WKWebView,
@@ -478,6 +599,12 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavi
     
     public func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
         onLoadError(url: (currentURL?.absoluteString)!, error: error)
+        
+        if IABController != nil {
+            IABController!.backButton.isEnabled = canGoBack
+            IABController!.forwardButton.isEnabled = canGoForward
+            IABController!.spinner.stopAnimating()
+        }
     }
     
     public func scrollViewDidScroll(_ scrollView: UIScrollView) {
@@ -609,7 +736,10 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavi
         }
         else if message.name == "resourceLoaded" && (options?.useOnLoadResource)! {
             if let resource = convertToDictionary(text: message.body as! String) {
-                let url = URL(string: resource["name"] as! String)!
+                // escape special chars
+                let resourceName = (resource["name"] as! String).addingPercentEncoding(withAllowedCharacters:NSCharacterSet.urlQueryAllowed)
+                
+                let url = URL(string: resourceName!)!
                 if !UIApplication.shared.canOpenURL(url) {
                     return
                 }

ios/Classes/SwiftFlutterPlugin.swift

@@ -211,7 +211,7 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin {
                 break
             case "takeScreenshot":
                 if let webViewController = self.webViewControllers[uuid] {
-                    webViewController!.takeScreenshot(completionHandler: { (screenshot) -> Void in
+                    webViewController!.webView.takeScreenshot(completionHandler: { (screenshot) -> Void in
                         result(screenshot)
                     })
                 }
@@ -420,7 +420,7 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin {
         webViewController.webViewOptions = webViewOptions
         webViewController.isHidden = browserOptions.hidden
         webViewController.tmpWindow = tmpWindow
-        webViewController.currentURL = url
+        webViewController.initURL = url
         webViewController.initHeaders = headers
         webViewController.navigationDelegate = self
         
@@ -708,21 +708,21 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin {
     
     func onLoadStart(uuid: String, webView: WKWebView) {
         if let webViewController = self.webViewControllers[uuid] {
-            let url: String = webViewController!.currentURL!.absoluteString
+            let url: String = webViewController!.webView.currentURL!.absoluteString
             SwiftFlutterPlugin.channel!.invokeMethod("onLoadStart", arguments: ["uuid": uuid, "url": url])
         }
     }
     
     func onLoadStop(uuid: String, webView: WKWebView) {
         if let webViewController = self.webViewControllers[uuid] {
-            let url: String = webViewController!.currentURL!.absoluteString
+            let url: String = webViewController!.webView.currentURL!.absoluteString
             SwiftFlutterPlugin.channel!.invokeMethod("onLoadStop", arguments: ["uuid": uuid, "url": url])
         }
     }
     
     func onLoadError(uuid: String, webView: WKWebView, error: Error) {
         if let webViewController = self.webViewControllers[uuid] {
-            let url: String = webViewController!.currentURL!.absoluteString
+            let url: String = webViewController!.webView.currentURL!.absoluteString
             let arguments = ["uuid": uuid, "url": url, "code": error._code, "message": error.localizedDescription] as [String : Any]
             SwiftFlutterPlugin.channel!.invokeMethod("onLoadError", arguments: arguments)
         }
@@ -846,7 +846,7 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin {
     
     func getCopyBackForwardList(uuid: String) -> [String: Any]? {
         if let webViewController = self.webViewControllers[uuid] {
-            return webViewController!.getCopyBackForwardList()
+            return webViewController!.webView.getCopyBackForwardList()
         }
         return nil
     }

pubspec.yaml

 name: flutter_inappbrowser
 description: A Flutter plugin that allows you to add an inline webview or open an in-app browser window (inspired by the popular cordova-plugin-inappbrowser).
-version: 0.5.51
+version: 0.6.0
 author: Lorenzo Pichilli <pichillilorenzo@gmail.com>
 homepage: https://github.com/pichillilorenzo/flutter_inappbrowser
 
@@ -11,7 +11,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  uuid: ^1.0.3
+  uuid: ^2.0.0
   mime: ^0.9.6+2
 
 # For information on the generic Dart part of this file, see the