@capgo/capacitor-inappbrowser 8.18.1 → 8.20.0

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

@@ -40,6 +40,7 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -74,6 +75,8 @@ import androidx.activity.OnBackPressedCallback;
 import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.TooltipCompat;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.FileProvider;
 import androidx.core.content.res.ResourcesCompat;
@@ -91,6 +94,8 @@ import com.caverock.androidsvg.SVG;
 import com.caverock.androidsvg.SVGParseException;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.color.DynamicColors;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -338,6 +343,154 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
     private SwipeRefreshLayout swipeRefreshLayout;
     private boolean reloadFromGestureInProgress = false;
     private WebView _webView;
+    private FullscreenWindowState nativeFullscreenWindow;
+    private FullscreenWindowState mediaFullscreenWindow;
+    private MaterialButton fullscreenExitButton;
+    private java.util.function.Consumer<Boolean> fullscreenChangeListener;
+    private final java.util.Map<View, Integer> fullscreenVisibility = new java.util.HashMap<>();
+    private int[] fullscreenPadding;
+    private CoordinatorLayout.Behavior<?> fullscreenContentBehavior;
+    private String fullscreenOrigin;
+
+    public void setFullscreenChangeListener(java.util.function.Consumer<Boolean> listener) {
+        fullscreenChangeListener = listener;
+    }
+
+    public boolean isFullscreen() {
+        return nativeFullscreenWindow != null;
+    }
+
+    public void clearFullscreen() {
+        if (_options != null) _options.setFullscreen(false);
+        exitCustomFullscreenView();
+        setFullscreen(false);
+    }
+
+    public void setFullscreen(boolean enabled) {
+        if (!enabled && _options != null) _options.setFullscreen(false);
+        if (enabled == isFullscreen()) return;
+        if (enabled) {
+            if (
+                _webView == null ||
+                !activeForBackNavigation ||
+                isDismissing ||
+                isHiddenModeActive ||
+                (_options != null &&
+                    (_options.isHidden() ||
+                        _options.isToBack() ||
+                        _options.getWidth() != null ||
+                        _options.getHeight() != null ||
+                        _options.getX() != null ||
+                        _options.getY() != null)) ||
+                backLayerActive ||
+                getWindow() == null
+            ) {
+                throw new IllegalStateException("Fullscreen requires a visible, full-size front WebView");
+            }
+            // Finish media first: its saved window state must not outlive the browser baseline.
+            exitCustomFullscreenView();
+            nativeFullscreenWindow = new FullscreenWindowState(getWindow());
+            fullscreenOrigin = origin(_webView.getUrl() != null ? _webView.getUrl() : _options.getUrl());
+            for (int id : new int[] { R.id.app_bar_layout, R.id.status_bar_color_view }) {
+                View view = findBrowserContentDescendant(id);
+                if (view != null) {
+                    fullscreenVisibility.put(view, view.getVisibility());
+                    view.setVisibility(View.GONE);
+                }
+            }
+            View container = findBrowserContentDescendant(R.id.content_browser_layout);
+            if (container != null) {
+                fullscreenPadding = new int[] {
+                    container.getPaddingLeft(),
+                    container.getPaddingTop(),
+                    container.getPaddingRight(),
+                    container.getPaddingBottom()
+                };
+                container.setPadding(0, 0, 0, 0);
+                if (container.getLayoutParams() instanceof CoordinatorLayout.LayoutParams params) {
+                    // A hidden appbar retains its measured height; its scrolling behavior still reserves that space.
+                    fullscreenContentBehavior = params.getBehavior();
+                    params.setBehavior(null);
+                    container.setLayoutParams(params);
+                }
+            }
+            nativeFullscreenWindow.enter();
+            // Scope Material styling to the overlay, including hosts without a Material theme.
+            Context buttonContext = DynamicColors.wrapContextIfAvailable(
+                new ContextThemeWrapper(getContext(), com.google.android.material.R.style.Theme_Material3_DayNight_NoActionBar)
+            );
+            ViewGroup decor = (ViewGroup) getWindow().getDecorView();
+            fullscreenExitButton = (MaterialButton) LayoutInflater.from(buttonContext).inflate(
+                R.layout.fullscreen_exit_button,
+                decor,
+                false
+            );
+            TooltipCompat.setTooltipText(fullscreenExitButton, getContext().getString(R.string.exit_fullscreen));
+            fullscreenExitButton.setOnClickListener((v) -> clearFullscreen());
+            decor.addView(fullscreenExitButton);
+            ViewCompat.setOnApplyWindowInsetsListener(fullscreenExitButton, (v, insets) -> {
+                updateFullscreenExitInsets(insets);
+                return insets;
+            });
+            ViewCompat.requestApplyInsets(fullscreenExitButton);
+        } else {
+            exitCustomFullscreenView();
+            FullscreenWindowState baseline = nativeFullscreenWindow;
+            nativeFullscreenWindow = null;
+            if (fullscreenExitButton != null && fullscreenExitButton.getParent() instanceof ViewGroup parent) parent.removeView(
+                fullscreenExitButton
+            );
+            fullscreenExitButton = null;
+            for (java.util.Map.Entry<View, Integer> entry : fullscreenVisibility.entrySet()) entry.getKey().setVisibility(entry.getValue());
+            fullscreenVisibility.clear();
+            View container = findBrowserContentDescendant(R.id.content_browser_layout);
+            if (container != null && fullscreenPadding != null) container.setPadding(
+                fullscreenPadding[0],
+                fullscreenPadding[1],
+                fullscreenPadding[2],
+                fullscreenPadding[3]
+            );
+            fullscreenPadding = null;
+            if (container != null && container.getLayoutParams() instanceof CoordinatorLayout.LayoutParams params) {
+                params.setBehavior(fullscreenContentBehavior);
+                container.setLayoutParams(params);
+            }
+            fullscreenContentBehavior = null;
+            baseline.restore();
+            reapplyInsetsFromWindowRoot();
+        }
+        if (fullscreenChangeListener != null) fullscreenChangeListener.accept(enabled);
+    }
+
+    private void updateFullscreenExitInsets(WindowInsetsCompat insets) {
+        if (fullscreenExitButton == null || insets == null) return;
+        // Hidden status bars need no space in landscape; cutouts and navigation gestures always do.
+        Insets safe = Insets.max(
+            insets.getInsets(WindowInsetsCompat.Type.systemBars()),
+            insets.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.navigationBars() | WindowInsetsCompat.Type.displayCutout())
+        );
+        FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) fullscreenExitButton.getLayoutParams();
+        int margin = getContext().getResources().getDimensionPixelSize(R.dimen.fullscreen_exit_margin);
+        params.topMargin = safe.top + margin;
+        params.rightMargin = safe.right + margin;
+        fullscreenExitButton.setLayoutParams(params);
+    }
+
+    private static String origin(String url) {
+        if (url == null) return null;
+        try {
+            URI uri = new URI(url);
+            String scheme = uri.getScheme();
+            String host = uri.getHost();
+            if (scheme == null || host == null) return url;
+            int port = uri.getPort();
+            if (port == -1) port = "https".equalsIgnoreCase(scheme) ? 443 : 80;
+            return scheme.toLowerCase(java.util.Locale.ROOT) + "://" + host.toLowerCase(java.util.Locale.ROOT) + ":" + port;
+        } catch (Exception error) {
+            return url;
+        }
+    }
+
     // HTML5/iframe fullscreen (e.g. embedded YouTube) routes through WebChromeClient custom views.
     private View customFullscreenView;
     private WebChromeClient.CustomViewCallback customViewCallback;
