@capgo/camera-preview 7.4.0-alpha.1 → 7.4.0-alpha.13

package/README.md

@@ -37,7 +37,7 @@ Take into account that this will make transparent all ion-content on application
 ```
 
 If the camera preview is not displaying after applying the above styles, apply transparent background color to the root div element of the parent component
-Ex: VueJS >> App.vue component 
+Ex: VueJS >> App.vue component
 ```html
 <template>
   <ion-app id="app">
@@ -76,6 +76,24 @@ 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
 
 
+## Fast base64 from file path (no bridge)
+
+When using `storeToFile: true`, you can avoid sending large base64 strings over the Capacitor bridge:
+
+```ts
+import { CameraPreview, getBase64FromFilePath } from '@capgo/camera-preview'
+
+// Take a picture and get a file path
+const { value: filePath } = await CameraPreview.capture({ quality: 85, storeToFile: true })
+
+// Convert the file to base64 entirely on the JS side (fast, no bridge)
+const base64 = await getBase64FromFilePath(filePath)
+
+// Optionally cleanup the temp file natively
+await CameraPreview.deleteFile({ path: filePath })
+```
+
+
 # Installation
 
 ```
@@ -234,6 +252,7 @@ Documentation for the [uploader](https://github.com/Cap-go/capacitor-uploader)
 * [`isRunning()`](#isrunning)
 * [`getAvailableDevices()`](#getavailabledevices)
 * [`getZoom()`](#getzoom)
+* [`getZoomButtonValues()`](#getzoombuttonvalues)
 * [`setZoom(...)`](#setzoom)
 * [`getFlashMode()`](#getflashmode)
 * [`removeAllListeners()`](#removealllisteners)
@@ -242,6 +261,7 @@ Documentation for the [uploader](https://github.com/Cap-go/capacitor-uploader)
 * [`getPreviewSize()`](#getpreviewsize)
 * [`setPreviewSize(...)`](#setpreviewsize)
 * [`setFocus(...)`](#setfocus)
+* [`addListener('screenResize', ...)`](#addlistenerscreenresize-)
 * [Interfaces](#interfaces)
 * [Type Aliases](#type-aliases)
 * [Enums](#enums)
@@ -559,6 +579,21 @@ Gets the current zoom state, including min/max and current lens info.
 --------------------
 
 
+### getZoomButtonValues()
+
+```typescript
+getZoomButtonValues() => Promise<{ values: number[]; }>
+```
+
+Returns zoom button values for quick switching.
+- iOS/Android: includes 0.5 if ultra-wide available; 1 and 2 if wide available; 3 if telephoto available
+- Web: unsupported
+
+**Returns:** <code>Promise&lt;{ values: number[]; }&gt;</code>
+
+--------------------
+
+
 ### setZoom(...)
 
 ```typescript
@@ -683,6 +718,22 @@ Sets the camera focus to a specific point in the preview.
 --------------------
 
 
+### addListener('screenResize', ...)
+
+```typescript
+addListener(eventName: "screenResize", listenerFunc: (data: { width: number; height: number; x: number; y: number; }) => void) => Promise<PluginListenerHandle>
+```
+
+| Param              | Type                                                                                     |
+| ------------------ | ---------------------------------------------------------------------------------------- |
+| **`eventName`**    | <code>'screenResize'</code>                                                              |
+| **`listenerFunc`** | <code>(data: { width: number; height: number; x: number; y: number; }) =&gt; void</code> |
+
+**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt;</code>
+
+--------------------
+
+
 ### Interfaces
 
 
@@ -816,6 +867,13 @@ Represents the detailed information of the currently active lens.
 | **`digitalZoom`**   | <code>number</code>                               | The current digital zoom factor applied on top of the base zoom. |
 
 
+#### PluginListenerHandle
+
+| Prop         | Type                                      |
+| ------------ | ----------------------------------------- |
+| **`remove`** | <code>() =&gt; Promise&lt;void&gt;</code> |
+
+
 ### Type Aliases
 
 

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

@@ -276,6 +276,53 @@ public class CameraPreview
     call.resolve(result);
   }
 
