@capgo/inappbrowser 0.0.4 → 0.1.0

package/android/build.gradle

@@ -55,4 +55,10 @@ dependencies {
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
+    implementation 'com.android.support:customtabs:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation 'com.google.android.material:material:1.0.0'
 }

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/InAppBrowserPlugin.java

@@ -4,24 +4,25 @@ import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.customtabs.CustomTabsCallback;
-import android.support.customtabs.CustomTabsClient;
-import android.support.customtabs.CustomTabsIntent;
-import android.support.customtabs.CustomTabsServiceConnection;
-import android.support.customtabs.CustomTabsSession;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.browser.customtabs.CustomTabsCallback;
+import androidx.browser.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.browser.customtabs.CustomTabsServiceConnection;
+import androidx.browser.customtabs.CustomTabsSession;
+
 import com.getcapacitor.JSObject;
-import com.getcapacitor.NativePlugin;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.CapacitorPlugin;
 
 import java.util.Iterator;
 
-@NativePlugin()
-public class CapBrowser extends Plugin {
+@CapacitorPlugin(name = "InAppBrowser")
+public class InAppBrowserPlugin extends Plugin {
     public static final String CUSTOM_TAB_PACKAGE_NAME = "com.android.chrome";  // Change when in stable
     private CustomTabsClient customTabsClient;
     private CustomTabsSession currentSession;
@@ -41,31 +42,40 @@ public class CapBrowser extends Plugin {
 
     @PluginMethod()
     public void setUrl(PluginCall call) {
-        call.success();
+        String url = call.getString("url");
+        if(url == null || TextUtils.isEmpty(url)) {
+            call.reject("Invalid URL");
+        }
+        getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                webViewDialog.setUrl(url);
+            }
+        });
+        call.resolve();
     }
 
     @PluginMethod()
     public void open(PluginCall call) {
         String url = call.getString("url");
         if(url == null || TextUtils.isEmpty(url)) {
-            call.error("Invalid URL");
+            call.reject("Invalid URL");
         }
         CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder(getCustomTabsSession());
-        builder.addDefaultShareMenuItem();
         CustomTabsIntent tabsIntent = builder.build();
         tabsIntent.intent.putExtra(Intent.EXTRA_REFERRER,
                 Uri.parse(Intent.URI_ANDROID_APP_SCHEME + "//" + getContext().getPackageName()));
         tabsIntent.intent.putExtra(android.provider.Browser.EXTRA_HEADERS, this.getHeaders(call));
         tabsIntent.launchUrl(getContext(), Uri.parse(url));
 
-        call.success();
+        call.resolve();
     }
 
     @PluginMethod()
     public void openWebView(PluginCall call) {
         String url = call.getString("url");
         if(url == null || TextUtils.isEmpty(url)) {
-            call.error("Invalid URL");
+            call.reject("Invalid URL");
         }
         final Options options = new Options();
         options.setUrl(url);
@@ -111,7 +121,7 @@ public class CapBrowser extends Plugin {
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             getContext().startActivity(intent);
         }
-        call.success();
+        call.resolve();
     }
 
     private Bundle getHeaders(PluginCall pluginCall) {
@@ -157,9 +167,4 @@ public class CapBrowser extends Plugin {
         }
         return currentSession;
     }
-
-    @Override
-    protected void handleOnActivityResult(int requestCode, int resultCode, Intent data) {
-        super.handleOnActivityResult(requestCode, resultCode, data);
-    }
 }

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/WebViewDialog.java

@@ -3,7 +3,6 @@ package ee.forgr.capacitor_inappbrowser;
 import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.Window;
@@ -14,8 +13,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageButton;
 import android.widget.TextView;
-
-import com.cap.browser.plugin.capbrowser.R;
+import androidx.appcompat.widget.Toolbar;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -78,6 +76,22 @@ public class WebViewDialog extends Dialog {
         }
     }
 
