@capgo/camera-preview 8.11.1 → 8.11.3

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/android/src/main/java/app/capgo/capacitor/camera/preview/CameraPreview.java

@@ -15,7 +15,6 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.location.Location;
 import android.net.Uri;
@@ -54,7 +53,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import java.util.Objects;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -104,11 +102,7 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
                 cameraXView.setListener(this);
             }
             if (lastSessionConfig.isToBack()) {
-                if (usesFullStackTransparentBackgroundWorkaround()) {
-                    activateTransparentBackgroundsForToBack(cameraXView);
-                } else {
-                    prepareTransparentBackgroundsForToBack(cameraXView);
-                }
+                applyToBackVisualState(cameraXView);
             } else {
                 toBackVisualStateActive = false;
             }
@@ -128,9 +122,7 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
         lastSessionConfig = null;
         clearActiveBarcodeScanner();
         toBackVisualStateActive = false;
-        restoreOriginalWindowBackground(getBridge().getActivity());
         restoreWebViewVisualState();
-        restoreSystemUiForToBackMode(getBridge().getActivity());
         unregisterScreenLockReceiver();
     }
 
@@ -144,9 +136,10 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
     static final String CAMERA_WITH_LOCATION_PERMISSION_ALIAS = "cameraWithLocation";
     static final String MICROPHONE_ONLY_PERMISSION_ALIAS = "microphoneOnly";
 
-    private String captureCallbackId = "";
-    private String sampleCallbackId = "";
-    private String cameraStartCallbackId = "";
+    private PluginCall pendingCaptureCall;
+    private PluginCall pendingSampleCall;
+    private PluginCall pendingCameraStartedCall;
+    private PluginCall pendingStopRecordCall;
     private final Object pendingStartLock = new Object();
     private PluginCall pendingStartCall;
     private int previousOrientationRequest = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
@@ -159,16 +152,12 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
     private String lastOrientationStr = "unknown";
     private boolean lastDisableAudio = true;
     private boolean lastIncludeSafeAreaInsets = false;
-    private Drawable originalWindowBackground;
-    private boolean originalWindowBackgroundCaptured = false;
     private Drawable originalWebViewBackground;
     private boolean originalWebViewBackgroundCaptured = false;
     private Float originalWebViewAlpha;
+    private Integer originalWebViewLayerType;
     private Drawable originalWebViewParentBackground;
     private boolean originalWebViewParentBackgroundCaptured = false;
-    private Integer originalStatusBarColor;
-    private Integer originalNavigationBarColor;
-    private Boolean originalNavigationBarContrastEnforced;
     private volatile boolean toBackVisualStateActive = false;
     private boolean isCameraPermissionDialogShowing = false;
     private boolean pendingStartBarcodeScanner = false;
@@ -518,8 +507,8 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
     }
 
     private void proceedWithCapture(PluginCall call, Location location) {
-        bridge.saveCall(call);
-        captureCallbackId = call.getCallbackId();
+        call.setKeepAlive(true);
+        pendingCaptureCall = call;
 
         Integer quality = Objects.requireNonNull(call.getInt("quality", 85));
         final boolean saveToGallery = Boolean.TRUE.equals(call.getBoolean("saveToGallery"));
@@ -538,8 +527,8 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
             call.reject("Camera is not running");
             return;
         }
-        bridge.saveCall(call);
-        sampleCallbackId = call.getCallbackId();
+        call.setKeepAlive(true);
+        pendingSampleCall = call;
         Integer quality = Objects.requireNonNull(call.getInt("quality", 85));
         final boolean mirrorFrontCamera = Boolean.TRUE.equals(call.getBoolean("mirrorFrontCamera"));
         cameraXView.captureSample(quality, mirrorFrontCamera);
@@ -798,6 +787,9 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
         ) {
             cameraXView = new CameraXView(getContext(), getBridge().getWebView());
             cameraXView.setListener(this);
+            if (lastSessionConfig.isToBack()) {
+                applyToBackVisualState(cameraXView);
+            }
             requestBarcodeScannerRestartAfterCameraResume();
             cameraRestartAfterResumeInProgress = true;
             cameraXView.startSession(lastSessionConfig);
@@ -840,9 +832,7 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
                 lastSessionConfig = null;
                 clearActiveBarcodeScanner();
                 toBackVisualStateActive = false;
-                restoreOriginalWindowBackground(getBridge().getActivity());
                 restoreWebViewVisualState();
-                restoreSystemUiForToBackMode(getBridge().getActivity());
                 call.resolve();
             });
     }
