@capacitor-plus/android 8.0.0-beta.0 → 8.0.2

package/README.md

@@ -0,0 +1,55 @@
+# @capacitor-plus/android
+
+The Android native runtime for Capacitor+.
+
+## What is Capacitor+?
+
+**Capacitor+** is an automated fork of [Capacitor](https://github.com/ionic-team/capacitor) maintained by [Capgo](https://capgo.app). It provides the same functionality as `@capacitor/android` with these benefits:
+
+- **Faster Updates**: Get upstream fixes as soon as they pass CI, not months later
+- **Community PRs Merged**: Valuable PRs stuck in the upstream queue are merged here
+- **Security Reviewed**: Every change is analyzed by Claude Code for vulnerabilities
+- **Drop-in Replacement**: Same native APIs, just a different package scope
+
+## Installation
+
+```bash
+npm install @capacitor-plus/android
+npx cap add android
+```
+
+## Requirements
+
+- Android Studio
+- Android SDK 22+ (target SDK 35)
+- Java 21+
+- Gradle 8+
+
+## Why Use This Instead of @capacitor/android?
+
+The official Capacitor release cycle can leave bug fixes and improvements waiting for months. Capacitor+ automatically syncs with upstream daily, runs full CI (including Android builds and tests), and publishes verified releases immediately.
+
+**Have a PR stuck in the Capacitor repo?** Open an issue linking to it, and we'll merge it here so you can use your fix today.
+
+## What's Included
+
+This package contains:
+
+- **Capacitor Android Library**: The core native bridge between your web app and Android
+- **WebView Configuration**: Optimized WebView settings for hybrid apps
+- **Plugin System**: Native plugin architecture for extending functionality
+- **ProGuard Rules**: Pre-configured rules for production builds
+
+## Compatibility
+
+This package maintains API compatibility with `@capacitor/android`. All Capacitor plugins work with both the official and Capacitor+ Android runtime.
+
+## Links
+
+- [Main Repository](https://github.com/Cap-go/capacitor-plus)
+- [Android Documentation](https://capacitorjs.com/docs/android)
+- [Capgo](https://capgo.app)
+
+## License
+
+MIT - See [LICENSE](../LICENSE)

package/capacitor/src/main/assets/native-bridge.js

@@ -367,6 +367,12 @@ var nativeBridge = (function (exports) {
                 }
             };
             const platform = getPlatformId(win);
+            if (platform == 'android' && typeof win.CapacitorSystemBarsAndroidInterface !== 'undefined') {
+                // add DOM ready listener for System Bars
+                document.addEventListener('DOMContentLoaded', function () {
+                    win.CapacitorSystemBarsAndroidInterface.onDOMReady();
+                });
+            }
             if (platform == 'android' || platform == 'ios') {
                 // patch document.cookie on Android/iOS
                 win.CapacitorCookiesDescriptor =

package/capacitor/src/main/java/com/getcapacitor/BridgeWebViewClient.java

@@ -102,4 +102,16 @@ public class BridgeWebViewClient extends WebViewClient {
 
         return result;
     }
+
+    @Override
+    public void onPageCommitVisible(WebView view, String url) {
+        super.onPageCommitVisible(view, url);
+
+        List<WebViewListener> webViewListeners = bridge.getWebViewListeners();
+        if (webViewListeners != null) {
+            for (WebViewListener listener : bridge.getWebViewListeners()) {
+                listener.onPageCommitVisible(view, url);
+            }
+        }
+    }
 }

package/capacitor/src/main/java/com/getcapacitor/WebViewListener.java

@@ -54,4 +54,14 @@ public abstract class WebViewListener {
         // Override me to add behavior to the web view render process gone event
         return false;
     }
+
+    /**
+     * Callback for page start event.
+     *
+     * @param view The WebView for which the navigation occurred.
+     * @param url The URL corresponding to the page navigation that triggered this callback.
+     */
+    public void onPageCommitVisible(WebView view, String url) {
+        // Override me to add behavior to handle the onPageCommitVisible event
+    }
 }

package/capacitor/src/main/java/com/getcapacitor/plugin/SystemBars.java

@@ -1,22 +1,23 @@
 package com.getcapacitor.plugin;
 
-import android.content.pm.PackageInfo;
 import android.content.res.Configuration;
+import android.os.Build;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebView;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
-import androidx.webkit.WebViewCompat;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
+import com.getcapacitor.WebViewListener;
 import com.getcapacitor.annotation.CapacitorPlugin;
 import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 @CapacitorPlugin
 public class SystemBars extends Plugin {
@@ -27,6 +28,9 @@ public class SystemBars extends Plugin {
     static final String BAR_STATUS_BAR = "StatusBar";
     static final String BAR_GESTURE_BAR = "NavigationBar";
 
+    static final String INSETS_HANDLING_CSS = "css";
+    static final String INSETS_HANDLING_DISABLE = "disable";
+
     static final String viewportMetaJSFunction = """
         function capacitorSystemBarsCheckMetaViewport() {
             const meta = document.querySelectorAll("meta[name=viewport]");
@@ -37,42 +41,52 @@ public class SystemBars extends Plugin {
             const metaContent = meta[meta.length - 1].content;
             return metaContent.includes("viewport-fit=cover");
         }
-
         capacitorSystemBarsCheckMetaViewport();
         """;
 
+    private boolean insetHandlingEnabled = true;
+    private boolean hasViewportCover = false;
+
     @Override
     public void load() {
+        getBridge().getWebView().addJavascriptInterface(this, "CapacitorSystemBarsAndroidInterface");
         super.load();
+
         initSystemBars();
     }
 
-    private boolean hasFixedWebView() {
-        PackageInfo packageInfo = WebViewCompat.getCurrentWebViewPackage(bridge.getContext());
-        Pattern pattern = Pattern.compile("(\\d+)");
-        Matcher matcher = pattern.matcher(packageInfo.versionName);
-
-        if (!matcher.find()) {
-            return false;
-        }
-
-        String majorVersionStr = matcher.group(0);
-        int majorVersion = Integer.parseInt(majorVersionStr);
+    @Override
+    protected void handleOnStart() {
+        super.handleOnStart();
+
+        this.getBridge().addWebViewListener(
+            new WebViewListener() {
+                @Override
+                public void onPageCommitVisible(WebView view, String url) {
+                    super.onPageCommitVisible(view, url);
+                    getBridge().getWebView().requestApplyInsets();
+                }
+            }
+        );
+    }
 
-        return majorVersion >= 140;
+    @Override
+    protected void handleOnConfigurationChanged(Configuration newConfig) {
+        super.handleOnConfigurationChanged(newConfig);
+        setStyle(STYLE_DEFAULT, "");
     }
 
     private void initSystemBars() {
         String style = getConfig().getString("style", STYLE_DEFAULT).toUpperCase(Locale.US);
         boolean hidden = getConfig().getBoolean("hidden", false);
-        boolean disableCSSInsets = getConfig().getBoolean("disableInsets", false);
 
-        this.bridge.getWebView().evaluateJavascript(viewportMetaJSFunction, (res) -> {
-            boolean hasMetaViewportCover = res.equals("true");
-            if (!disableCSSInsets) {
-                setupSafeAreaInsets(this.hasFixedWebView(), hasMetaViewportCover);
-            }
-        });
+        String insetsHandling = getConfig().getString("insetsHandling", "css");
+        if (insetsHandling.equals(INSETS_HANDLING_DISABLE)) {
+            insetHandlingEnabled = false;
+        }
+
+        initWindowInsetsListener();
+        initSafeAreaInsets();
 
         getBridge().executeOnMainThread(() -> {
             setStyle(style, "");
@@ -116,28 +130,65 @@ public class SystemBars extends Plugin {
         call.resolve();
     }
 
-    private void setupSafeAreaInsets(boolean hasFixedWebView, boolean hasMetaViewportCover) {
-        ViewCompat.setOnApplyWindowInsetsListener((View) getBridge().getWebView().getParent(), (v, insets) -> {
-            if (hasFixedWebView && hasMetaViewportCover) {
-                return insets;
-            }
+    @JavascriptInterface
+    public void onDOMReady() {
+        getActivity().runOnUiThread(() -> {
+            this.bridge.getWebView().evaluateJavascript(viewportMetaJSFunction, (res) -> {
+                hasViewportCover = res.equals("true");
 
-            Insets safeArea = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
-            Insets imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime());
-            boolean keyboardVisible = insets.isVisible(WindowInsetsCompat.Type.ime());
+                getBridge().getWebView().requestApplyInsets();
+            });
+        });
+    }
 
-            int bottomInsets = safeArea.bottom;
+    private Insets calcSafeAreaInsets(WindowInsetsCompat insets) {
+        Insets safeArea = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+        return Insets.of(safeArea.left, safeArea.top, safeArea.right, safeArea.bottom);
+    }
 
-            if (keyboardVisible) {
-                // When https://issues.chromium.org/issues/457682720 is fixed and released,
-                // add behind a WebView version check
-                bottomInsets = imeInsets.bottom - bottomInsets;
+    private void initSafeAreaInsets() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && insetHandlingEnabled) {
+            View v = (View) this.getBridge().getWebView().getParent();
+            WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(v);
+            if (insets != null) {
+                Insets safeAreaInsets = calcSafeAreaInsets(insets);
+                injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
             }
+        }
+    }
 
-            injectSafeAreaCSS(safeArea.top, safeArea.right, bottomInsets, safeArea.left);
+    private void initWindowInsetsListener() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && insetHandlingEnabled) {
+            ViewCompat.setOnApplyWindowInsetsListener((View) getBridge().getWebView().getParent(), (v, insets) -> {
+                if (hasViewportCover) {
+                    Insets safeAreaInsets = calcSafeAreaInsets(insets);
+                    boolean keyboardVisible = insets.isVisible(WindowInsetsCompat.Type.ime());
 
-            return WindowInsetsCompat.CONSUMED;
-        });
+                    if (keyboardVisible) {
+                        safeAreaInsets = Insets.of(safeAreaInsets.left, safeAreaInsets.top, safeAreaInsets.right, 0);
+
+                        Insets imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime());
+                        setViewMargins(v, Insets.of(0, 0, 0, imeInsets.bottom));
+                    } else {
+                        setViewMargins(v, Insets.NONE);
+                    }
+
+                    injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+                    return WindowInsetsCompat.CONSUMED;
+                }
+
+                return insets;
+            });
+        }
+    }
+
+    private void setViewMargins(View v, Insets insets) {
+        ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+        mlp.leftMargin = insets.left;
+        mlp.bottomMargin = insets.bottom;
+        mlp.rightMargin = insets.right;
+        mlp.topMargin = insets.top;
+        v.setLayoutParams(mlp);
     }
 
     private void injectSafeAreaCSS(int top, int right, int bottom, int left) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/android",
-  "version": "8.0.0-beta.0",
+  "version": "8.0.2",
   "description": "Capacitor+: Enhanced Capacitor with automated upstream sync - Cross-platform apps with JavaScript and the web",
   "homepage": "https://github.com/Cap-go/capacitor-plus",
   "author": "Capgo Team <support@capgo.app> (https://capgo.app)",
@@ -23,7 +23,8 @@
     "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
   },
   "peerDependencies": {
-    "@capacitor-plus/core": "^8.0.0-beta.0"
+    "@capacitor-plus/core": "^8.0.0",
+    "@capacitor/core": "^8.0.0"
   },
   "publishConfig": {
     "access": "public"