@capgo/capacitor-inappbrowser 8.16.5 → 8.17.0

package/README.md

@@ -1606,6 +1606,7 @@ See the README section "openSecureWindow (OAuth)" for full setup examples.
 | **`isAnimated`**                       | <code>boolean</code>                                                                                                                                                   | Whether the webview opening is animated or not, ios only                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | <code>true</code>                                             |        |
 | **`showReloadButton`**                 | <code>boolean</code>                                                                                                                                                   | Shows a reload button that reloads the web page                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | <code>false</code>                                            | 1.0.15 |
 | **`closeAction`**                      | <code><a href="#closeaction">CloseAction</a></code>                                                                                                                    | closeAction controls what happens when the native toolbar close button is pressed. This does not change the behavior of close(), JavaScript window.mobileApp.close(), or native back navigation.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | <code>CloseAction.CLOSE</code>                                | 8.7.7  |
+| **`closeButtonPosition`**              | <code><a href="#closebuttonposition">CloseButtonPosition</a></code>                                                                                                    | Where the native toolbar close button is placed. When omitted, each platform keeps its convention: Android places the close button at the start, iOS at the end (or at the start when `showArrow` is true). Setting this option overrides that placement on both platforms.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |                                                               | 8.17.0 |
 | **`screenshotOnHide`**                 | <code>boolean</code>                                                                                                                                                   | Captures the visible webview and includes it as `screenshot` in `hideEvent` before the toolbar close button hides the webview. Only applies when `closeAction` is <a href="#closeaction">`CloseAction.HIDE`</a>. On iOS, capture uses `WKWebView.takeSnapshot`. When testing through Apple's iPhone Mirroring app with the physical device locked, the snapshot can succeed with the correct dimensions but a fully transparent PNG. Capture works as expected on a normal unlocked device. This appears to be an Apple mirroring limitation rather than a plugin bug.                                                                                                                                                                                                                                                                                                                                                 | <code>false</code>                                            | 8.7.10 |
 | **`closeModal`**                       | <code>boolean</code>                                                                                                                                                   | CloseModal: if true a confirm will be displayed when user clicks on close button, if false the browser will be closed immediately.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | <code>false</code>                                            | 1.1.0  |
 | **`closeModalTitle`**                  | <code>string</code>                                                                                                                                                    | CloseModalTitle: title of the confirm when user clicks on close button                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | <code>"Close"</code>                                          | 1.1.0  |
@@ -2015,6 +2016,14 @@ Native handling mode used after a managed download finishes.
 | **`HIDE`**  | <code>'hide'</code>  | The toolbar close button hides the webview so it can be shown again. |
 
 
+#### CloseButtonPosition
+
+| Members     | Value                | Description                                                    |
+| ----------- | -------------------- | -------------------------------------------------------------- |
+| **`START`** | <code>'start'</code> | Leading edge of the toolbar (left in left-to-right layouts).   |
+| **`END`**   | <code>'end'</code>   | Trailing edge of the toolbar (right in left-to-right layouts). |
+
+
 #### InvisibilityMode
 
 | Members            | Value                       | Description                                                                             |

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

@@ -1072,6 +1072,15 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
             return;
         }
         options.setCloseAction(closeAction);
