@capgo/capacitor-inappbrowser 8.7.9 → 8.8.0

package/README.md

@@ -148,6 +148,34 @@ await InAppBrowser.hide({ id: first.id });
 await InAppBrowser.show({ id: second.id });
 ```
 
+#### Hide from the native close button and brand the toolbar title
+
+Use `closeAction: CloseAction.HIDE` when the toolbar close button should hide the WebView instead of destroying it. Listen to `hideEvent` if your app needs to update Ionic state, then call `show()` later to bring the same browser session back.
+
+```js
+import { CloseAction, InAppBrowser } from '@capgo/capacitor-inappbrowser';
+
+await InAppBrowser.addListener('hideEvent', ({ id, url }) => {
+  console.log('Browser hidden', id, url);
+});
+
+const { id } = await InAppBrowser.openWebView({
+  url: 'https://example.com/checkout',
+  title: 'Secure checkout',
+  closeAction: CloseAction.HIDE,
+  titleFontFamily: 'Inter',
+  titleIcon: {
+    ios: { iconType: 'sf-symbol', icon: 'lock.fill' },
+    android: { iconType: 'vector', icon: 'ic_lock', width: 20, height: 20 },
+  },
+});
+
+// Later, after the toolbar close button hides it:
+await InAppBrowser.show({ id });
+```
+
+For iOS, `titleFontFamily` must match a registered font family name and `titleIcon` can use either an SF Symbol or bundled asset. For Android, `titleFontFamily` first checks `res/font` and then falls back to a system font family; `titleIcon` can use a vector drawable or bundled SVG asset.
+
 #### Embed advanced web app flows
 
 Use proxy rules and `handleDownloads` for web apps that need request control, file uploads, downloads, or controlled popup behavior inside the managed browser. Typical examples include document portals, support desks, payment pages, Google Pay flows on Android, and apps that need to keep `_blank` links inside the same managed WebView.
@@ -520,6 +548,7 @@ The W3C Payment Request API (used by Google Pay) requires Android WebView 120+.
 * [`addListener('urlChangeEvent', ...)`](#addlistenerurlchangeevent-)
 * [`addListener('buttonNearDoneClick', ...)`](#addlistenerbuttonneardoneclick-)
 * [`addListener('closeEvent', ...)`](#addlistenercloseevent-)
+* [`addListener('hideEvent', ...)`](#addlistenerhideevent-)
 * [`addListener('confirmBtnClicked', ...)`](#addlistenerconfirmbtnclicked-)
 * [`addListener('messageFromWebview', ...)`](#addlistenermessagefromwebview-)
 * [`addListener('screenshotTaken', ...)`](#addlistenerscreenshottaken-)
@@ -943,6 +972,26 @@ Listen for close click only for openWebView
 --------------------
 
 
+### addListener('hideEvent', ...)
+
+```typescript
+addListener(eventName: 'hideEvent', listenerFunc: UrlChangeListener) => Promise<PluginListenerHandle>
+```
+
+Listen for webviews hidden by the toolbar close button when closeAction is <a href="#closeaction">CloseAction.HIDE</a>.
+
+| Param              | Type                                                            |
+| ------------------ | --------------------------------------------------------------- |
+| **`eventName`**    | <code>'hideEvent'</code>                                        |
+| **`listenerFunc`** | <code><a href="#urlchangelistener">UrlChangeListener</a></code> |
+
+**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt;</code>
+
+**Since:** 8.7.7
+
+--------------------
+
+
 ### addListener('confirmBtnClicked', ...)
 
 ```typescript
@@ -1430,6 +1479,8 @@ And in the AndroidManifest.xml file:
 | **`toolbarType`**                      | <code><a href="#toolbartype">ToolBarType</a></code>                                                                                                                    | Toolbar type determines the appearance and behavior of the browser's toolbar - "activity": Shows a simple toolbar with just a close button and share button - "navigation": Shows a full navigation toolbar with back/forward buttons - "blank": Shows no toolbar - "": Default toolbar with close button                                                                                                                                                                                                                                                  | <code>ToolBarType.DEFAULT</code>                              | 0.1.0  |
 | **`shareSubject`**                     | <code>string</code>                                                                                                                                                    | Subject text for sharing. Required when using shareDisclaimer. This text will be used as the subject line when sharing content.                                                                                                                                                                                                                                                                                                                                                                                                                            |                                                               | 0.1.0  |
 | **`title`**                            | <code>string</code>                                                                                                                                                    | Title of the browser                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | <code>"New Window"</code>                                     | 0.1.0  |
