@capgo/camera-preview 7.4.0-beta.9 → 7.4.0

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

@@ -3,80 +3,117 @@ package com.ahm.capacitor.camera.preview;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.View;
 
 public class GridOverlayView extends View {
-    private Paint gridPaint;
-    private String gridMode = "none";
 
-    public GridOverlayView(Context context) {
-        super(context);
-        init();
-    }
+  private Paint gridPaint;
+  private String gridMode = "none";
+  private Rect cameraBounds = null;
 
-    public GridOverlayView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
+  public GridOverlayView(Context context) {
+    super(context);
+    init();
+  }
 
-    public GridOverlayView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
+  public GridOverlayView(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    init();
+  }
 
-    private void init() {
-        gridPaint = new Paint();
-        gridPaint.setColor(0x80FFFFFF); // Semi-transparent white
-        gridPaint.setStrokeWidth(2f);
-        gridPaint.setStyle(Paint.Style.STROKE);
-        gridPaint.setAntiAlias(true);
-    }
+  public GridOverlayView(
+    Context context,
+    AttributeSet attrs,
+    int defStyleAttr
+  ) {
+    super(context, attrs, defStyleAttr);
+    init();
+  }
+
+  private void init() {
+    gridPaint = new Paint();
+    gridPaint.setColor(0x80FFFFFF); // Semi-transparent white
+    gridPaint.setStrokeWidth(2f);
+    gridPaint.setStyle(Paint.Style.STROKE);
+    gridPaint.setAntiAlias(true);
+  }
+
+  public void setCameraBounds(Rect bounds) {
+    this.cameraBounds = bounds;
+    invalidate();
+  }
 
-    public void setGridMode(String mode) {
-        String previousMode = this.gridMode;
-        this.gridMode = mode != null ? mode : "none";
-        setVisibility("none".equals(this.gridMode) ? View.GONE : View.VISIBLE);
-        android.util.Log.d("GridOverlayView", "setGridMode: Changed from '" + previousMode + "' to '" + this.gridMode + "', visibility: " + ("none".equals(this.gridMode) ? "GONE" : "VISIBLE"));
-        invalidate();
+  public void setGridMode(String mode) {
+    String previousMode = this.gridMode;
+    this.gridMode = mode != null ? mode : "none";
+    setVisibility("none".equals(this.gridMode) ? View.GONE : View.VISIBLE);
+    android.util.Log.d(
+      "GridOverlayView",
+      "setGridMode: Changed from '" +
+      previousMode +
+      "' to '" +
+      this.gridMode +
+      "', visibility: " +
+      ("none".equals(this.gridMode) ? "GONE" : "VISIBLE")
+    );
+    invalidate();
+  }
+
+  @Override
+  protected void onDraw(Canvas canvas) {
+    super.onDraw(canvas);
+
+    if ("none".equals(gridMode)) {
+      return;
     }
 
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
+    // Use camera bounds if available, otherwise use full view bounds
+    int left = 0;
+    int top = 0;
+    int width = getWidth();
+    int height = getHeight();
+
+    if (cameraBounds != null) {
+      left = cameraBounds.left;
+      top = cameraBounds.top;
+      width = cameraBounds.width();
+      height = cameraBounds.height();
+    }
 
-        if ("none".equals(gridMode)) {
-            return;
-        }
+    if (width <= 0 || height <= 0) {
+      return;
+    }
 
-        int width = getWidth();
-        int height = getHeight();
+    if ("3x3".equals(gridMode)) {
+      drawGrid(canvas, left, top, width, height, 3);
+    } else if ("4x4".equals(gridMode)) {
+      drawGrid(canvas, left, top, width, height, 4);
+    }
+  }
 
-        if (width <= 0 || height <= 0) {
-            return;
-        }
+  private void drawGrid(
+    Canvas canvas,
+    int left,
+    int top,
+    int width,
+    int height,
+    int divisions
+  ) {
+    float stepX = (float) width / divisions;
+    float stepY = (float) height / divisions;
 
-        if ("3x3".equals(gridMode)) {
-            drawGrid(canvas, width, height, 3);
-        } else if ("4x4".equals(gridMode)) {
-            drawGrid(canvas, width, height, 4);
-        }
+    // Draw vertical lines
+    for (int i = 1; i < divisions; i++) {
+      float x = left + (i * stepX);
+      canvas.drawLine(x, top, x, top + height, gridPaint);
     }
 
-    private void drawGrid(Canvas canvas, int width, int height, int divisions) {
-        float stepX = (float) width / divisions;
-        float stepY = (float) height / divisions;
-
-        // Draw vertical lines
-        for (int i = 1; i < divisions; i++) {
-            float x = i * stepX;
-            canvas.drawLine(x, 0, x, height, gridPaint);
-        }
-
-        // Draw horizontal lines
-        for (int i = 1; i < divisions; i++) {
-            float y = i * stepY;
-            canvas.drawLine(0, y, width, y, gridPaint);
-        }
+    // Draw horizontal lines
+    for (int i = 1; i < divisions; i++) {
+      float y = top + (i * stepY);
+      canvas.drawLine(left, y, left + width, y, gridPaint);
     }
+  }
 }

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

@@ -6,49 +6,58 @@ import java.util.List;
  * Represents a camera device available on the Android device.
  */
 public class CameraDevice {
-    private final String deviceId;
-    private final String label;
-    private final String position;
-    private final List<LensInfo> lenses;
-    private final float minZoom;
-    private final float maxZoom;
-    private final boolean isLogical;
-
-    public CameraDevice(String deviceId, String label, String position, List<LensInfo> lenses, float minZoom, float maxZoom, boolean isLogical) {
-        this.deviceId = deviceId;
-        this.label = label;
-        this.position = position;
-        this.lenses = lenses;
-        this.minZoom = minZoom;
-        this.maxZoom = maxZoom;
-        this.isLogical = isLogical;
-    }
-
-    public String getDeviceId() {
-        return deviceId;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public String getPosition() {
-        return position;
-    }
-
-    public List<LensInfo> getLenses() {
-        return lenses;
-    }
-
-    public float getMinZoom() {
-        return minZoom;
-    }
-
-    public float getMaxZoom() {
-        return maxZoom;
-    }
-    
-    public boolean isLogical() {
-        return isLogical;
-    }
-} 
+
+  private final String deviceId;
+  private final String label;
+  private final String position;
+  private final List<LensInfo> lenses;
+  private final float minZoom;
+  private final float maxZoom;
+  private final boolean isLogical;
+
+  public CameraDevice(
+    String deviceId,
+    String label,
+    String position,
+    List<LensInfo> lenses,
+    float minZoom,
+    float maxZoom,
+    boolean isLogical
+  ) {
+    this.deviceId = deviceId;
+    this.label = label;
+    this.position = position;
+    this.lenses = lenses;
+    this.minZoom = minZoom;
+    this.maxZoom = maxZoom;
+    this.isLogical = isLogical;
+  }
+
+  public String getDeviceId() {
+    return deviceId;
+  }
+
+  public String getLabel() {
+    return label;
+  }
+
+  public String getPosition() {
+    return position;
+  }
+
+  public List<LensInfo> getLenses() {
+    return lenses;
+  }
+
+  public float getMinZoom() {
+    return minZoom;
+  }
+
+  public float getMaxZoom() {
+    return maxZoom;
+  }
+
+  public boolean isLogical() {
+    return isLogical;
+  }
+}

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

@@ -4,67 +4,76 @@ package com.ahm.capacitor.camera.preview.model;
  * Represents a camera lens available on the Android device.
  */
 public class CameraLens {
-    private final String id;
-    private final String label;
-    private final String position;
-    private final String deviceType;
-    private final float focalLength;
-    private final float minZoom;
-    private final float maxZoom;
-    private final float baseZoomRatio;
-    public boolean isActive;
 
-    public CameraLens(String id, String label, String position, String deviceType,
-                     float focalLength, float minZoom, float maxZoom,
-                     float baseZoomRatio, boolean isActive) {
-        this.id = id;
-        this.label = label;
-        this.position = position;
-        this.deviceType = deviceType;
-        this.focalLength = Math.round(focalLength * 100.0f) / 100.0f;
-        this.minZoom = minZoom;
-        this.maxZoom = maxZoom;
-        this.baseZoomRatio = Math.round(baseZoomRatio);
-        this.isActive = isActive;
-    }
+  private final String id;
+  private final String label;
+  private final String position;
+  private final String deviceType;
+  private final float focalLength;
+  private final float minZoom;
+  private final float maxZoom;
+  private final float baseZoomRatio;
+  public boolean isActive;
 
-    public String getId() {
-        return id;
-    }
+  public CameraLens(
+    String id,
+    String label,
+    String position,
+    String deviceType,
+    float focalLength,
+    float minZoom,
+    float maxZoom,
+    float baseZoomRatio,
+    boolean isActive
+  ) {
+    this.id = id;
+    this.label = label;
+    this.position = position;
+    this.deviceType = deviceType;
+    this.focalLength = Math.round(focalLength * 100.0f) / 100.0f;
+    this.minZoom = minZoom;
+    this.maxZoom = maxZoom;
+    this.baseZoomRatio = Math.round(baseZoomRatio);
+    this.isActive = isActive;
+  }
 
-    public String getLabel() {
-        return label;
-    }
+  public String getId() {
+    return id;
+  }
 
-    public String getPosition() {
-        return position;
-    }
+  public String getLabel() {
+    return label;
+  }
 
-    public String getDeviceType() {
-        return deviceType;
-    }
+  public String getPosition() {
+    return position;
+  }
 
-    public float getFocalLength() {
-        return focalLength;
-    }
+  public String getDeviceType() {
+    return deviceType;
+  }
 
-    public float getMinZoom() {
-        return minZoom;
-    }
+  public float getFocalLength() {
+    return focalLength;
+  }
 
-    public float getMaxZoom() {
-        return maxZoom;
-    }
+  public float getMinZoom() {
+    return minZoom;
+  }
 
-    public float getBaseZoomRatio() {
-        return baseZoomRatio;
-    }
+  public float getMaxZoom() {
+    return maxZoom;
+  }
 
-    public boolean isActive() {
-        return isActive;
-    }
+  public float getBaseZoomRatio() {
+    return baseZoomRatio;
+  }
 
-    public void setIsActive(boolean isActive) {
-        this.isActive = isActive;
-    }
+  public boolean isActive() {
+    return isActive;
+  }
+
+  public void setIsActive(boolean isActive) {
+    this.isActive = isActive;
+  }
 }

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

@@ -4,76 +4,164 @@ package com.ahm.capacitor.camera.preview.model;
  * Configuration for a camera session.
  */
 public class CameraSessionConfiguration {
-    private final String deviceId;
-    private final String position;
-    private final int x;
-    private final int y;
-    private final int width;
-    private final int height;
-    private final int paddingBottom;
-    private final boolean toBack;
-    private final boolean storeToFile;
-    private final boolean enableOpacity;
-    private final boolean enableZoom;
-    private final boolean disableExifHeaderStripping;
-    private final boolean disableAudio;
-    private final float zoomFactor;
-    private final String aspectRatio;
-    private final String gridMode;
-    private float targetZoom = 1.0f;
-
-    public CameraSessionConfiguration(String deviceId, String position, int x, int y, int width, int height,
-                                    int paddingBottom, boolean toBack, boolean storeToFile, boolean enableOpacity,
-                                    boolean enableZoom, boolean disableExifHeaderStripping, boolean disableAudio,
-                                    float zoomFactor, String aspectRatio, String gridMode) {
-        this.deviceId = deviceId;
-        this.position = position;
-        this.x = x;
-        this.y = y;
-        this.width = width;
-        this.height = height;
-        this.paddingBottom = paddingBottom;
-        this.toBack = toBack;
-        this.storeToFile = storeToFile;
-        this.enableOpacity = enableOpacity;
-        this.enableZoom = enableZoom;
-        this.disableExifHeaderStripping = disableExifHeaderStripping;
-        this.disableAudio = disableAudio;
-        this.zoomFactor = zoomFactor;
-        this.aspectRatio = aspectRatio;
-        this.gridMode = gridMode != null ? gridMode : "none";
-    }
-
-    public void setTargetZoom(float zoom) {
-        this.targetZoom = zoom;
-    }
-
-    public float getTargetZoom() {
-        return this.targetZoom;
-    }
-
-    public String getDeviceId() { return deviceId; }
-    public String getPosition() { return position; }
-    public int getX() { return x; }
-    public int getY() { return y; }
-    public int getWidth() { return width; }
-    public int getHeight() { return height; }
-    public int getPaddingBottom() { return paddingBottom; }
-    public boolean isToBack() { return toBack; }
-    public boolean isStoreToFile() { return storeToFile; }
-    public boolean isEnableOpacity() { return enableOpacity; }
-    public boolean isEnableZoom() { return enableZoom; }
-    public boolean isDisableExifHeaderStripping() { return disableExifHeaderStripping; }
-    public boolean isDisableAudio() { return disableAudio; }
-    public float getZoomFactor() { return zoomFactor; }
-    public String getAspectRatio() { return aspectRatio; }
-    public String getGridMode() { return gridMode; }
-
-    // Additional getters with "get" prefix for compatibility
-    public boolean getToBack() { return toBack; }
-    public boolean getStoreToFile() { return storeToFile; }
-    public boolean getEnableOpacity() { return enableOpacity; }
-    public boolean getEnableZoom() { return enableZoom; }
-    public boolean getDisableExifHeaderStripping() { return disableExifHeaderStripping; }
-    public boolean getDisableAudio() { return disableAudio; }
+
+  private final String deviceId;
+  private final String position;
+  private final int x;
+  private final int y;
+  private final int width;
+  private final int height;
+  private final int paddingBottom;
+  private final boolean toBack;
+  private final boolean storeToFile;
+  private final boolean enableOpacity;
+  private final boolean enableZoom;
+  private final boolean disableExifHeaderStripping;
+  private final boolean disableAudio;
+  private final float zoomFactor;
+  private final String aspectRatio;
+  private final String gridMode;
+  private float targetZoom = 1.0f;
+  private boolean isCentered = false;
+
+  public CameraSessionConfiguration(
+    String deviceId,
+    String position,
+    int x,
+    int y,
+    int width,
+    int height,
+    int paddingBottom,
+    boolean toBack,
+    boolean storeToFile,
+    boolean enableOpacity,
+    boolean enableZoom,
+    boolean disableExifHeaderStripping,
+    boolean disableAudio,
+    float zoomFactor,
+    String aspectRatio,
+    String gridMode
+  ) {
+    this.deviceId = deviceId;
+    this.position = position;
+    this.x = x;
+    this.y = y;
+    this.width = width;
+    this.height = height;
+    this.paddingBottom = paddingBottom;
+    this.toBack = toBack;
+    this.storeToFile = storeToFile;
+    this.enableOpacity = enableOpacity;
+    this.enableZoom = enableZoom;
+    this.disableExifHeaderStripping = disableExifHeaderStripping;
+    this.disableAudio = disableAudio;
+    this.zoomFactor = zoomFactor;
+    this.aspectRatio = aspectRatio;
+    this.gridMode = gridMode != null ? gridMode : "none";
+  }
+
+  public void setTargetZoom(float zoom) {
+    this.targetZoom = zoom;
+  }
+
+  public float getTargetZoom() {
+    return this.targetZoom;
+  }
+
+  public String getDeviceId() {
+    return deviceId;
+  }
+
+  public String getPosition() {
+    return position;
+  }
+
+  public int getX() {
+    return x;
+  }
+
+  public int getY() {
+    return y;
+  }
+
+  public int getWidth() {
+    return width;
+  }
+
+  public int getHeight() {
+    return height;
+  }
+
+  public int getPaddingBottom() {
+    return paddingBottom;
+  }
+
+  public boolean isToBack() {
+    return toBack;
+  }
+
+  public boolean isStoreToFile() {
+    return storeToFile;
+  }
+
+  public boolean isEnableOpacity() {
+    return enableOpacity;
+  }
+
+  public boolean isEnableZoom() {
+    return enableZoom;
+  }
+
+  public boolean isDisableExifHeaderStripping() {
+    return disableExifHeaderStripping;
+  }
+
+  public boolean isDisableAudio() {
+    return disableAudio;
+  }
+
+  public float getZoomFactor() {
+    return zoomFactor;
+  }
+
+  public String getAspectRatio() {
+    return aspectRatio;
+  }
+
+  public String getGridMode() {
+    return gridMode;
+  }
+
+  // Additional getters with "get" prefix for compatibility
+  public boolean getToBack() {
+    return toBack;
+  }
+
+  public boolean getStoreToFile() {
+    return storeToFile;
+  }
+
+  public boolean getEnableOpacity() {
+    return enableOpacity;
+  }
+
+  public boolean getEnableZoom() {
+    return enableZoom;
+  }
+
+  public boolean getDisableExifHeaderStripping() {
+    return disableExifHeaderStripping;
+  }
+
+  public boolean getDisableAudio() {
+    return disableAudio;
+  }
+
+  public boolean isCentered() {
+    return isCentered;
+  }
+
+  public void setCentered(boolean centered) {
+    isCentered = centered;
+  }
 }