@capgo/camera-preview 7.4.0-beta.1 → 7.4.0-beta.10

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

@@ -3,15 +3,11 @@ package com.ahm.capacitor.camera.preview;
 import static android.Manifest.permission.CAMERA;
 import static android.Manifest.permission.RECORD_AUDIO;
 
+import android.Manifest;
 import android.content.pm.ActivityInfo;
-import android.graphics.Point;
 import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.Display;
-import androidx.annotation.NonNull;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
-import com.getcapacitor.Logger;
 import com.getcapacitor.PermissionState;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
@@ -27,6 +23,14 @@ import java.util.Objects;
 import android.util.Size;
 import android.util.Log;
 import com.ahm.capacitor.camera.preview.model.LensInfo;
+import com.google.android.gms.location.FusedLocationProviderClient;
+import com.google.android.gms.location.LocationServices;
+import org.json.JSONObject;
+import android.location.Location;
+import android.view.ViewGroup;
+
+import com.getcapacitor.Logger;
+
 
 @CapacitorPlugin(
   name = "CameraPreview",
@@ -39,6 +43,10 @@ import com.ahm.capacitor.camera.preview.model.LensInfo;
       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
@@ -47,12 +55,15 @@ public class CameraPreview
 
   static final String CAMERA_WITH_AUDIO_PERMISSION_ALIAS = "cameraWithAudio";
   static final String CAMERA_ONLY_PERMISSION_ALIAS = "cameraOnly";
+  static final String CAMERA_WITH_LOCATION_PERMISSION_ALIAS = "cameraWithLocation";
 
   private String captureCallbackId = "";
   private String snapshotCallbackId = "";
   private String cameraStartCallbackId = "";
   private int previousOrientationRequest = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
   private CameraXView cameraXView;
+  private FusedLocationProviderClient fusedLocationClient;
+  private Location lastLocation;
 
   @PluginMethod
   public void start(PluginCall call) {
@@ -83,15 +94,62 @@ public class CameraPreview
   }
 
   @PluginMethod
-  public void capture(PluginCall call) {
+  public void capture(final PluginCall call) {
     if (cameraXView == null || !cameraXView.isRunning()) {
       call.reject("Camera is not running");
       return;
     }
+
+    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);
+    }
+  }
+
+  @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));
-    cameraXView.capturePhoto(quality);
+    final boolean saveToGallery = call.getBoolean("saveToGallery", false);
+    Integer width = call.getInt("width");
+    Integer height = call.getInt("height");
+
+    cameraXView.capturePhoto(quality, saveToGallery, width, height, location);
   }
 
   @PluginMethod
@@ -235,7 +293,7 @@ public class CameraPreview
     }
     rear.put("supportedPictureSizes", rearSizesJs);
     supportedPictureSizesResult.put(rear);
-    
+
     List<Size> frontSizes = CameraXView.getSupportedPictureSizes("front");
     JSObject front = new JSObject();
     front.put("facing", "front");
@@ -248,7 +306,7 @@ public class CameraPreview
     }
     front.put("supportedPictureSizes", frontSizesJs);
     supportedPictureSizesResult.put(front);
-    
+
     JSObject ret = new JSObject();
     ret.put("supportedPictureSizes", supportedPictureSizesResult);
     call.resolve(ret);
@@ -326,14 +384,22 @@ public class CameraPreview
     final int width = call.getInt("width", 0);
     final int height = call.getInt("height", 0);
     final int paddingBottom = call.getInt("paddingBottom", 0);
-    final boolean toBack = call.getBoolean("toBack", true);
-    final boolean storeToFile = call.getBoolean("storeToFile", false);
-    final boolean enableOpacity = call.getBoolean("enableOpacity", false);
-    final boolean enableZoom = call.getBoolean("enableZoom", false);
-    final boolean disableExifHeaderStripping = call.getBoolean("disableExifHeaderStripping", false);
-    final boolean lockOrientation = call.getBoolean("lockAndroidOrientation", false);
-    final boolean disableAudio = call.getBoolean("disableAudio", true);
+    final boolean toBack = Boolean.TRUE.equals(call.getBoolean("toBack", true));
+    final boolean storeToFile = Boolean.TRUE.equals(call.getBoolean("storeToFile", false));
+    final boolean enableOpacity = Boolean.TRUE.equals(call.getBoolean("enableOpacity", false));
+    final boolean enableZoom = Boolean.TRUE.equals(call.getBoolean("enableZoom", false));
+    final boolean disableExifHeaderStripping = Boolean.TRUE.equals(call.getBoolean("disableExifHeaderStripping", false));
+    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");
     
+    // 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 = 1.0f;
     // Check if the selected device is a physical ultra-wide
     if (originalDeviceId != null) {
@@ -345,7 +411,7 @@ public class CameraPreview
                         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; 
+                        deviceId = null;
                         break;
                     }
                 }
