@capgo/camera-preview 7.14.8 → 7.15.0

package/README.md

@@ -84,6 +84,16 @@ Video and photo taken with the plugin are never removed, so do not forget to rem
 use https://capacitorjs.com/docs/apis/filesystem#deletefile for that
 
 
+## Touch & Gestures (JS‑Driven)
+
+- Native tap‑to‑focus and pinch‑to‑zoom gesture handling are intentionally disabled on both Android and iOS.
+- Handle all user interactions in your HTML/JS layer, then call the plugin methods:
+  - Focus: `await CameraPreview.setFocus({ x, y })` with normalized coordinates (0–1) relative to the preview bounds.
+  - Zoom: `await CameraPreview.setZoom({ level })` using your own gesture/UI logic.
+- Rationale: native gesture recognizers can conflict with your HTML touch handlers and block UI interactions. Keeping gestures in JS guarantees your UI receives touches as intended.
+- The `enableZoom` start option is removed. Use JS gestures + `setZoom(...)`.
+- Tip: When using `toBack: true`, the WebView is in front of the camera and receives touches; design your overlay UI there and drive focus/zoom through the JS API.
+
 ## Fast base64 from file path (no bridge)
 
 When using `storeToFile: true`, you can avoid sending large base64 strings over the Capacitor bridge:
@@ -784,6 +794,9 @@ setFocus(options: { x: number; y: number; }) => Promise<void>
 
 Sets the camera focus to a specific point in the preview.
 
+Note: The plugin does not attach any native tap-to-focus gesture handlers. Handle taps in
+your HTML/JS (e.g., on the overlaying UI), then pass normalized coordinates here.
+
 | Param         | Type                                   | Description          |
 | ------------- | -------------------------------------- | -------------------- |
 | **`options`** | <code>{ x: number; y: number; }</code> | - The focus options. |
@@ -999,7 +1012,6 @@ Defines the configuration options for starting the camera preview.
 | **`disableAudio`**                 | <code>boolean</code>                                            | If true, disables the audio stream, preventing audio permission requests.                                                                                                                               | <code>true</code>     |        |
 | **`lockAndroidOrientation`**       | <code>boolean</code>                                            | If true, locks the device orientation while the camera is active.                                                                                                                                       | <code>false</code>    |        |
 | **`enableOpacity`**                | <code>boolean</code>                                            | If true, allows the camera preview's opacity to be changed.                                                                                                                                             | <code>false</code>    |        |
-| **`enableZoom`**                   | <code>boolean</code>                                            | If true, enables pinch-to-zoom functionality on the preview.                                                                                                                                            | <code>false</code>    |        |
 | **`disableFocusIndicator`**        | <code>boolean</code>                                            | If true, disables the visual focus indicator when tapping to focus.                                                                                                                                     | <code>false</code>    |        |
 | **`deviceId`**                     | <code>string</code>                                             | The `deviceId` of the camera to use. If provided, `position` is ignored.                                                                                                                                |                       |        |
 | **`initialZoomLevel`**             | <code>number</code>                                             | The initial zoom level when starting the camera preview. If the requested zoom level is not available, the native plugin will reject.                                                                   | <code>1.0</code>      | 2.2.0  |

package/android/build.gradle

@@ -18,7 +18,7 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    namespace "com.ahm.capacitor.camera.preview.capacitorcamerapreview"
+    namespace "app.capgo.capacitor.camera.preview.capacitorcamerapreview"
     compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23

package/android/src/main/java/{com/ahm → app/capgo}/capacitor/camera/preview/CameraPreview.java

@@ -1,15 +1,18 @@
-package com.ahm.capacitor.camera.preview;
+package app.capgo.capacitor.camera.preview;
 
 import static android.Manifest.permission.CAMERA;
 import static android.Manifest.permission.RECORD_AUDIO;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 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;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Size;
@@ -17,13 +20,15 @@ import android.view.OrientationEventListener;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
+import androidx.annotation.RequiresPermission;
+import androidx.core.app.ActivityCompat;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
-import com.ahm.capacitor.camera.preview.model.CameraDevice;
-import com.ahm.capacitor.camera.preview.model.CameraSessionConfiguration;
-import com.ahm.capacitor.camera.preview.model.LensInfo;
-import com.ahm.capacitor.camera.preview.model.ZoomFactors;
+import app.capgo.capacitor.camera.preview.model.CameraDevice;
+import app.capgo.capacitor.camera.preview.model.CameraSessionConfiguration;
+import app.capgo.capacitor.camera.preview.model.LensInfo;
+import app.capgo.capacitor.camera.preview.model.ZoomFactors;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Logger;
@@ -107,7 +112,7 @@ public class CameraPreview
     "cameraWithLocation";
 
   private String captureCallbackId = "";
-  private String snapshotCallbackId = "";
+  private String sampleCallbackId = "";
   private String cameraStartCallbackId = "";
   private int previousOrientationRequest =
     ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
