@capgo/camera-preview 7.3.12 → 7.4.0-alpha.0

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

@@ -3,27 +3,19 @@ package com.ahm.capacitor.camera.preview;
 import static android.Manifest.permission.CAMERA;
 import static android.Manifest.permission.RECORD_AUDIO;
 
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.Context;
+import android.Manifest;
 import android.content.pm.ActivityInfo;
-import android.graphics.Color;
-import android.graphics.ImageFormat;
-import android.graphics.Point;
-import android.hardware.Camera;
-import android.hardware.camera2.CameraAccessException;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.params.StreamConfigurationMap;
+import android.location.Location;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.util.Size;
-import android.util.TypedValue;
-import android.view.Display;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import androidx.annotation.NonNull;
+import android.webkit.WebView;
+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 com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Logger;
@@ -34,11 +26,11 @@ import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
 import com.getcapacitor.annotation.Permission;
 import com.getcapacitor.annotation.PermissionCallback;
-import java.io.File;
-import java.util.ArrayList;
+import com.google.android.gms.location.FusedLocationProviderClient;
+import com.google.android.gms.location.LocationServices;
 import java.util.List;
 import java.util.Objects;
-import org.json.JSONArray;
+import org.json.JSONObject;
 
 @CapacitorPlugin(
   name = "CameraPreview",
@@ -51,33 +43,38 @@ import org.json.JSONArray;
       strings = { CAMERA },
       alias = CameraPreview.CAMERA_ONLY_PERMISSION_ALIAS
     ),
+    @Permission(
+      strings = {
+        Manifest.permission.ACCESS_COARSE_LOCATION,
+        Manifest.permission.ACCESS_FINE_LOCATION,
+      },
+      alias = CameraPreview.CAMERA_WITH_LOCATION_PERMISSION_ALIAS
+    ),
   }
 )
 public class CameraPreview
   extends Plugin