+| **`titleFontFamily`**                  | <code>string</code>                                                                                                                                                    | Native toolbar title font family. On iOS, use the registered font family name. On Android, the plugin first tries a res/font resource name, then falls back to a system font family name.                                                                                                                                                                                                                                                                                                                                                                  |                                                               | 8.7.7  |
+| **`titleIcon`**                        | <code><a href="#toolbartitleiconoptions">ToolbarTitleIconOptions</a></code>                                                                                            | Native toolbar title icon displayed before the title text. For Android: - iconType can be "asset" for a bundled SVG asset or "vector" for a drawable resource - icon path should be in the public folder for assets (e.g. "brand.svg") - width and height are optional and default to 24dp For iOS: - iconType can be "sf-symbol" or "asset" - for sf-symbol, icon should be the symbol name - for asset, icon should be the asset name or bundled web asset path                                                                                          |                                                               | 8.7.7  |
 | **`backgroundColor`**                  | <code><a href="#backgroundcolor">BackgroundColor</a></code>                                                                                                            | Background color of the browser                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | <code>BackgroundColor.BLACK</code>                            | 0.1.0  |
 | **`activeNativeNavigationForWebview`** | <code>boolean</code>                                                                                                                                                   | If true, enables native navigation gestures within the webview. - Android: Native back button navigates within webview history - iOS: Enables swipe left/right gestures for back/forward navigation                                                                                                                                                                                                                                                                                                                                                        | <code>false (Android), true (iOS - enabled by default)</code> |        |
 | **`disableGoBackOnNativeApplication`** | <code>boolean</code>                                                                                                                                                   | Disable the possibility to go back on native application, useful to force user to stay on the webview, Android only                                                                                                                                                                                                                                                                                                                                                                                                                                        | <code>false</code>                                            |        |
@@ -1437,6 +1488,7 @@ And in the AndroidManifest.xml file:
 | **`isInspectable`**                    | <code>boolean</code>                                                                                                                                                   | Whether the website in the webview is inspectable or not, ios only                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | <code>false</code>                                            |        |
 | **`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  |
 | **`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  |
 | **`closeModalDescription`**            | <code>string</code>                                                                                                                                                    | CloseModalDescription: description of the confirm when user clicks on close button                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | <code>"Are you sure you want to close this window?"</code>    | 1.1.0  |
@@ -1498,6 +1550,14 @@ And in the AndroidManifest.xml file:
 | **`cancelBtn`**  | <code>string</code> | Text for the cancel button             | <code>"Cancel"</code>  |
 
 
+#### ToolbarTitleIconOptions
+
+| Prop          | Type                                                                                           |
+| ------------- | ---------------------------------------------------------------------------------------------- |
+| **`ios`**     | <code>{ iconType: 'sf-symbol' \| 'asset'; icon: string; }</code>                               |
+| **`android`** | <code>{ iconType: 'asset' \| 'vector'; icon: string; width?: number; height?: number; }</code> |
+
+
 #### NativeProxyRule
 
 Native-first proxy rule used on Android and iOS.
@@ -1815,6 +1875,14 @@ Native handling mode used after a managed download finishes.
 | **`BLACK`** | <code>'black'</code> |
 
 
+#### CloseAction
+
+| Members     | Value                | Description                                                          |
+| ----------- | -------------------- | -------------------------------------------------------------------- |
+| **`CLOSE`** | <code>'close'</code> | The toolbar close button closes and destroys the webview.            |
+| **`HIDE`**  | <code>'hide'</code>  | The toolbar close button hides the webview so it can be shown again. |
+
+
 #### InvisibilityMode
 
 | Members            | Value                       | Description                                                                             |

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