@@ -266,6 +271,7 @@ public class CameraPreview
     call.resolve();
   }
 
+  @SuppressLint("MissingPermission")
   @PluginMethod
   public void capture(final PluginCall call) {
     if (cameraXView == null || !cameraXView.isRunning()) {
@@ -273,7 +279,9 @@ public class CameraPreview
       return;
     }
 
-    final boolean withExifLocation = call.getBoolean("withExifLocation", false);
+    final boolean withExifLocation = Boolean.TRUE.equals(
+      call.getBoolean("withExifLocation", false)
+    );
 
     if (withExifLocation) {
       if (
@@ -293,12 +301,27 @@ public class CameraPreview
     }
   }
 
+  @SuppressLint("MissingPermission")
   @PermissionCallback
   private void captureWithLocationPermission(PluginCall call) {
     if (
       getPermissionState(CAMERA_WITH_LOCATION_PERMISSION_ALIAS) ==
       PermissionState.GRANTED
     ) {
+      if (
+        ActivityCompat.checkSelfPermission(
+            getContext(),
+            Manifest.permission.ACCESS_FINE_LOCATION
+          ) !=
+          PackageManager.PERMISSION_GRANTED ||
+        ActivityCompat.checkSelfPermission(
+          getContext(),
+          Manifest.permission.ACCESS_COARSE_LOCATION
+        ) !=
+        PackageManager.PERMISSION_GRANTED
+      ) {
+        return;
+      }
       getLocationAndCapture(call);
     } else {
       Logger.warn(
@@ -308,6 +331,12 @@ public class CameraPreview
     }
   }
 
+  @RequiresPermission(
+    allOf = {
+      Manifest.permission.ACCESS_FINE_LOCATION,
+      Manifest.permission.ACCESS_COARSE_LOCATION,
+    }
+  )
   private void getLocationAndCapture(PluginCall call) {
     if (fusedLocationClient == null) {
       fusedLocationClient = LocationServices.getFusedLocationProviderClient(
@@ -335,7 +364,9 @@ public class CameraPreview
     captureCallbackId = call.getCallbackId();
 
     Integer quality = Objects.requireNonNull(call.getInt("quality", 85));
-    final boolean saveToGallery = call.getBoolean("saveToGallery", false);
+    final boolean saveToGallery = Boolean.TRUE.equals(
+      call.getBoolean("saveToGallery")
+    );
     Integer width = call.getInt("width");
     Integer height = call.getInt("height");
 
@@ -349,7 +380,7 @@ public class CameraPreview
       return;
     }
     bridge.saveCall(call);
-    snapshotCallbackId = call.getCallbackId();
+    sampleCallbackId = call.getCallbackId();
     Integer quality = Objects.requireNonNull(call.getInt("quality", 85));
     cameraXView.captureSample(quality);
   }
@@ -442,7 +473,7 @@ public class CameraPreview
       deviceJson.put("label", device.getLabel());
       deviceJson.put("position", device.getPosition());
       JSArray lensesArray = new JSArray();
-      for (com.ahm.capacitor.camera.preview.model.LensInfo lens : device.getLenses()) {
+      for (app.capgo.capacitor.camera.preview.model.LensInfo lens : device.getLenses()) {
         JSObject lensJson = new JSObject();
         lensJson.put("focalLength", lens.getFocalLength());
         lensJson.put("deviceType", lens.getDeviceType());
@@ -496,7 +527,7 @@ public class CameraPreview
       float minUltra = 0.5f;
 
       for (CameraDevice device : devices) {
-        for (com.ahm.capacitor.camera.preview.model.LensInfo lens : device.getLenses()) {
+        for (app.capgo.capacitor.camera.preview.model.LensInfo lens : device.getLenses()) {
           if ("ultraWide".equals(lens.getDeviceType())) {
             hasUltraWide = true;
             // Use overall minZoom for that device as the button value to represent UW
@@ -629,6 +660,7 @@ public class CameraPreview
       return;
     }
     Float opacity = call.getFloat("opacity", 1.0f);
+    //noinspection DataFlowIssue
     cameraXView.setOpacity(opacity);
     call.resolve();
   }
@@ -724,8 +756,11 @@ public class CameraPreview
       (y == -1) +
       ")"
     );
+    //noinspection DataFlowIssue
     final int width = call.getInt("width", 0);
+    //noinspection DataFlowIssue
     final int height = call.getInt("height", 0);
+    //noinspection DataFlowIssue
     final int paddingBottom = call.getInt("paddingBottom", 0);
     final boolean toBack = Boolean.TRUE.equals(call.getBoolean("toBack", true));
     final boolean storeToFile = Boolean.TRUE.equals(
@@ -734,9 +769,6 @@ public class CameraPreview
     final boolean enableOpacity = Boolean.TRUE.equals(
       call.getBoolean("enableOpacity", false)
     );
-    final boolean enableZoom = Boolean.TRUE.equals(
-      call.getBoolean("enableZoom", false)
-    );
     final boolean disableExifHeaderStripping = Boolean.TRUE.equals(
       call.getBoolean("disableExifHeaderStripping", false)
     );
@@ -750,7 +782,9 @@ public class CameraPreview
     final String aspectRatio = call.getString("aspectRatio", "4:3");
     final String gridMode = call.getString("gridMode", "none");
     final String positioning = call.getString("positioning", "top");
+    //noinspection DataFlowIssue
     final float initialZoomLevel = call.getFloat("initialZoomLevel", 1.0f);
+    //noinspection DataFlowIssue
     final boolean disableFocusIndicator = call.getBoolean(
       "disableFocusIndicator",
       false
@@ -1014,7 +1048,7 @@ public class CameraPreview
           // Position vertically based on positioning parameter
           int screenHeight = metrics.heightPixels;
 
-          switch (positioning) {
+          switch (Objects.requireNonNull(positioning)) {
             case "top":
               computedY = 0;
               Log.d("CameraPreview", "Positioning at top: computedY=0");
@@ -1181,7 +1215,6 @@ public class CameraPreview
           toBack,
           storeToFile,
           enableOpacity,
-          enableZoom,
           disableExifHeaderStripping,
           disableAudio,
           1.0f,
@@ -1711,14 +1744,31 @@ public class CameraPreview
 
   @Override
   public void onSampleTaken(String result) {
-    // Handle sample taken if needed
-    Log.i("CameraPreview", "Sample taken: " + result);
+    PluginCall call = bridge.getSavedCall(sampleCallbackId);
+    if (call != null) {
+      JSObject ret = new JSObject();
+      ret.put("value", result);
+      call.resolve(ret);
+      bridge.releaseCall(call);
+      sampleCallbackId = null;
+    } else {
+      Log.w("CameraPreview", "onSampleTaken: no pending call to resolve");
+    }
   }
 
   @Override
   public void onSampleTakenError(String message) {
-    // Handle sample taken error if needed
-    Log.e("CameraPreview", "Sample taken error: " + message);
+    PluginCall call = bridge.getSavedCall(sampleCallbackId);
+    if (call != null) {
+      call.reject(message);
+      bridge.releaseCall(call);
+      sampleCallbackId = null;
+    } else {
+      Log.e(
+        "CameraPreview",
+        "Sample taken error (no pending call): " + message
+      );
+    }
   }
 
   @Override
@@ -1897,7 +1947,9 @@ public class CameraPreview
       return;
     }
     try {
-      java.io.File f = new java.io.File(android.net.Uri.parse(path).getPath());
+      java.io.File f = new java.io.File(
+        Objects.requireNonNull(Uri.parse(path).getPath())
+      );
       boolean deleted = f.exists() && f.delete();
       JSObject ret = new JSObject();
       ret.put("success", deleted);
@@ -2031,20 +2083,9 @@ public class CameraPreview
         if (orientation == Configuration.ORIENTATION_PORTRAIT) {
           // Portrait: return top inset (notch/status bar)
           notchInsetPx = Math.max(cutout.top, sysBars.top);
-
-          // If no cutout detected but we have system bars, use status bar height as fallback
-          if (cutout.top == 0 && sysBars.top > 0) {
-            notchInsetPx = sysBars.top;
-          }
         } else if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
           // Landscape: return left inset (notch moved to side)
           notchInsetPx = Math.max(cutout.left, sysBars.left);
-
-          // If no cutout detected but we have system bars, use left system bar as fallback
-          if (cutout.left == 0 && sysBars.left > 0) {
-            notchInsetPx = sysBars.left;
-          }
-
           // Additional fallback: some devices might have the notch on the right in landscape
           // If left is 0, check right side as well
           if (notchInsetPx == 0) {
@@ -2070,12 +2111,9 @@ public class CameraPreview
     call.resolve(ret);
   }
 
-  private boolean approxEqualPx(int a, int b) {
-    return Math.abs(a - b) <= 2; // within 2px tolerance
-  }
-
   private int getStatusBarHeightPx() {
     int result = 0;
+    @SuppressLint("InternalInsetResource")
     int resourceId = getContext()
       .getResources()
       .getIdentifier("status_bar_height", "dimen", "android");
@@ -2084,15 +2122,4 @@ public class CameraPreview
     }
     return result;
   }
-
-  private int getNavigationBarHeightPx() {
-    int result = 0;
-    int resourceId = getContext()
-      .getResources()
-      .getIdentifier("navigation_bar_height", "dimen", "android");
-    if (resourceId > 0) {
-      result = getContext().getResources().getDimensionPixelSize(resourceId);
-    }
-    return result;
-  }
 }