@capgo/camera-preview 7.13.10 → 7.14.0

package/android/src/main/java/com/ahm/capacitor/camera/preview/CameraPreview.java

@@ -7,6 +7,8 @@ import android.Manifest;
 import android.content.pm.ActivityInfo;
 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.util.DisplayMetrics;
 import android.util.Log;
@@ -116,6 +118,7 @@ public class CameraPreview
   private OrientationEventListener orientationListener;
   private int lastOrientation = Configuration.ORIENTATION_UNDEFINED;
   private boolean lastDisableAudio = true;
+  private Drawable originalWindowBackground;
 
   @PluginMethod
   public void getExposureModes(PluginCall call) {
@@ -379,6 +382,16 @@ public class CameraPreview
           cameraXView.stopSession();
           cameraXView = null;
         }
+        // Restore original window background if modified earlier
+        if (originalWindowBackground != null) {
+          try {
+            getBridge()
+              .getActivity()
+              .getWindow()
+              .setBackgroundDrawable(originalWindowBackground);
+          } catch (Exception ignored) {}
+          originalWindowBackground = null;
+        }
         call.resolve();
       });
   }
@@ -788,6 +801,22 @@ public class CameraPreview
     getBridge()
       .getActivity()
       .runOnUiThread(() -> {
+        // Ensure transparent background when preview is behind the WebView (Android 10 fix)
+        if (toBack) {
+          try {
+            if (originalWindowBackground == null) {
+              originalWindowBackground = getBridge()
+                .getActivity()
+                .getWindow()
+                .getDecorView()
+                .getBackground();
+            }
+            getBridge()
+              .getActivity()
+              .getWindow()
+              .setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+          } catch (Exception ignored) {}
+        }
         DisplayMetrics metrics = getBridge()
           .getActivity()
           .getResources()

package/android/src/main/java/com/ahm/capacitor/camera/preview/CameraXView.java

@@ -51,6 +51,7 @@ import androidx.camera.core.MeteringPoint;
 import androidx.camera.core.MeteringPointFactory;
 import androidx.camera.core.Preview;
 import androidx.camera.core.ResolutionInfo;
+import androidx.camera.core.TorchState;
 import androidx.camera.core.UseCase;
 import androidx.camera.core.ZoomState;
 import androidx.camera.core.resolutionselector.AspectRatioStrategy;
@@ -2321,7 +2322,8 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     try {
       boolean hasFlash = camera.getCameraInfo().hasFlashUnit();
       if (hasFlash) {
-        return Arrays.asList("off", "on", "auto");
+        // Include torch for devices with a flash unit
+        return Arrays.asList("off", "on", "auto", "torch");
       } else {
         return Collections.singletonList("off");
       }
@@ -2332,6 +2334,16 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
   }
 
   public String getFlashMode() {
+    // If torch is enabled, report torch regardless of ImageCapture flash mode
+    try {
+      if (camera != null) {
+        Integer torch = camera.getCameraInfo().getTorchState().getValue();
+        if (torch != null && torch == TorchState.ON) {
+          return "torch";
+        }
+      }
+    } catch (Exception ignore) {}
+
     switch (currentFlashMode) {
       case ImageCapture.FLASH_MODE_ON:
         return "on";
@@ -2343,6 +2355,35 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
   }
 
   public void setFlashMode(String mode) {
+    // Handle torch separately via CameraControl
+    if ("torch".equals(mode)) {
+      try {
+        if (camera != null) {
+          camera.getCameraControl().enableTorch(true);
+        }
+      } catch (Exception e) {
+        Log.e(TAG, "setFlashMode: Failed to enable torch", e);
+      }
+      // Keep ImageCapture flash mode OFF to avoid conflicts with torch
+      currentFlashMode = ImageCapture.FLASH_MODE_OFF;
+      if (imageCapture != null) {
+        imageCapture.setFlashMode(ImageCapture.FLASH_MODE_OFF);
+      }
+      if (sampleImageCapture != null) {
+        sampleImageCapture.setFlashMode(ImageCapture.FLASH_MODE_OFF);
+      }
+      return;
+    }
+
+    // For non-torch modes, ensure torch is disabled
+    try {
+      if (camera != null) {
+        camera.getCameraControl().enableTorch(false);
+      }
+    } catch (Exception e) {
+      Log.w(TAG, "setFlashMode: Failed to disable torch", e);
+    }
+
     int flashMode;
     switch (mode) {
       case "on":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/camera-preview",
-  "version": "7.13.10",
+  "version": "7.14.0",
   "description": "Camera preview",
   "license": "MIT",
   "repository": {