@capacitor/android 8.0.0-alpha.3 → 8.0.0-beta.0

package/capacitor/build.gradle

@@ -13,12 +13,11 @@ ext {
 
 
 buildscript {
-    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '2.2.20'
     repositories {
         google()
         mavenCentral()
         maven {
-            url "https://plugins.gradle.org/m2/"
+            url = "https://plugins.gradle.org/m2/"
         }
     }
     dependencies {
@@ -41,8 +40,8 @@ if (System.getenv("CAP_PUBLISH") == "true") {
 }
 
 android {
-    namespace "com.getcapacitor.android"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
+    namespace = "com.getcapacitor.android"
+    compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24
         targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36
@@ -59,9 +58,9 @@ android {
     }
     lintOptions {
         baseline file("lint-baseline.xml")
-        abortOnError true
-        warningsAsErrors true
-        lintConfig file('lint.xml')
+        abortOnError = true
+        warningsAsErrors = true
+        lintConfig = file('lint.xml')
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_21
@@ -79,7 +78,6 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation platform("org.jetbrains.kotlin:kotlin-bom:$kotlin_version")
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation "androidx.core:core:$androidxCoreVersion"
     implementation "androidx.activity:activity:$androidxActivityVersion"

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

@@ -326,7 +326,7 @@ var nativeBridge = (function (exports) {
                         c.error(result.error);
                     }
                     else {
-                        c.dir(result.data);
+                        c.dir(JSON.stringify(result.data));
                     }
                     c.groupEnd();
                 }

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

@@ -655,6 +655,7 @@ public class Bridge {
         this.registerPlugin(com.getcapacitor.plugin.CapacitorCookies.class);
         this.registerPlugin(com.getcapacitor.plugin.WebView.class);
         this.registerPlugin(com.getcapacitor.plugin.CapacitorHttp.class);
+        this.registerPlugin(com.getcapacitor.plugin.SystemBars.class);
 
         for (Class<? extends Plugin> pluginClass : this.initialPlugins) {
             this.registerPlugin(pluginClass);
@@ -1610,7 +1611,6 @@ public class Bridge {
 
             if (webView instanceof CapacitorWebView capacitorWebView) {
                 capacitorWebView.setBridge(bridge);
-                capacitorWebView.edgeToEdgeHandler(bridge);
             }
 
             bridge.setCordovaWebView(mockWebView);

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

@@ -447,12 +447,7 @@ public class BridgeWebChromeClient extends WebChromeClient {
     }
 
     public boolean isValidMsg(String msg) {
-        return !(
-            msg.contains("%cresult %c") ||
-            (msg.contains("%cnative %c")) ||
-            msg.equalsIgnoreCase("[object Object]") ||
-            msg.equalsIgnoreCase("console.groupEnd")
-        );
+        return !(msg.contains("%cresult %c") || (msg.contains("%cnative %c")) || msg.equalsIgnoreCase("console.groupEnd"));
     }
 
     private Uri createImageFileUri() throws IOException {

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

@@ -54,7 +54,6 @@ public class CapConfig {
     private String errorPath;
     private boolean zoomableWebView = false;
     private boolean resolveServiceWorkerRequests = true;
-    private String adjustMarginsForEdgeToEdge = "disable";
 
     // Embedded
     private String startPath;
@@ -182,7 +181,6 @@ public class CapConfig {
         this.errorPath = builder.errorPath;
         this.zoomableWebView = builder.zoomableWebView;
         this.resolveServiceWorkerRequests = builder.resolveServiceWorkerRequests;
-        this.adjustMarginsForEdgeToEdge = builder.adjustMarginsForEdgeToEdge;
 
         // Embedded
         this.startPath = builder.startPath;
@@ -288,7 +286,6 @@ public class CapConfig {
         webContentsDebuggingEnabled = JSONUtils.getBoolean(configJSON, "android.webContentsDebuggingEnabled", isDebug);
         zoomableWebView = JSONUtils.getBoolean(configJSON, "android.zoomEnabled", JSONUtils.getBoolean(configJSON, "zoomEnabled", false));
         resolveServiceWorkerRequests = JSONUtils.getBoolean(configJSON, "android.resolveServiceWorkerRequests", true);
-        adjustMarginsForEdgeToEdge = JSONUtils.getString(configJSON, "android.adjustMarginsForEdgeToEdge", "disable");
 
         String logBehavior = JSONUtils.getString(
             configJSON,
@@ -405,10 +402,6 @@ public class CapConfig {
         return useLegacyBridge;
     }
 
-    public String adjustMarginsForEdgeToEdge() {
-        return adjustMarginsForEdgeToEdge;
-    }
-
     public int getMinWebViewVersion() {
         if (minWebViewVersion < MINIMUM_ANDROID_WEBVIEW_VERSION) {
             Logger.warn("Specified minimum webview version is too low, defaulting to " + MINIMUM_ANDROID_WEBVIEW_VERSION);
@@ -589,7 +582,6 @@ public class CapConfig {
         private int minHuaweiWebViewVersion = DEFAULT_HUAWEI_WEBVIEW_VERSION;
         private boolean zoomableWebView = false;
         private boolean resolveServiceWorkerRequests = true;
-        private String adjustMarginsForEdgeToEdge = "disable";
 
         // Embedded
         private String startPath = null;

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

@@ -54,36 +54,4 @@ public class CapacitorWebView extends WebView {
         }
         return super.dispatchKeyEvent(event);
     }
-
-    public void edgeToEdgeHandler(Bridge bridge) {
-        String configEdgeToEdge = bridge.getConfig().adjustMarginsForEdgeToEdge();
-
-        if (configEdgeToEdge.equals("disable")) return;
-
-        boolean autoMargins = false;
-        boolean forceMargins = configEdgeToEdge.equals("force");
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && configEdgeToEdge.equals("auto")) {
-            TypedValue value = new TypedValue();
-            boolean foundOptOut = getContext().getTheme().resolveAttribute(android.R.attr.windowOptOutEdgeToEdgeEnforcement, value, true);
-            boolean optOutValue = value.data != 0; // value is set to -1 on true as of Android 15, so we have to do this.
-
-            autoMargins = !(foundOptOut && optOutValue);
-        }
-
-        if (forceMargins || autoMargins) {
-            ViewCompat.setOnApplyWindowInsetsListener(this, (v, windowInsets) -> {
-                Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
-                MarginLayoutParams mlp = (MarginLayoutParams) v.getLayoutParams();
-                mlp.leftMargin = insets.left;
-                mlp.bottomMargin = insets.bottom;
-                mlp.rightMargin = insets.right;
-                mlp.topMargin = insets.top;
-                v.setLayoutParams(mlp);
-
-                // Don't pass window insets to children
-                return WindowInsetsCompat.CONSUMED;
-            });
-        }
-    }
 }

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

@@ -0,0 +1,220 @@
+package com.getcapacitor.plugin;
+
+import android.content.pm.PackageInfo;
+import android.content.res.Configuration;
+import android.view.View;
+import android.view.Window;
+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.annotation.CapacitorPlugin;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@CapacitorPlugin
+public class SystemBars extends Plugin {
+
+    static final String STYLE_LIGHT = "LIGHT";
+    static final String STYLE_DARK = "DARK";
+    static final String STYLE_DEFAULT = "DEFAULT";
+    static final String BAR_STATUS_BAR = "StatusBar";
+    static final String BAR_GESTURE_BAR = "NavigationBar";
+
+    static final String viewportMetaJSFunction = """
+        function capacitorSystemBarsCheckMetaViewport() {
+            const meta = document.querySelectorAll("meta[name=viewport]");
+            if (meta.length == 0) {
+                return false;
+            }
+            // get the last found meta viewport tag
+            const metaContent = meta[meta.length - 1].content;
+            return metaContent.includes("viewport-fit=cover");
+        }
+
+        capacitorSystemBarsCheckMetaViewport();
+        """;
+
+    @Override
+    public void load() {
+        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);
+
+        return majorVersion >= 140;
+    }
+
+    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);
+            }
+        });
+
+        getBridge().executeOnMainThread(() -> {
+            setStyle(style, "");
+            setHidden(hidden, "");
+        });
+    }
+
+    @PluginMethod
+    public void setStyle(final PluginCall call) {
+        String bar = call.getString("bar", "");
+        String style = call.getString("style", STYLE_DEFAULT);
+
+        getBridge().executeOnMainThread(() -> {
+            setStyle(style, bar);
+            call.resolve();
+        });
+    }
+
+    @PluginMethod
+    public void show(final PluginCall call) {
+        String bar = call.getString("bar", "");
+
+        getBridge().executeOnMainThread(() -> {
+            setHidden(false, bar);
+            call.resolve();
+        });
+    }
+
+    @PluginMethod
+    public void hide(final PluginCall call) {
+        String bar = call.getString("bar", "");
+
+        getBridge().executeOnMainThread(() -> {
+            setHidden(true, bar);
+            call.resolve();
+        });
+    }
+
+    @PluginMethod
+    public void setAnimation(final PluginCall call) {
+        call.resolve();
+    }
+
+    private void setupSafeAreaInsets(boolean hasFixedWebView, boolean hasMetaViewportCover) {
+        ViewCompat.setOnApplyWindowInsetsListener((View) getBridge().getWebView().getParent(), (v, insets) -> {
+            if (hasFixedWebView && hasMetaViewportCover) {
+                return insets;
+            }
+
+            Insets safeArea = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+            Insets imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime());
+            boolean keyboardVisible = insets.isVisible(WindowInsetsCompat.Type.ime());
+
+            int bottomInsets = 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;
+            }
+
+            injectSafeAreaCSS(safeArea.top, safeArea.right, bottomInsets, safeArea.left);
+
+            return WindowInsetsCompat.CONSUMED;
+        });
+    }
+
+    private void injectSafeAreaCSS(int top, int right, int bottom, int left) {
+        // Convert pixels to density-independent pixels
+        float density = getActivity().getResources().getDisplayMetrics().density;
+        float topPx = top / density;
+        float rightPx = right / density;
+        float bottomPx = bottom / density;
+        float leftPx = left / density;
+
+        // Execute JavaScript to inject the CSS
+        getBridge().executeOnMainThread(() -> {
+            if (bridge != null && bridge.getWebView() != null) {
+                String script = String.format(
+                    Locale.US,
+                    """
+                    try {
+                      document.documentElement.style.setProperty("--safe-area-inset-top", "%dpx");
+                      document.documentElement.style.setProperty("--safe-area-inset-right", "%dpx");
+                      document.documentElement.style.setProperty("--safe-area-inset-bottom", "%dpx");
+                      document.documentElement.style.setProperty("--safe-area-inset-left", "%dpx");
+                    } catch(e) { console.error('Error injecting safe area CSS:', e); }
+                    """,
+                    (int) topPx,
+                    (int) rightPx,
+                    (int) bottomPx,
+                    (int) leftPx
+                );
+
+                bridge.getWebView().evaluateJavascript(script, null);
+            }
+        });
+    }
+
+    private void setStyle(String style, String bar) {
+        if (style.equals(STYLE_DEFAULT)) {
+            style = getStyleForTheme();
+        }
+
+        Window window = getActivity().getWindow();
+        WindowInsetsControllerCompat windowInsetsControllerCompat = WindowCompat.getInsetsController(window, window.getDecorView());
+        if (bar.isEmpty() || bar.equals(BAR_STATUS_BAR)) {
+            windowInsetsControllerCompat.setAppearanceLightStatusBars(!style.equals(STYLE_DARK));
+        }
+
+        if (bar.isEmpty() || bar.equals(BAR_GESTURE_BAR)) {
+            windowInsetsControllerCompat.setAppearanceLightNavigationBars(!style.equals(STYLE_DARK));
+        }
+    }
+
+    private void setHidden(boolean hide, String bar) {
+        Window window = getActivity().getWindow();
+        WindowInsetsControllerCompat windowInsetsControllerCompat = WindowCompat.getInsetsController(window, window.getDecorView());
+
+        if (hide) {
+            if (bar.isEmpty() || bar.equals(BAR_STATUS_BAR)) {
+                windowInsetsControllerCompat.hide(WindowInsetsCompat.Type.statusBars());
+            }
+            if (bar.isEmpty() || bar.equals(BAR_GESTURE_BAR)) {
+                windowInsetsControllerCompat.hide(WindowInsetsCompat.Type.navigationBars());
+            }
+            return;
+        }
+
+        if (bar.isEmpty() || bar.equals(BAR_STATUS_BAR)) {
+            windowInsetsControllerCompat.show(WindowInsetsCompat.Type.systemBars());
+        }
+        if (bar.isEmpty() || bar.equals(BAR_GESTURE_BAR)) {
+            windowInsetsControllerCompat.show(WindowInsetsCompat.Type.navigationBars());
+        }
+    }
+
+    private String getStyleForTheme() {
+        int currentNightMode = getActivity().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        if (currentNightMode != Configuration.UI_MODE_NIGHT_YES) {
+            return STYLE_LIGHT;
+        }
+        return STYLE_DARK;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "8.0.0-alpha.3",
+  "version": "8.0.0-beta.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -23,7 +23,7 @@
     "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
   },
   "peerDependencies": {
-    "@capacitor/core": "^8.0.0-alpha.3"
+    "@capacitor/core": "^8.0.0-beta.0"
   },
   "publishConfig": {
     "access": "public"