@@ -1360,13 +1350,8 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
         getBridge()
             .getActivity()
             .runOnUiThread(() -> {
-                lockSystemUiForToBackMode(getBridge().getActivity(), toBack);
                 if (toBack) {
-                    if (usesFullStackTransparentBackgroundWorkaround()) {
-                        activateTransparentBackgroundsForToBack(cameraXView);
-                    } else {
-                        prepareTransparentBackgroundsForToBack(cameraXView);
-                    }
+                    applyToBackVisualState(cameraXView);
                 } else {
                     toBackVisualStateActive = false;
                 }
@@ -1651,8 +1636,8 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
                     clearActiveBarcodeScanner();
                 }
 
-                bridge.saveCall(call);
-                cameraStartCallbackId = call.getCallbackId();
+                call.setKeepAlive(true);
+                pendingCameraStartedCall = call;
                 cameraXView.startSession(config);
 
                 // Setup orientation listener to mirror iOS screenResize emission
@@ -1908,7 +1893,7 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
 
     @Override
     public void onPictureTaken(String base64, JSONObject exif) {
-        PluginCall pluginCall = bridge.getSavedCall(captureCallbackId);
+        PluginCall pluginCall = pendingCaptureCall;
         if (pluginCall == null) {
             Log.e("CameraPreview", "onPictureTaken: captureCallbackId is null");
             return;
@@ -1917,18 +1902,20 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
         result.put("value", base64);
         result.put("exif", exif);
         pluginCall.resolve(result);
-        bridge.releaseCall(pluginCall);
+        pluginCall.setKeepAlive(false);
+        pendingCaptureCall = null;
     }
 
     @Override
     public void onPictureTakenError(String message) {
-        PluginCall pluginCall = bridge.getSavedCall(captureCallbackId);
+        PluginCall pluginCall = pendingCaptureCall;
         if (pluginCall == null) {
             Log.e("CameraPreview", "onPictureTakenError: captureCallbackId is null");
             return;
         }
         pluginCall.reject(message);
-        bridge.releaseCall(pluginCall);
+        pluginCall.setKeepAlive(false);
+        pendingCaptureCall = null;
     }
 
     @Override
@@ -1985,36 +1972,6 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
         return false;
     }
 
-    private boolean isMiuiDevice() {
-        String manufacturer = Build.MANUFACTURER != null ? Build.MANUFACTURER.toLowerCase(Locale.US) : "";
-        String brand = Build.BRAND != null ? Build.BRAND.toLowerCase(Locale.US) : "";
-        return manufacturer.contains("xiaomi") || brand.contains("xiaomi") || brand.contains("redmi") || brand.contains("poco");
-    }
-
-    private boolean usesFullStackTransparentBackgroundWorkaround() {
-        String manufacturer = Build.MANUFACTURER != null ? Build.MANUFACTURER.toLowerCase(Locale.US) : "";
-        String brand = Build.BRAND != null ? Build.BRAND.toLowerCase(Locale.US) : "";
-        return (
-            isMiuiDevice() ||
-            manufacturer.contains("huawei") ||
-            manufacturer.contains("honor") ||
-            brand.contains("huawei") ||
-            brand.contains("honor")
-        );
-    }
-
-    private void captureOriginalWindowBackground(Activity activity) {
-        if (activity == null) {
-            return;
-        }
-        synchronized (this) {
-            if (!originalWindowBackgroundCaptured) {
-                originalWindowBackground = activity.getWindow().getDecorView().getBackground();
-                originalWindowBackgroundCaptured = true;
-            }
-        }
-    }
-
     private void captureOriginalWebViewVisualState(WebView webView, ViewGroup webViewParent) {
         if (webView == null) {
             return;
@@ -2027,6 +1984,9 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
             if (originalWebViewAlpha == null) {
                 originalWebViewAlpha = webView.getAlpha();
             }
+            if (originalWebViewLayerType == null) {
+                originalWebViewLayerType = webView.getLayerType();
+            }
             if (webViewParent != null && !originalWebViewParentBackgroundCaptured) {
                 originalWebViewParentBackground = webViewParent.getBackground();
                 originalWebViewParentBackgroundCaptured = true;
@@ -2034,95 +1994,7 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
         }
     }
 
-    private void restoreOriginalWindowBackground(Activity activity) {
-        final Drawable backgroundToRestore;
-        final boolean captured;
-        synchronized (this) {
-            backgroundToRestore = originalWindowBackground;
-            captured = originalWindowBackgroundCaptured;
-            originalWindowBackground = null;
-            originalWindowBackgroundCaptured = false;
-        }
-
-        if (!captured || activity == null) {
-            return;
-        }
-
-        activity.runOnUiThread(() -> {
-            try {
-                activity.getWindow().setBackgroundDrawable(backgroundToRestore);
-            } catch (Exception e) {
-                Log.w(TAG, "Failed to restore window background", e);
-            }
-        });
-    }
-
-    private int toOpaqueColor(int color) {
-        return Color.argb(255, Color.red(color), Color.green(color), Color.blue(color));
-    }
-
-    private void lockSystemUiForToBackMode(Activity activity, boolean toBack) {
-        if (activity == null) {
-            return;
-        }
-        if (!toBack) {
-            restoreSystemUiForToBackMode(activity);
-            return;
-        }
-
-        try {
-            if (originalStatusBarColor == null) {
-                originalStatusBarColor = activity.getWindow().getStatusBarColor();
-            }
-            if (originalNavigationBarColor == null) {
-                originalNavigationBarColor = activity.getWindow().getNavigationBarColor();
-            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && originalNavigationBarContrastEnforced == null) {
-                originalNavigationBarContrastEnforced = activity.getWindow().isNavigationBarContrastEnforced();
-            }
-
-            int statusBarColor = toOpaqueColor(originalStatusBarColor != null ? originalStatusBarColor : Color.BLACK);
-            int navigationBarColor = toOpaqueColor(originalNavigationBarColor != null ? originalNavigationBarColor : Color.BLACK);
-
-            activity.getWindow().setStatusBarColor(statusBarColor);
-            activity.getWindow().setNavigationBarColor(navigationBarColor);
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                activity.getWindow().setNavigationBarContrastEnforced(false);
-            }
-        } catch (Exception e) {
-            Log.w(TAG, "Failed to lock system UI colors for toBack mode", e);
-        }
-    }
-
-    private void restoreSystemUiForToBackMode(Activity activity) {
-        final Integer statusBarColor = originalStatusBarColor;
-        final Integer navigationBarColor = originalNavigationBarColor;
-        final Boolean navigationBarContrastEnforced = originalNavigationBarContrastEnforced;
-        originalStatusBarColor = null;
-        originalNavigationBarColor = null;
-        originalNavigationBarContrastEnforced = null;
-
-        if (activity == null) {
-            return;
-        }
-
-        activity.runOnUiThread(() -> {
-            try {
-                if (statusBarColor != null) {
-                    activity.getWindow().setStatusBarColor(statusBarColor);
-                }
-                if (navigationBarColor != null) {
-                    activity.getWindow().setNavigationBarColor(navigationBarColor);
-                }
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && navigationBarContrastEnforced != null) {
-                    activity.getWindow().setNavigationBarContrastEnforced(navigationBarContrastEnforced);
-                }
-            } catch (Exception ignored) {}
-        });
-    }
-
-    private void prepareTransparentBackgroundsForToBack(CameraXView visualStateOwner) {
+    private void applyToBackVisualState(CameraXView visualStateOwner) {
         Activity activity = getActivity();
         WebView webView = getBridge().getWebView();
         if (activity == null || webView == null) {
@@ -2131,34 +2003,20 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
 
         toBackVisualStateActive = true;
         final ViewGroup webViewParent = (ViewGroup) webView.getParent();
-        captureOriginalWindowBackground(activity);
         captureOriginalWebViewVisualState(webView, webViewParent);
-    }
-
-    private void activateTransparentBackgroundsForToBack(CameraXView visualStateOwner) {
-        prepareTransparentBackgroundsForToBack(visualStateOwner);
-        Activity activity = getActivity();
-        WebView webView = getBridge().getWebView();
-        if (activity == null || webView == null) {
-            return;
-        }
-
-        final ViewGroup webViewParent = (ViewGroup) webView.getParent();
 
         Runnable apply = () -> {
             try {
                 if (!toBackVisualStateActive || visualStateOwner == null || cameraXView != visualStateOwner) {
                     return;
                 }
-                boolean fullStackWorkaround = usesFullStackTransparentBackgroundWorkaround();
-                if (fullStackWorkaround) {
-                    activity.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+                if (ToBackCompositorHelper.shouldTransparentizeWebViewParent() && webViewParent != null) {
+                    webViewParent.setBackgroundColor(ToBackCompositorHelper.resolveWebViewBackgroundColor());
                 }
-                if (webViewParent != null && fullStackWorkaround) {
-                    webViewParent.setBackgroundColor(Color.TRANSPARENT);
-                }
-                webView.setBackgroundColor(isMiuiDevice() ? Color.argb(1, 255, 255, 255) : Color.TRANSPARENT);
-                webView.setAlpha(isMiuiDevice() ? 0.99f : (originalWebViewAlpha != null ? originalWebViewAlpha : 1f));
+                webView.setBackgroundColor(ToBackCompositorHelper.resolveWebViewBackgroundColor());
+                webView.setLayerType(ToBackCompositorHelper.resolveWebViewLayerType(), null);
+                float alpha = ToBackCompositorHelper.resolveWebViewAlpha(originalWebViewAlpha != null ? originalWebViewAlpha : 1f);
+                webView.setAlpha(alpha);
                 if (webViewParent != null) {
                     webViewParent.requestTransparentRegion(webView);
                 }
@@ -2167,20 +2025,14 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
             }
         };
 
-        activity.runOnUiThread(() -> {
-            apply.run();
-            if (isMiuiDevice()) {
-                webView.postDelayed(apply, 50);
-                webView.postDelayed(apply, 250);
-            }
-        });
+        activity.runOnUiThread(apply);
     }
 
     private void applyTransparentBackgroundsForToBack() {
         if (!isToBackMode()) {
             return;
         }
-        activateTransparentBackgroundsForToBack(cameraXView);
+        applyToBackVisualState(cameraXView);
     }
 
     private void restoreWebViewVisualState() {
@@ -2191,24 +2043,27 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
         Activity activity = getActivity();
         WebView webView = getBridge().getWebView();
         final Float alphaToRestore;
+        final Integer layerTypeToRestore;
         final Drawable webViewBackground;
         final boolean webViewBackgroundCaptured;
         final Drawable parentBackground;
         final boolean parentBackgroundCaptured;
         synchronized (this) {
             alphaToRestore = originalWebViewAlpha;
+            layerTypeToRestore = originalWebViewLayerType;
             webViewBackground = originalWebViewBackground;
             webViewBackgroundCaptured = originalWebViewBackgroundCaptured;
             parentBackground = originalWebViewParentBackground;
             parentBackgroundCaptured = originalWebViewParentBackgroundCaptured;
             originalWebViewAlpha = null;
+            originalWebViewLayerType = null;
             originalWebViewBackground = null;
             originalWebViewBackgroundCaptured = false;
             originalWebViewParentBackground = null;
             originalWebViewParentBackgroundCaptured = false;
         }
 
-        if (alphaToRestore == null && !webViewBackgroundCaptured && !parentBackgroundCaptured) {
+        if (alphaToRestore == null && layerTypeToRestore == null && !webViewBackgroundCaptured && !parentBackgroundCaptured) {
             return;
         }
 
@@ -2227,6 +2082,9 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
                 } else {
                     webView.setBackgroundColor(DEFAULT_WEB_VIEW_BACKGROUND);
                 }
+                if (layerTypeToRestore != null) {
+                    webView.setLayerType(layerTypeToRestore, null);
+                }
                 if (webViewParent != null && parentBackgroundCaptured) {
                     webViewParent.setBackground(parentBackground);
                 }
@@ -2237,17 +2095,10 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
     @Override
     public void onCameraStarted(int width, int height, int x, int y) {
         cameraRestartAfterResumeInProgress = false;
-        // Always transition window and WebView backgrounds to transparent when the camera starts,
-        // regardless of whether there is a pending JS call. This is critical for the
-        // background/foreground resume cycle: on resume, handleOnResume() sets backgrounds to
-        // black (to prevent flicker) and then restarts the camera session, but
-        // cameraStartCallbackId is null at that point. Without this unconditional block the
-        // window and WebView stay black after every background/foreground transition.
-        // Both backgrounds are set together in the same UI thread operation to avoid race
-        // conditions and compositor layering issues.
+        // Re-apply WebView transparency after the preview is bound (idempotent safety net for resume).
         applyTransparentBackgroundsForToBack();
 
-        PluginCall call = bridge.getSavedCall(cameraStartCallbackId);
+        PluginCall call = pendingCameraStartedCall;
         if (call != null) {
             // Convert pixel values back to logical units
             DisplayMetrics metrics = getBridge().getActivity().getResources().getDisplayMetrics();
@@ -2417,27 +2268,27 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
 
     private void resolveCameraStartCall(PluginCall call, JSObject result) {
         call.resolve(result);
-        bridge.releaseCall(call);
-        cameraStartCallbackId = null; // Prevent re-use
+        call.setKeepAlive(false);
+        pendingCameraStartedCall = null; // Prevent re-use
         resetPendingStartBarcodeScanner();
     }
 
     private void rejectCameraStartCall(PluginCall call, String message) {
         call.reject(message);
-        bridge.releaseCall(call);
-        cameraStartCallbackId = null;
+        call.setKeepAlive(false);
+        pendingCameraStartedCall = null;
         resetPendingStartBarcodeScanner();
     }
 
     @Override
     public void onSampleTaken(String result) {
-        PluginCall call = bridge.getSavedCall(sampleCallbackId);
+        PluginCall call = pendingSampleCall;
         if (call != null) {
             JSObject ret = new JSObject();
             ret.put("value", result);
             call.resolve(ret);
-            bridge.releaseCall(call);
-            sampleCallbackId = null;
+            call.setKeepAlive(false);
+            pendingSampleCall = null;
         } else {
             Log.w("CameraPreview", "onSampleTaken: no pending call to resolve");
         }
@@ -2445,11 +2296,11 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
 
     @Override
     public void onSampleTakenError(String message) {
-        PluginCall call = bridge.getSavedCall(sampleCallbackId);
+        PluginCall call = pendingSampleCall;
         if (call != null) {
             call.reject(message);
-            bridge.releaseCall(call);
-            sampleCallbackId = null;
+            call.setKeepAlive(false);
+            pendingSampleCall = null;
         } else {
             Log.e("CameraPreview", "Sample taken error (no pending call): " + message);
         }
@@ -2495,17 +2346,15 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
             }
         }
 
-        PluginCall call = bridge.getSavedCall(cameraStartCallbackId);
+        PluginCall call = pendingCameraStartedCall;
         if (call != null) {
             call.reject(message);
-            bridge.releaseCall(call);
-            cameraStartCallbackId = null;
+            call.setKeepAlive(false);
+            pendingCameraStartedCall = null;
             resetPendingStartBarcodeScanner();
         }
 
-        restoreOriginalWindowBackground(getBridge().getActivity());
         restoreWebViewVisualState();
-        restoreSystemUiForToBackMode(getBridge().getActivity());
     }
 
     @PluginMethod
@@ -2882,28 +2731,30 @@ public class CameraPreview extends Plugin implements CameraXView.CameraXViewList
         }
 
         try {
-            bridge.saveCall(call);
-            final String cbId = call.getCallbackId();
+            call.setKeepAlive(true);
+            pendingStopRecordCall = call;
             cameraXView.stopRecordVideo(
                 new CameraXView.VideoRecordingCallback() {
                     @Override
                     public void onSuccess(String filePath, String reason) {
-                        PluginCall saved = bridge.getSavedCall(cbId);
+                        PluginCall saved = pendingStopRecordCall;
+                        pendingStopRecordCall = null;
                         if (saved != null) {
                             JSObject result = new JSObject();
                             result.put("videoFilePath", filePath);
                             result.put("reason", reason);
                             saved.resolve(result);
-                            bridge.releaseCall(saved);
+                            saved.setKeepAlive(false);
                         }
                     }
 
                     @Override
                     public void onError(String message) {
-                        PluginCall saved = bridge.getSavedCall(cbId);
+                        PluginCall saved = pendingStopRecordCall;
+                        pendingStopRecordCall = null;
                         if (saved != null) {
                             saved.reject("Failed to stop video recording: " + message);
-                            bridge.releaseCall(saved);
+                            saved.setKeepAlive(false);
                         }
                     }
                 }

package/android/src/main/java/app/capgo/capacitor/camera/preview/CameraXView.java

@@ -739,7 +739,12 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
         previewContainer.setFocusable(true);
 
         // Disable any potential drawing artifacts that might cause 1px offset
-        previewContainer.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        boolean toBack = sessionConfig != null && sessionConfig.isToBack();
+        if (ToBackCompositorHelper.shouldUseHardwareLayerOnPreviewContainer(toBack)) {
+            previewContainer.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        } else {
+            previewContainer.setLayerType(View.LAYER_TYPE_NONE, null);
+        }
 
         // Ensure no clip bounds that might cause visual offset
         previewContainer.setClipChildren(false);

package/android/src/main/java/app/capgo/capacitor/camera/preview/ToBackCompositorHelper.java

@@ -0,0 +1,36 @@
+package app.capgo.capacitor.camera.preview;
+
+import android.graphics.Color;
+import android.view.View;
+
+/**
+ * Policy for Android {@code toBack} compositing.
+ * <p>
+ * Camera preview sits behind the Capacitor WebView. Only the WebView stack should be made
+ * transparent — never the Activity window drawable or system bar colors. Touching those causes
+ * status/navigation bar flicker (Pixel/Android 16) and fights edge-to-edge scrims.
+ */
+public final class ToBackCompositorHelper {
+
+    private ToBackCompositorHelper() {}
+
+    public static boolean shouldTransparentizeWebViewParent() {
+        return true;
+    }
+
+    public static int resolveWebViewBackgroundColor() {
+        return Color.TRANSPARENT;
+    }
+
+    public static float resolveWebViewAlpha(float originalAlpha) {
+        return originalAlpha;
+    }
+
+    public static boolean shouldUseHardwareLayerOnPreviewContainer(boolean toBack) {
+        return !toBack;
+    }
+
+    public static int resolveWebViewLayerType() {
+        return View.LAYER_TYPE_HARDWARE;
+    }
+}

package/android/src/test/java/app/capgo/capacitor/camera/preview/ToBackCompositorHelperTest.java

@@ -0,0 +1,39 @@
+package app.capgo.capacitor.camera.preview;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.graphics.Color;
+import android.view.View;
+import org.junit.Test;
+
+public class ToBackCompositorHelperTest {
+
+    @Test
+    public void transparentizesWebViewParentOnAllDevices() {
+        assertTrue(ToBackCompositorHelper.shouldTransparentizeWebViewParent());
+    }
+
+    @Test
+    public void webViewBackgroundIsFullyTransparent() {
+        assertEquals(Color.TRANSPARENT, ToBackCompositorHelper.resolveWebViewBackgroundColor());
+    }
+
+    @Test
+    public void preservesOriginalWebViewAlpha() {
+        assertEquals(0.75f, ToBackCompositorHelper.resolveWebViewAlpha(0.75f), 0.0001f);
+        assertEquals(1f, ToBackCompositorHelper.resolveWebViewAlpha(1f), 0.0001f);
+    }
+
+    @Test
+    public void skipsHardwareLayerOnPreviewContainerWhenToBack() {
+        assertFalse(ToBackCompositorHelper.shouldUseHardwareLayerOnPreviewContainer(true));
+        assertTrue(ToBackCompositorHelper.shouldUseHardwareLayerOnPreviewContainer(false));
+    }
+
+    @Test
+    public void usesHardwareLayerForWebViewTransparency() {
+        assertEquals(View.LAYER_TYPE_HARDWARE, ToBackCompositorHelper.resolveWebViewLayerType());
+    }
+}

package/ios/Sources/CapgoCameraPreviewPlugin/CameraController.swift

@@ -82,8 +82,8 @@ class CameraController: NSObject {
                 }
             }
 
-            // 2. Reset Exposure to the center ONLY if it is not explicitly locked
-            if device.exposureMode != .locked {
+            // 2. Reset Exposure to the center ONLY if it is not explicitly locked by the user
+            if self.shouldAutoAdjustExposureOnFocus {
                 if device.isExposureModeSupported(.continuousAutoExposure) {
                     device.exposureMode = .continuousAutoExposure
                     if device.isExposurePointOfInterestSupported {
@@ -105,6 +105,14 @@ class CameraController: NSObject {
 
     var captureSession: AVCaptureSession?
     var disableFocusIndicator: Bool = false
+    /// App-level exposure preference. AVFoundation's `.autoExpose` auto-transitions to
+    /// `.locked` after one-shot metering, so device.exposureMode alone cannot tell whether
+    /// the user explicitly locked exposure via setExposureMode("LOCK").
+    private var preferredExposureMode: String = "CONTINUOUS"
+    /// AUTO/CONTINUOUS allow tap/restore to reset metering + EV; LOCK/CUSTOM must keep user settings.
+    private var shouldAutoAdjustExposureOnFocus: Bool {
+        preferredExposureMode == "AUTO" || preferredExposureMode == "CONTINUOUS"
+    }
     private var focusExposureRestoreGeneration: UInt = 0
     private var focusExposureRestoreTimeoutWorkItem: DispatchWorkItem?
     private let focusExposureRestoreTimeout: TimeInterval = 3.0
@@ -1290,12 +1298,13 @@ extension CameraController {
             self.rearCameraInput = newInput
             self.currentCameraPosition = .rear
         }
-        // (Lightweight focus config; non-fatal on failure)
+        // (Lightweight focus/exposure config; non-fatal on failure)
         try? targetDevice.lockForConfiguration()
         if targetDevice.isFocusModeSupported(.continuousAutoFocus) {
             targetDevice.focusMode = .continuousAutoFocus
         }
         targetDevice.unlockForConfiguration()
+        try? self.applyPreferredExposureMode(to: targetDevice)
 
         // Restore audio input if it existed
         if let audioInput = existingAudioInput, captureSession.canAddInput(audioInput) {
@@ -2224,7 +2233,8 @@ extension CameraController {
             device.focusPointOfInterest = point
         }
 
-        if adjustExposure, device.exposureMode != .locked {
+        // Prefer app-level mode: `.autoExpose` leaves device.exposureMode as `.locked`.
+        if adjustExposure, self.shouldAutoAdjustExposureOnFocus {
             if device.isExposurePointOfInterestSupported, device.isExposureModeSupported(.autoExpose) {
                 device.exposureMode = .autoExpose
                 device.setExposureTargetBias(0.0) { _ in }
@@ -2282,7 +2292,9 @@ extension CameraController {
                 }
             }
 
-            if device.exposureMode != .locked {
+            // Restore continuous AE for AUTO/CONTINUOUS only (preserve LOCK/CUSTOM).
+            // Do not trust device.exposureMode here: one-shot `.autoExpose` ends in `.locked`.
+            if self.shouldAutoAdjustExposureOnFocus {
                 if device.isExposureModeSupported(.continuousAutoExposure) {
                     device.exposureMode = .continuousAutoExposure
                     if device.isExposurePointOfInterestSupported {
@@ -2302,13 +2314,7 @@ extension CameraController {
         guard let device = self.activeVideoDevice() else { return }
 
         let centerPoint = CGPoint(x: 0.5, y: 0.5)
-        let adjustExposure: Bool
-        do {
-            let exposureMode = try self.getExposureMode()
-            adjustExposure = exposureMode == "AUTO" || exposureMode == "CONTINUOUS"
-        } catch {
-            adjustExposure = true
-        }
+        let adjustExposure = self.shouldAutoAdjustExposureOnFocus
 
         do {
             try self.applyOneShotFocusAndExposure(at: centerPoint, on: device, adjustExposure: adjustExposure)
@@ -2498,14 +2504,15 @@ extension CameraController {
                 self.rearCameraInput = newInput
                 self.rearCamera = targetDevice
                 self.currentCameraPosition = .rear
+            }
 
-                // Configure rear camera
-                try targetDevice.lockForConfiguration()
-                if targetDevice.isFocusModeSupported(.continuousAutoFocus) {
-                    targetDevice.focusMode = .continuousAutoFocus
-                }
-                targetDevice.unlockForConfiguration()
+            // Lightweight focus/exposure config; non-fatal on failure
+            try? targetDevice.lockForConfiguration()
+            if targetDevice.isFocusModeSupported(.continuousAutoFocus) {
+                targetDevice.focusMode = .continuousAutoFocus
             }
+            targetDevice.unlockForConfiguration()
+            try? self.applyPreferredExposureMode(to: targetDevice)
         } else {
             throw CameraControllerError.invalidOperation
         }
@@ -2564,6 +2571,7 @@ extension CameraController {
 
         self.captureSession = nil
         self.currentCameraPosition = nil
+        self.preferredExposureMode = "CONTINUOUS"
 
         // Reset output preparation status
         self.outputsPrepared = false
@@ -2576,6 +2584,39 @@ extension CameraController {
 
     // MARK: - Exposure Controls
 
+    private func applyPreferredExposureMode(to device: AVCaptureDevice) throws {
+        let mode = self.preferredExposureMode
+        let desiredMode: AVCaptureDevice.ExposureMode
+        switch mode {
+        case "LOCK":
+            desiredMode = .locked
+        case "AUTO":
+            desiredMode = .autoExpose
+        case "CUSTOM":
+            desiredMode = .custom
+        default:
+            desiredMode = .continuousAutoExposure
+        }
+
+        guard device.isExposureModeSupported(desiredMode) else {
+            // Fall back to continuous when the preferred mode is unavailable on this lens.
+            if device.isExposureModeSupported(.continuousAutoExposure) {
+                try device.lockForConfiguration()
+                device.exposureMode = .continuousAutoExposure
+                device.setExposureTargetBias(0.0) { _ in }
+                device.unlockForConfiguration()
+            }
+            return
+        }
+
+        try device.lockForConfiguration()
+        device.exposureMode = desiredMode
+        if desiredMode == .autoExpose || desiredMode == .continuousAutoExposure {
+            device.setExposureTargetBias(0.0) { _ in }
+        }
+        device.unlockForConfiguration()
+    }
+
     func getExposureModes() throws -> [String] {
         var currentCamera: AVCaptureDevice?
         switch currentCameraPosition {
@@ -2610,22 +2651,12 @@ extension CameraController {
             break
         }
 
-        guard let device = currentCamera else {
+        guard currentCamera != nil else {
             throw CameraControllerError.noCamerasAvailable
         }
 
-        switch device.exposureMode {
-        case .locked:
-            return "LOCK"
-        case .autoExpose:
-            return "AUTO"
-        case .continuousAutoExposure:
-            return "CONTINUOUS"
-        case .custom:
-            return "CUSTOM"
-        @unknown default:
-            return "CONTINUOUS"
-        }
+        // App preference, not device.exposureMode: one-shot `.autoExpose` ends as `.locked`.
+        return self.preferredExposureMode
     }
 
     func setExposureMode(mode: String) throws {
@@ -2662,14 +2693,15 @@ extension CameraController {
             throw CameraControllerError.invalidOperation
         }
 
+        switch normalized {
+        case "LOCK", "AUTO", "CONTINUOUS", "CUSTOM":
+            self.preferredExposureMode = normalized
+        default:
+            self.preferredExposureMode = "CONTINUOUS"
+        }
+
         do {
-            try device.lockForConfiguration()
-            device.exposureMode = finalMode
-            // Reset EV to 0 when switching to AUTO or CONTINUOUS
-            if finalMode == .autoExpose || finalMode == .continuousAutoExposure {
-                device.setExposureTargetBias(0.0) { _ in }
-            }
-            device.unlockForConfiguration()
+            try self.applyPreferredExposureMode(to: device)
         } catch {
             throw CameraControllerError.invalidOperation
         }

package/ios/Sources/CapgoCameraPreviewPlugin/Plugin.swift

@@ -35,7 +35,7 @@ extension UIWindow {
  */
 @objc(CameraPreview)
 public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelegate {
-    private let pluginVersion: String = "8.11.1"
+    private let pluginVersion: String = "8.11.3"
     public let identifier = "CameraPreviewPlugin"
     public let jsName = "CameraPreview"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -1233,7 +1233,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                     print("[CameraPreview] Location permission not determined, requesting...")
                     // Save the call for the delegate callback
                     print("[CameraPreview] Saving call for location authorization flow")
-                    self.bridge?.saveCall(call)
+                    call.keepAlive = true
                     self.permissionCallID = call.callbackId
                     self.waitingForLocation = true
 
@@ -2029,14 +2029,14 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                     print("[CameraPreview] Location authorized, getting location for capture")
                     self.getCurrentLocation { _ in
                         self.performCapture(call: call)
-                        self.bridge?.releaseCall(call)
+                        call.keepAlive = false
                         self.permissionCallID = nil
                         self.waitingForLocation = false
                     }
                 case .denied, .restricted:
                     print("[CameraPreview] Location denied, rejecting capture")
                     call.reject("Location permission denied")
-                    self.bridge?.releaseCall(call)
+                    call.keepAlive = false
                     self.permissionCallID = nil
                     self.waitingForLocation = false
                 case .notDetermined:
@@ -2045,7 +2045,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                 @unknown default:
                     print("[CameraPreview] Unknown status, rejecting capture")
                     call.reject("Unknown location permission status")
-                    self.bridge?.releaseCall(call)
+                    call.keepAlive = false
                     self.permissionCallID = nil
                     self.waitingForLocation = false
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/camera-preview",
-  "version": "8.11.1",
+  "version": "8.11.3",
   "description": "Camera preview",
   "license": "MPL-2.0",
   "repository": {
@@ -56,6 +56,7 @@
     "watch": "tsc --watch",
     "prepublishOnly": "bun run build",
     "check:wiring": "node scripts/check-capacitor-plugin-wiring.mjs",
+    "check:cap9-deprecated": "bun scripts/check-cap9-deprecated.mjs",
     "example:install": "cd example-app && bun install --frozen-lockfile",
     "example:build": "bun run build && cd example-app && bun install --frozen-lockfile && bun run build",
     "changelog:ai": "node scripts/generate-ai-changelog.mjs"