@@ -48,6 +48,7 @@ import java.util.Deque;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
@@ -168,6 +169,11 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
                 unregisterWebView(webViewId);
             }
 
+            @Override
+            public void hideEvent(String url) {
+                notifyListeners("hideEvent", new JSObject().put("id", webViewId).put("url", url));
+            }
+
             @Override
             public void pageLoaded() {
                 notifyListeners("browserPageLoaded", new JSObject().put("id", webViewId));
@@ -1020,6 +1026,40 @@ public class CapgoInAppBrowserPlugin extends Plugin implements WebViewDialog.Per
         options.setToolbarColor(call.getString("toolbarColor", "#ffffff"));
         options.setBackgroundColor(call.getString("backgroundColor", "white"));
         options.setToolbarTextColor(call.getString("toolbarTextColor"));
+        String closeAction = call.getString("closeAction", "close").toLowerCase(Locale.ROOT);
+        if (!"close".equals(closeAction) && !"hide".equals(closeAction)) {
+            call.reject("closeAction must be 'close' or 'hide'");
+            return;
+        }
+        options.setCloseAction(closeAction);
+        options.setTitleFontFamily(call.getString("titleFontFamily"));
+        JSObject titleIconObj = call.getObject("titleIcon");
+        if (titleIconObj != null) {
+            JSObject androidTitleIconObj = titleIconObj.getJSObject("android");
+            if (androidTitleIconObj != null) {
+                try {
+                    String titleIconType = androidTitleIconObj.getString("iconType", "asset");
+                    String titleIconName = androidTitleIconObj.getString("icon", "");
+                    if ("vector".equals(titleIconType)) {
+                        int resourceId = getContext()
+                            .getResources()
+                            .getIdentifier(titleIconName, "drawable", getContext().getPackageName());
+                        if (resourceId == 0) {
+                            Log.e("InAppBrowser", "Title icon vector resource not found: " + titleIconName);
+                            call.reject("titleIcon validation failed: vector resource not found: " + titleIconName);
+                            return;
+                        }
+                    }
+                    options.setTitleIcon(
+                        Options.ButtonNearDone.generateFromAndroidObject(androidTitleIconObj, getContext().getAssets(), "titleIcon.android")
+                    );
+                } catch (Exception e) {
+                    Log.e("InAppBrowser", "Error setting titleIcon: " + e.getMessage(), e);
+                    call.reject("titleIcon validation failed: " + e.getMessage());
+                    return;
+                }
+            }
+        }
         options.setArrow(Boolean.TRUE.equals(call.getBoolean("showArrow", false)));
         options.setIgnoreUntrustedSSLError(Boolean.TRUE.equals(call.getBoolean("ignoreUntrustedSSLError", false)));
         options.setClientCertificatePrompt(resolveClientCertificatePrompt(call));

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

@@ -57,7 +57,6 @@ public class Options {
             throws IllegalArgumentException, RuntimeException {
             JSObject buttonNearDone = call.getObject("buttonNearDone");
             if (buttonNearDone == null) {
-                // Return null when "buttonNearDone" isn't configured, else throw an error
                 return null;
             }
 
@@ -66,42 +65,41 @@ public class Options {
                 throw new IllegalArgumentException("buttonNearDone.android is null");
             }
 
+            return generateFromAndroidObject(android, assetManager, "buttonNearDone.android");
+        }
+
+        public static ButtonNearDone generateFromAndroidObject(JSObject android, AssetManager assetManager, String optionName)
+            throws IllegalArgumentException, RuntimeException {
             String iconType = android.getString("iconType", "asset");
             AllIconTypes iconTypeEnum;
 
-            // Validate and process icon type
             if ("asset".equals(iconType)) {
                 iconTypeEnum = AllIconTypes.ASSET;
             } else if ("vector".equals(iconType)) {
                 iconTypeEnum = AllIconTypes.VECTOR;
             } else {
-                throw new IllegalArgumentException("buttonNearDone.android.iconType must be 'asset' or 'vector'");
+                throw new IllegalArgumentException(optionName + ".iconType must be 'asset' or 'vector'");
             }
 
             String icon = android.getString("icon");
             if (icon == null) {
-                throw new IllegalArgumentException("buttonNearDone.android.icon is null");
+                throw new IllegalArgumentException(optionName + ".icon is null");
             }
 
-            // For asset type, verify the file exists
             if (iconTypeEnum == AllIconTypes.ASSET) {
                 InputStream fileInputString = null;
 
                 try {
-                    // Try to find in public folder first
                     try {
                         fileInputString = assetManager.open("public/" + icon);
                     } catch (IOException e) {
-                        // If not in public, try in root assets
                         try {
                             fileInputString = assetManager.open(icon);
                         } catch (IOException e2) {
-                            throw new IllegalArgumentException("buttonNearDone.android.icon cannot be found in the assetManager");
+                            throw new IllegalArgumentException(optionName + ".icon cannot be found in the assetManager", e2);
                         }
                     }
-                    // File exists, do nothing
                 } finally {
-                    // Close the input stream if it was opened
                     if (fileInputString != null) {
                         try {
                             fileInputString.close();
@@ -110,18 +108,14 @@ public class Options {
                         }
                     }
                 }
-            }
-            // For vector type, we don't validate here since resources are checked at runtime
-            else if (iconTypeEnum == AllIconTypes.VECTOR) {
-                // Vector resources will be validated when used
+            } else if (iconTypeEnum == AllIconTypes.VECTOR) {
                 System.out.println("Vector resource will be validated at runtime: " + icon);
             }
 
             Integer width = android.getInteger("width", 24);
             Integer height = android.getInteger("height", 24);
 
-            final ButtonNearDone buttonNearDone1 = new ButtonNearDone(iconTypeEnum, iconType, icon, height, width);
-            return buttonNearDone1;
+            return new ButtonNearDone(iconTypeEnum, iconType, icon, height, width);
         }
 
         public AllIconTypes getIconTypeEnum() {
@@ -151,6 +145,9 @@ public class Options {
     private String CloseModalDescription;
     private String CloseModalCancel;
     private ButtonNearDone buttonNearDone;
+    private String closeAction = "close";
+    private String titleFontFamily;
+    private ButtonNearDone titleIcon;
     private String CloseModalOk;
     private Pattern closeModalURLPattern;
     private String url;
@@ -418,6 +415,30 @@ public class Options {
         return this.buttonNearDone;
     }
 
+    public String getCloseAction() {
+        return closeAction;
+    }
+
+    public void setCloseAction(String closeAction) {
+        this.closeAction = closeAction;
+    }
+
+    public String getTitleFontFamily() {
+        return titleFontFamily;
+    }
+
+    public void setTitleFontFamily(String titleFontFamily) {
+        this.titleFontFamily = titleFontFamily;
+    }
+
+    public ButtonNearDone getTitleIcon() {
+        return titleIcon;
+    }
+
+    public void setTitleIcon(ButtonNearDone titleIcon) {
+        this.titleIcon = titleIcon;
+    }
+
     public String getCloseModalCancel() {
         return CloseModalCancel;
     }
@@ -713,6 +734,9 @@ public class Options {
         copy.setCloseModalOk(CloseModalOk);
         copy.setCloseModalURLPattern(closeModalURLPattern);
         copy.setButtonNearDone(buttonNearDone);
+        copy.setCloseAction(closeAction);
+        copy.setTitleFontFamily(titleFontFamily);
+        copy.setTitleIcon(titleIcon);
         copy.setUrl("about:blank");
         copy.setHeaders(headers);
         copy.setCredentials(credentials);

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

@@ -7,6 +7,8 @@ public interface WebViewCallbacks {
 
     public void closeEvent(String url);
 
+    public void hideEvent(String url);
+
     public void pageLoaded();
 
     public void pageLoadError();

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

@@ -16,6 +16,8 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
+import android.graphics.Typeface;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -69,6 +71,7 @@ import androidx.activity.result.ActivityResult;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.FileProvider;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
@@ -344,6 +347,10 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
     private final Map<String, BlobDownloadSession> blobDownloadSessions = new ConcurrentHashMap<>();
     private final Map<String, ClientCertificateIdentity> clientCertificateIdentities = new ConcurrentHashMap<>();
     private int iconColor = Color.BLACK; // Default icon color
+    private Typeface cachedTitleTypeface;
+    private String cachedTitleFontFamily;
+    private Drawable cachedTitleIconDrawable;
+    private boolean cachedTitleIconResolved;
     private boolean isHiddenModeActive = false;
     private WindowManager.LayoutParams previousWindowAttributes;
     private Drawable previousWindowBackground;
@@ -3863,6 +3870,156 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
         } else {
             textView.setText("");
         }
+        applyTitleTextOptions(textView);
+    }
+
+    private void performToolbarCloseAction(String currentUrl) {
+        if (_options != null && "hide".equals(_options.getCloseAction())) {
+            setHidden(true);
+            if (_options.getCallbacks() != null) {
+                _options.getCallbacks().hideEvent(currentUrl);
+            }
+            return;
+        }
+
+        dismiss();
+        if (_options != null && _options.getCallbacks() != null) {
+            _options.getCallbacks().closeEvent(currentUrl);
+        }
+    }
+
+    private void applyTitleTextOptions(TextView titleText) {
+        if (titleText == null || _options == null) {
+            return;
+        }
+
+        String fontFamily = _options.getTitleFontFamily();
+        if (!TextUtils.isEmpty(fontFamily)) {
+            if (!fontFamily.equals(cachedTitleFontFamily)) {
+                cachedTitleFontFamily = fontFamily;
+                cachedTitleTypeface = resolveTitleTypeface(fontFamily);
+            }
+            if (cachedTitleTypeface != null) {
+                titleText.setTypeface(cachedTitleTypeface);
+            }
+        } else {
+            cachedTitleFontFamily = null;
+            cachedTitleTypeface = null;
+        }
+
+        Options.ButtonNearDone titleIcon = _options.getTitleIcon();
+        if (titleIcon == null) {
+            titleText.setCompoundDrawablesRelative(null, null, null, null);
+            cachedTitleIconDrawable = null;
+            cachedTitleIconResolved = false;
+            return;
+        }
+
+        if (!cachedTitleIconResolved) {
+            cachedTitleIconDrawable = loadTitleIconDrawable(titleIcon);
+            cachedTitleIconResolved = true;
+        }
+
+        if (cachedTitleIconDrawable != null) {
+            titleText.setCompoundDrawablesRelative(cachedTitleIconDrawable, null, null, null);
+            titleText.setCompoundDrawablePadding(Math.round(6 * _context.getResources().getDisplayMetrics().density));
+        } else {
+            titleText.setCompoundDrawablesRelative(null, null, null, null);
+        }
+    }
+
+    private Typeface resolveTitleTypeface(String fontFamily) {
+        try {
+            int fontResourceId = _context.getResources().getIdentifier(fontFamily, "font", _context.getPackageName());
+            if (fontResourceId != 0) {
+                Typeface typeface = ResourcesCompat.getFont(_context, fontResourceId);
+                if (typeface != null) {
+                    return typeface;
+                }
+            }
+            return Typeface.create(fontFamily, Typeface.NORMAL);
+        } catch (Exception e) {
+            Log.e("InAppBrowser", "Error loading title font: " + e.getMessage());
+            return Typeface.create(fontFamily, Typeface.NORMAL);
+        }
+    }
+
+    private Drawable loadTitleIconDrawable(Options.ButtonNearDone titleIcon) {
+        int width = Math.round(
+            (titleIcon.getWidth() > 0 ? titleIcon.getWidth() : 24) * _context.getResources().getDisplayMetrics().density
+        );
+        int height = Math.round(
+            (titleIcon.getHeight() > 0 ? titleIcon.getHeight() : 24) * _context.getResources().getDisplayMetrics().density
+        );
+
+        if ("vector".equals(titleIcon.getIconType())) {
+            try {
+                String iconName = titleIcon.getIcon();
+                if (iconName.endsWith(".xml")) {
+                    iconName = iconName.substring(0, iconName.length() - 4);
+                }
+                int resourceId = _context.getResources().getIdentifier(iconName, "drawable", _context.getPackageName());
+                if (resourceId == 0) {
+                    Log.e("InAppBrowser", "Title icon vector drawable not found: " + iconName);
+                    return null;
+                }
+                Drawable drawable = ResourcesCompat.getDrawable(_context.getResources(), resourceId, _context.getTheme());
+                if (drawable == null) {
+                    return null;
+                }
+                drawable = drawable.mutate();
+                drawable.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN);
+                drawable.setBounds(0, 0, width, height);
+                return drawable;
+            } catch (Exception e) {
+                Log.e("InAppBrowser", "Error loading title vector icon: " + e.getMessage());
+                return null;
+            }
+        }
+
+        if ("asset".equals(titleIcon.getIconType())) {
+            InputStream inputStream = null;
+            try {
+                AssetManager assetManager = _context.getAssets();
+                try {
+                    inputStream = assetManager.open("public/" + titleIcon.getIcon());
+                } catch (IOException e) {
+                    inputStream = assetManager.open(titleIcon.getIcon());
+                }
+
+                SVG svg = SVG.getFromInputStream(inputStream);
+                if (svg == null) {
+                    return null;
+                }
+
+                svg.setDocumentWidth(width);
+                svg.setDocumentHeight(height);
+                Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+                Canvas canvas = new Canvas(bitmap);
+                svg.renderToCanvas(canvas);
+
+                Paint paint = new Paint();
+                paint.setColorFilter(new PorterDuffColorFilter(iconColor, PorterDuff.Mode.SRC_IN));
+                Canvas colorFilterCanvas = new Canvas(bitmap);
+                colorFilterCanvas.drawBitmap(bitmap, 0, 0, paint);
+
+                BitmapDrawable drawable = new BitmapDrawable(_context.getResources(), bitmap);
+                drawable.setBounds(0, 0, width, height);
+                return drawable;
+            } catch (IOException | SVGParseException e) {
+                Log.e("InAppBrowser", "Error loading title asset icon: " + e.getMessage());
+            } finally {
+                if (inputStream != null) {
+                    try {
+                        inputStream.close();
+                    } catch (IOException e) {
+                        Log.e("InAppBrowser", "Error closing title icon stream: " + e.getMessage());
+                    }
+                }
+            }
+        }
+
+        return null;
     }
 
     private void setupToolbar() {
@@ -3878,6 +4035,9 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
                 TextView titleText = _toolbar.findViewById(R.id.titleText);
 
                 // Determine icon and text color
+                cachedTitleIconDrawable = null;
+                cachedTitleIconResolved = false;
+
                 int iconColor;
                 if (_options.getToolbarTextColor() != null && !_options.getToolbarTextColor().isEmpty()) {
                     try {
@@ -3938,30 +4098,21 @@ public class WebViewDialog extends Dialog implements ProxyResponseRouting.ProxyR
                                     _options.getCloseModalOk(),
                                     new OnClickListener() {
                                         public void onClick(DialogInterface dialog, int which) {
-                                            // Close button clicked, do something
-                                            dismiss();
                                             if (_options != null && _options.getCallbacks() != null) {
-                                                // Notify that confirm was clicked
                                                 _options.getCallbacks().confirmBtnClicked(currentUrl);
-                                                _options.getCallbacks().closeEvent(currentUrl);
                                             }
+                                            performToolbarCloseAction(currentUrl);
                                         }
                                     }
                                 )
                                 .setNegativeButton(_options.getCloseModalCancel(), null)
                                 .show();
                         } else {
-                            dismiss();
-                            if (_options != null && _options.getCallbacks() != null) {
-                                _options.getCallbacks().closeEvent(currentUrl);
-                            }
+                            performToolbarCloseAction(currentUrl);
                         }
                     } else {
                         String currentUrl = getUrl();
-                        dismiss();
-                        if (_options != null && _options.getCallbacks() != null) {
-                            _options.getCallbacks().closeEvent(currentUrl);
-                        }
+                        performToolbarCloseAction(currentUrl);
                     }
                 }
             }