-  implements CameraActivity.CameraPreviewListener {
+  implements CameraXView.CameraXViewListener {
 
   static final String CAMERA_WITH_AUDIO_PERMISSION_ALIAS = "cameraWithAudio";
   static final String CAMERA_ONLY_PERMISSION_ALIAS = "cameraOnly";
-
-  private static String VIDEO_FILE_PATH = "";
-  private static final String VIDEO_FILE_EXTENSION = ".mp4";
+  static final String CAMERA_WITH_LOCATION_PERMISSION_ALIAS =
+    "cameraWithLocation";
 
   private String captureCallbackId = "";
   private String snapshotCallbackId = "";
-  private String recordCallbackId = "";
   private String cameraStartCallbackId = "";
-
-  // keep track of previously specified orientation to support locking orientation:
   private int previousOrientationRequest =
     ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
-
-  private CameraActivity fragment;
-  private final int containerViewId = 20;
+  private CameraXView cameraXView;
+  private FusedLocationProviderClient fusedLocationClient;
+  private Location lastLocation;
 
   @PluginMethod
   public void start(PluginCall call) {
-    boolean disableAudio = call.getBoolean("disableAudio", false);
+    boolean disableAudio = Boolean.TRUE.equals(
+      call.getBoolean("disableAudio", true)
+    );
     String permissionAlias = disableAudio
       ? CAMERA_ONLY_PERMISSION_ALIAS
       : CAMERA_WITH_AUDIO_PERMISSION_ALIAS;
@@ -95,309 +92,349 @@ public class CameraPreview
 
   @PluginMethod
   public void flip(PluginCall call) {
-    try {
-      fragment.switchCamera();
-      call.resolve();
-    } catch (Exception e) {
-      Logger.debug(getLogTag(), "Camera flip exception: " + e);
-      call.reject("failed to flip camera");
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
     }
+    cameraXView.flipCamera();
+    call.resolve();
   }
 
   @PluginMethod
-  public void setOpacity(PluginCall call) {
-    if (!this.hasCamera(call)) {
+  public void capture(final PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
       call.reject("Camera is not running");
       return;
     }
 
-    bridge.saveCall(call);
-    Float opacity = Objects.requireNonNull(call.getFloat("opacity", 1F));
-    fragment.setOpacity(opacity);
+    final boolean withExifLocation = call.getBoolean("withExifLocation", false);
+
+    if (withExifLocation) {
+      if (
+        getPermissionState(CAMERA_WITH_LOCATION_PERMISSION_ALIAS) !=
+        PermissionState.GRANTED
+      ) {
+        requestPermissionForAlias(
+          CAMERA_WITH_LOCATION_PERMISSION_ALIAS,
+          call,
+          "captureWithLocationPermission"
+        );
+      } else {
+        getLocationAndCapture(call);
+      }
+    } else {
+      captureWithoutLocation(call);
+    }
   }
 
-  @PluginMethod
-  public void capture(PluginCall call) {
-    if (!this.hasCamera(call)) {
-      call.reject("Camera is not running");
-      return;
+  @PermissionCallback
+  private void captureWithLocationPermission(PluginCall call) {
+    if (
+      getPermissionState(CAMERA_WITH_LOCATION_PERMISSION_ALIAS) ==
+      PermissionState.GRANTED
+    ) {
+      getLocationAndCapture(call);
+    } else {
+      Logger.warn(
+        "Location permission denied. Capturing photo without location data."
+      );
+      captureWithoutLocation(call);
+    }
+  }
+
+  private void getLocationAndCapture(PluginCall call) {
+    if (fusedLocationClient == null) {
+      fusedLocationClient = LocationServices.getFusedLocationProviderClient(
+        getContext()
+      );
     }
+    fusedLocationClient
+      .getLastLocation()
+      .addOnSuccessListener(getActivity(), location -> {
+        lastLocation = location;
+        proceedWithCapture(call, lastLocation);
+      })
+      .addOnFailureListener(e -> {
+        Logger.error("Failed to get location: " + e.getMessage());
+        proceedWithCapture(call, null);
+      });
+  }
+
+  private void captureWithoutLocation(PluginCall call) {
+    proceedWithCapture(call, null);
+  }
+
+  private void proceedWithCapture(PluginCall call, Location location) {
     bridge.saveCall(call);
     captureCallbackId = call.getCallbackId();
 
     Integer quality = Objects.requireNonNull(call.getInt("quality", 85));
-    // Image Dimensions - Optional
-    Integer width = Objects.requireNonNull(call.getInt("width", 0));
-    Integer height = Objects.requireNonNull(call.getInt("height", 0));
-    fragment.takePicture(width, height, quality);
+    final boolean saveToGallery = call.getBoolean("saveToGallery", false);
+    Integer width = call.getInt("width");
+    Integer height = call.getInt("height");
+    String aspectRatio = call.getString("aspectRatio");
+
+    cameraXView.capturePhoto(
+      quality,
+      saveToGallery,
+      width,
+      height,
+      aspectRatio,
+      location
+    );
   }
 
   @PluginMethod
   public void captureSample(PluginCall call) {
-    if (!this.hasCamera(call)) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
       call.reject("Camera is not running");
       return;
     }
     bridge.saveCall(call);
     snapshotCallbackId = call.getCallbackId();
-
     Integer quality = Objects.requireNonNull(call.getInt("quality", 85));
-    fragment.takeSnapshot(quality);
-  }
-
-  @PluginMethod
-  public void getSupportedPictureSizes(final PluginCall call) {
-    CameraManager cameraManager = (CameraManager) this.getContext()
-      .getSystemService(Context.CAMERA_SERVICE);
-
-    JSArray ret = new JSArray();
-    try {
-      String[] cameraIdList = cameraManager.getCameraIdList();
-      for (String cameraId : cameraIdList) {
-        CameraCharacteristics characteristics =
-          cameraManager.getCameraCharacteristics(cameraId);
-
-        // Determine the facing of the camera
-        Integer lensFacing = characteristics.get(
-          CameraCharacteristics.LENS_FACING
-        );
-        String facing = "Unknown";
-        if (lensFacing != null) {
-          switch (lensFacing) {
-            case CameraCharacteristics.LENS_FACING_FRONT:
-              facing = "Front";
-              break;
-            case CameraCharacteristics.LENS_FACING_BACK:
-              facing = "Back";
-              break;
-            case CameraCharacteristics.LENS_FACING_EXTERNAL:
-              facing = "External";
-              break;
-          }
-        }
-
-        StreamConfigurationMap map = characteristics.get(
-          CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP
-        );
-        if (map == null) {
-          continue;
-        }
-
-        Size[] jpegSizes = map.getOutputSizes(ImageFormat.JPEG);
-        JSObject camera = new JSObject();
-        camera.put("facing", facing);
-        JSArray supportedPictureSizes = new JSArray();
-        if (jpegSizes != null) {
-          for (Size size : jpegSizes) {
-            JSObject sizeJson = new JSObject();
-            sizeJson.put("width", size.getWidth());
-            sizeJson.put("height", size.getHeight());
-            supportedPictureSizes.put(sizeJson);
-          }
-          camera.put("supportedPictureSizes", supportedPictureSizes);
-          ret.put(camera);
-        }
-      }
-      JSObject finalRet = new JSObject();
-      finalRet.put("supportedPictureSizes", ret);
-      call.resolve(finalRet);
-    } catch (CameraAccessException ex) {
-      Logger.error(getLogTag(), "Cannot call getSupportedPictureSizes", ex);
-      call.reject(
-        String.format("Cannot call getSupportedPictureSizes. Error: %s", ex)
-      );
-    }
+    cameraXView.captureSample(quality);
   }
 
   @PluginMethod
   public void stop(final PluginCall call) {
     bridge
       .getActivity()
-      .runOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            FrameLayout containerView = getBridge()
-              .getActivity()
-              .findViewById(containerViewId);
-
-            // allow orientation changes after closing camera:
-            getBridge()
-              .getActivity()
-              .setRequestedOrientation(previousOrientationRequest);
-
-            if (containerView != null) {
-              ((ViewGroup) getBridge().getWebView().getParent()).removeView(
-                  containerView
-                );
-              getBridge().getWebView().setBackgroundColor(Color.WHITE);
-              FragmentManager fragmentManager = getActivity()
-                .getFragmentManager();
-              FragmentTransaction fragmentTransaction =
-                fragmentManager.beginTransaction();
-              fragmentTransaction.remove(fragment);
-              fragmentTransaction.commit();
-              fragment = null;
-
-              call.resolve();
-            } else {
-              call.reject("camera already stopped");
-            }
-          }
+      .runOnUiThread(() -> {
+        getBridge()
+          .getActivity()
+          .setRequestedOrientation(previousOrientationRequest);
+
+        if (cameraXView != null && cameraXView.isRunning()) {
+          cameraXView.stopSession();
+          cameraXView = null;
         }
-      );
+        call.resolve();
+      });
   }
 
   @PluginMethod
   public void getSupportedFlashModes(PluginCall call) {
-    if (!this.hasCamera(call)) {
-      call.reject("Camera is not running");
-      return;
+    List<String> supportedFlashModes = cameraXView.getSupportedFlashModes();
+    JSArray jsonFlashModes = new JSArray();
+    for (String mode : supportedFlashModes) {
+      jsonFlashModes.put(mode);
     }
-
-    Camera camera = fragment.getCamera();
-    Camera.Parameters params = camera.getParameters();
-    List<String> supportedFlashModes;
-    supportedFlashModes = params.getSupportedFlashModes();
-    JSONArray jsonFlashModes = new JSONArray();
-
-    if (supportedFlashModes != null) {
-      for (int i = 0; i < supportedFlashModes.size(); i++) {
-        jsonFlashModes.put(supportedFlashModes.get(i));
-      }
-    }
-
     JSObject jsObject = new JSObject();
     jsObject.put("result", jsonFlashModes);
     call.resolve(jsObject);
   }
 
   @PluginMethod
-  public void getHorizontalFov(PluginCall call) {
-    if (!this.hasCamera(call)) {
-      call.reject("Camera is not running");
+  public void setFlashMode(PluginCall call) {
+    String flashMode = call.getString("flashMode");
+    if (flashMode == null || flashMode.isEmpty()) {
+      call.reject("flashMode required parameter is missing");
       return;
     }
+    cameraXView.setFlashMode(flashMode);
+    call.resolve();
+  }
 
-    Camera camera = fragment.getCamera();
-    Camera.Parameters params = camera.getParameters();
-
-    float horizontalViewAngle = params.getHorizontalViewAngle();
+  @PluginMethod
+  public void getAvailableDevices(PluginCall call) {
+    List<CameraDevice> devices = CameraXView.getAvailableDevicesStatic(
+      getContext()
+    );
+    JSArray devicesArray = new JSArray();
+    for (CameraDevice device : devices) {
+      JSObject deviceJson = new JSObject();
+      deviceJson.put("deviceId", device.getDeviceId());
+      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()) {
+        JSObject lensJson = new JSObject();
+        lensJson.put("focalLength", lens.getFocalLength());
+        lensJson.put("deviceType", lens.getDeviceType());
+        lensJson.put("baseZoomRatio", lens.getBaseZoomRatio());
+        lensJson.put("digitalZoom", lens.getDigitalZoom());
+        lensesArray.put(lensJson);
+      }
+      deviceJson.put("lenses", lensesArray);
+      deviceJson.put("minZoom", device.getMinZoom());
+      deviceJson.put("maxZoom", device.getMaxZoom());
+      devicesArray.put(deviceJson);
+    }
+    JSObject result = new JSObject();
+    result.put("devices", devicesArray);
+    call.resolve(result);
+  }
 
-    JSObject jsObject = new JSObject();
-    jsObject.put("result", horizontalViewAngle);
-    call.resolve(jsObject);
+  @PluginMethod
+  public void getZoom(PluginCall call) {
+    ZoomFactors zoomFactors = cameraXView.getZoomFactors();
+    JSObject result = new JSObject();
+    result.put("min", zoomFactors.getMin());
+    result.put("max", zoomFactors.getMax());
+    result.put("current", zoomFactors.getCurrent());
+    call.resolve(result);
   }
 
   @PluginMethod
-  public void setFlashMode(PluginCall call) {
-    if (!this.hasCamera(call)) {
+  public void setZoom(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
       call.reject("Camera is not running");
       return;
     }
-
-    String flashMode = call.getString("flashMode");
-    if (flashMode == null || flashMode.isEmpty()) {
-      call.reject("flashMode required parameter is missing");
+    Float level = call.getFloat("level");
+    if (level == null) {
+      call.reject("level parameter is required");
       return;
     }
+    Boolean autoFocus = call.getBoolean("autoFocus", true);
+    try {
+      cameraXView.setZoom(level, autoFocus);
+      call.resolve();
+    } catch (Exception e) {
+      call.reject("Failed to set zoom: " + e.getMessage());
+    }
+  }
 
-    Camera camera = fragment.getCamera();
-    Camera.Parameters params = camera.getParameters();
-
-    List<String> supportedFlashModes;
-    supportedFlashModes = camera.getParameters().getSupportedFlashModes();
-    if (
-      supportedFlashModes != null && supportedFlashModes.contains(flashMode)
-    ) {
-      params.setFlashMode(flashMode);
-    } else {
-      call.reject("Flash mode not recognised: " + flashMode);
+  @PluginMethod
+  public void setFocus(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
+    }
+    Float x = call.getFloat("x");
+    Float y = call.getFloat("y");
+    if (x == null || y == null) {
+      call.reject("x and y parameters are required");
+      return;
+    }
+    // Reject if values are outside 0-1 range
+    if (x < 0f || x > 1f || y < 0f || y > 1f) {
+      call.reject("Focus coordinates must be between 0 and 1");
       return;
     }
 
-    fragment.setCameraParameters(params);
-
-    call.resolve();
+    getActivity()
+      .runOnUiThread(() -> {
+        try {
+          cameraXView.setFocus(x, y);
+          call.resolve();
+        } catch (Exception e) {
+          call.reject("Failed to set focus: " + e.getMessage());
+        }
+      });
   }
 
   @PluginMethod
-  public void startRecordVideo(final PluginCall call) {
-    if (!this.hasCamera(call)) {
+  public void setDeviceId(PluginCall call) {
+    String deviceId = call.getString("deviceId");
+    if (deviceId == null || deviceId.isEmpty()) {
+      call.reject("deviceId parameter is required");
+      return;
+    }
+    if (cameraXView == null || !cameraXView.isRunning()) {
       call.reject("Camera is not running");
       return;
     }
-    final String filename = "videoTmp";
-    VIDEO_FILE_PATH = getActivity().getCacheDir().toString() + "/";
-
-    final String position = Objects.requireNonNull(
-      call.getString("position", "front")
-    );
-    final Integer width = Objects.requireNonNull(call.getInt("width", 0));
-    final Integer height = Objects.requireNonNull(call.getInt("height", 0));
-    final Boolean withFlash = Objects.requireNonNull(
-      call.getBoolean("withFlash", false)
-    );
-    final Integer maxDuration = Objects.requireNonNull(
-      call.getInt("maxDuration", 0)
-    );
-    // final Integer quality = Objects.requireNonNull(call.getInt("quality", 0));
-    bridge.saveCall(call);
-    recordCallbackId = call.getCallbackId();
+    cameraXView.switchToDevice(deviceId);
+    call.resolve();
+  }
 
-    bridge
-      .getActivity()
-      .runOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            fragment.startRecord(
-              getFilePath(),
-              position,
-              width,
-              height,
-              70,
-              withFlash,
-              maxDuration
-            );
-          }
-        }
-      );
+  @PluginMethod
+  public void getSupportedPictureSizes(final PluginCall call) {
+    JSArray supportedPictureSizesResult = new JSArray();
+    List<Size> rearSizes = CameraXView.getSupportedPictureSizes("rear");
+    JSObject rear = new JSObject();
+    rear.put("facing", "rear");
+    JSArray rearSizesJs = new JSArray();
+    for (Size size : rearSizes) {
+      JSObject sizeJs = new JSObject();
+      sizeJs.put("width", size.getWidth());
+      sizeJs.put("height", size.getHeight());
+      rearSizesJs.put(sizeJs);
+    }
+    rear.put("supportedPictureSizes", rearSizesJs);
+    supportedPictureSizesResult.put(rear);
+
+    List<Size> frontSizes = CameraXView.getSupportedPictureSizes("front");
+    JSObject front = new JSObject();
+    front.put("facing", "front");
+    JSArray frontSizesJs = new JSArray();
+    for (Size size : frontSizes) {
+      JSObject sizeJs = new JSObject();
+      sizeJs.put("width", size.getWidth());
+      sizeJs.put("height", size.getHeight());
+      frontSizesJs.put(sizeJs);
+    }
+    front.put("supportedPictureSizes", frontSizesJs);
+    supportedPictureSizesResult.put(front);
 
-    call.resolve();
+    JSObject ret = new JSObject();
+    ret.put("supportedPictureSizes", supportedPictureSizesResult);
+    call.resolve(ret);
   }
 
   @PluginMethod
-  public void stopRecordVideo(PluginCall call) {
-    if (!this.hasCamera(call)) {
+  public void setOpacity(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
       call.reject("Camera is not running");
       return;
     }
+    Float opacity = call.getFloat("opacity", 1.0f);
+    cameraXView.setOpacity(opacity);
+    call.resolve();
+  }
 
-    System.out.println("stopRecordVideo - Callbackid=" + call.getCallbackId());
+  @PluginMethod
+  public void getHorizontalFov(PluginCall call) {
+    // CameraX does not provide a simple way to get FoV.
+    // This would require Camera2 interop to access camera characteristics.
+    // Returning a default/estimated value.
+    JSObject ret = new JSObject();
+    ret.put("result", 60.0); // A common default FoV
+    call.resolve(ret);
+  }
 
-    bridge.saveCall(call);
-    recordCallbackId = call.getCallbackId();
+  @PluginMethod
+  public void getDeviceId(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
+    }
+    JSObject ret = new JSObject();
+    ret.put("deviceId", cameraXView.getCurrentDeviceId());
+    call.resolve(ret);
+  }
 
-    // bridge.getActivity().runOnUiThread(new Runnable() {
-    //     @Override
-    //     public void run() {
-    //         fragment.stopRecord();
-    //     }
-    // });
+  @PluginMethod
+  public void getFlashMode(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
+    }
+    JSObject ret = new JSObject();
+    ret.put("flashMode", cameraXView.getFlashMode());
+    call.resolve(ret);
+  }
 
-    fragment.stopRecord();
-    // call.resolve();
+  @PluginMethod
+  public void isRunning(PluginCall call) {
+    boolean running = cameraXView != null && cameraXView.isRunning();
+    JSObject jsObject = new JSObject();
+    jsObject.put("isRunning", running);
+    call.resolve(jsObject);
   }
 
   @PermissionCallback
   private void handleCameraPermissionResult(PluginCall call) {
-    boolean disableAudio = call.getBoolean("disableAudio", false);
-    String permissionAlias = disableAudio
-      ? CAMERA_ONLY_PERMISSION_ALIAS
-      : CAMERA_WITH_AUDIO_PERMISSION_ALIAS;
-
-    if (PermissionState.GRANTED.equals(getPermissionState(permissionAlias))) {
+    if (
+      PermissionState.GRANTED.equals(
+        getPermissionState(CAMERA_ONLY_PERMISSION_ALIAS)
+      ) ||
+      PermissionState.GRANTED.equals(
+        getPermissionState(CAMERA_WITH_AUDIO_PERMISSION_ALIAS)
+      )
+    ) {
       startCamera(call);
     } else {
       call.reject("Permission failed");
@@ -405,327 +442,753 @@ public class CameraPreview
   }
 
   private void startCamera(final PluginCall call) {
-    String position = call.getString("position");
-
-    if (position == null || position.isEmpty() || "rear".equals(position)) {
-      position = "back";
-    } else {
-      position = "front";
-    }
-
-    @NonNull
-    final Integer x = Objects.requireNonNull(call.getInt("x", 0));
-    @NonNull
-    final Integer y = Objects.requireNonNull(call.getInt("y", 0));
-    @NonNull
-    final Integer width = Objects.requireNonNull(call.getInt("width", 0));
-    @NonNull
-    final Integer height = Objects.requireNonNull(call.getInt("height", 0));
-    @NonNull
-    final Integer paddingBottom = Objects.requireNonNull(
-      call.getInt("paddingBottom", 0)
+    String positionParam = call.getString("position");
+    String originalDeviceId = call.getString("deviceId");
+    String deviceId = originalDeviceId; // Use a mutable variable
+
+    final String position = (positionParam == null ||
+        positionParam.isEmpty() ||
+        "rear".equals(positionParam) ||
+        "back".equals(positionParam))
+      ? "back"
+      : "front";
+    // Use -1 as default to indicate centering is needed when x/y not provided
+    final Integer xParam = call.getInt("x");
+    final Integer yParam = call.getInt("y");
+    final int x = xParam != null ? xParam : -1;
+    final int y = yParam != null ? yParam : -1;
+
+    Log.d("CameraPreview", "========================");
+    Log.d("CameraPreview", "CAMERA POSITION TRACKING START:");
+    Log.d(
+      "CameraPreview",
+      "1. RAW PARAMS - xParam: " + xParam + ", yParam: " + yParam
     );
-    final Boolean toBack = Objects.requireNonNull(
-      call.getBoolean("toBack", false)
+    Log.d(
+      "CameraPreview",
+      "2. AFTER DEFAULT - x: " +
+      x +
+      " (center=" +
+      (x == -1) +
+      "), y: " +
+      y +
+      " (center=" +
+      (y == -1) +
+      ")"
     );
-    final Boolean storeToFile = Objects.requireNonNull(
+    final int width = call.getInt("width", 0);
+    final int height = call.getInt("height", 0);
+    final int paddingBottom = call.getInt("paddingBottom", 0);
+    final boolean toBack = Boolean.TRUE.equals(call.getBoolean("toBack", true));
+    final boolean storeToFile = Boolean.TRUE.equals(
       call.getBoolean("storeToFile", false)
     );
-    final Boolean enableOpacity = Objects.requireNonNull(
+    final boolean enableOpacity = Boolean.TRUE.equals(
       call.getBoolean("enableOpacity", false)
     );
-    final Boolean enableZoom = Objects.requireNonNull(
+    final boolean enableZoom = Boolean.TRUE.equals(
       call.getBoolean("enableZoom", false)
     );
-    final Boolean disableExifHeaderStripping = Objects.requireNonNull(
+    final boolean disableExifHeaderStripping = Boolean.TRUE.equals(
       call.getBoolean("disableExifHeaderStripping", false)
     );
-    final Boolean lockOrientation = Objects.requireNonNull(
+    final boolean lockOrientation = Boolean.TRUE.equals(
       call.getBoolean("lockAndroidOrientation", false)
     );
+    final boolean disableAudio = Boolean.TRUE.equals(
+      call.getBoolean("disableAudio", true)
+    );
+    final String aspectRatio = call.getString("aspectRatio", "4:3");
+    final String gridMode = call.getString("gridMode", "none");
+    final String positioning = call.getString("positioning", "top");
+    final float initialZoomLevel = call.getFloat("initialZoomLevel", 1.0f);
+
+    // Check for conflict between aspectRatio and size
+    if (
+      call.getData().has("aspectRatio") &&
+      (call.getData().has("width") || call.getData().has("height"))
+    ) {
+      call.reject(
+        "Cannot set both aspectRatio and size (width/height). Use setPreviewSize after start."
+      );
+      return;
+    }
+
+    float targetZoom = initialZoomLevel;
+    // Check if the selected device is a physical ultra-wide
+    if (originalDeviceId != null) {
+      List<CameraDevice> devices = CameraXView.getAvailableDevicesStatic(
+        getContext()
+      );
+      for (CameraDevice device : devices) {
+        if (
+          originalDeviceId.equals(device.getDeviceId()) && !device.isLogical()
+        ) {
+          for (LensInfo lens : device.getLenses()) {
+            if ("ultraWide".equals(lens.getDeviceType())) {
+              Log.d(
+                "CameraPreview",
+                "Ultra-wide lens selected. Targeting 0.5x zoom on logical camera."
+              );
+              targetZoom = 0.5f;
+              // Force the use of the logical camera by clearing the specific deviceId
+              deviceId = null;
+              break;
+            }
+          }
+        }
+        if (deviceId == null) break; // Exit outer loop once we've made our decision
+      }
+    }
+
     previousOrientationRequest = getBridge()
       .getActivity()
       .getRequestedOrientation();
+    cameraXView = new CameraXView(getContext(), getBridge().getWebView());
+    cameraXView.setListener(this);
 
-    fragment = new CameraActivity();
-    fragment.setEventListener(this);
-    fragment.defaultCamera = position;
-    fragment.tapToTakePicture = false;
-    fragment.dragEnabled = false;
-    fragment.tapToFocus = true;
-    fragment.disableExifHeaderStripping = disableExifHeaderStripping;
-    fragment.storeToFile = storeToFile;
-    fragment.toBack = toBack;
-    fragment.enableOpacity = enableOpacity;
-    fragment.enableZoom = enableZoom;
-    fragment.disableAudio = call.getBoolean("disableAudio", false);
-
-    bridge
+    String finalDeviceId = deviceId;
+    float finalTargetZoom = targetZoom;
+    getBridge()
       .getActivity()
-      .runOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            DisplayMetrics metrics = getBridge()
-              .getActivity()
-              .getResources()
-              .getDisplayMetrics();
-            // lock orientation if specified in options:
-            if (lockOrientation) {
-              getBridge()
-                .getActivity()
-                .setRequestedOrientation(
-                  ActivityInfo.SCREEN_ORIENTATION_LOCKED
-                );
-            }
+      .runOnUiThread(() -> {
+        DisplayMetrics metrics = getBridge()
+          .getActivity()
+          .getResources()
+          .getDisplayMetrics();
+        if (lockOrientation) {
+          getBridge()
+            .getActivity()
+            .setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
+        }
 
-            // offset
-            int computedX = (int) TypedValue.applyDimension(
-              TypedValue.COMPLEX_UNIT_DIP,
-              x,
-              metrics
-            );
-            int computedY = (int) TypedValue.applyDimension(
-              TypedValue.COMPLEX_UNIT_DIP,
-              y,
-              metrics
-            );
+        // Debug: Let's check all the positioning information
+        ViewGroup webViewParent = (ViewGroup) getBridge()
+          .getWebView()
+          .getParent();
+
+        // Get webview position in different coordinate systems
+        int[] webViewLocationInWindow = new int[2];
+        int[] webViewLocationOnScreen = new int[2];
+        getBridge().getWebView().getLocationInWindow(webViewLocationInWindow);
+        getBridge().getWebView().getLocationOnScreen(webViewLocationOnScreen);
+
+        int webViewLeft = getBridge().getWebView().getLeft();
+        int webViewTop = getBridge().getWebView().getTop();
+
+        // Check parent position too
+        int[] parentLocationInWindow = new int[2];
+        int[] parentLocationOnScreen = new int[2];
+        webViewParent.getLocationInWindow(parentLocationInWindow);
+        webViewParent.getLocationOnScreen(parentLocationOnScreen);
+
+        // Calculate pixel ratio
+        float pixelRatio = metrics.density;
+
+        // The key insight: JavaScript coordinates are relative to the WebView's viewport
+        // If the WebView is positioned below the status bar (webViewLocationOnScreen[1] > 0),
+        // we need to add that offset when placing native views
+        int webViewTopInset = webViewLocationOnScreen[1];
+        boolean isEdgeToEdgeActive = webViewLocationOnScreen[1] > 0;
+
+        // Log all the positioning information for debugging
+        Log.d("CameraPreview", "WebView Position Debug:");
+        Log.d("CameraPreview", "  - webView.getTop(): " + webViewTop);
+        Log.d("CameraPreview", "  - webView.getLeft(): " + webViewLeft);
+        Log.d(
+          "CameraPreview",
+          "  - webView locationInWindow: (" +
+          webViewLocationInWindow[0] +
+          ", " +
+          webViewLocationInWindow[1] +
+          ")"
+        );
+        Log.d(
+          "CameraPreview",
+          "  - webView locationOnScreen: (" +
+          webViewLocationOnScreen[0] +
+          ", " +
+          webViewLocationOnScreen[1] +
+          ")"
+        );
+        Log.d(
+          "CameraPreview",
+          "  - parent locationInWindow: (" +
+          parentLocationInWindow[0] +
+          ", " +
+          parentLocationInWindow[1] +
+          ")"
+        );
+        Log.d(
+          "CameraPreview",
+          "  - parent locationOnScreen: (" +
+          parentLocationOnScreen[0] +
+          ", " +
+          parentLocationOnScreen[1] +
+          ")"
+        );
 
-            // size
-            int computedWidth;
-            int computedHeight;
-            int computedPaddingBottom;
+        // Check if WebView has margins
+        View webView = getBridge().getWebView();
+        ViewGroup.LayoutParams webViewLayoutParams = webView.getLayoutParams();
+        if (webViewLayoutParams instanceof ViewGroup.MarginLayoutParams) {
+          ViewGroup.MarginLayoutParams marginParams =
+            (ViewGroup.MarginLayoutParams) webViewLayoutParams;
+          Log.d(
+            "CameraPreview",
+            "  - webView margins: left=" +
+            marginParams.leftMargin +
+            ", top=" +
+            marginParams.topMargin +
+            ", right=" +
+            marginParams.rightMargin +
+            ", bottom=" +
+            marginParams.bottomMargin
+          );
+        }
 
-            if (paddingBottom != 0) {
-              computedPaddingBottom = (int) TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP,
-                paddingBottom,
-                metrics
-              );
-            } else {
-              computedPaddingBottom = 0;
-            }
+        // Check WebView padding
+        Log.d(
+          "CameraPreview",
+          "  - webView padding: left=" +
+          webView.getPaddingLeft() +
+          ", top=" +
+          webView.getPaddingTop() +
+          ", right=" +
+          webView.getPaddingRight() +
+          ", bottom=" +
+          webView.getPaddingBottom()
+        );
 
-            if (width != 0) {
-              computedWidth = (int) TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP,
-                width,
-                metrics
-              );
-            } else {
-              Display defaultDisplay = getBridge()
-                .getActivity()
-                .getWindowManager()
-                .getDefaultDisplay();
-              final Point size = new Point();
-              defaultDisplay.getSize(size);
-
-              computedWidth = (int) TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_PX,
-                size.x,
-                metrics
-              );
-            }
+        Log.d("CameraPreview", "  - Using webViewTopInset: " + webViewTopInset);
+        Log.d("CameraPreview", "  - isEdgeToEdgeActive: " + isEdgeToEdgeActive);
+
+        // Calculate position - center if x or y is -1
+        int computedX;
+        int computedY;
+
+        // Calculate dimensions first
+        int computedWidth = width != 0
+          ? (int) (width * pixelRatio)
+          : getBridge().getWebView().getWidth();
+        int computedHeight = height != 0
+          ? (int) (height * pixelRatio)
+          : getBridge().getWebView().getHeight();
+        computedHeight -= (int) (paddingBottom * pixelRatio);
+
+        Log.d("CameraPreview", "========================");
+        Log.d("CameraPreview", "POSITIONING CALCULATIONS:");
+        Log.d(
+          "CameraPreview",
+          "1. INPUT - x: " +
+          x +
+          ", y: " +
+          y +
+          ", width: " +
+          width +
+          ", height: " +
+          height
+        );
+        Log.d("CameraPreview", "2. PIXEL RATIO: " + pixelRatio);
+        Log.d(
+          "CameraPreview",
+          "3. SCREEN - width: " +
+          metrics.widthPixels +
+          ", height: " +
+          metrics.heightPixels
+        );
+        Log.d(
+          "CameraPreview",
+          "4. WEBVIEW - width: " +
+          getBridge().getWebView().getWidth() +
+          ", height: " +
+          getBridge().getWebView().getHeight()
+        );
+        Log.d(
+          "CameraPreview",
+          "5. COMPUTED DIMENSIONS - width: " +
+          computedWidth +
+          ", height: " +
+          computedHeight
+        );
 
-            if (height != 0) {
-              computedHeight =
-                (int) TypedValue.applyDimension(
-                  TypedValue.COMPLEX_UNIT_DIP,
-                  height,
-                  metrics
-                ) -
-                computedPaddingBottom;
-            } else {
-              Display defaultDisplay = getBridge()
-                .getActivity()
-                .getWindowManager()
-                .getDefaultDisplay();
-              final Point size = new Point();
-              defaultDisplay.getSize(size);
-
-              computedHeight =
-                (int) TypedValue.applyDimension(
-                  TypedValue.COMPLEX_UNIT_PX,
-                  size.y,
-                  metrics
-                ) -
-                computedPaddingBottom;
-            }
+        if (x == -1) {
+          // Center horizontally
+          int screenWidth = metrics.widthPixels;
+          computedX = (screenWidth - computedWidth) / 2;
+          Log.d(
+            "CameraPreview",
+            "Centering horizontally: screenWidth=" +
+            screenWidth +
+            ", computedWidth=" +
+            computedWidth +
+            ", computedX=" +
+            computedX
+          );
+        } else {
+          computedX = (int) (x * pixelRatio);
+          Log.d(
+            "CameraPreview",
+            "Using provided X position: " +
+            x +
+            " * " +
+            pixelRatio +
+            " = " +
+            computedX
+          );
+        }
 
-            fragment.setRect(
-              computedX,
-              computedY,
-              computedWidth,
-              computedHeight
-            );
+        if (y == -1) {
+          // Position vertically based on positioning parameter
+          int screenHeight = metrics.heightPixels;
 
-            FrameLayout containerView = getBridge()
-              .getActivity()
-              .findViewById(containerViewId);
-            if (containerView == null) {
-              containerView = new FrameLayout(
-                getActivity().getApplicationContext()
+          switch (positioning) {
+            case "top":
+              computedY = 0;
+              Log.d("CameraPreview", "Positioning at top: computedY=0");
+              break;
+            case "bottom":
+              computedY = screenHeight - computedHeight;
+              Log.d(
+                "CameraPreview",
+                "Positioning at bottom: screenHeight=" +
+                screenHeight +
+                ", computedHeight=" +
+                computedHeight +
+                ", computedY=" +
+                computedY
               );
-              containerView.setId(containerViewId);
-
-              getBridge().getWebView().setBackgroundColor(Color.TRANSPARENT);
-              ((ViewGroup) getBridge().getWebView().getParent()).addView(
-                  containerView
+              break;
+            case "center":
+            default:
+              // Center vertically
+              if (isEdgeToEdgeActive) {
+                // When WebView is offset from top, center within the available space
+                // The camera should be centered in the full screen, not just the WebView area
+                computedY = (screenHeight - computedHeight) / 2;
+                Log.d(
+                  "CameraPreview",
+                  "Centering vertically with WebView offset: screenHeight=" +
+                  screenHeight +
+                  ", webViewTop=" +
+                  webViewTopInset +
+                  ", computedHeight=" +
+                  computedHeight +
+                  ", computedY=" +
+                  computedY
+                );
+              } else {
+                // Normal mode - use full screen height
+                computedY = (screenHeight - computedHeight) / 2;
+                Log.d(
+                  "CameraPreview",
+                  "Centering vertically (normal): screenHeight=" +
+                  screenHeight +
+                  ", computedHeight=" +
+                  computedHeight +
+                  ", computedY=" +
+                  computedY
                 );
-              if (toBack) {
-                getBridge()
-                  .getWebView()
-                  .getParent()
-                  .bringChildToFront(getBridge().getWebView());
-                setupBroadcast();
               }
-
-              FragmentManager fragmentManager = getBridge()
-                .getActivity()
-                .getFragmentManager();
-              FragmentTransaction fragmentTransaction =
-                fragmentManager.beginTransaction();
-              fragmentTransaction.add(containerView.getId(), fragment);
-              fragmentTransaction.commit();
-
-              // NOTE: we don't return invoke call.resolve here because it must be invoked in onCameraStarted
-              // otherwise the plugin start method might resolve/return before the camera is actually set in CameraActivity
-              // onResume method (see this line mCamera = Camera.open(defaultCameraId);) and the next subsequent plugin
-              // method invocations (for example, getSupportedFlashModes) might fails with "Camera is not running" error
-              // because camera is not available yet and hasCamera method will return false
-              // Please also see https://developer.android.com/reference/android/hardware/Camera.html#open%28int%29
-              bridge.saveCall(call);
-              cameraStartCallbackId = call.getCallbackId();
-            } else {
-              call.reject("camera already started");
-            }
+              break;
+          }
+        } else {
+          computedY = (int) (y * pixelRatio);
+          // If edge-to-edge is active, JavaScript Y is relative to WebView content area
+          // We need to add the inset to get absolute screen position
+          if (isEdgeToEdgeActive) {
+            computedY += webViewTopInset;
+            Log.d(
+              "CameraPreview",
+              "Edge-to-edge adjustment: Y position " +
+              (int) (y * pixelRatio) +
+              " + inset " +
+              webViewTopInset +
+              " = " +
+              computedY
+            );
           }
+          Log.d(
+            "CameraPreview",
+            "Using provided Y position: " +
+            y +
+            " * " +
+            pixelRatio +
+            " = " +
+            computedY +
+            (isEdgeToEdgeActive ? " (adjusted for edge-to-edge)" : "")
+          );
         }
-      );
-  }
 
-  @Override
-  protected void handleOnResume() {
-    super.handleOnResume();
+        Log.d(
+          "CameraPreview",
+          "2b. EDGE-TO-EDGE - " +
+          (isEdgeToEdgeActive
+              ? "ACTIVE (inset=" + webViewTopInset + ")"
+              : "INACTIVE")
+        );
+        Log.d(
+          "CameraPreview",
+          "3. COMPUTED POSITION - x=" + computedX + ", y=" + computedY
+        );
+        Log.d(
+          "CameraPreview",
+          "4. COMPUTED SIZE - width=" +
+          computedWidth +
+          ", height=" +
+          computedHeight
+        );
+        Log.d("CameraPreview", "=== COORDINATE DEBUG ===");
+        Log.d(
+          "CameraPreview",
+          "WebView getLeft/getTop: (" + webViewLeft + ", " + webViewTop + ")"
+        );
+        Log.d(
+          "CameraPreview",
+          "WebView locationInWindow: (" +
+          webViewLocationInWindow[0] +
+          ", " +
+          webViewLocationInWindow[1] +
+          ")"
+        );
+        Log.d(
+          "CameraPreview",
+          "WebView locationOnScreen: (" +
+          webViewLocationOnScreen[0] +
+          ", " +
+          webViewLocationOnScreen[1] +
+          ")"
+        );
+        Log.d(
+          "CameraPreview",
+          "Parent locationInWindow: (" +
+          parentLocationInWindow[0] +
+          ", " +
+          parentLocationInWindow[1] +
+          ")"
+        );
+        Log.d(
+          "CameraPreview",
+          "Parent locationOnScreen: (" +
+          parentLocationOnScreen[0] +
+          ", " +
+          parentLocationOnScreen[1] +
+          ")"
+        );
+        Log.d(
+          "CameraPreview",
+          "Parent class: " + webViewParent.getClass().getSimpleName()
+        );
+        Log.d(
+          "CameraPreview",
+          "Requested position (logical): (" + x + ", " + y + ")"
+        );
+        Log.d("CameraPreview", "Pixel ratio: " + pixelRatio);
+        Log.d(
+          "CameraPreview",
+          "Final computed position (no offset): (" +
+          computedX +
+          ", " +
+          computedY +
+          ")"
+        );
+        Log.d("CameraPreview", "5. IS_CENTERED - " + (x == -1 || y == -1));
+        Log.d("CameraPreview", "========================");
+
+        // Pass along whether we're centering so CameraXView knows not to add insets
+        boolean isCentered = (x == -1 || y == -1);
+
+        CameraSessionConfiguration config = new CameraSessionConfiguration(
+          finalDeviceId,
+          position,
+          computedX,
+          computedY,
+          computedWidth,
+          computedHeight,
+          paddingBottom,
+          toBack,
+          storeToFile,
+          enableOpacity,
+          enableZoom,
+          disableExifHeaderStripping,
+          disableAudio,
+          1.0f,
+          aspectRatio,
+          gridMode
+        );
+        config.setTargetZoom(finalTargetZoom);
+        config.setCentered(isCentered);
+
+        bridge.saveCall(call);
+        cameraStartCallbackId = call.getCallbackId();
+        cameraXView.startSession(config);
+      });
   }
 
   @Override
-  public void onPictureTaken(String originalPicture) {
-    JSObject jsObject = new JSObject();
-    jsObject.put("value", originalPicture);
-    bridge.getSavedCall(captureCallbackId).resolve(jsObject);
+  public void onPictureTaken(String base64, JSONObject exif) {
+    PluginCall pluginCall = bridge.getSavedCall(captureCallbackId);
+    if (pluginCall == null) {
+      Log.e("CameraPreview", "onPictureTaken: captureCallbackId is null");
+      return;
+    }
+    JSObject result = new JSObject();
+    result.put("value", base64);
+    result.put("exif", exif);
+    pluginCall.resolve(result);
+    bridge.releaseCall(pluginCall);
   }
 
   @Override
   public void onPictureTakenError(String message) {
-    bridge.getSavedCall(captureCallbackId).reject(message);
+    PluginCall pluginCall = bridge.getSavedCall(captureCallbackId);
+    if (pluginCall == null) {
+      Log.e("CameraPreview", "onPictureTakenError: captureCallbackId is null");
+      return;
+    }
+    pluginCall.reject(message);
+    bridge.releaseCall(pluginCall);
   }
 
   @Override
-  public void onSnapshotTaken(String originalPicture) {
-    JSObject jsObject = new JSObject();
-    jsObject.put("value", originalPicture);
-    bridge.getSavedCall(snapshotCallbackId).resolve(jsObject);
-  }
+  public void onCameraStarted(int width, int height, int x, int y) {
+    PluginCall call = bridge.getSavedCall(cameraStartCallbackId);
+    if (call != null) {
+      // Convert pixel values back to logical units
+      DisplayMetrics metrics = getBridge()
+        .getActivity()
+        .getResources()
+        .getDisplayMetrics();
+      float pixelRatio = metrics.density;
+
+      // When WebView is offset from the top (e.g., below status bar),
+      // we need to convert between JavaScript coordinates (relative to WebView)
+      // and native coordinates (relative to screen)
+      WebView webView = getBridge().getWebView();
+      int webViewTopInset = 0;
+      boolean isEdgeToEdgeActive = false;
+      if (webView != null) {
+        int[] location = new int[2];
+        webView.getLocationOnScreen(location);
+        webViewTopInset = location[1];
+        isEdgeToEdgeActive = webViewTopInset > 0;
+      }
 
-  @Override
-  public void onSnapshotTakenError(String message) {
-    bridge.getSavedCall(snapshotCallbackId).reject(message);
+      // Only convert to relative position if edge-to-edge is active
+      int relativeY = isEdgeToEdgeActive ? (y - webViewTopInset) : y;
+
+      Log.d("CameraPreview", "========================");
+      Log.d("CameraPreview", "CAMERA STARTED - POSITION RETURNED:");
+      Log.d(
+        "CameraPreview",
+        "7. RETURNED (pixels) - x=" +
+        x +
+        ", y=" +
+        y +
+        ", width=" +
+        width +
+        ", height=" +
+        height
+      );
+      Log.d(
+        "CameraPreview",
+        "8. EDGE-TO-EDGE - " + (isEdgeToEdgeActive ? "ACTIVE" : "INACTIVE")
+      );
+      Log.d("CameraPreview", "9. WEBVIEW INSET - " + webViewTopInset);
+      Log.d(
+        "CameraPreview",
+        "10. RELATIVE Y - " +
+        relativeY +
+        " (y=" +
+        y +
+        (isEdgeToEdgeActive ? " - inset=" + webViewTopInset : " unchanged") +
+        ")"
+      );
+      Log.d(
+        "CameraPreview",
+        "11. RETURNED (logical) - x=" +
+        (x / pixelRatio) +
+        ", y=" +
+        (relativeY / pixelRatio) +
+        ", width=" +
+        (width / pixelRatio) +
+        ", height=" +
+        (height / pixelRatio)
+      );
+      Log.d("CameraPreview", "12. PIXEL RATIO - " + pixelRatio);
+      Log.d("CameraPreview", "========================");
+
+      JSObject result = new JSObject();
+      result.put("width", width / pixelRatio);
+      result.put("height", height / pixelRatio);
+      result.put("x", x / pixelRatio);
+      result.put("y", relativeY / pixelRatio);
+      call.resolve(result);
+      bridge.releaseCall(call);
+      cameraStartCallbackId = null; // Prevent re-use
+    }
   }
 
   @Override
-  public void onFocusSet(int pointX, int pointY) {}
-
-  @Override
-  public void onFocusSetError(String message) {}
-
-  @Override
-  public void onBackButton() {}
-
-  @Override
-  public void onCameraStarted() {
-    PluginCall pluginCall = bridge.getSavedCall(cameraStartCallbackId);
-    pluginCall.resolve();
-    bridge.releaseCall(pluginCall);
+  public void onSampleTaken(String result) {
+    // Handle sample taken if needed
+    Log.i("CameraPreview", "Sample taken: " + result);
   }
 
   @Override
-  public void onStartRecordVideo() {}
-
-  @Override
-  public void onStartRecordVideoError(String message) {
-    bridge.getSavedCall(recordCallbackId).reject(message);
+  public void onSampleTakenError(String message) {
+    // Handle sample taken error if needed
+    Log.e("CameraPreview", "Sample taken error: " + message);
   }
 
   @Override
-  public void onStopRecordVideo(String file) {
-    PluginCall pluginCall = bridge.getSavedCall(recordCallbackId);
-    JSObject jsObject = new JSObject();
-    jsObject.put("videoFilePath", file);
-    pluginCall.resolve(jsObject);
+  public void onCameraStartError(String message) {
+    PluginCall call = bridge.getSavedCall(cameraStartCallbackId);
+    if (call != null) {
+      call.reject(message);
+      bridge.releaseCall(call);
+      cameraStartCallbackId = null;
+    }
   }
 
-  @Override
-  public void onStopRecordVideoError(String error) {
-    bridge.getSavedCall(recordCallbackId).reject(error);
+  @PluginMethod
+  public void setAspectRatio(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
+    }
+    String aspectRatio = call.getString("aspectRatio", "4:3");
+    Float x = call.getFloat("x");
+    Float y = call.getFloat("y");
+
+    getActivity()
+      .runOnUiThread(() -> {
+        cameraXView.setAspectRatio(aspectRatio, x, y, () -> {
+          // Return the actual preview bounds after layout and camera operations are complete
+          int[] bounds = cameraXView.getCurrentPreviewBounds();
+          JSObject ret = new JSObject();
+          ret.put("x", bounds[0]);
+          ret.put("y", bounds[1]);
+          ret.put("width", bounds[2]);
+          ret.put("height", bounds[3]);
+          call.resolve(ret);
+        });
+      });
   }
 
-  private boolean hasView(PluginCall call) {
-    if (fragment == null) {
-      return false;
+  @PluginMethod
+  public void getAspectRatio(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
     }
+    String aspectRatio = cameraXView.getAspectRatio();
+    JSObject ret = new JSObject();
+    ret.put("aspectRatio", aspectRatio);
+    call.resolve(ret);
+  }
 
-    return true;
+  @PluginMethod
+  public void setGridMode(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
+    }
+    String gridMode = call.getString("gridMode", "none");
+    getActivity()
+      .runOnUiThread(() -> {
+        cameraXView.setGridMode(gridMode);
+        call.resolve();
+      });
   }
 
-  private boolean hasCamera(PluginCall call) {
-    if (!this.hasView(call)) {
-      return false;
+  @PluginMethod
+  public void getGridMode(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
     }
+    JSObject ret = new JSObject();
+    ret.put("gridMode", cameraXView.getGridMode());
+    call.resolve(ret);
+  }
 
-    if (fragment.getCamera() == null) {
-      return false;
+  @PluginMethod
+  public void getPreviewSize(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
     }
 
-    return true;
+    // Convert pixel values back to logical units
+    DisplayMetrics metrics = getBridge()
+      .getActivity()
+      .getResources()
+      .getDisplayMetrics();
+    float pixelRatio = metrics.density;
+
+    JSObject ret = new JSObject();
+    ret.put("x", cameraXView.getPreviewX() / pixelRatio);
+    ret.put("y", cameraXView.getPreviewY() / pixelRatio);
+    ret.put("width", cameraXView.getPreviewWidth() / pixelRatio);
+    ret.put("height", cameraXView.getPreviewHeight() / pixelRatio);
+    call.resolve(ret);
   }
 
-  private String getFilePath() {
-    String fileName = "videoTmp";
+  @PluginMethod
+  public void setPreviewSize(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
+    }
 
-    int i = 1;
+    // Get values from call - null values will become 0
+    Integer xParam = call.getInt("x");
+    Integer yParam = call.getInt("y");
+    Integer widthParam = call.getInt("width");
+    Integer heightParam = call.getInt("height");
 
-    while (
-      new File(VIDEO_FILE_PATH + fileName + VIDEO_FILE_EXTENSION).exists()
-    ) {
-      // Add number suffix if file exists
-      fileName = "videoTmp" + '_' + i;
-      i++;
+    // Apply pixel ratio conversion to non-null values
+    DisplayMetrics metrics = getBridge()
+      .getActivity()
+      .getResources()
+      .getDisplayMetrics();
+    float pixelRatio = metrics.density;
+
+    // Check if edge-to-edge mode is active
+    WebView webView = getBridge().getWebView();
+    int webViewTopInset = 0;
+    boolean isEdgeToEdgeActive = false;
+    if (webView != null) {
+      int[] location = new int[2];
+      webView.getLocationOnScreen(location);
+      webViewTopInset = location[1];
+      isEdgeToEdgeActive = webViewTopInset > 0;
     }
 
-    return VIDEO_FILE_PATH + fileName + VIDEO_FILE_EXTENSION;
-  }
-
-  private void setupBroadcast() {
-    /** When touch event is triggered, relay it to camera view if needed so it can support pinch zoom */
+    int x = (xParam != null && xParam > 0) ? (int) (xParam * pixelRatio) : 0;
+    int y = (yParam != null && yParam > 0) ? (int) (yParam * pixelRatio) : 0;
 
-    getBridge().getWebView().setClickable(true);
-    getBridge()
-      .getWebView()
-      .setOnTouchListener(
-        new View.OnTouchListener() {
-          @Override
-          public boolean onTouch(View v, MotionEvent event) {
-            if (
-              (null != fragment) &&
-              (fragment.toBack == true) &&
-              null != fragment.frameContainerLayout
-            ) {
-              fragment.frameContainerLayout.dispatchTouchEvent(event);
-            }
-            return false;
-          }
-        }
-      );
+    // Add edge-to-edge inset to Y if active
+    if (isEdgeToEdgeActive && y > 0) {
+      y += webViewTopInset;
+    }
+    int width = (widthParam != null && widthParam > 0)
+      ? (int) (widthParam * pixelRatio)
+      : 0;
+    int height = (heightParam != null && heightParam > 0)
+      ? (int) (heightParam * pixelRatio)
+      : 0;
+
+    cameraXView.setPreviewSize(x, y, width, height, () -> {
+      // Return the actual preview bounds after layout operations are complete
+      int[] bounds = cameraXView.getCurrentPreviewBounds();
+      JSObject ret = new JSObject();
+      ret.put("x", bounds[0]);
+      ret.put("y", bounds[1]);
+      ret.put("width", bounds[2]);
+      ret.put("height", bounds[3]);
+      call.resolve(ret);
+    });
   }
 }