+  @PluginMethod
+  public void getZoomButtonValues(PluginCall call) {
+    // Build a sorted set to dedupe and order ascending
+    java.util.Set<Double> sorted = new java.util.TreeSet<>();
+    sorted.add(1.0);
+    sorted.add(2.0);
+
+    // Try to detect ultra-wide to include its min zoom (often 0.5)
+    try {
+      List<CameraDevice> devices = CameraXView.getAvailableDevicesStatic(
+        getContext()
+      );
+      ZoomFactors zoomFactors = cameraXView.getZoomFactors();
+      boolean hasUltraWide = false;
+      boolean hasTelephoto = false;
+      float minUltra = 0.5f;
+
+      for (CameraDevice device : devices) {
+        for (com.ahm.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
+            minUltra = Math.max(minUltra, zoomFactors.getMin());
+          } else if ("telephoto".equals(lens.getDeviceType())) {
+            hasTelephoto = true;
+          }
+        }
+      }
+      if (hasUltraWide) {
+        sorted.add((double) minUltra);
+      }
+      if (hasTelephoto) {
+        sorted.add(3.0);
+      }
+    } catch (Exception ignored) {
+      // Ignore and keep defaults
+    }
+
+    JSObject result = new JSObject();
+    JSArray values = new JSArray();
+    for (Double v : sorted) {
+      values.put(v);
+    }
+    result.put("values", values);
+    call.resolve(result);
+  }
+
   @PluginMethod
   public void setZoom(PluginCall call) {
     if (cameraXView == null || !cameraXView.isRunning()) {
@@ -287,9 +334,8 @@ public class CameraPreview
       call.reject("level parameter is required");
       return;
     }
-    Boolean autoFocus = call.getBoolean("autoFocus", true);
     try {
-      cameraXView.setZoom(level, autoFocus);
+      cameraXView.setZoom(level);
       call.resolve();
     } catch (Exception e) {
       call.reject("Failed to set zoom: " + e.getMessage());
@@ -1191,4 +1237,22 @@ public class CameraPreview
       call.resolve(ret);
     });
   }
+
+  @PluginMethod
+  public void deleteFile(PluginCall call) {
+    String path = call.getString("path");
+    if (path == null || path.isEmpty()) {
+      call.reject("path parameter is required");
+      return;
+    }
+    try {
+      java.io.File f = new java.io.File(android.net.Uri.parse(path).getPath());
+      boolean deleted = f.exists() && f.delete();
+      JSObject ret = new JSObject();
+      ret.put("success", deleted);
+      call.resolve(ret);
+    } catch (Exception e) {
+      call.reject("Failed to delete file: " + e.getMessage());
+    }
+  }
 }

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

@@ -102,6 +102,7 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
   private GridOverlayView gridOverlayView;
   private FrameLayout previewContainer;
   private View focusIndicatorView;
+  private long focusIndicatorAnimationId = 0; // Incrementing token to invalidate previous animations
   private CameraSelector currentCameraSelector;
   private String currentDeviceId;
   private int currentFlashMode = ImageCapture.FLASH_MODE_OFF;
@@ -726,7 +727,7 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
             }
           }
 
-          setZoomInternal(initialZoom);
+          setZoom(initialZoom);
         }
 
         isRunning = true;
@@ -1040,12 +1041,40 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
               saveImageToGallery(bytes);
             }
 
-            String base64 = Base64.encodeToString(bytes, Base64.NO_WRAP);
+            String resultValue;
+            boolean returnFileUri =
+              sessionConfig != null && sessionConfig.isStoreToFile();
+            if (returnFileUri) {
+              // Persist processed image to a file and return its URI to avoid heavy base64 bridging
+              try {
+                String fileName =
+                  "cpcp_" +
+                  new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(
+                    new java.util.Date()
+                  ) +
+                  ".jpg";
+                File outDir = context.getCacheDir();
+                File outFile = new File(outDir, fileName);
+                FileOutputStream outFos = new FileOutputStream(outFile);
+                outFos.write(bytes);
+                outFos.close();
+
+                // Return a file path; apps can convert via Capacitor.convertFileSrc on JS side
+                resultValue = outFile.getAbsolutePath();
+              } catch (IOException ioEx) {
+                Log.e(TAG, "capturePhoto: Failed to write image file", ioEx);
+                // Fallback to base64 if file write fails
+                resultValue = Base64.encodeToString(bytes, Base64.NO_WRAP);
+              }
+            } else {
+              // Backward-compatible behavior
+              resultValue = Base64.encodeToString(bytes, Base64.NO_WRAP);
+            }
 
             tempFile.delete();
 
             if (listener != null) {
-              listener.onPictureTaken(base64, exifData);
+              listener.onPictureTaken(resultValue, exifData);
             }
           } catch (Exception e) {
             Log.e(TAG, "capturePhoto: Error processing image", e);
@@ -1605,7 +1634,7 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     }
   }
 