@@ -365,15 +431,50 @@ public class CameraPreview
         if (lockOrientation) {
           getBridge().getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
         }
-        int computedX = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, x, metrics);
-        int computedY = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, y, metrics);
-        int computedWidth = width != 0 ? (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, width, metrics) : (int) getBridge().getWebView().getWidth();
-        int computedHeight = height != 0 ? (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, height, metrics) : (int) getBridge().getWebView().getHeight();
-        computedHeight -= (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, paddingBottom, metrics);
-
-        CameraSessionConfiguration config = new CameraSessionConfiguration(finalDeviceId, position, computedX, computedY, computedWidth, computedHeight, paddingBottom, toBack, storeToFile, enableOpacity, enableZoom, disableExifHeaderStripping, disableAudio, 1.0f);
-        config.setTargetZoom(finalTargetZoom);
         
+        // 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;
+        
+        // Try using just the pixel ratio without any webview offset for now
+        int computedX = (int) (x * pixelRatio);
+        int computedY = (int) (y * pixelRatio);
+        
+        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", "========================");
+        int computedWidth = width != 0 ? (int) (width * pixelRatio) : getBridge().getWebView().getWidth();
+        int computedHeight = height != 0 ? (int) (height * pixelRatio) : getBridge().getWebView().getHeight();
+        computedHeight -= (int) (paddingBottom * pixelRatio);
+
+        CameraSessionConfiguration config = new CameraSessionConfiguration(finalDeviceId, position, computedX, computedY, computedWidth, computedHeight, paddingBottom, toBack, storeToFile, enableOpacity, enableZoom, disableExifHeaderStripping, disableAudio, 1.0f, aspectRatio, gridMode);
+        config.setTargetZoom(finalTargetZoom);
+
         bridge.saveCall(call);
         cameraStartCallbackId = call.getCallbackId();
         cameraXView.startSession(config);
@@ -382,44 +483,180 @@ public class CameraPreview
   }
 
   @Override
-  public void onPictureTaken(String result) {
-    JSObject jsObject = new JSObject();
-    jsObject.put("value", result);
-    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 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;
+        
+        JSObject result = new JSObject();
+        result.put("width", width / pixelRatio);
+        result.put("height", height / pixelRatio);
+        result.put("x", x / pixelRatio);
+        result.put("y", y / pixelRatio);
+        call.resolve(result);
+        bridge.releaseCall(call);
+        cameraStartCallbackId = null; // Prevent re-use
+    }
   }
 
   @Override
   public void onSampleTaken(String result) {
-    JSObject jsObject = new JSObject();
-    jsObject.put("value", result);
-    bridge.getSavedCall(snapshotCallbackId).resolve(jsObject);
+    // Handle sample taken if needed
+    Log.i("CameraPreview", "Sample taken: " + result);
   }
 
   @Override
   public void onSampleTakenError(String message) {
-    bridge.getSavedCall(snapshotCallbackId).reject(message);
+    // Handle sample taken error if needed
+    Log.e("CameraPreview", "Sample taken error: " + message);
   }
 
   @Override
-  public void onCameraStarted() {
-    PluginCall pluginCall = bridge.getSavedCall(cameraStartCallbackId);
-    if (pluginCall != null) {
-      pluginCall.resolve();
-      bridge.releaseCall(pluginCall);
+  public void onCameraStartError(String message) {
+    PluginCall call = bridge.getSavedCall(cameraStartCallbackId);
+    if (call != null) {
+        call.reject(message);
+        bridge.releaseCall(call);
+        cameraStartCallbackId = null;
     }
   }
 
-  @Override
-  public void onCameraStartError(String message) {
-    PluginCall pluginCall = bridge.getSavedCall(cameraStartCallbackId);
-    if (pluginCall != null) {
-      pluginCall.reject(message);
-      bridge.releaseCall(pluginCall);
+  @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);
+      });
+    });
+  }
+
+  @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);
+  }
+
+  @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();
+    });
+  }
+
+  @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);
+  }
+
+  @PluginMethod
+  public void getPreviewSize(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
     }
+    
+    // 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);
+  }
+  @PluginMethod
+  public void setPreviewSize(PluginCall call) {
+    if (cameraXView == null || !cameraXView.isRunning()) {
+      call.reject("Camera is not running");
+      return;
+    }
+    
+    // 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");
+    
+    // Apply pixel ratio conversion to non-null values
+    DisplayMetrics metrics = getBridge().getActivity().getResources().getDisplayMetrics();
+    float pixelRatio = metrics.density;
+    
+    int x = (xParam != null && xParam > 0) ? (int) (xParam * pixelRatio) : 0;
+    int y = (yParam != null && yParam > 0) ? (int) (yParam * pixelRatio) : 0;
+    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);
+    });
   }
 }