+    public void setUrl(String url) {
+        Map<String, String> requestHeaders = new HashMap<>();
+        if(_options.getHeaders() != null) {
+            Iterator<String> keys = _options.getHeaders().keys();
+            while(keys.hasNext()) {
+            String key = keys.next();
+            if(TextUtils.equals(key, "User-Agent")) {
+                _webView.getSettings().setUserAgentString(_options.getHeaders().getString(key));
+            } else {
+                requestHeaders.put(key, _options.getHeaders().getString(key));
+            }
+            }
+        }
+        _webView.loadUrl(url, requestHeaders);
+    }
+
     private void setTitle(String newTitleText) {
         TextView textView = (TextView) _toolbar.findViewById(R.id.titleText);
         textView.setText(newTitleText);

package/android/src/main/res/layout/activity_browser.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.cap.browser.plugin.WebViewActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
@@ -15,8 +15,8 @@
             android:id="@+id/tool_bar"
             layout="@layout/tool_bar" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_browser" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

package/android/src/main/res/layout/bridge_layout_main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -12,4 +12,4 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

package/android/src/main/res/layout/tool_bar.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -47,4 +47,4 @@
         android:contentDescription="@string/back_button"
         android:paddingRight="10dp"
         android:src="@drawable/arrow_back_disabled" />
-</android.support.v7.widget.Toolbar>
+</androidx.appcompat.widget.Toolbar>

package/ios/Plugin/InAppBrowserPlugin.swift

@@ -12,6 +12,7 @@ public class InAppBrowserPlugin: CAPPlugin {
     private var isSetupDone = false
     var currentPluginCall: CAPPluginCall?
     var isPresentAfterPageLoad = false
+    var webViewController: WKWebViewController?
     
     private func setup(){
         self.isSetupDone = true
@@ -59,25 +60,24 @@ public class InAppBrowserPlugin: CAPPlugin {
         
         DispatchQueue.main.async {
             let url = URL(string: urlString)
-            let webViewController: WKWebViewController?
             
             if self.isPresentAfterPageLoad {
-                webViewController = WKWebViewController.init(url: url!, headers: headers)
+                self.webViewController = WKWebViewController.init(url: url!, headers: headers)
             } else {
-                webViewController = WKWebViewController.init()
-                webViewController?.setHeaders(headers: headers)
+                self.webViewController = WKWebViewController.init()
+                self.webViewController?.setHeaders(headers: headers)
             }
             
-            webViewController?.source = .remote(url!)
-            webViewController?.leftNavigaionBarItemTypes = self.getToolbarItems(toolbarType: toolbarType ?? "")
+            self.webViewController?.source = .remote(url!)
+            self.webViewController?.leftNavigaionBarItemTypes = self.getToolbarItems(toolbarType: toolbarType ?? "")
             
-            webViewController?.toolbarItemTypes = []
-            webViewController?.doneBarButtonItemPosition = .right
-            webViewController?.capBrowserPlugin = self
-            webViewController?.title = call.getString("title") ?? ""
-            webViewController?.shareSubject = call.getString("shareSubject")
-            webViewController?.shareDisclaimer = disclaimerContent
-            self.navigationWebViewController = UINavigationController.init(rootViewController: webViewController!)
+            self.webViewController?.toolbarItemTypes = []
+            self.webViewController?.doneBarButtonItemPosition = .right
+            self.webViewController?.capBrowserPlugin = self
+            self.webViewController?.title = call.getString("title") ?? ""
+            self.webViewController?.shareSubject = call.getString("shareSubject")
+            self.webViewController?.shareDisclaimer = disclaimerContent
+            self.navigationWebViewController = UINavigationController.init(rootViewController: self.webViewController!)
             self.navigationWebViewController?.navigationBar.isTranslucent = false
             self.navigationWebViewController?.toolbar.isTranslucent = false
             self.navigationWebViewController?.navigationBar.backgroundColor = .white
@@ -104,6 +104,11 @@ public class InAppBrowserPlugin: CAPPlugin {
     }
     
     @objc func setUrl(_ call: CAPPluginCall) {
+        guard let url = call.getString("url") else {
+            call.reject("Cannot get new url to set")
+            return
+        }
+        self.webViewController?.load(remote: URL(string: url)!)
         call.resolve()
     }
 
@@ -130,21 +135,20 @@ public class InAppBrowserPlugin: CAPPlugin {
         
         DispatchQueue.main.async {
             let url = URL(string: urlString)
-            let webViewController: WKWebViewController?
             
             if self.isPresentAfterPageLoad {
-                webViewController = WKWebViewController.init(url: url!, headers: headers)
+                self.webViewController = WKWebViewController.init(url: url!, headers: headers)
             } else {
-                webViewController = WKWebViewController.init()
-                webViewController?.setHeaders(headers: headers)
+                self.webViewController = WKWebViewController.init()
+                self.webViewController?.setHeaders(headers: headers)
             }
             
-            webViewController?.source = .remote(url!)
-            webViewController?.leftNavigaionBarItemTypes = [.reload]
-            webViewController?.toolbarItemTypes = [.back, .forward, .activity]
-            webViewController?.capBrowserPlugin = self
-            webViewController?.hasDynamicTitle = true
-            self.navigationWebViewController = UINavigationController.init(rootViewController: webViewController!)
+            self.webViewController?.source = .remote(url!)
+            self.webViewController?.leftNavigaionBarItemTypes = [.reload]
+            self.webViewController?.toolbarItemTypes = [.back, .forward, .activity]
+            self.webViewController?.capBrowserPlugin = self
+            self.webViewController?.hasDynamicTitle = true
+            self.navigationWebViewController = UINavigationController.init(rootViewController: self.webViewController!)
             self.navigationWebViewController?.navigationBar.isTranslucent = false
             self.navigationWebViewController?.toolbar.isTranslucent = false
             self.navigationWebViewController?.navigationBar.backgroundColor = .white

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/inappbrowser",
-  "version": "0.0.4",
+  "version": "0.1.0",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",