@capgo/camera-preview 7.4.0-alpha.11 → 7.4.0-alpha.17

package/README.md

@@ -262,6 +262,8 @@ Documentation for the [uploader](https://github.com/Cap-go/capacitor-uploader)
 * [`setPreviewSize(...)`](#setpreviewsize)
 * [`setFocus(...)`](#setfocus)
 * [`addListener('screenResize', ...)`](#addlistenerscreenresize-)
+* [`deleteFile(...)`](#deletefile)
+* [`getSafeAreaInsets()`](#getsafeareainsets)
 * [Interfaces](#interfaces)
 * [Type Aliases](#type-aliases)
 * [Enums](#enums)
@@ -734,6 +736,41 @@ addListener(eventName: "screenResize", listenerFunc: (data: { width: number; hei
 --------------------
 
 
+### deleteFile(...)
+
+```typescript
+deleteFile(options: { path: string; }) => Promise<{ success: boolean; }>
+```
+
+Deletes a file at the given absolute path on the device.
+Use this to quickly clean up temporary images created with `storeToFile`.
+On web, this is not supported and will throw.
+
+| Param         | Type                           |
+| ------------- | ------------------------------ |
+| **`options`** | <code>{ path: string; }</code> |
+
+**Returns:** <code>Promise&lt;{ success: boolean; }&gt;</code>
+
+**Since:** 8.2.0
+
+--------------------
+
+
+### getSafeAreaInsets()
+
+```typescript
+getSafeAreaInsets() => Promise<SafeAreaInsets>
+```
+
+Gets the safe area insets for Android devices.
+Returns the top and bottom insets in dp and the current orientation.
+
+**Returns:** <code>Promise&lt;<a href="#safeareainsets">SafeAreaInsets</a>&gt;</code>
+
+--------------------
+
+
 ### Interfaces
 
 
@@ -874,6 +911,18 @@ Represents the detailed information of the currently active lens.
 | **`remove`** | <code>() =&gt; Promise&lt;void&gt;</code> |
 
 
+#### SafeAreaInsets
+
+Represents safe area insets on Android.
+Values are expressed in logical pixels (dp) to match JS layout units.
+
+| Prop              | Type                | Description                                                      |
+| ----------------- | ------------------- | ---------------------------------------------------------------- |
+| **`orientation`** | <code>number</code> | Current device orientation as reported by Android configuration. |
+| **`top`**         | <code>number</code> | Top inset (e.g., status bar or cutout) in dp.                    |
+| **`bottom`**      | <code>number</code> | Bottom inset (e.g., navigation bar) in dp.                       |
+
+
 ### Type Aliases
 
 

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

@@ -5,13 +5,18 @@ import static android.Manifest.permission.RECORD_AUDIO;
 
 import android.Manifest;
 import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.location.Location;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Size;
+import android.view.OrientationEventListener;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
+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;
@@ -69,6 +74,8 @@ public class CameraPreview
   private CameraXView cameraXView;
   private FusedLocationProviderClient fusedLocationClient;
   private Location lastLocation;
+  private OrientationEventListener orientationListener;
+  private int lastOrientation = Configuration.ORIENTATION_UNDEFINED;
 
   @PluginMethod
   public void start(PluginCall call) {
@@ -205,6 +212,13 @@ public class CameraPreview
           .getActivity()
           .setRequestedOrientation(previousOrientationRequest);
 
+        // Disable and clear orientation listener
+        if (orientationListener != null) {
+          orientationListener.disable();
+          orientationListener = null;
+          lastOrientation = Configuration.ORIENTATION_UNDEFINED;
+        }
+
         if (cameraXView != null && cameraXView.isRunning()) {
           cameraXView.stopSession();
           cameraXView = null;
@@ -215,6 +229,10 @@ public class CameraPreview
 
   @PluginMethod
   public void getSupportedFlashModes(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
+    }
     List<String> supportedFlashModes = cameraXView.getSupportedFlashModes();
     JSArray jsonFlashModes = new JSArray();
     for (String mode : supportedFlashModes) {
@@ -268,6 +286,10 @@ public class CameraPreview
 
   @PluginMethod
   public void getZoom(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
+    }
     ZoomFactors zoomFactors = cameraXView.getZoomFactors();
     JSObject result = new JSObject();
     result.put("min", zoomFactors.getMin());
@@ -278,6 +300,10 @@ public class CameraPreview
 
   @PluginMethod
   public void getZoomButtonValues(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
+    }
     // Build a sorted set to dedupe and order ascending
     java.util.Set<Double> sorted = new java.util.TreeSet<>();
     sorted.add(1.0);
@@ -288,15 +314,17 @@ public class CameraPreview
       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.min(minUltra, device.getMinZoom());
+            minUltra = Math.max(minUltra, zoomFactors.getMin());
           } else if ("telephoto".equals(lens.getDeviceType())) {
             hasTelephoto = true;
           }
@@ -332,9 +360,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());
@@ -967,6 +994,50 @@ public class CameraPreview
         bridge.saveCall(call);
         cameraStartCallbackId = call.getCallbackId();
         cameraXView.startSession(config);
+
+        // Setup orientation listener to mirror iOS screenResize emission
+        if (orientationListener == null) {
+          lastOrientation = getContext()
+            .getResources()
+            .getConfiguration()
+            .orientation;
+          orientationListener = new OrientationEventListener(getContext()) {
+            @Override
+            public void onOrientationChanged(int orientation) {
+              if (orientation == ORIENTATION_UNKNOWN) return;
+              int current = getContext()
+                .getResources()
+                .getConfiguration()
+                .orientation;
+              if (current != lastOrientation) {
+                lastOrientation = current;
+                handleOrientationChange();
+              }
+            }
+          };
+          if (orientationListener.canDetectOrientation()) {
+            orientationListener.enable();
+          }
+        }
+      });
+  }
+
+  private void handleOrientationChange() {
+    if (cameraXView == null || !cameraXView.isRunning()) return;
+    getBridge()
+      .getActivity()
+      .runOnUiThread(() -> {
+        // Reapply current aspect ratio to recompute layout, then emit screenResize
+        String ar = cameraXView.getAspectRatio();
+        cameraXView.setAspectRatio(ar, null, null, () -> {
+          int[] bounds = cameraXView.getCurrentPreviewBounds();
+          JSObject data = new JSObject();
+          data.put("x", bounds[0]);
+          data.put("y", bounds[1]);
+          data.put("width", bounds[2]);
+          data.put("height", bounds[3]);
+          notifyListeners("screenResize", data);
+        });
       });
   }
 
@@ -1254,4 +1325,120 @@ public class CameraPreview
       call.reject("Failed to delete file: " + e.getMessage());
     }
   }
+
+  @PluginMethod
+  public void getSafeAreaInsets(PluginCall call) {
+    JSObject ret = new JSObject();
+    int orientation = getContext()
+      .getResources()
+      .getConfiguration()
+      .orientation;
+
+    int topPx = 0;
+    int bottomPx = 0;
+    try {
+      View webView = getBridge().getWebView();
+      if (webView != null) {
+        DisplayMetrics metrics = getBridge()
+          .getActivity()
+          .getResources()
+          .getDisplayMetrics();
+        int screenHeight = metrics.heightPixels;
+        int[] location = new int[2];
+        webView.getLocationOnScreen(location);
+        int webViewTop = location[1];
+        int webViewBottom = webViewTop + webView.getHeight();
+        int webViewBottomGap = Math.max(0, screenHeight - webViewBottom);
+
+        // System insets (status/navigation/cutout)
+        int systemTop = 0;
+        int systemBottom = 0;
+        View decorView = getBridge().getActivity().getWindow().getDecorView();
+        WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(decorView);
+        if (insets != null) {
+          Insets sysBars = insets.getInsets(
+            WindowInsetsCompat.Type.systemBars()
+          );
+          Insets cutout = insets.getInsets(
+            WindowInsetsCompat.Type.displayCutout()
+          );
+          systemTop = Math.max(sysBars.top, cutout.top);
+          systemBottom = Math.max(sysBars.bottom, cutout.bottom);
+        } else {
+          systemTop = getStatusBarHeightPx();
+          systemBottom = getNavigationBarHeightPx();
+        }
+
+        // Top: report the gap between screen and WebView (useful when not edge-to-edge)
+        topPx = Math.max(0, webViewTop);
+
+        // Bottom logic:
+        // - If WebView has a bottom gap equal to the system nav bar height (3-button mode),
+        //   it means layout already accounts for it -> return 0 as requested.
+        // - If WebView has no gap (edge-to-edge or overlay), return system bottom inset.
+        // - Otherwise, default to system bottom inset (avoid counting app UI like tab bars).
+        if (
+          webViewBottomGap > 0 && approxEqualPx(webViewBottomGap, systemBottom)
+        ) {
+          bottomPx = 0; // already offset by system nav bar
+        } else if (webViewBottomGap == 0) {
+          bottomPx = systemBottom;
+        } else {
+          bottomPx = systemBottom;
+        }
+      } else {
+        // Fallback if WebView is unavailable
+        View decorView = getBridge().getActivity().getWindow().getDecorView();
+        WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(decorView);
+        if (insets != null) {
+          Insets sysBars = insets.getInsets(
+            WindowInsetsCompat.Type.systemBars()
+          );
+          Insets cutout = insets.getInsets(
+            WindowInsetsCompat.Type.displayCutout()
+          );
+          topPx = Math.max(sysBars.top, cutout.top);
+          bottomPx = Math.max(sysBars.bottom, cutout.bottom);
+        } else {
+          topPx = getStatusBarHeightPx();
+          bottomPx = getNavigationBarHeightPx();
+        }
+      }
+    } catch (Exception e) {
+      topPx = getStatusBarHeightPx();
+      bottomPx = getNavigationBarHeightPx();
+    }
+
+    float density = getContext().getResources().getDisplayMetrics().density;
+    ret.put("orientation", orientation);
+    ret.put("top", topPx / density);
+    ret.put("bottom", bottomPx / density);
+    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;
+    int resourceId = getContext()
+      .getResources()
+      .getIdentifier("status_bar_height", "dimen", "android");
+    if (resourceId > 0) {
+      result = getContext().getResources().getDimensionPixelSize(resourceId);
+    }
+    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;
+  }
 }

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

@@ -727,7 +727,7 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
             }
           }
 
-          setZoomInternal(initialZoom);
+          setZoom(initialZoom);
         }
 
         isRunning = true;
@@ -1634,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");
     }
@@ -1643,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;
@@ -1821,8 +1811,8 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
 
     // 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
@@ -1848,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)
     );
@@ -1865,7 +1855,7 @@ 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
@@ -1876,121 +1866,39 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
             thisIndicatorView == focusIndicatorView &&
             thisAnimationId == focusIndicatorAnimationId
           ) {
-            // 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 &&
-                    thisIndicatorView == focusIndicatorView &&
-                    thisAnimationId == focusIndicatorAnimationId
-                  ) {
-                    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 &&
-                            thisIndicatorView == focusIndicatorView &&
-                            thisAnimationId == focusIndicatorAnimationId
-                          ) {
-                            try {
-                              focusIndicatorView.clearAnimation();
-                            } catch (Exception ignore) {}
-                            previewContainer.removeView(focusIndicatorView);
-                            focusIndicatorView = null;
-                          }
-                        }
-
-                        @Override
-                        public void onAnimationRepeat(Animation animation) {}
-                      }
-                    );
-
+            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
                     ) {
-                      focusIndicatorView.startAnimation(finalAnimation);
+                      try {
+                        focusIndicatorView.clearAnimation();
+                      } catch (Exception ignore) {}
+                      previewContainer.removeView(focusIndicatorView);
+                      focusIndicatorView = null;
                     }
                   }
                 }
-
-                @Override
-                public void onAnimationRepeat(Animation animation) {}
-              }
-            );
-
-            if (
-              thisIndicatorView == focusIndicatorView &&
-              thisAnimationId == focusIndicatorAnimationId
-            ) {
-              focusIndicatorView.startAnimation(fadeToTransparent);
-            }
+              );
           }
         }
       },
-      800
-    ); // Optimal timing for smooth focus feedback
+      250
+    ); // Faster feedback
   }
 
   public static List<Size> getSupportedPictureSizes(String facing) {
@@ -2016,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