@@ -469,11 +622,24 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
     @Override
     protected void onStart() {
         super.onStart();
+        applyStartupFullscreen();
         // ComponentDialog registers its own back callback in onCreate; re-add ours last so
         // handleBrowserBackNavigation runs before the built-in cancel callback (LIFO order).
         ensureDialogBackHandlerOnTop();
     }
 
+    private void applyStartupFullscreen() {
+        if (_options != null && _options.isFullscreen() && !_options.isHidden()) {
+            _options.setFullscreen(false);
+            try {
+                setFullscreen(true);
+            } catch (IllegalStateException error) {
+                // Deferred presentation or page-initiated show may target an inactive WebView.
+                Log.w("InAppBrowser", "Skipping deferred fullscreen entry: " + error.getMessage());
+            }
+        }
+    }
+
     @Override
     public void show() {
         super.show();
@@ -698,6 +864,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
     }
 
     public boolean sendToBack(boolean transparentBackground) {
+        clearFullscreen();
         if (_options != null) {
             _options.setToBack(true);
             _options.setTransparentBackground(transparentBackground);
@@ -925,7 +1092,10 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                 Log.e("InAppBrowser", "Cannot hide - activity is null");
                 return;
             }
-            activity.runOnUiThread(() -> setHidden(true));
+            activity.runOnUiThread(() -> {
+                clearFullscreen();
+                setHidden(true);
+            });
         }
 
         @JavascriptInterface
