@capgo/capacitor-inappbrowser 8.16.3 → 8.16.4

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

@@ -41,14 +41,14 @@ final class SystemUiChromeSupport {
         WindowCompat.setDecorFitsSystemWindows(window, decorFitsSystemWindows);
     }
 
-    static void prepareInitialDialogWindow(Window window) {
+    static void prepareInitialDialogWindow(Window window, View statusBarColorView) {
         if (window == null) {
             return;
         }
 
         window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
         if (shouldApplyLegacySystemBarColors(Build.VERSION.SDK_INT)) {
-            applyLegacySystemBarColors(window, Color.TRANSPARENT, null);
+            applyLegacyStatusBarColorViaView(statusBarColorView, Color.TRANSPARENT);
             clearLegacyTranslucentStatusFlag(window);
         }
     }
@@ -56,9 +56,9 @@ final class SystemUiChromeSupport {
     static void applyDialogWindowChrome(
         Window window,
         View decorView,
+        View statusBarColorView,
         boolean edgeToEdge,
         Integer statusBarColor,
-        Integer navigationBarColor,
         Boolean lightStatusBars
     ) {
         if (window == null || decorView == null) {
@@ -69,10 +69,10 @@ final class SystemUiChromeSupport {
             setDecorFitsSystemWindows(window, false);
         } else if (!shouldUsePreApi30LayoutFlags(Build.VERSION.SDK_INT)) {
             setDecorFitsSystemWindows(window, true);
-            applyLegacySystemBarColors(window, statusBarColor, navigationBarColor);
+            applyLegacyStatusBarColorViaView(statusBarColorView, statusBarColor);
         } else {
-            applyPreApi30LayoutBehindNavigationBar(decorView);
-            applyLegacySystemBarColors(window, statusBarColor, navigationBarColor);
+            setDecorFitsSystemWindows(window, false);
+            applyLegacyStatusBarColorViaView(statusBarColorView, statusBarColor);
         }
 
         WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(window, decorView);
@@ -81,22 +81,13 @@ final class SystemUiChromeSupport {
         }
     }
 
-    @SuppressWarnings("deprecation")
-    private static void applyPreApi30LayoutBehindNavigationBar(View decorView) {
-        decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
-    }
-
-    @SuppressWarnings("deprecation")
-    static void applyLegacySystemBarColors(Window window, Integer statusBarColor, Integer navigationBarColor) {
-        if (window == null || !shouldApplyLegacySystemBarColors(Build.VERSION.SDK_INT)) {
+    static void applyLegacyStatusBarColorViaView(View statusBarColorView, Integer statusBarColor) {
+        if (!shouldApplyLegacySystemBarColors(Build.VERSION.SDK_INT)) {
             return;
         }
 
-        if (statusBarColor != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            window.setStatusBarColor(statusBarColor);
-        }
-        if (navigationBarColor != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            window.setNavigationBarColor(navigationBarColor);
+        if (statusBarColor != null && statusBarColorView != null) {
+            statusBarColorView.setBackgroundColor(statusBarColor);
         }
     }
 

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

@@ -1,6 +1,10 @@
 package ee.forgr.capacitor_inappbrowser;
 
 import android.view.View;
+import android.view.Window;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
 
 /**
  * Testable helpers for HTML5/iframe fullscreen routed through WebChromeClient custom views
@@ -22,16 +26,28 @@ final class WebViewCustomFullscreenSupport {
         return isActive;
     }
 
-    @SuppressWarnings("deprecation")
-    static int immersiveFullscreenSystemUiVisibility() {
-        return (
-            View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
-            View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-            View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
-            View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
-            View.SYSTEM_UI_FLAG_FULLSCREEN |
-            View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-        );
+    static int immersiveSystemBarsBehavior() {
+        return WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE;
+    }
+
+    static void enterImmersiveFullscreen(Window window, View decorView) {
+        if (window == null || decorView == null) {
+            return;
+        }
+
+        WindowCompat.setDecorFitsSystemWindows(window, false);
+        WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(window, decorView);
+        controller.hide(WindowInsetsCompat.Type.systemBars());
+        controller.setSystemBarsBehavior(immersiveSystemBarsBehavior());
+    }
+
+    static void exitImmersiveFullscreen(Window window, View decorView) {
+        if (window == null || decorView == null) {
+            return;
+        }
+
+        WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(window, decorView);
+        controller.show(WindowInsetsCompat.Type.systemBars());
     }
 
     static boolean shouldUseHostActivityWindow(boolean backLayerActive) {
@@ -41,9 +57,4 @@ final class WebViewCustomFullscreenSupport {
     static boolean shouldRegisterHostBackHandler(boolean backLayerActive) {
         return backLayerActive;
     }
-
-    @SuppressWarnings("deprecation")
-    static int restoredSystemUiVisibility() {
-        return View.SYSTEM_UI_FLAG_VISIBLE;
-    }
 }

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

@@ -2172,7 +2172,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         // Set dimensions if specified, otherwise fullscreen
         applyDimensions();
 
-        SystemUiChromeSupport.prepareInitialDialogWindow(getWindow());
+        SystemUiChromeSupport.prepareInitialDialogWindow(getWindow(), findViewById(R.id.status_bar_color_view));
 
         WindowInsetsControllerCompat insetsController = new WindowInsetsControllerCompat(
             getWindow(),
@@ -3020,7 +3020,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         }
 
         window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        decorView.setSystemUiVisibility(WebViewCustomFullscreenSupport.immersiveFullscreenSystemUiVisibility());
+        WebViewCustomFullscreenSupport.enterImmersiveFullscreen(window, decorView);
 
         if (WebViewCustomFullscreenSupport.shouldRegisterHostBackHandler(backLayerActive)) {
             registerCustomFullscreenBackHandler();
@@ -3078,7 +3078,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         Window window = customFullscreenWindow != null ? customFullscreenWindow : getWindow();
         if (window != null) {
             window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-            window.getDecorView().setSystemUiVisibility(WebViewCustomFullscreenSupport.restoredSystemUiVisibility());
+            WebViewCustomFullscreenSupport.exitImmersiveFullscreen(window, window.getDecorView());
             reapplyInsetsFromWindowRoot();
             if (SystemUiChromeSupport.requiresEdgeToEdgeChrome(Build.VERSION.SDK_INT)) {
                 refreshEdgeToEdgeChrome();
@@ -3275,7 +3275,6 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
         if (getWindow() != null) {
             View decorView = getWindow().getDecorView();
             Integer statusBarColor = null;
-            Integer navigationBarColor = Color.TRANSPARENT;
             Boolean lightStatusBars = null;
 
             if (isAndroid15Plus) {
@@ -3316,9 +3315,9 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
             SystemUiChromeSupport.applyDialogWindowChrome(
                 getWindow(),
                 decorView,
+                findViewById(R.id.status_bar_color_view),
                 isAndroid15Plus,
                 statusBarColor,
-                navigationBarColor,
                 lightStatusBars
             );
         }
@@ -4913,7 +4912,7 @@ public class WebViewDialog extends ComponentDialog implements ProxyResponseRouti
 
                 // Also ensure status bar gets the color
                 if (getWindow() != null) {
-                    SystemUiChromeSupport.applyLegacySystemBarColors(getWindow(), toolbarColor, 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);

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -446,7 +446,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.16.3"
+    private let pluginVersion: String = "8.16.4"
     public let identifier = "CapgoInAppBrowserPlugin"
     public let jsName = "CapgoInAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-inappbrowser",
-  "version": "8.16.3",
+  "version": "8.16.4",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",