+        String closeButtonPosition = call.getString("closeButtonPosition");
+        if (closeButtonPosition != null) {
+            closeButtonPosition = closeButtonPosition.toLowerCase(Locale.ROOT);
+            if (CloseButtonPositionSupport.gravityFor(closeButtonPosition) == null) {
+                call.reject("closeButtonPosition must be 'start' or 'end'");
+                return;
+            }
+        }
+        options.setCloseButtonPosition(closeButtonPosition);
         options.setTitleFontFamily(call.getString("titleFontFamily"));
         JSObject titleIconObj = call.getObject("titleIcon");
         if (titleIconObj != null) {

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

@@ -0,0 +1,35 @@
+package ee.forgr.capacitor_inappbrowser;
+
+import android.view.Gravity;
+
+/**
+ * Maps the {@code closeButtonPosition} option onto toolbar layout values.
+ */
+final class CloseButtonPositionSupport {
+
+    /** End padding that visually matches the start side's toolbar content inset. */
+    static final int END_PADDING_DP = 20;
+
+    private CloseButtonPositionSupport() {}
+
+    /** Toolbar gravity for the option value, or {@code null} to keep the layout default. */
+    static Integer gravityFor(String closeButtonPosition) {
+        if ("start".equals(closeButtonPosition)) {
+            return Gravity.START;
+        }
+        if ("end".equals(closeButtonPosition)) {
+            return Gravity.END;
+        }
+        return null;
+    }
+
+    /**
+     * Keeps the layout's edge nudge pointing outwards for the resolved gravity.
+     * Resolves start/end against the layout direction so RTL mirrors correctly.
+     */
+    static float mirroredTranslationX(int gravity, int layoutDirection, float translationX) {
+        int absoluteGravity = Gravity.getAbsoluteGravity(gravity, layoutDirection);
+        float outwards = Math.abs(translationX);
+        return absoluteGravity == Gravity.RIGHT ? outwards : -outwards;
+    }
+}

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

@@ -146,6 +146,7 @@ public class Options {
     private String CloseModalCancel;
     private ButtonNearDone buttonNearDone;
     private String closeAction = "close";
+    private String closeButtonPosition;
     private String titleFontFamily;
     private ButtonNearDone titleIcon;
     private String CloseModalOk;
@@ -466,6 +467,14 @@ public class Options {
         this.closeAction = closeAction;
     }
 
+    public String getCloseButtonPosition() {
+        return closeButtonPosition;
+    }
+
+    public void setCloseButtonPosition(String closeButtonPosition) {
+        this.closeButtonPosition = closeButtonPosition;
+    }
+
     public String getTitleFontFamily() {
         return titleFontFamily;
     }
@@ -834,6 +843,7 @@ public class Options {
         copy.setCloseModalURLPattern(closeModalURLPattern);
         copy.setButtonNearDone(buttonNearDone);
         copy.setCloseAction(closeAction);
+        copy.setCloseButtonPosition(closeButtonPosition);
         copy.setTitleFontFamily(titleFontFamily);
         copy.setTitleIcon(titleIcon);
         copy.setUrl("about:blank");

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

@@ -16,11 +16,13 @@ final class OrientationLayoutSupport {
         Integer previousScreenHeightDp,
         Integer previousSmallestScreenWidthDp,
         Integer previousDensityDpi,
+        Integer previousUiMode,
         int currentOrientation,
         int currentScreenWidthDp,
         int currentScreenHeightDp,
         int currentSmallestScreenWidthDp,
-        int currentDensityDpi
+        int currentDensityDpi,
+        int currentUiMode
     ) {
         if (previousOrientation == null) {
             return true;
@@ -35,7 +37,9 @@ final class OrientationLayoutSupport {
             previousSmallestScreenWidthDp == null ||
             previousSmallestScreenWidthDp != currentSmallestScreenWidthDp ||
             previousDensityDpi == null ||
-            previousDensityDpi != currentDensityDpi
+            previousDensityDpi != currentDensityDpi ||
+            previousUiMode == null ||
+            previousUiMode != currentUiMode
         );
     }
 }

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

@@ -34,6 +34,17 @@ final class SystemUiChromeSupport {
         return !edgeToEdge && shouldUsePreApi30LayoutFlags(sdkInt);
     }
 
+    /**
+     * Color painted behind the browser content, visible in the system bar insets. Follows the toolbar
+     * color when one is set, otherwise the system theme, so the dialog theme's default never shows.
+     */
+    static int resolveWindowBackgroundColor(Integer toolbarColor, boolean darkTheme) {
+        if (toolbarColor != null) {
+            return toolbarColor;
+        }
+        return darkTheme ? Color.BLACK : Color.WHITE;
+    }
+
     static void setDecorFitsSystemWindows(Window window, boolean decorFitsSystemWindows) {
         if (window == null) {
             return;

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

@@ -25,7 +25,9 @@ final class WebViewBackNavigationSupport {
     /**
      * When {@code disableGoBackOnNativeApplication} is true, the dialog must not be cancelable on
      * back/gesture. Otherwise {@link androidx.activity.ComponentDialog}'s built-in back callback
-     * dismisses the dialog before our handler can return {@link Action#IGNORE}.
+     * dismisses the dialog before our handler can return {@link Action#IGNORE}. While cancelable is
+     * false that built-in callback still consumes back without dismissing, so {@link WebViewDialog}
+     * must keep its own callback registered last on the dispatcher.
      */
     static boolean isCancelableOnBack(boolean disableGoBackOnNativeApplication) {
         return !disableGoBackOnNativeApplication;

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

@@ -469,7 +469,9 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
     @Override
     protected void onStart() {
         super.onStart();
-        syncBackNavigationHandlers();
+        // ComponentDialog registers its own back callback in onCreate; re-add ours last so
+        // handleBrowserBackNavigation runs before the built-in cancel callback (LIFO order).
+        ensureDialogBackHandlerOnTop();
     }
 
     @Override
@@ -2212,9 +2214,9 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                                 boolean isDarkBackground = isDarkColor(toolbarColor);
                                 insetsController.setAppearanceLightStatusBars(!isDarkBackground);
                             } catch (IllegalArgumentException e) {
-                                // Fallback to default black if color parsing fails
-                                statusBarColorView.setBackgroundColor(Color.BLACK);
-                                insetsController.setAppearanceLightStatusBars(false);
+                                int fallbackColor = resolveWindowBackgroundColor();
+                                statusBarColorView.setBackgroundColor(fallbackColor);
+                                insetsController.setAppearanceLightStatusBars(!isDarkThemeEnabled());
                             }
                         } else {
                             // Follow system dark mode if no toolbar color provided
@@ -2921,6 +2923,19 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         if (dialogBackCallback != null) {
             return;
         }
+        ensureDialogBackHandlerOnTop();
+    }
+
+    /**
+     * Re-register the dialog back callback so it sits above {@link ComponentDialog}'s built-in
+     * callback. That callback is always enabled and consumes back without dismissing when
+     * {@link #setCancelable(boolean)} is false, which would block webview history navigation.
+     */
+    private void ensureDialogBackHandlerOnTop() {
+        if (dialogBackCallback != null) {
+            dialogBackCallback.remove();
+            dialogBackCallback = null;
+        }
         // Predictive back (API 33+) never delivers KEYCODE_BACK to Dialog OnKeyListener.
         dialogBackCallback = new OnBackPressedCallback(false) {
             @Override
@@ -2949,7 +2964,11 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
     void applyBackNavigationPolicy() {
         boolean disableGoBack = _options != null && _options.getDisableGoBackOnNativeApplication();
         setCancelable(WebViewBackNavigationSupport.isCancelableOnBack(disableGoBack));
-        syncBackNavigationHandlers();
+        if (isShowing()) {
+            ensureDialogBackHandlerOnTop();
+        } else {
+            syncBackNavigationHandlers();
+        }
     }
 
     private void syncBackNavigationHandlers() {
@@ -3431,6 +3450,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         Integer previousScreenHeightDp = lastConfiguration != null ? lastConfiguration.screenHeightDp : null;
         Integer previousSmallestScreenWidthDp = lastConfiguration != null ? lastConfiguration.smallestScreenWidthDp : null;
         Integer previousDensityDpi = lastConfiguration != null ? lastConfiguration.densityDpi : null;
+        Integer previousUiMode = lastConfiguration != null ? lastConfiguration.uiMode : null;
 
         int currentOrientation = newConfig != null ? newConfig.orientation : (previousOrientation != null ? previousOrientation : 0);
         int currentScreenWidthDp =
@@ -3442,6 +3462,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
                 ? newConfig.smallestScreenWidthDp
                 : (previousSmallestScreenWidthDp != null ? previousSmallestScreenWidthDp : 0);
         int currentDensityDpi = newConfig != null ? newConfig.densityDpi : (previousDensityDpi != null ? previousDensityDpi : 0);
+        int currentUiMode = newConfig != null ? newConfig.uiMode : (previousUiMode != null ? previousUiMode : 0);
 
         boolean shouldRefresh = OrientationLayoutSupport.shouldRefreshBrowserLayout(
             previousOrientation,
@@ -3449,11 +3470,13 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             previousScreenHeightDp,
             previousSmallestScreenWidthDp,
             previousDensityDpi,
+            previousUiMode,
             currentOrientation,
             currentScreenWidthDp,
             currentScreenHeightDp,
             currentSmallestScreenWidthDp,
-            currentDensityDpi
+            currentDensityDpi,
+            currentUiMode
         );
 
         if (newConfig != null) {
@@ -3494,6 +3517,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         }
 
         ensureContentBrowserMatchParentHeight();
+        applyWindowBackgroundColor();
 
         boolean isBlankToolbar = _options != null && TextUtils.equals(_options.getToolbarType(), "blank");
         if (isBlankToolbar) {
@@ -3580,18 +3604,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         appBarLayout.setStateListAnimator(null);
         appBarLayout.setOutlineProvider(null);
 
-        int backgroundColor = Color.BLACK;
-        if (_options.getToolbarColor() != null && !_options.getToolbarColor().isEmpty()) {
-            try {
-                backgroundColor = Color.parseColor(_options.getToolbarColor());
-            } catch (IllegalArgumentException e) {
-                Log.e("InAppBrowser", "Invalid toolbar color, using black: " + e.getMessage());
-            }
-        } else {
-            backgroundColor = isDarkThemeEnabled() ? Color.BLACK : Color.WHITE;
-        }
-
-        final int finalBgColor = backgroundColor;
+        final int finalBgColor = resolveWindowBackgroundColor();
         _webView.post(() -> {
             if (_webView == null) {
                 return;
@@ -3611,6 +3624,12 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
 
             applyAppBarTopInset(appBarLayout, appBarHandlesTopInset(toolbarView) ? statusBarHeight : 0);
             appBarLayout.setBackgroundColor(finalBgColor);
+
+            Window window = getWindow();
+            if (window != null) {
+                WindowInsetsControllerCompat insetsController = new WindowInsetsControllerCompat(window, window.getDecorView());
+                insetsController.setAppearanceLightStatusBars(!isDarkColor(finalBgColor));
+            }
         });
     }
 
@@ -3855,6 +3874,29 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         }
     }
 
+    private int resolveWindowBackgroundColor() {
+        Integer toolbarColor = null;
+        if (_options.getToolbarColor() != null && !_options.getToolbarColor().isEmpty()) {
+            try {
+                toolbarColor = Color.parseColor(_options.getToolbarColor());
+            } catch (IllegalArgumentException e) {
+                Log.e("InAppBrowser", "Invalid toolbar color, using theme default: " + e.getMessage());
+            }
+        }
+        return SystemUiChromeSupport.resolveWindowBackgroundColor(toolbarColor, isDarkThemeEnabled());
+    }
+
+    private void applyWindowBackgroundColor() {
+        // Custom dimensions keep the window transparent for touch passthrough
+        if (_options.getWidth() != null || _options.getHeight() != null) {
+            return;
+        }
+        Window window = getWindow();
+        if (window != null) {
+            window.getDecorView().setBackgroundColor(resolveWindowBackgroundColor());
+        }
+    }
+
     private int getSystemStatusBarHeight() {
         int resourceId = getContext().getResources().getIdentifier("status_bar_height", "dimen", "android");
         if (resourceId <= 0) {
@@ -4932,62 +4974,85 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
 
     private void setupToolbar() {
         _toolbar = findViewById(R.id.tool_bar);
+        applyWindowBackgroundColor();
 
         // Apply toolbar color early, for ALL toolbar types, before any view configuration
         if (_options.getToolbarColor() != null && !_options.getToolbarColor().isEmpty()) {
+            int toolbarColor;
             try {
-                int toolbarColor = Color.parseColor(_options.getToolbarColor());
-                _toolbar.setBackgroundColor(toolbarColor);
+                toolbarColor = Color.parseColor(_options.getToolbarColor());
+            } catch (IllegalArgumentException e) {
+                Log.e("InAppBrowser", "Invalid toolbar color, using theme default: " + e.getMessage());
+                toolbarColor = resolveWindowBackgroundColor();
+            }
 
-                // Get toolbar title and ensure it gets the right color
-                TextView titleText = _toolbar.findViewById(R.id.titleText);
+            _toolbar.setBackgroundColor(toolbarColor);
 
-                // Determine icon and text color
-                cachedTitleIconDrawable = null;
-                cachedTitleIconResolved = false;
+            // Get toolbar title and ensure it gets the right color
+            TextView titleText = _toolbar.findViewById(R.id.titleText);
 
-                int iconColor;
-                if (_options.getToolbarTextColor() != null && !_options.getToolbarTextColor().isEmpty()) {
-                    try {
-                        iconColor = Color.parseColor(_options.getToolbarTextColor());
-                    } catch (IllegalArgumentException e) {
-                        // Fallback to automatic detection if parsing fails
-                        boolean isDarkBackground = isDarkColor(toolbarColor);
-                        iconColor = isDarkBackground ? Color.WHITE : Color.BLACK;
-                    }
-                } else {
-                    // No explicit toolbarTextColor, use automatic detection based on background
+            // Determine icon and text color
+            cachedTitleIconDrawable = null;
+            cachedTitleIconResolved = false;
+
+            int iconColor;
+            if (_options.getToolbarTextColor() != null && !_options.getToolbarTextColor().isEmpty()) {
+                try {
+                    iconColor = Color.parseColor(_options.getToolbarTextColor());
+                } catch (IllegalArgumentException e) {
+                    // Fallback to automatic detection if parsing fails
                     boolean isDarkBackground = isDarkColor(toolbarColor);
                     iconColor = isDarkBackground ? Color.WHITE : Color.BLACK;
                 }
+            } else {
+                // No explicit toolbarTextColor, use automatic detection based on background
+                boolean isDarkBackground = isDarkColor(toolbarColor);
+                iconColor = isDarkBackground ? Color.WHITE : Color.BLACK;
+            }
 
-                // Store for later use with navigation buttons
-                this.iconColor = iconColor;
+            // Store for later use with navigation buttons
+            this.iconColor = iconColor;
 
-                // Set title text color directly
-                titleText.setTextColor(iconColor);
+            // Set title text color directly
+            titleText.setTextColor(iconColor);
 
-                // Apply colors to all buttons
-                applyColorToAllButtons(toolbarColor, iconColor);
+            // Apply colors to all buttons
+            applyColorToAllButtons(toolbarColor, iconColor);
 
-                // Also ensure status bar gets the color
-                if (getWindow() != null) {
-                    SystemUiChromeSupport.applyLegacyStatusBarColorViaView(findViewById(R.id.status_bar_color_view), toolbarColor);
+            // Also ensure status bar gets the color
+            if (getWindow() != null) {
+                SystemUiChromeSupport.applyLegacyStatusBarColorViaView(findViewById(R.id.status_bar_color_view), toolbarColor);
 
-                    // Determine proper status bar text color (light or dark icons)
-                    boolean isDarkBackground = isDarkColor(toolbarColor);
-                    WindowInsetsControllerCompat insetsController = new WindowInsetsControllerCompat(
-                        getWindow(),
-                        getWindow().getDecorView()
-                    );
-                    insetsController.setAppearanceLightStatusBars(!isDarkBackground);
-                }
-            } catch (IllegalArgumentException e) {
-                Log.e("InAppBrowser", "Invalid toolbar color: " + _options.getToolbarColor());
+                // Determine proper status bar text color (light or dark icons)
+                boolean isDarkBackground = isDarkColor(toolbarColor);
+                WindowInsetsControllerCompat insetsController = new WindowInsetsControllerCompat(getWindow(), getWindow().getDecorView());
+                insetsController.setAppearanceLightStatusBars(!isDarkBackground);
             }
         }
 
         ImageButton closeButtonView = _toolbar.findViewById(R.id.closeButton);
+        Integer closeButtonGravity = CloseButtonPositionSupport.gravityFor(_options.getCloseButtonPosition());
+        if (closeButtonGravity != null && closeButtonView.getLayoutParams() instanceof Toolbar.LayoutParams closeButtonParams) {
+            int verticalGravity = closeButtonParams.gravity & Gravity.VERTICAL_GRAVITY_MASK;
+            closeButtonParams.gravity = verticalGravity | closeButtonGravity;
+            closeButtonView.setLayoutParams(closeButtonParams);
+            closeButtonView.setTranslationX(
+                CloseButtonPositionSupport.mirroredTranslationX(
+                    closeButtonGravity,
+                    _context.getResources().getConfiguration().getLayoutDirection(),
+                    closeButtonView.getTranslationX()
+                )
+            );
+            // Toolbar only insets the start edge; pad the logical end so the icon keeps clear of the screen edge
+            if (closeButtonGravity == Gravity.END) {
+                closeButtonView.setPaddingRelative(
+                    closeButtonView.getPaddingStart(),
+                    closeButtonView.getPaddingTop(),
+                    (int) getPixels(CloseButtonPositionSupport.END_PADDING_DP),
+                    closeButtonView.getPaddingBottom()
+                );
+            }
+        }
         closeButtonView.setOnClickListener(
             new View.OnClickListener() {
                 @Override
@@ -5091,41 +5156,10 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             configureBlankToolbarLayout();
             requestSafeAreaInsets();
 
-            // Also set window background color to match status bar for blank toolbar
+            // Without a toolbar the status bar view is the only chrome, so it follows the window color
             View statusBarColorView = findViewById(R.id.status_bar_color_view);
-            if (_options.getToolbarColor() != null && !_options.getToolbarColor().isEmpty()) {
-                try {
-                    int toolbarColor = Color.parseColor(_options.getToolbarColor());
-                    if (getWindow() != null) {
-                        getWindow().getDecorView().setBackgroundColor(toolbarColor);
-                    }
-                    // Also set status bar color view background if available
-                    if (statusBarColorView != null) {
-                        statusBarColorView.setBackgroundColor(toolbarColor);
-                    }
-                } catch (IllegalArgumentException e) {
-                    // Fallback to system default if color parsing fails
-                    boolean isDarkTheme = isDarkThemeEnabled();
-                    int windowBackgroundColor = isDarkTheme ? Color.BLACK : Color.WHITE;
-                    if (getWindow() != null) {
-                        getWindow().getDecorView().setBackgroundColor(windowBackgroundColor);
-                    }
-                    // Also set status bar color view background if available
-                    if (statusBarColorView != null) {
-                        statusBarColorView.setBackgroundColor(windowBackgroundColor);
-                    }
-                }
-            } else {
-                // Follow system dark mode
-                boolean isDarkTheme = isDarkThemeEnabled();
-                int windowBackgroundColor = isDarkTheme ? Color.BLACK : Color.WHITE;
-                if (getWindow() != null) {
-                    getWindow().getDecorView().setBackgroundColor(windowBackgroundColor);
-                }
-                // Also set status bar color view background if available
-                if (statusBarColorView != null) {
-                    statusBarColorView.setBackgroundColor(windowBackgroundColor);
-                }
+            if (statusBarColorView != null) {
+                statusBarColorView.setBackgroundColor(resolveWindowBackgroundColor());
             }
         } else {
             _toolbar.findViewById(R.id.forwardButton).setVisibility(View.GONE);

package/dist/docs.json

@@ -1954,6 +1954,24 @@
           ],
           "type": "CloseAction"
         },
+        {
+          "name": "closeButtonPosition",
+          "tags": [
+            {
+              "text": "8.17.0",
+              "name": "since"
+            },
+            {
+              "text": "closeButtonPosition: CloseButtonPosition.END",
+              "name": "example"
+            }
+          ],
+          "docs": "Where the native toolbar close button is placed.\n\nWhen omitted, each platform keeps its convention: Android places the close button at the\nstart, iOS at the end (or at the start when `showArrow` is true). Setting this option\noverrides that placement on both platforms.",
+          "complexTypes": [
+            "CloseButtonPosition"
+          ],
+          "type": "CloseButtonPosition"
+        },
         {
           "name": "screenshotOnHide",
           "tags": [
@@ -3654,6 +3672,24 @@
         }
       ]
     },
+    {
+      "name": "CloseButtonPosition",
+      "slug": "closebuttonposition",
+      "members": [
+        {
+          "name": "START",
+          "value": "'start'",
+          "tags": [],
+          "docs": "Leading edge of the toolbar (left in left-to-right layouts)."
+        },
+        {
+          "name": "END",
+          "value": "'end'",
+          "tags": [],
+          "docs": "Trailing edge of the toolbar (right in left-to-right layouts)."
+        }
+      ]
+    },
     {
       "name": "InvisibilityMode",
       "slug": "invisibilitymode",

package/dist/esm/definitions.d.ts

@@ -105,6 +105,16 @@ export declare enum CloseAction {
      */
     HIDE = "hide"
 }
+export declare enum CloseButtonPosition {
+    /**
+     * Leading edge of the toolbar (left in left-to-right layouts).
+     */
+    START = "start",
+    /**
+     * Trailing edge of the toolbar (right in left-to-right layouts).
+     */
+    END = "end"
+}
 export interface ToolbarTitleIconOptions {
     ios?: {
         iconType: 'sf-symbol' | 'asset';
@@ -975,6 +985,18 @@ export interface OpenWebViewOptions {
      * closeAction: CloseAction.HIDE
      */
     closeAction?: CloseAction;
+    /**
+     * Where the native toolbar close button is placed.
+     *
+     * When omitted, each platform keeps its convention: Android places the close button at the
+     * start, iOS at the end (or at the start when `showArrow` is true). Setting this option
+     * overrides that placement on both platforms.
+     *
+     * @since 8.17.0
+     * @example
+     * closeButtonPosition: CloseButtonPosition.END
+     */
+    closeButtonPosition?: CloseButtonPosition;
     /**
      * Captures the visible webview and includes it as `screenshot` in `hideEvent`
      * before the toolbar close button hides the webview.

package/dist/esm/definitions.js

@@ -48,4 +48,15 @@ export var CloseAction;
      */
     CloseAction["HIDE"] = "hide";
 })(CloseAction || (CloseAction = {}));
+export var CloseButtonPosition;
+(function (CloseButtonPosition) {
+    /**
+     * Leading edge of the toolbar (left in left-to-right layouts).
+     */
+    CloseButtonPosition["START"] = "start";
+    /**
+     * Trailing edge of the toolbar (right in left-to-right layouts).
+     */
+    CloseButtonPosition["END"] = "end";
+})(CloseButtonPosition || (CloseButtonPosition = {}));
 //# sourceMappingURL=definitions.js.map