updated webview options, updated content blockers

android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlocker.java

@@ -11,8 +11,11 @@ import com.pichillilorenzo.flutter_inappbrowser.InAppWebView.InAppWebView;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -22,10 +25,15 @@ import okhttp3.Response;
 public class ContentBlocker {
     protected static final String LOG_TAG = "ContentBlocker";
 
-    public static WebResourceResponse checkUrl(final InAppWebView webView, String url, ContentBlockerTriggerResourceType responseResourceType) {
+    public static WebResourceResponse checkUrl(final InAppWebView webView, String url, ContentBlockerTriggerResourceType responseResourceType) throws URISyntaxException, InterruptedException {
         if (webView.options.contentBlockers == null)
             return null;
 
+        URI u = new URI(url);
+        String host = u.getHost();
+        int port = u.getPort();
+        String scheme = u.getScheme();
+
         for (Map<String, Map<String, Object>> contentBlocker : webView.options.contentBlockers) {
             ContentBlockerTrigger trigger =  ContentBlockerTrigger.fromMap(contentBlocker.get("trigger"));
             List<ContentBlockerTriggerResourceType> resourceTypes = trigger.resourceType;
@@ -36,13 +44,68 @@ public class ContentBlocker {
             Matcher m = mPattern.matcher(url);
 
             if (m.matches()) {
-                Log.d(LOG_TAG, url);
-                Log.d(LOG_TAG, responseResourceType.toString());
-                Log.d(LOG_TAG, resourceTypes.toString());
 
-                if (resourceTypes != null && resourceTypes.size() > 0 && !resourceTypes.contains(responseResourceType)) {
+                if (!resourceTypes.isEmpty() && !resourceTypes.contains(responseResourceType)) {
                     return null;
                 }
+                if (!trigger.ifDomain.isEmpty()) {
+                    boolean matchFound = false;
+                    for (String domain : trigger.ifDomain) {
+                        if ((domain.startsWith("*") && host.endsWith(domain.replace("*", ""))) || domain.equals(host)) {
+                            matchFound = true;
+                            break;
+                        }
+                    }
+                    if (!matchFound)
+                        return null;
+                }
+                if (!trigger.unlessDomain.isEmpty()) {
+                    for (String domain : trigger.unlessDomain)
+                        if ((domain.startsWith("*") && host.endsWith(domain.replace("*", ""))) || domain.equals(host))
+                            return null;
+                }
+
+                final String[] webViewUrl = new String[1];
+                if (!trigger.loadType.isEmpty() || !trigger.ifTopUrl.isEmpty() || !trigger.unlessTopUrl.isEmpty()) {
+                    final CountDownLatch latch = new CountDownLatch(1);
+                    Handler handler = new Handler(Looper.getMainLooper());
+                    handler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            webViewUrl[0] = webView.getUrl();
+                            latch.countDown();
+                        }
+                    });
+                    latch.await();
+                }
+
+                if (!trigger.loadType.isEmpty()) {
+                    URI cUrl = new URI(webViewUrl[0]);
+                    String cHost = cUrl.getHost();
+                    int cPort = cUrl.getPort();
+                    String cScheme = cUrl.getScheme();
+
+                    if ( (trigger.loadType.contains("first-party") && cHost != null && !(cScheme.equals(scheme) && cHost.equals(host) && cPort == port)) ||
+                            (trigger.loadType.contains("third-party") && cHost != null && cHost.equals(host)) )
+                        return null;
+                }
+                if (!trigger.ifTopUrl.isEmpty()) {
+                    boolean matchFound = false;
+                    for (String topUrl : trigger.ifTopUrl) {
+                        if (webViewUrl[0].equals(topUrl)) {
+                            matchFound = true;
+                            break;
+                        }
+                    }
+                    if (!matchFound)
+                        return null;
+                }
+                if (!trigger.unlessTopUrl.isEmpty()) {
+                    for (String topUrl : trigger.unlessTopUrl)
+                        if (webViewUrl[0].equals(topUrl))
+                            return null;
+                }
+
                 switch (action.type) {
 
                     case BLOCK:
@@ -103,12 +166,12 @@ public class ContentBlocker {
         return null;
     }
 
-    public static WebResourceResponse checkUrl(final InAppWebView webView, String url) {
+    public static WebResourceResponse checkUrl(final InAppWebView webView, String url) throws URISyntaxException, InterruptedException {
         ContentBlockerTriggerResourceType responseResourceType = getResourceTypeFromUrl(webView, url);
         return checkUrl(webView, url, responseResourceType);
     }
 
-    public static WebResourceResponse checkUrl(final InAppWebView webView, String url, String contentType) {
+    public static WebResourceResponse checkUrl(final InAppWebView webView, String url, String contentType) throws URISyntaxException, InterruptedException {
         ContentBlockerTriggerResourceType responseResourceType = getResourceTypeFromContentType(contentType);
         return checkUrl(webView, url, responseResourceType);
     }
@@ -141,6 +204,7 @@ public class ContentBlocker {
                     response.close();
                 }
                 e.printStackTrace();
+                Log.e(LOG_TAG, e.getMessage());
             }
         }
         return responseResourceType;

android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ContentBlocker/ContentBlockerTrigger.java

@@ -7,21 +7,45 @@ import java.util.Map;
 public class ContentBlockerTrigger {
 
     public String urlFilter;
-    List<ContentBlockerTriggerResourceType> resourceType = new ArrayList<>();
+    public Boolean urlFilterIsCaseSensitive;
+    public List<ContentBlockerTriggerResourceType> resourceType = new ArrayList<>();
+    public List<String> ifDomain = new ArrayList<>();
+    public List<String> unlessDomain = new ArrayList<>();
+    public List<String> loadType = new ArrayList<>();
+    public List<String> ifTopUrl = new ArrayList<>();
+    public List<String> unlessTopUrl = new ArrayList<>();
 
-    public ContentBlockerTrigger(String urlFilter, List<ContentBlockerTriggerResourceType> resourceType) {
+    public ContentBlockerTrigger(String urlFilter, Boolean urlFilterIsCaseSensitive, List<ContentBlockerTriggerResourceType> resourceType, List<String> ifDomain,
+                                 List<String> unlessDomain, List<String> loadType, List<String> ifTopUrl, List<String> unlessTopUrl) {
         this.urlFilter = urlFilter;
         this.resourceType = resourceType != null ? resourceType : this.resourceType;
+        this.urlFilterIsCaseSensitive = urlFilterIsCaseSensitive != null ? urlFilterIsCaseSensitive : false;
+        this.ifDomain = ifDomain != null ? ifDomain : this.ifDomain;
+        this.unlessDomain = unlessDomain != null ? unlessDomain : this.unlessDomain;
+        if ((!(this.ifDomain.isEmpty() || this.unlessDomain.isEmpty()) != false))
+            throw new AssertionError();
+        this.loadType = loadType != null ? loadType : this.loadType;
+        if ((this.loadType.size() > 2)) throw new AssertionError();
+        this.ifTopUrl = ifTopUrl != null ? ifTopUrl : this.ifTopUrl;
+        this.unlessTopUrl = unlessTopUrl != null ? unlessTopUrl : this.unlessTopUrl;
+        if ((!(this.ifTopUrl.isEmpty() || this.unlessTopUrl.isEmpty()) != false))
+            throw new AssertionError();
     }
 
     public static ContentBlockerTrigger fromMap(Map<String, Object> map) {
         String urlFilter = (String) map.get("url-filter");
+        Boolean urlFilterIsCaseSensitive = (Boolean) map.get("url-filter-is-case-sensitive");
         List<String> resourceTypeStringList = (List<String>) map.get("resource-type");
         List<ContentBlockerTriggerResourceType> resourceType = new ArrayList<>();
         for (String type : resourceTypeStringList) {
             resourceType.add(ContentBlockerTriggerResourceType.fromValue(type));
         }
-        return new ContentBlockerTrigger(urlFilter, resourceType);
+        List<String> ifDomain = (List<String>) map.get("if-domain");
+        List<String> unlessDomain = (List<String>) map.get("unless-domain");
+        List<String> loadType = (List<String>) map.get("load-type");
+        List<String> ifTopUrl = (List<String>) map.get("if-top-url");
+        List<String> unlessTopUrl = (List<String>) map.get("unless-top-url");
+        return new ContentBlockerTrigger(urlFilter, urlFilterIsCaseSensitive, resourceType, ifDomain, unlessDomain, loadType, ifTopUrl, unlessTopUrl);
     }
 
 }

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

@@ -27,6 +27,8 @@ import com.pichillilorenzo.flutter_inappbrowser.JavaScriptBridgeInterface;
 import com.pichillilorenzo.flutter_inappbrowser.Util;
 
 import java.io.ByteArrayInputStream;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -317,14 +319,27 @@ public class InAppWebViewClient extends WebViewClient {
       obj.put("url", url);
       obj.put("scheme", scheme);
 
-      Util.WaitFlutterResult flutterResult = Util.invokeMethodAndWait(getChannel(), "onLoadResourceCustomScheme", obj);
+      Util.WaitFlutterResult flutterResult;
+      try {
+        flutterResult = Util.invokeMethodAndWait(getChannel(), "onLoadResourceCustomScheme", obj);
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+        Log.e(LOG_TAG, e.getMessage());
+        return null;
+      }
 
       if (flutterResult.error != null) {
-        Log.d(LOG_TAG, flutterResult.error);
+        Log.e(LOG_TAG, flutterResult.error);
       }
       else if (flutterResult.result != null) {
         Map<String, String> res = (Map<String, String>) flutterResult.result;
-        WebResourceResponse response = ContentBlocker.checkUrl(webView, url, res.get("content-type"));
+        WebResourceResponse response = null;
+        try {
+          response = ContentBlocker.checkUrl(webView, url, res.get("content-type"));
+        } catch (Exception e) {
+          e.printStackTrace();
+          Log.e(LOG_TAG, e.getMessage());
+        }
         if (response != null)
           return response;
         byte[] data = Base64.decode(res.get("base64data"), Base64.DEFAULT);
@@ -332,7 +347,13 @@ public class InAppWebViewClient extends WebViewClient {
       }
     }
 
-    WebResourceResponse response = ContentBlocker.checkUrl(webView, url);
+    WebResourceResponse response = null;
+    try {
+      response = ContentBlocker.checkUrl(webView, url);
+    } catch (Exception e) {
+      e.printStackTrace();
+      Log.e(LOG_TAG, e.getMessage());
+    }
     return response;
   }
 

android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/Util.java

@@ -9,6 +9,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
@@ -44,11 +45,12 @@ public class Util {
     return ANDROID_ASSET_URL + key;
   }
 
-    public static WaitFlutterResult invokeMethodAndWait(final MethodChannel channel, final String method, final Object arguments) {
+    public static WaitFlutterResult invokeMethodAndWait(final MethodChannel channel, final String method, final Object arguments) throws InterruptedException {
+      final CountDownLatch latch = new CountDownLatch(1);
+
       final Map<String, Object> flutterResultMap = new HashMap<>();
       flutterResultMap.put("result", null);
       flutterResultMap.put("error", null);
-      flutterResultMap.put("isBlocking", true);
 
       Handler handler = new Handler(Looper.getMainLooper());
       handler.post(new Runnable() {
@@ -58,27 +60,25 @@ public class Util {
             @Override
             public void success(Object result) {
               flutterResultMap.put("result", result);
-              flutterResultMap.put("isBlocking", false);
+              latch.countDown();
             }
 
             @Override
             public void error(String s, String s1, Object o) {
               flutterResultMap.put("error", "ERROR: " + s + " " + s1);
               flutterResultMap.put("result", o);
-              flutterResultMap.put("isBlocking", false);
+              latch.countDown();
             }
 
             @Override
             public void notImplemented() {
-              flutterResultMap.put("isBlocking", false);
+              latch.countDown();
             }
           });
         }
       });
 
-      while((Boolean) flutterResultMap.get("isBlocking")) {
-        // block until flutter side returns
-      }
+      latch.await();
 
       return new WaitFlutterResult(flutterResultMap.get("result"), (String) flutterResultMap.get("error"));
     }

example/assets/index.html

@@ -26,8 +26,8 @@
             <h1 class="cover-heading">Inline WebView</h1>
             <img src="my-special-custom-scheme://images/flutter-logo.svg" alt="flutter logo">
             <p class="lead">Cover is a one-page template for building simple and beautiful home pages. Download, edit the text, and add your own fullscreen background photo to make it your own.</p>
-            <p class="lead">
-                <a href="#" class="btn btn-lg btn-secondary">Learn more</a>
+            <p>
+                <img src="https://via.placeholder.com/100x50" alt="placeholder 100x50">
             </p>
         </main>
 
@@ -54,6 +54,9 @@
                 console.log(JSON.stringify(result));
             });
         });
+        $(document).ready(function() {
+            console.log("jQuery ready");
+        });
     </script>
 </body>
 </html>
\ No newline at end of file

example/lib/chrome_safari_example.screen.dart

@@ -38,7 +38,10 @@ class _ChromeSafariExampleScreenState extends State<ChromeSafariExampleScreen> {
     return new Center(
       child: new RaisedButton(
           onPressed: () async {
-            await widget.browser.open("https://flutter.dev/");
+            await widget.browser.open("https://flutter.dev/", options: [
+              AndroidChromeCustomTabsOptions(addShareButton: false),
+              iOSChromeCustomTabsOptions(barCollapsingEnabled: true)
+            ]);
           },
           child: Text("Open Chrome Safari Browser")),
     );

example/lib/inline_example.screen.dart

@@ -74,7 +74,9 @@ class _InlineExampleScreenState extends State<InlineExampleScreen> {
                 resourceCustomSchemes: ["my-special-custom-scheme"],
                 contentBlockers: [
                   ContentBlocker(
-                      ContentBlockerTrigger(".*", resourceType: [ContentBlockerTriggerResourceType.IMAGE]),
+                      ContentBlockerTrigger(".*",
+                          resourceType: [ContentBlockerTriggerResourceType.IMAGE, ContentBlockerTriggerResourceType.STYLE_SHEET],
+                          ifTopUrl: ["https://getbootstrap.com/"]),
                       ContentBlockerAction(ContentBlockerActionType.BLOCK)
                   )
                 ]

example/lib/webview_example.screen.dart

@@ -97,10 +97,12 @@ class _WebviewExampleScreenState extends State<WebviewExampleScreen> {
           onPressed: ()  {
             widget.browser.open(
                 url: "https://www.google.com/",
-                options: {
-                  "useShouldOverrideUrlLoading": true,
-                  "useOnLoadResource": true,
-                }
+                options: [
+                  InAppWebViewOptions(
+                      useShouldOverrideUrlLoading: true,
+                      useOnLoadResource: true,
+                  )
+                ]
             );
           },
           child: Text("Open Webview Browser")),

ios/Classes/FlutterWebViewController.swift

@@ -38,6 +38,39 @@ public class FlutterWebViewController: NSObject, FlutterPlatformView {
         webView!.options = options
         webView!.prepare()
         
+        if #available(iOS 11.0, *) {
+            if let contentBlockers = webView!.options?.contentBlockers {
+                do {
+                    let jsonData = try JSONSerialization.data(withJSONObject: contentBlockers, options: [])
+                    let blockRules = String(data: jsonData, encoding: String.Encoding.utf8)
+                    WKContentRuleListStore.default().compileContentRuleList(
+                        forIdentifier: "ContentBlockingRules",
+                        encodedContentRuleList: blockRules) { (contentRuleList, error) in
+                            
+                            if let error = error {
+                                print(error.localizedDescription)
+                                return
+                            }
+                            
+                            let configuration = self.webView!.configuration
+                            configuration.userContentController.add(contentRuleList!)
+                            
+                            self.load(initialUrl: initialUrl, initialFile: initialFile, initialData: initialData, initialHeaders: initialHeaders)
+                    }
+                    return
+                } catch {
+                    print(error.localizedDescription)
+                }
+            }
+        }
+        load(initialUrl: initialUrl, initialFile: initialFile, initialData: initialData, initialHeaders: initialHeaders)
+    }
+    
+    public func view() -> UIView {
+        return webView!
+    }
+    
+    public func load(initialUrl: String, initialFile: String?, initialData: [String: String]?, initialHeaders: [String: String]) {
         if initialFile != nil {
             do {
                 try webView!.loadFile(url: initialFile!, headers: initialHeaders)
@@ -60,10 +93,6 @@ public class FlutterWebViewController: NSObject, FlutterPlatformView {
         }
     }
     
-    public func view() -> UIView {
-        return webView!
-    }
-    
     public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
         let arguments = call.arguments as? NSDictionary
         switch call.method {

ios/Classes/InAppBrowserWebViewController.swift

@@ -119,19 +119,50 @@ class InAppBrowserWebViewController: UIViewController, UIScrollViewDelegate, WKU
             prepareConstraints()
             prepareWebView()
             
-            if self.initData == nil {
-                loadUrl(url: self.initURL!, headers: self.initHeaders)
-            }
-            else {
-                webView.loadData(data: initData!, mimeType: initMimeType!, encoding: initEncoding!, baseUrl: initBaseUrl!)
+            if #available(iOS 11.0, *) {
+                if let contentBlockers = webView!.options?.contentBlockers, contentBlockers.count > 0 {
+                    do {
+                        let jsonData = try JSONSerialization.data(withJSONObject: contentBlockers, options: [])
+                        let blockRules = String(data: jsonData, encoding: String.Encoding.utf8)
+                        WKContentRuleListStore.default().compileContentRuleList(
+                            forIdentifier: "ContentBlockingRules",
+                            encodedContentRuleList: blockRules) { (contentRuleList, error) in
+                                
+                                if let error = error {
+                                    print(error.localizedDescription)
+                                    return
+                                }
+                                
+                                let configuration = self.webView!.configuration
+                                configuration.userContentController.add(contentRuleList!)
+                                
+                                self.initLoad(initURL: self.initURL, initData: self.initData, initMimeType: self.initMimeType, initEncoding: self.initEncoding, initBaseUrl: self.initBaseUrl, initHeaders: self.initHeaders)
+                                
+                                self.navigationDelegate?.onBrowserCreated(uuid: self.uuid, webView: self.webView)
+                        }
+                        return
+                    } catch {
+                        print(error.localizedDescription)
+                    }
+                }
             }
             
+            initLoad(initURL: initURL, initData: initData, initMimeType: initMimeType, initEncoding: initEncoding, initBaseUrl: initBaseUrl, initHeaders: initHeaders)
+            
             navigationDelegate?.onBrowserCreated(uuid: uuid, webView: webView)
         }
         viewPrepared = true
         super.viewWillAppear(animated)
     }
     
+    func initLoad(initURL: URL?, initData: String?, initMimeType: String?, initEncoding: String?, initBaseUrl: String?, initHeaders: [String: String]?) {
+        if self.initData == nil {
+            loadUrl(url: self.initURL!, headers: self.initHeaders)
+        }
+        else {
+            webView.loadData(data: initData!, mimeType: initMimeType!, encoding: initEncoding!, baseUrl: initBaseUrl!)
+        }
+    }
     
     override func viewDidLoad() {
         super.viewDidLoad()

ios/Classes/InAppWebView.swift

@@ -418,6 +418,28 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavi
             clearCache()
         }
         
+        if #available(iOS 11.0, *), newOptionsMap["contentBlockers"] != nil {
+            let contentBlockers = newOptions.contentBlockers
+            configuration.userContentController.removeAllContentRuleLists()
+            if contentBlockers.count > 0 {
+                do {
+                    let jsonData = try JSONSerialization.data(withJSONObject: contentBlockers, options: [])
+                    let blockRules = String(data: jsonData, encoding: String.Encoding.utf8)
+                    WKContentRuleListStore.default().compileContentRuleList(
+                        forIdentifier: "ContentBlockingRules",
+                        encodedContentRuleList: blockRules) { (contentRuleList, error) in
+                            if let error = error {
+                                print(error.localizedDescription)
+                                return
+                            }
+                            self.configuration.userContentController.add(contentRuleList!)
+                    }
+                } catch {
+                    print(error.localizedDescription)
+                }
+            }
+        }
+        
         self.options = newOptions
     }
     

lib/src/chrome_safari_browser.dart

 import 'dart:async';
 
 import 'package:flutter/services.dart';
+import 'package:flutter_inappbrowser/src/webview_options.dart';
 
 import 'types.dart';
 import 'channel_manager.dart';
@@ -69,16 +70,27 @@ class ChromeSafariBrowser {
   ///- __preferredControlTintColor__: Set the custom color of the control buttons on the navigation bar and the toolbar.
   ///- __presentationStyle__: Set the custom modal presentation style when presenting the WebView. The default value is `0 //fullscreen`. See [UIModalPresentationStyle](https://developer.apple.com/documentation/uikit/uimodalpresentationstyle) for all the available styles.
   ///- __transitionStyle__: Set to the custom transition style when presenting the WebView. The default value is `0 //crossDissolve`. See [UIModalTransitionStyle](https://developer.apple.com/documentation/uikit/uimodaltransitionStyle) for all the available styles.
-  Future<void> open(String url, {Map<String, dynamic> options = const {}, Map<String, String> headersFallback = const {}, Map<String, dynamic> optionsFallback = const {}}) async {
+  Future<void> open(String url, {List<ChromeCustomTabsOptions> options = const [], Map<String, String> headersFallback = const {}, List<BrowserOptions> optionsFallback = const []}) async {
     assert(url != null && url.isNotEmpty);
     this.throwIsAlreadyOpened(message: 'Cannot open $url!');
+
+    Map<String, dynamic> optionsMap = {};
+    options.forEach((webViewOption) {
+      optionsMap.addAll(webViewOption.toMap());
+    });
+
+    Map<String, dynamic> optionsFallbackMap = {};
+    optionsFallback.forEach((webViewOption) {
+      optionsFallbackMap.addAll(webViewOption.toMap());
+    });
+
     Map<String, dynamic> args = <String, dynamic>{};
     args.putIfAbsent('uuid', () => uuid);
     args.putIfAbsent('uuidFallback', () => (browserFallback != null) ? browserFallback.uuid : '');
     args.putIfAbsent('url', () => url);
     args.putIfAbsent('headers', () => headersFallback);
-    args.putIfAbsent('options', () => options);
-    args.putIfAbsent('optionsFallback', () => optionsFallback);
+    args.putIfAbsent('options', () => optionsMap);
+    args.putIfAbsent('optionsFallback', () => optionsFallbackMap);
     args.putIfAbsent('isData', () => false);
     args.putIfAbsent('useChromeSafariBrowser', () => true);
     await ChannelManager.channel.invokeMethod('open', args);

lib/src/content_blocker.dart

@@ -27,22 +27,68 @@ class ContentBlockerTriggerResourceType {
   static const RAW = const ContentBlockerTriggerResourceType._internal('raw');
 }
 
+class ContentBlockerTriggerLoadType {
+  final String _value;
+  const ContentBlockerTriggerLoadType._internal(this._value);
+  toString() => _value;
+
+  static const FIRST_PARTY = const ContentBlockerTriggerLoadType._internal('first-party');
+  static const THIRD_PARTY = const ContentBlockerTriggerLoadType._internal('third-party');
+}
+
 class ContentBlockerTrigger {
   String urlFilter;
+  bool urlFilterIsCaseSensitive;
   List<ContentBlockerTriggerResourceType> resourceType;
+  List<String> ifDomain;
+  List<String> unlessDomain;
+  List<ContentBlockerTriggerLoadType> loadType;
+  List<String> ifTopUrl;
+  List<String> unlessTopUrl;
 
-  ContentBlockerTrigger(this.urlFilter, {this.resourceType = const []});
+  ContentBlockerTrigger(String urlFilter, {bool urlFilterIsCaseSensitive = false, List<ContentBlockerTriggerResourceType> resourceType = const [],
+    List<String> ifDomain = const [], List<String> unlessDomain = const [], List<ContentBlockerTriggerLoadType> loadType = const [],
+    List<String> ifTopUrl = const [], List<String> unlessTopUrl = const []}) {
+    this.urlFilter = urlFilter;
+    this.resourceType = resourceType;
+    this.urlFilterIsCaseSensitive = urlFilterIsCaseSensitive;
+    this.ifDomain = ifDomain;
+    this.unlessDomain = unlessDomain;
+    assert(!(this.ifDomain.isEmpty || this.unlessDomain.isEmpty) == false);
+    this.loadType = loadType;
+    assert(this.loadType.length <= 2);
+    this.ifTopUrl = ifTopUrl;
+    this.unlessTopUrl = unlessTopUrl;
+    assert(!(this.ifTopUrl.isEmpty || this.unlessTopUrl.isEmpty) == false);
+  }
 
   Map<String, dynamic> toMap() {
     List<String> resourceTypeStringList = [];
     resourceType.forEach((type) {
       resourceTypeStringList.add(type.toString());
     });
+    List<String> loadTypeStringList = [];
+    loadType.forEach((type) {
+      loadTypeStringList.add(type.toString());
+    });
 
-    return {
+    Map<String, dynamic> map = {
       "url-filter": urlFilter,
-      "resource-type": resourceTypeStringList
+      "url-filter-is-case-sensitive": urlFilterIsCaseSensitive,
+      "if-domain": ifDomain,
+      "unless-domain": unlessDomain,
+      "resource-type": resourceTypeStringList,
+      "load-type": loadTypeStringList,
+      "if-top-url": ifTopUrl,
+      "unless-top-url": unlessTopUrl
     };
+
+    map.keys
+        .where((key) => map[key] == null || (map[key] is List && (map[key] as List).length == 0)) // filter keys
+        .toList() // create a copy to avoid concurrent modifications
+        .forEach(map.remove);
+
+    return map;
   }
 }
 
@@ -69,9 +115,16 @@ class ContentBlockerAction {
   }
 
   Map<String, dynamic> toMap() {
-    return {
+    Map<String, dynamic> map =  {
       "type": type.toString(),
       "selector": selector
     };
+
+    map.keys
+        .where((key) => map[key] == null || (map[key] is List && (map[key] as List).length == 0)) // filter keys
+        .toList() // create a copy to avoid concurrent modifications
+        .forEach(map.remove);
+
+    return map;
   }
 }
\ No newline at end of file

lib/src/in_app_browser.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:collection';
 
 import 'package:flutter/services.dart';
+import 'package:flutter_inappbrowser/src/webview_options.dart';
 
 import 'types.dart';
 import 'channel_manager.dart';
@@ -101,14 +102,20 @@ class InAppBrowser {
   ///    - __allowsInlineMediaPlayback__: Set to `true` to allow HTML5 media playback to appear inline within the screen layout, using browser-supplied controls rather than native controls. For this to work, add the `webkit-playsinline` attribute to any `<video>` elements. The default value is `false`.
   ///    - __allowsPictureInPictureMediaPlayback__: Set to `true` to allow HTML5 videos play picture-in-picture. The default value is `true`.
   ///    - __spinner__: Set to `false` to hide the spinner when the WebView is loading a page. The default value is `true`.
-  Future<void> open({String url = "about:blank", Map<String, String> headers = const {}, Map<String, dynamic> options = const {}}) async {
+  Future<void> open({String url = "about:blank", Map<String, String> headers = const {}, List<BrowserOptions> options = const []}) async {
     assert(url != null && url.isNotEmpty);
     this.throwIsAlreadyOpened(message: 'Cannot open $url!');
+
+    Map<String, dynamic> optionsMap = {};
+    options.forEach((webViewOption) {
+      optionsMap.addAll(webViewOption.toMap());
+    });
+
     Map<String, dynamic> args = <String, dynamic>{};
     args.putIfAbsent('uuid', () => uuid);
     args.putIfAbsent('url', () => url);
     args.putIfAbsent('headers', () => headers);
-    args.putIfAbsent('options', () => options);
+    args.putIfAbsent('options', () => optionsMap);
     args.putIfAbsent('openWithSystemBrowser', () => false);
     args.putIfAbsent('isLocalFile', () => false);
     args.putIfAbsent('isData', () => false);
@@ -145,14 +152,20 @@ class InAppBrowser {
   ///inAppBrowser.openFile("assets/index.html");
   ///...
   ///```
-  Future<void> openFile(String assetFilePath, {Map<String, String> headers = const {}, Map<String, dynamic> options = const {}}) async {
+  Future<void> openFile(String assetFilePath, {Map<String, String> headers = const {}, List<BrowserOptions> options = const []}) async {
     assert(assetFilePath != null && assetFilePath.isNotEmpty);
     this.throwIsAlreadyOpened(message: 'Cannot open $assetFilePath!');
+
+    Map<String, dynamic> optionsMap = {};
+    options.forEach((webViewOption) {
+      optionsMap.addAll(webViewOption.toMap());
+    });
+
     Map<String, dynamic> args = <String, dynamic>{};
     args.putIfAbsent('uuid', () => uuid);
     args.putIfAbsent('url', () => assetFilePath);
     args.putIfAbsent('headers', () => headers);
-    args.putIfAbsent('options', () => options);
+    args.putIfAbsent('options', () => optionsMap);
     args.putIfAbsent('openWithSystemBrowser', () => false);
     args.putIfAbsent('isLocalFile', () => true);
     args.putIfAbsent('isData', () => false);
@@ -163,11 +176,17 @@ class InAppBrowser {
   ///Opens a new [InAppBrowser] instance with [data] as a content, using [baseUrl] as the base URL for it.
   ///The [mimeType] parameter specifies the format of the data.
   ///The [encoding] parameter specifies the encoding of the data.
-  Future<void> openData(String data, {String mimeType = "text/html", String encoding = "utf8", String baseUrl = "about:blank", Map<String, dynamic> options = const {}}) async {
+  Future<void> openData(String data, {String mimeType = "text/html", String encoding = "utf8", String baseUrl = "about:blank", List<BrowserOptions> options = const []}) async {
     assert(data != null);
+
+    Map<String, dynamic> optionsMap = {};
+    options.forEach((webViewOption) {
+      optionsMap.addAll(webViewOption.toMap());
+    });
+
     Map<String, dynamic> args = <String, dynamic>{};
     args.putIfAbsent('uuid', () => uuid);
-    args.putIfAbsent('options', () => options);
+    args.putIfAbsent('options', () => optionsMap);
     args.putIfAbsent('data', () => data);
     args.putIfAbsent('mimeType', () => mimeType);
     args.putIfAbsent('encoding', () => encoding);
@@ -227,16 +246,22 @@ class InAppBrowser {
   }
 
   ///Sets the [InAppBrowser] options with the new [options] and evaluates them.
-  Future<void> setOptions(Map<String, dynamic> options) async {
+  Future<void> setOptions(List<BrowserOptions> options) async {
     this.throwIsNotOpened();
+
+    Map<String, dynamic> optionsMap = {};
+    options.forEach((webViewOption) {
+      optionsMap.addAll(webViewOption.toMap());
+    });
+
     Map<String, dynamic> args = <String, dynamic>{};
     args.putIfAbsent('uuid', () => uuid);
-    args.putIfAbsent('options', () => options);
+    args.putIfAbsent('options', () => optionsMap);
     args.putIfAbsent('optionsType', () => "InAppBrowserOptions");
     await ChannelManager.channel.invokeMethod('setOptions', args);
   }
 
-  ///Gets the current [InAppBrowser] options. Returns `null` if the options are not setted yet.
+  ///Gets the current [InAppBrowser] options as a `Map`. Returns `null` if the options are not setted yet.
   Future<Map<String, dynamic>> getOptions() async {
     this.throwIsNotOpened();
     Map<String, dynamic> args = <String, dynamic>{};

lib/src/webview_options.dart

@@ -6,7 +6,13 @@ class WebViewOptions {
   }
 }
 
-class InAppWebViewOptions implements WebViewOptions {
+class BrowserOptions {
+  Map<String, dynamic> toMap() {
+    return {};
+  }
+}
+
+class InAppWebViewOptions implements WebViewOptions, BrowserOptions {
   bool useShouldOverrideUrlLoading;
   bool useOnLoadResource;
   bool useOnDownloadStart;
@@ -53,7 +59,7 @@ class InAppWebViewOptions implements WebViewOptions {
   }
 }
 
-class AndroidInAppWebViewOptions implements WebViewOptions {
+class AndroidInAppWebViewOptions implements WebViewOptions, BrowserOptions {
   bool clearSessionCache;
   bool builtInZoomControls;
   bool displayZoomControls;
@@ -85,7 +91,7 @@ class AndroidInAppWebViewOptions implements WebViewOptions {
   }
 }
 
-class iOSInAppWebViewOptions implements WebViewOptions {
+class iOSInAppWebViewOptions implements WebViewOptions, BrowserOptions {
   bool disallowOverScroll;
   bool enableViewportScale;
   bool suppressesIncrementalRendering;
@@ -118,7 +124,7 @@ class iOSInAppWebViewOptions implements WebViewOptions {
   }
 }
 
-class InAppBrowserOptions implements WebViewOptions {
+class InAppBrowserOptions implements BrowserOptions {
   bool hidden;
   bool toolbarTop;
   String toolbarTopBackgroundColor;
@@ -139,7 +145,7 @@ class InAppBrowserOptions implements WebViewOptions {
   }
 }
 
-class AndroidInAppBrowserOptions implements WebViewOptions {
+class AndroidInAppBrowserOptions implements BrowserOptions {
   bool hideTitleBar;
   bool closeOnCannotGoBack;
   bool progressBar;
@@ -156,7 +162,7 @@ class AndroidInAppBrowserOptions implements WebViewOptions {
   }
 }
 
-class iOSInAppBrowserOptions implements WebViewOptions {
+class iOSInAppBrowserOptions implements BrowserOptions {
   bool toolbarBottom;
   String toolbarBottomBackgroundColor;
   bool toolbarBottomTranslucent;
@@ -184,7 +190,13 @@ class iOSInAppBrowserOptions implements WebViewOptions {
   }
 }
 
-class AndroidChromeCustomTabsOptions implements WebViewOptions {
+class ChromeCustomTabsOptions {
+  Map<String, dynamic> toMap() {
+    return {};
+  }
+}
+
+class AndroidChromeCustomTabsOptions implements ChromeCustomTabsOptions {
   bool addShareButton;
   bool showTitle;
   String toolbarBackgroundColor;
@@ -205,7 +217,7 @@ class AndroidChromeCustomTabsOptions implements WebViewOptions {
   }
 }
 
-class iOSChromeCustomTabsOptions implements WebViewOptions {
+class iOSChromeCustomTabsOptions implements ChromeCustomTabsOptions {
   bool entersReaderIfAvailable;
   bool barCollapsingEnabled;
   int dismissButtonStyle; //default done