@@ -2162,7 +2332,10 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         setContentView(R.layout.activity_browser);
 
         // If custom dimensions are set, configure for touch passthrough
-        if (_options != null && (_options.getWidth() != null || _options.getHeight() != null)) {
+        if (
+            _options != null &&
+            (_options.getWidth() != null || _options.getHeight() != null || _options.getX() != null || _options.getY() != null)
+        ) {
             Window window = getWindow();
             if (window != null) {
                 // Make the dialog background transparent
@@ -2850,9 +3023,9 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         }
 
         try {
-            loadInitialWebViewContent(requestHeaders);
             setupToolbar();
             setWebViewClient();
+            loadInitialWebViewContent(requestHeaders);
 
             if (this._options.isHidden()) {
                 if (_options.isPopupWindowMode() || _options.getInvisibilityMode() == Options.InvisibilityMode.FAKE_VISIBLE) {
@@ -3002,6 +3175,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         if (activeForBackNavigation == active) {
             return;
         }
+        if (!active && (isFullscreen() || customFullscreenView != null)) clearFullscreen();
         activeForBackNavigation = active;
         syncBackNavigationHandlers();
     }
@@ -3030,10 +3204,18 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
     }
 
     private boolean shouldConsumeBackPress() {
-        return WebViewBackNavigationSupport.shouldConsumeBackPress(isShowing(), isHiddenModeActive, backLayerActive);
+        return isFullscreen() || WebViewBackNavigationSupport.shouldConsumeBackPress(isShowing(), isHiddenModeActive, backLayerActive);
     }
 
     private void handleBrowserBackNavigation() {
+        if (WebViewCustomFullscreenSupport.shouldConsumeBackPress(customFullscreenView != null)) {
+            exitCustomFullscreenView();
+            return;
+        }
+        if (isFullscreen()) {
+            clearFullscreen();
+            return;
+        }
         if (_options == null) {
             dismiss();
             return;
@@ -3106,8 +3288,9 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             _webView.setVisibility(View.INVISIBLE);
         }
 
-        window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        WebViewCustomFullscreenSupport.enterImmersiveFullscreen(window, decorView);
+        mediaFullscreenWindow = new FullscreenWindowState(window);
+        mediaFullscreenWindow.enter();
+        if (fullscreenExitButton != null) fullscreenExitButton.bringToFront();
 
         if (WebViewCustomFullscreenSupport.shouldRegisterHostBackHandler(backLayerActive)) {
             registerCustomFullscreenBackHandler();
@@ -3162,15 +3345,12 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             _webView.setVisibility(View.VISIBLE);
         }
 
-        Window window = customFullscreenWindow != null ? customFullscreenWindow : getWindow();
-        if (window != null) {
-            window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-            WebViewCustomFullscreenSupport.exitImmersiveFullscreen(window, window.getDecorView());
-            reapplyInsetsFromWindowRoot();
-            if (SystemUiChromeSupport.requiresEdgeToEdgeChrome(Build.VERSION.SDK_INT)) {
-                refreshEdgeToEdgeChrome();
-            }
+        if (mediaFullscreenWindow != null) {
+            mediaFullscreenWindow.restore();
+            mediaFullscreenWindow = null;
         }
+        if (nativeFullscreenWindow != null) nativeFullscreenWindow.enter();
+        else reapplyInsetsFromWindowRoot();
 
         unregisterCustomFullscreenBackHandler();
 
@@ -3275,6 +3455,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
     }
 
     public void setHidden(boolean hidden) {
+        if (hidden && (isFullscreen() || (_options != null && !_options.isHidden()))) clearFullscreen();
         if (hidden) {
             if (!isHiddenModeActive) {
                 if (getWindow() == null) {
@@ -3314,6 +3495,9 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         }
         if (_options != null) {
             _options.setHidden(hidden);
+            if (isShowing()) {
+                applyStartupFullscreen();
+            }
         }
     }
 
@@ -3508,6 +3692,11 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
      * after portrait↔landscape transitions.
      */
     private void refreshLayoutForConfigurationChange() {
+        if (isFullscreen()) {
+            nativeFullscreenWindow.enter();
+            updateFullscreenExitInsets(ViewCompat.getRootWindowInsets(getWindow().getDecorView()));
+            return;
+        }
         if (isDismissing || _webView == null) {
             return;
         }
@@ -3684,6 +3873,18 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             return;
         }
 
+        if (isFullscreen()) {
+            updateFullscreenExitInsets(windowInsets);
+            View container = findBrowserContentDescendant(R.id.content_browser_layout);
+            if (container != null) {
+                // FLAG_FULLSCREEN disables adjustResize even before Android 15; keep only the keyboard inset.
+                int imeBottom = windowInsets.isVisible(WindowInsetsCompat.Type.ime())
+                    ? windowInsets.getInsets(WindowInsetsCompat.Type.ime()).bottom
+                    : 0;
+                container.setPadding(0, 0, 0, imeBottom);
+            }
+            return;
+        }
         Insets bars = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
         Insets navigationBars = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars());
         Insets systemGestures = windowInsets.getInsets(WindowInsetsCompat.Type.systemGestures());
@@ -6316,9 +6517,20 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                     super.onLoadResource(view, url);
                 }
 
+                @Override
+                public boolean onRenderProcessGone(WebView view, android.webkit.RenderProcessGoneDetail detail) {
+                    clearFullscreen();
+                    dismiss();
+                    return true;
+                }
+
                 @Override
                 public void onPageStarted(WebView view, String url, Bitmap favicon) {
                     super.onPageStarted(view, url, favicon);
+                    if (
+                        (isFullscreen() && !java.util.Objects.equals(fullscreenOrigin, origin(url))) ||
+                        (_options.isFullscreen() && !java.util.Objects.equals(origin(_options.getUrl()), origin(url)))
+                    ) clearFullscreen();
                     if (view == null || _webView == null) {
                         return;
                     }
@@ -6361,13 +6573,13 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                 @Override
                 public void onPageFinished(WebView view, String url) {
                     super.onPageFinished(view, url);
-                    if (view == null || _webView == null) {
+                    if (view == null || _webView != view || isDismissing) {
                         return;
                     }
                     if (!isInitialized) {
                         isInitialized = true;
                         _webView.clearHistory();
-                        if (_options.isPresentAfterPageLoad()) {
+                        if (_options.isPresentAfterPageLoad() && !_options.isHidden()) {
                             boolean usePreShowScript =
                                 _options.getPreShowScript() != null &&
                                 !_options.getPreShowScript().isEmpty() &&
@@ -6388,7 +6600,9 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                                                 new Runnable() {
                                                     @Override
                                                     public void run() {
-                                                        showAccordingToLayerModeOrFallback();
+                                                        if (isDismissing || _webView != view) return;
+                                                        // Visibility can change while the pre-show script is running.
+                                                        if (!_options.isHidden()) showAccordingToLayerModeOrFallback();
                                                         resolveOpenWebViewIfNeeded();
                                                     }
                                                 }
@@ -6554,7 +6768,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
 
     @Override
     public void dismiss() {
-        exitCustomFullscreenView();
+        clearFullscreen();
         unregisterConfigurationCallbacks();
         scheduleHostWebViewInsetRestore();
         detachBackLayer();
@@ -6962,6 +7176,8 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                 ? Base64.encodeToString(httpBody.getBytes(StandardCharsets.UTF_8), Base64.NO_WRAP)
                 : "";
 
+        // View.post waits for attachment; deferred presentation waits for this first load to finish.
+        // Dispatch through the main looper so hidden and present-after-load WebViews can start loading.
         executorService.execute(() -> {
             NativeRequestContext requestContext = new NativeRequestContext(
                 initialUrl,
@@ -6984,7 +7200,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                     if (_webView == null) {
                         return;
                     }
-                    _webView.post(() -> loadInitialUrlDirect(initialDirectHeaders, initialMethod, httpBody));
+                    mainHandler.post(() -> loadInitialUrlDirect(initialDirectHeaders, initialMethod, httpBody));
                     return;
                 }
 
@@ -7000,7 +7216,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                     return;
                 }
 
-                _webView.post(() -> {
+                mainHandler.post(() -> {
                     if (_webView == null) {
                         return;
                     }
@@ -7015,7 +7231,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                     ProxyRequestSupport.createNativeRequestFailureBody(initialUrl, error),
                     StandardCharsets.UTF_8
                 );
-                _webView.post(() -> {
+                mainHandler.post(() -> {
                     if (_webView == null) {
                         return;
                     }
@@ -7700,6 +7916,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
      * Update dimensions at runtime
      */
     public void updateDimensions(Integer width, Integer height, Integer x, Integer y) {
+        clearFullscreen();
         // Update options
         if (width != null) {
             _options.setWidth(width);

package/android/src/main/res/drawable/ic_fullscreen_exit.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Google Material Icons: fullscreen_exit (Apache License 2.0). -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FF000000"
+        android:pathData="M5,16h3v3h2v-5H5v2zM8,8H5v2h5V5H8v3zM14,19h2v-3h3v-2h-5v5zM16,8V5h-2v5h5V8h-3z" />
+</vector>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- The native exit control stays physically top-right in every layout direction. -->
+<com.google.android.material.button.MaterialButton
+    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"
+    tools:ignore="RtlHardcoded"
+    style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:layout_gravity="top|right"
+    android:layout_marginTop="@dimen/fullscreen_exit_margin"
+    android:layout_marginRight="@dimen/fullscreen_exit_margin"
+    android:contentDescription="@string/exit_fullscreen"
+    android:insetLeft="4dp"
+    android:insetTop="4dp"
+    android:insetRight="4dp"
+    android:insetBottom="4dp"
+    android:padding="12dp"
+    app:icon="@drawable/ic_fullscreen_exit"
+    app:iconGravity="textStart"
+    app:iconSize="24dp"
+    app:iconPadding="0dp"
+    app:shapeAppearance="@xml/fullscreen_exit_shape" />

package/android/src/main/res/values/fullscreen_exit.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- With the button's 4dp visual inset, this leaves an 8dp gap inside the safe area. -->
+    <dimen name="fullscreen_exit_margin">4dp</dimen>
+    <style name="FullscreenExitShape" parent="ShapeAppearance.Material3.Corner.Full" />
+    <style name="FullscreenExitPressedShape" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">8dp</item>
+    </style>
+</resources>

package/android/src/main/res/values/strings.xml

@@ -3,6 +3,7 @@
     <string name="my_string">Just a simple string</string>
     <string name="title_activity_browser">BrowserActivity</string>
     <string name="title_activity_basic">BasicActivity</string>
+    <string name="exit_fullscreen">Exit fullscreen</string>
     <string name="close_button">Close Button</string>
     <string name="button_near_done">Button near "done"</string>
     <string name="reload_button">Reload Button</string>

package/android/src/main/res/xml/fullscreen_exit_shape.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:state_pressed="true" app:shapeAppearance="@style/FullscreenExitPressedShape" />
+    <item app:shapeAppearance="@style/FullscreenExitShape" />
+</selector>