-  public void setZoom(float zoomRatio, boolean autoFocus) throws Exception {
+  public void setZoom(float zoomRatio) throws Exception {
     if (camera == null) {
       throw new Exception("Camera not initialized");
     }
@@ -1614,26 +1643,16 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
 
     // Just let CameraX handle everything - it should automatically switch lenses
     try {
-      ListenableFuture<Void> zoomFuture = camera
-        .getCameraControl()
-        .setZoomRatio(zoomRatio);
+      ZoomFactors zoomFactors = getZoomFactors();
 
-      // Add callback to see what actually happened
-      zoomFuture.addListener(
-        () -> {
-          try {
-            zoomFuture.get();
-            Log.d(TAG, "Zoom successfully set to " + zoomRatio);
-            // Trigger autofocus after zoom if requested
-            if (autoFocus) {
-              triggerAutoFocus();
-            }
-          } catch (Exception e) {
-            Log.e(TAG, "Error setting zoom: " + e.getMessage());
-          }
-        },
-        ContextCompat.getMainExecutor(context)
-      );
+      if (zoomRatio < zoomFactors.getMin()) {
+        zoomRatio = zoomFactors.getMin();
+      } else if (zoomRatio > zoomFactors.getMax()) {
+        zoomRatio = zoomFactors.getMax();
+      }
+
+      camera.getCameraControl().setZoomRatio(zoomRatio);
+      // Note: autofocus is intentionally not triggered on zoom because it's done by CameraX
     } catch (Exception e) {
       Log.e(TAG, "Failed to set zoom: " + e.getMessage());
       throw e;
@@ -1748,8 +1767,11 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
       return;
     }
 
-    // Remove any existing focus indicator
+    // Remove any existing focus indicator and cancel its animation
     if (focusIndicatorView != null) {
+      try {
+        focusIndicatorView.clearAnimation();
+      } catch (Exception ignore) {}
       previewContainer.removeView(focusIndicatorView);
       focusIndicatorView = null;
     }
@@ -1783,11 +1805,14 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     container.setBackground(drawable);
 
     focusIndicatorView = container;
+    // Bump animation token; everything after this must validate against this token
+    final long thisAnimationId = ++focusIndicatorAnimationId;
+    final View thisIndicatorView = focusIndicatorView;
 
     // Set initial state for smooth animation
     focusIndicatorView.setAlpha(1f); // Start visible
-    focusIndicatorView.setScaleX(1.8f); // Start larger for scale-in effect
-    focusIndicatorView.setScaleY(1.8f);
+    focusIndicatorView.setScaleX(1.4f); // Start slightly larger for a quick scale-in
+    focusIndicatorView.setScaleY(1.4f);
     focusIndicatorView.setVisibility(View.VISIBLE);
 
     // Ensure container doesn't intercept touch events
@@ -1813,16 +1838,16 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
 
     // Smooth scale down animation with easing (no fade needed since we start visible)
     ScaleAnimation scaleAnimation = new ScaleAnimation(
-      1.8f,
+      1.4f,
       1.0f,
-      1.8f,
+      1.4f,
       1.0f,
       Animation.RELATIVE_TO_SELF,
       0.5f,
       Animation.RELATIVE_TO_SELF,
       0.5f
     );
-    scaleAnimation.setDuration(300);
+    scaleAnimation.setDuration(120);
     scaleAnimation.setInterpolator(
       new android.view.animation.OvershootInterpolator(1.2f)
     );
@@ -1830,108 +1855,50 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     // Start the animation
     focusIndicatorView.startAnimation(scaleAnimation);
 
-    // Schedule fade out and removal with smoother timing
+    // Schedule fast fade out and removal
     focusIndicatorView.postDelayed(
       new Runnable() {
         @Override
         public void run() {
-          if (focusIndicatorView != null) {
-            // Smooth fade to semi-transparent
-            AlphaAnimation fadeToTransparent = new AlphaAnimation(1f, 0.4f);
-            fadeToTransparent.setDuration(400);
-            fadeToTransparent.setInterpolator(
-              new android.view.animation.AccelerateInterpolator()
-            );
-
-            fadeToTransparent.setAnimationListener(
-              new Animation.AnimationListener() {
-                @Override
-                public void onAnimationStart(Animation animation) {
-                  Log.d(TAG, "showFocusIndicator: Fade to transparent started");
-                }
-
-                @Override
-                public void onAnimationEnd(Animation animation) {
-                  Log.d(
-                    TAG,
-                    "showFocusIndicator: Fade to transparent ended, starting final fade out"
-                  );
-                  // Final smooth fade out and scale down
-                  if (focusIndicatorView != null) {
-                    AnimationSet finalAnimation = new AnimationSet(false);
-
-                    AlphaAnimation finalFadeOut = new AlphaAnimation(0.4f, 0f);
-                    finalFadeOut.setDuration(500);
-                    finalFadeOut.setStartOffset(300);
-                    finalFadeOut.setInterpolator(
-                      new android.view.animation.AccelerateInterpolator()
-                    );
-
-                    ScaleAnimation finalScaleDown = new ScaleAnimation(
-                      1.0f,
-                      0.9f,
-                      1.0f,
-                      0.9f,
-                      Animation.RELATIVE_TO_SELF,
-                      0.5f,
-                      Animation.RELATIVE_TO_SELF,
-                      0.5f
-                    );
-                    finalScaleDown.setDuration(500);
-                    finalScaleDown.setStartOffset(300);
-                    finalScaleDown.setInterpolator(
-                      new android.view.animation.AccelerateInterpolator()
-                    );
-
-                    finalAnimation.addAnimation(finalFadeOut);
-                    finalAnimation.addAnimation(finalScaleDown);
-
-                    finalAnimation.setAnimationListener(
-                      new Animation.AnimationListener() {
-                        @Override
-                        public void onAnimationStart(Animation animation) {
-                          Log.d(
-                            TAG,
-                            "showFocusIndicator: Final animation started"
-                          );
-                        }
-
-                        @Override
-                        public void onAnimationEnd(Animation animation) {
-                          Log.d(
-                            TAG,
-                            "showFocusIndicator: Final animation ended, removing indicator"
-                          );
-                          // Remove the focus indicator
-                          if (
-                            focusIndicatorView != null &&
-                            previewContainer != null
-                          ) {
-                            previewContainer.removeView(focusIndicatorView);
-                            focusIndicatorView = null;
-                          }
-                        }
-
-                        @Override
-                        public void onAnimationRepeat(Animation animation) {}
-                      }
-                    );
-
-                    focusIndicatorView.startAnimation(finalAnimation);
+          // Ensure this runnable belongs to the latest indicator
+          if (
+            focusIndicatorView != null &&
+            thisIndicatorView == focusIndicatorView &&
+            thisAnimationId == focusIndicatorAnimationId
+          ) {
+            focusIndicatorView
+              .animate()
+              .alpha(0f)
+              .scaleX(0.9f)
+              .scaleY(0.9f)
+              .setDuration(180)
+              .setInterpolator(
+                new android.view.animation.AccelerateInterpolator()
+              )
+              .withEndAction(
+                new Runnable() {
+                  @Override
+                  public void run() {
+                    if (
+                      focusIndicatorView != null &&
+                      previewContainer != null &&
+                      thisIndicatorView == focusIndicatorView &&
+                      thisAnimationId == focusIndicatorAnimationId
+                    ) {
+                      try {
+                        focusIndicatorView.clearAnimation();
+                      } catch (Exception ignore) {}
+                      previewContainer.removeView(focusIndicatorView);
+                      focusIndicatorView = null;
+                    }
                   }
                 }
-
-                @Override
-                public void onAnimationRepeat(Animation animation) {}
-              }
-            );
-
-            focusIndicatorView.startAnimation(fadeToTransparent);
+              );
           }
         }
       },
-      800
-    ); // Optimal timing for smooth focus feedback
+      250
+    ); // Faster feedback
   }
 
   public static List<Size> getSupportedPictureSizes(String facing) {
@@ -1957,89 +1924,6 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     return sizes;
   }
 
-  private void setZoomInternal(float zoomRatio) {
-    if (camera != null) {
-      try {
-        float minZoom = Objects.requireNonNull(
-          camera.getCameraInfo().getZoomState().getValue()
-        ).getMinZoomRatio();
-        float maxZoom = camera
-          .getCameraInfo()
-          .getZoomState()
-          .getValue()
-          .getMaxZoomRatio();
-        float currentZoom = camera
-          .getCameraInfo()
-          .getZoomState()
-          .getValue()
-          .getZoomRatio();
-
-        Log.d(
-          TAG,
-          "setZoomInternal: Current camera range: " +
-          minZoom +
-          "-" +
-          maxZoom +
-          ", current: " +
-          currentZoom
-        );
-        Log.d(TAG, "setZoomInternal: Requesting zoom: " + zoomRatio);
-
-        // Try to set zoom directly - let CameraX handle lens switching
-        ListenableFuture<Void> zoomFuture = camera
-          .getCameraControl()
-          .setZoomRatio(zoomRatio);
-
-        zoomFuture.addListener(
-          () -> {
-            try {
-              zoomFuture.get(); // Check if zoom was successful
-              float newZoom = Objects.requireNonNull(
-                camera.getCameraInfo().getZoomState().getValue()
-              ).getZoomRatio();
-              Log.d(
-                TAG,
-                "setZoomInternal: Zoom set successfully to " +
-                newZoom +
-                " (requested: " +
-                zoomRatio +
-                ")"
-              );
-
-              // Check if CameraX switched cameras
-              String newCameraId = getCameraId(camera.getCameraInfo());
-              if (!newCameraId.equals(currentDeviceId)) {
-                currentDeviceId = newCameraId;
-                Log.d(
-                  TAG,
-                  "setZoomInternal: CameraX switched to camera: " + newCameraId
-                );
-              }
-            } catch (Exception e) {
-              Log.w(
-                TAG,
-                "setZoomInternal: Zoom operation failed: " + e.getMessage()
-              );
-              // Fallback: clamp to current camera's range
-              float clampedZoom = Math.max(
-                minZoom,
-                Math.min(zoomRatio, maxZoom)
-              );
-              camera.getCameraControl().setZoomRatio(clampedZoom);
-              Log.d(
-                TAG,
-                "setZoomInternal: Fallback - clamped zoom to " + clampedZoom
-              );
-            }
-          },
-          mainExecutor
-        );
-      } catch (Exception e) {
-        Log.e(TAG, "setZoomInternal: Error setting zoom", e);
-      }
-    }
-  }
-
   public static List<String> getSupportedFlashModesStatic() {
     try {
       // For static method, we can return common flash modes

package/dist/docs.json

@@ -471,6 +471,16 @@
         ],
         "slug": "getzoom"
       },
+      {
+        "name": "getZoomButtonValues",
+        "signature": "() => Promise<{ values: number[]; }>",
+        "parameters": [],
+        "returns": "Promise<{ values: number[]; }>",
+        "tags": [],
+        "docs": "Returns zoom button values for quick switching.\n- iOS/Android: includes 0.5 if ultra-wide available; 1 and 2 if wide available; 3 if telephoto available\n- Web: unsupported",
+        "complexTypes": [],
+        "slug": "getzoombuttonvalues"
+      },
       {
         "name": "setZoom",
         "signature": "(options: { level: number; ramp?: boolean; autoFocus?: boolean; }) => Promise<void>",
@@ -651,6 +661,29 @@
         "docs": "Sets the camera focus to a specific point in the preview.",
         "complexTypes": [],
         "slug": "setfocus"
+      },
+      {
+        "name": "addListener",
+        "signature": "(eventName: \"screenResize\", listenerFunc: (data: { width: number; height: number; x: number; y: number; }) => void) => Promise<PluginListenerHandle>",
+        "parameters": [
+          {
+            "name": "eventName",
+            "docs": "",
+            "type": "'screenResize'"
+          },
+          {
+            "name": "listenerFunc",
+            "docs": "",
+            "type": "(data: { width: number; height: number; x: number; y: number; }) => void"
+          }
+        ],
+        "returns": "Promise<PluginListenerHandle>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [
+          "PluginListenerHandle"
+        ],
+        "slug": "addlistenerscreenresize-"
       }
     ],
     "properties": []
@@ -1357,6 +1390,22 @@
           "type": "number"
         }
       ]
