@capgo/camera-preview 7.4.0-beta.16 → 7.4.0-beta.17

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

@@ -360,6 +360,14 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
       Log.d(TAG, "setupPreviewView: Setting grid mode to: " + currentGridMode);
       gridOverlayView.setGridMode(currentGridMode);
     });
+    
+    // Add a layout listener to update grid bounds when preview view changes size
+    previewView.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
+      if (left != oldLeft || top != oldTop || right != oldRight || bottom != oldBottom) {
+        Log.d(TAG, "PreviewView layout changed, updating grid bounds");
+        updateGridOverlayBounds();
+      }
+    });
 
     ViewGroup parent = (ViewGroup) webView.getParent();
     if (parent != null) {
@@ -738,6 +746,9 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
               actualHeight
             );
 
+            // Update grid overlay bounds after camera is started
+            updateGridOverlayBounds();
+
             listener.onCameraStarted(
               actualWidth,
               actualHeight,
@@ -2621,19 +2632,30 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
 
             // Wait for camera rebinding to complete, then call callback
             if (callback != null) {
-              previewContainer.post(() -> previewContainer.post(callback));
+              previewContainer.post(() -> {
+                updateGridOverlayBounds();
+                previewContainer.post(callback);
+              });
+            } else {
+              previewContainer.post(() -> updateGridOverlayBounds());
             }
           } else {
             // No camera rebinding needed, wait for layout to complete then call callback
-            if (callback != null) {
-              previewContainer.post(callback);
-            }
+            previewContainer.post(() -> {
+              updateGridOverlayBounds();
+              if (callback != null) {
+                callback.run();
+              }
+            });
           }
         } else {
           // No sessionConfig, just wait for layout then call callback
-          if (callback != null) {
-            previewContainer.post(callback);
-          }
+          previewContainer.post(() -> {
+            updateGridOverlayBounds();
+            if (callback != null) {
+              callback.run();
+            }
+          });
         }
       } else {
         Log.w(
@@ -2772,6 +2794,9 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
           finalY +
           ")"
         );
+        
+        // Update grid overlay bounds after aspect ratio change
+        previewContainer.post(() -> updateGridOverlayBounds());
       }
     } catch (NumberFormatException e) {
       Log.e(TAG, "Invalid aspect ratio format: " + aspectRatio, e);
@@ -2842,6 +2867,22 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     return new int[] { x, y, width, height };
   }
 
+  private void updateGridOverlayBounds() {
+    if (gridOverlayView != null && previewView != null) {
+      // Get the actual camera bounds
+      Rect cameraBounds = getActualCameraBounds();
+      
+      // Update the grid overlay with the camera bounds
+      gridOverlayView.setCameraBounds(cameraBounds);
+      
+      Log.d(
+        TAG,
+        "updateGridOverlayBounds: Updated grid bounds to " +
+        cameraBounds.toString()
+      );
+    }
+  }
+
   private void triggerAutoFocus() {
     if (camera == null) {
       return;

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

@@ -3,6 +3,7 @@ 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;
 
@@ -10,6 +11,7 @@ public class GridOverlayView extends View {
 
   private Paint gridPaint;
   private String gridMode = "none";
+  private Rect cameraBounds = null;
 
   public GridOverlayView(Context context) {
     super(context);
@@ -38,6 +40,11 @@ public class GridOverlayView extends View {
     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";
@@ -62,34 +69,44 @@ public class GridOverlayView extends View {
       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, width, height, 3);
+      drawGrid(canvas, left, top, width, height, 3);
     } else if ("4x4".equals(gridMode)) {
-      drawGrid(canvas, width, height, 4);
+      drawGrid(canvas, left, top, width, height, 4);
     }
   }
 
-  private void drawGrid(Canvas canvas, int width, int height, int divisions) {
+  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 = i * stepX;
-      canvas.drawLine(x, 0, x, height, gridPaint);
+      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 = i * stepY;
-      canvas.drawLine(0, y, width, y, gridPaint);
+      float y = top + (i * stepY);
+      canvas.drawLine(left, y, left + width, y, gridPaint);
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/camera-preview",
-  "version": "7.4.0-beta.16",
+  "version": "7.4.0-beta.17",
   "description": "Camera preview",
   "license": "MIT",
   "repository": {