@capgo/camera-preview 7.23.9 → 7.23.11

package/android/src/main/java/app/capgo/capacitor/camera/preview/GridOverlayView.java

@@ -10,111 +10,100 @@ import androidx.annotation.NonNull;
 
 public class GridOverlayView extends View {
 
-  private Paint gridPaint;
-  private String gridMode = "none";
-  private Rect cameraBounds = null;
-
-  public GridOverlayView(Context context) {
-    super(context);
-    init();
-  }
-
-  public GridOverlayView(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    init();
-  }
-
-  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();
-  }
-
-  @Override
-  protected void onDraw(@NonNull Canvas canvas) {
-    super.onDraw(canvas);
-
-    if ("none".equals(gridMode)) {
-      return;
+    private Paint gridPaint;
+    private String gridMode = "none";
+    private Rect cameraBounds = null;
+
+    public GridOverlayView(Context context) {
+        super(context);
+        init();
+    }
+
+    public GridOverlayView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
     }
 
-    // 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();
+    public GridOverlayView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
     }
 
-    if (width <= 0 || height <= 0) {
-      return;
+    private void init() {
+        gridPaint = new Paint();
+        gridPaint.setColor(0x80FFFFFF); // Semi-transparent white
+        gridPaint.setStrokeWidth(2f);
+        gridPaint.setStyle(Paint.Style.STROKE);
+        gridPaint.setAntiAlias(true);
     }
 
-    if ("3x3".equals(gridMode)) {
-      drawGrid(canvas, left, top, width, height, 3);
-    } else if ("4x4".equals(gridMode)) {
-      drawGrid(canvas, left, top, width, height, 4);
+    public void setCameraBounds(Rect bounds) {
+        this.cameraBounds = bounds;
+        invalidate();
     }
-  }
-
-  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;
-
-    // Draw vertical lines
-    for (int i = 1; i < divisions; i++) {
-      float x = left + (i * stepX);
-      canvas.drawLine(x, top, x, top + height, gridPaint);
+
+    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(@NonNull Canvas canvas) {
+        super.onDraw(canvas);
+
+        if ("none".equals(gridMode)) {
+            return;
+        }
+
+        // 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 (width <= 0 || height <= 0) {
+            return;
+        }
+
+        if ("3x3".equals(gridMode)) {
+            drawGrid(canvas, left, top, width, height, 3);
+        } else if ("4x4".equals(gridMode)) {
+            drawGrid(canvas, left, top, width, height, 4);
+        }
     }
 
-    // Draw horizontal lines
-    for (int i = 1; i < divisions; i++) {
-      float y = top + (i * stepY);
-      canvas.drawLine(left, y, left + width, y, gridPaint);
+    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;
+
+        // Draw vertical lines
+        for (int i = 1; i < divisions; i++) {
+            float x = left + (i * stepX);
+            canvas.drawLine(x, top, x, top + height, 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/app/capgo/capacitor/camera/preview/model/CameraDevice.java

@@ -7,57 +7,57 @@ import java.util.List;
  */
 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/app/capgo/capacitor/camera/preview/model/CameraSessionConfiguration.java

@@ -5,170 +5,170 @@ package app.capgo.capacitor.camera.preview.model;
  */
 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 disableExifHeaderStripping;
-  private final boolean disableAudio;
-  private final float zoomFactor;
-  private final String aspectRatio;
-  private final String gridMode;
-  private final boolean disableFocusIndicator;
-  private final boolean enableVideoMode;
-  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 disableExifHeaderStripping,
-    boolean disableAudio,
-    float zoomFactor,
-    String aspectRatio,
-    String gridMode,
-    boolean disableFocusIndicator,
-    boolean enableVideoMode
-  ) {
-    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.disableExifHeaderStripping = disableExifHeaderStripping;
-    this.disableAudio = disableAudio;
-    this.zoomFactor = zoomFactor;
-    this.aspectRatio = aspectRatio;
-    this.gridMode = gridMode != null ? gridMode : "none";
-    this.disableFocusIndicator = disableFocusIndicator;
-    this.enableVideoMode = enableVideoMode;
-  }
-
-  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 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 getDisableExifHeaderStripping() {
-    return disableExifHeaderStripping;
-  }
-
-  public boolean getDisableAudio() {
-    return disableAudio;
-  }
-
-  public boolean isCentered() {
-    return isCentered;
-  }
-
-  public void setCentered(boolean centered) {
-    isCentered = centered;
-  }
-
-  public boolean getDisableFocusIndicator() {
-    return disableFocusIndicator;
-  }
-
-  public boolean isVideoModeEnabled() {
-    return enableVideoMode;
-  }
-
-  public boolean getEnableVideoMode() {
-    return enableVideoMode;
-  }
+    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 disableExifHeaderStripping;
+    private final boolean disableAudio;
+    private final float zoomFactor;
+    private final String aspectRatio;
+    private final String gridMode;
+    private final boolean disableFocusIndicator;
+    private final boolean enableVideoMode;
+    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 disableExifHeaderStripping,
+        boolean disableAudio,
+        float zoomFactor,
+        String aspectRatio,
+        String gridMode,
+        boolean disableFocusIndicator,
+        boolean enableVideoMode
+    ) {
+        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.disableExifHeaderStripping = disableExifHeaderStripping;
+        this.disableAudio = disableAudio;
+        this.zoomFactor = zoomFactor;
+        this.aspectRatio = aspectRatio;
+        this.gridMode = gridMode != null ? gridMode : "none";
+        this.disableFocusIndicator = disableFocusIndicator;
+        this.enableVideoMode = enableVideoMode;
+    }
+
+    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 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 getDisableExifHeaderStripping() {
+        return disableExifHeaderStripping;
+    }
+
+    public boolean getDisableAudio() {
+        return disableAudio;
+    }
+
+    public boolean isCentered() {
+        return isCentered;
+    }
+
+    public void setCentered(boolean centered) {
+        isCentered = centered;
+    }
+
+    public boolean getDisableFocusIndicator() {
+        return disableFocusIndicator;
+    }
+
+    public boolean isVideoModeEnabled() {
+        return enableVideoMode;
+    }
+
+    public boolean getEnableVideoMode() {
+        return enableVideoMode;
+    }
 }