+    },
+    {
+      "name": "PluginListenerHandle",
+      "slug": "pluginlistenerhandle",
+      "docs": "",
+      "tags": [],
+      "methods": [],
+      "properties": [
+        {
+          "name": "remove",
+          "tags": [],
+          "docs": "",
+          "complexTypes": [],
+          "type": "() => Promise<void>"
+        }
+      ]
     }
   ],
   "enums": [

package/dist/esm/definitions.d.ts

@@ -1,3 +1,4 @@
+import type { PluginListenerHandle } from "@capacitor/core";
 export type CameraPosition = "rear" | "front";
 export type FlashMode = CameraPreviewFlashMode;
 export type GridMode = "none" | "3x3" | "4x4";
@@ -487,6 +488,14 @@ export interface CameraPreviewPlugin {
         current: number;
         lens: LensInfo;
     }>;
+    /**
+     * Returns zoom button values for quick switching.
+     * - iOS/Android: includes 0.5 if ultra-wide available; 1 and 2 if wide available; 3 if telephoto available
+     * - Web: unsupported
+     */
+    getZoomButtonValues(): Promise<{
+        values: number[];
+    }>;
     /**
      * Sets the zoom level of the camera.
      *
@@ -572,4 +581,10 @@ export interface CameraPreviewPlugin {
         x: number;
         y: number;
     }): Promise<void>;
+    addListener(eventName: "screenResize", listenerFunc: (data: {
+        width: number;
+        height: number;
+        x: number;
+        y: number;
+    }) => void): Promise<PluginListenerHandle>;
 }