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

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

@@ -1,17 +1,32 @@
 package com.ahm.capacitor.camera.preview;
 
 import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
 import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraManager;
+import android.location.Location;
+import android.net.Uri;
 import android.os.Build;
+import android.os.Environment;
 import android.util.Base64;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.Rational;
 import android.util.Size;
 import android.view.ViewGroup;
+import android.view.ViewGroup;
 import android.webkit.WebView;
+import android.widget.FrameLayout;
+import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.OptIn;
+import androidx.camera.camera2.interop.Camera2CameraInfo;
+import androidx.camera.camera2.interop.ExperimentalCamera2Interop;
+import androidx.camera.core.AspectRatio;
 import androidx.camera.core.Camera;
 import androidx.camera.core.CameraInfo;
 import androidx.camera.core.CameraSelector;
@@ -19,1630 +34,2176 @@ import androidx.camera.core.ImageCapture;
 import androidx.camera.core.ImageCaptureException;
 import androidx.camera.core.ImageProxy;
 import androidx.camera.core.Preview;
-import androidx.camera.core.AspectRatio;
+import androidx.camera.core.ResolutionInfo;
+import androidx.camera.core.ZoomState;
 import androidx.camera.core.resolutionselector.AspectRatioStrategy;
 import androidx.camera.core.resolutionselector.ResolutionSelector;
 import androidx.camera.core.resolutionselector.ResolutionStrategy;
 import androidx.camera.lifecycle.ProcessCameraProvider;
 import androidx.camera.view.PreviewView;
 import androidx.core.content.ContextCompat;
+import androidx.exifinterface.media.ExifInterface;
 import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LifecycleRegistry;
+import androidx.lifecycle.OnLifecycleEvent;
 import com.ahm.capacitor.camera.preview.model.CameraSessionConfiguration;
-import android.widget.FrameLayout;
 import com.ahm.capacitor.camera.preview.model.LensInfo;
 import com.ahm.capacitor.camera.preview.model.ZoomFactors;
 import com.google.common.util.concurrent.ListenableFuture;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.ArrayList;
+import java.util.Locale;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import androidx.camera.camera2.interop.Camera2CameraInfo;
-import androidx.camera.camera2.interop.ExperimentalCamera2Interop;
-import android.hardware.camera2.CameraCharacteristics;
-import java.util.Set;
-import androidx.camera.core.ZoomState;
-import androidx.camera.core.ResolutionInfo;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Environment;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
-import androidx.exifinterface.media.ExifInterface;
 import org.json.JSONObject;
-import java.nio.file.Files;
-import android.graphics.BitmapFactory;
-import android.graphics.Bitmap;
-import android.graphics.Matrix;
-import java.io.ByteArrayOutputStream;
-import android.location.Location;
-import android.widget.FrameLayout;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
-import android.util.Rational;
-import android.view.ViewGroup;
 
 public class CameraXView implements LifecycleOwner, LifecycleObserver {
-    private static final String TAG = "CameraPreview CameraXView";
-
-    public interface CameraXViewListener {
-        void onPictureTaken(String base64, JSONObject exif);
-        void onPictureTakenError(String message);
-        void onSampleTaken(String result);
-        void onSampleTakenError(String message);
-        void onCameraStarted(int width, int height, int x, int y);
-        void onCameraStartError(String message);
-    }
 
-    private ProcessCameraProvider cameraProvider;
-    private Camera camera;
-    private ImageCapture imageCapture;
-    private ImageCapture sampleImageCapture;
-    private PreviewView previewView;
-    private GridOverlayView gridOverlayView;
-    private FrameLayout previewContainer;
-    private CameraSelector currentCameraSelector;
-    private String currentDeviceId;
-    private int currentFlashMode = ImageCapture.FLASH_MODE_OFF;
-    private CameraSessionConfiguration sessionConfig;
-    private CameraXViewListener listener;
-    private final Context context;
-    private final WebView webView;
-    private final LifecycleRegistry lifecycleRegistry;
-    private final Executor mainExecutor;
-    private ExecutorService cameraExecutor;
-    private boolean isRunning = false;
-
-    public CameraXView(Context context, WebView webView) {
-        this.context = context;
-        this.webView = webView;
-        this.lifecycleRegistry = new LifecycleRegistry(this);
-        this.mainExecutor = ContextCompat.getMainExecutor(context);
-
-        mainExecutor.execute(() -> lifecycleRegistry.setCurrentState(Lifecycle.State.CREATED));
+  private static final String TAG = "CameraPreview CameraXView";
+
+  public interface CameraXViewListener {
+    void onPictureTaken(String base64, JSONObject exif);
+    void onPictureTakenError(String message);
+    void onSampleTaken(String result);
+    void onSampleTakenError(String message);
+    void onCameraStarted(int width, int height, int x, int y);
+    void onCameraStartError(String message);
+  }
+
+  private ProcessCameraProvider cameraProvider;
+  private Camera camera;
+  private ImageCapture imageCapture;
+  private ImageCapture sampleImageCapture;
+  private PreviewView previewView;
+  private GridOverlayView gridOverlayView;
+  private FrameLayout previewContainer;
+  private CameraSelector currentCameraSelector;
+  private String currentDeviceId;
+  private int currentFlashMode = ImageCapture.FLASH_MODE_OFF;
+  private CameraSessionConfiguration sessionConfig;
+  private CameraXViewListener listener;
+  private final Context context;
+  private final WebView webView;
+  private final LifecycleRegistry lifecycleRegistry;
+  private final Executor mainExecutor;
+  private ExecutorService cameraExecutor;
+  private boolean isRunning = false;
+
+  public CameraXView(Context context, WebView webView) {
+    this.context = context;
+    this.webView = webView;
+    this.lifecycleRegistry = new LifecycleRegistry(this);
+    this.mainExecutor = ContextCompat.getMainExecutor(context);
+
+    mainExecutor.execute(() ->
+      lifecycleRegistry.setCurrentState(Lifecycle.State.CREATED)
+    );
+  }
+
+  @NonNull
+  @Override
+  public Lifecycle getLifecycle() {
+    return lifecycleRegistry;
+  }
+
+  public void setListener(CameraXViewListener listener) {
+    this.listener = listener;
+  }
+
+  public boolean isRunning() {
+    return isRunning;
+  }
+
+  private void saveImageToGallery(byte[] data) {
+    try {
+      File photo = new File(
+        Environment.getExternalStoragePublicDirectory(
+          Environment.DIRECTORY_PICTURES
+        ),
+        "IMG_" +
+        new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(
+          new java.util.Date()
+        ) +
+        ".jpg"
+      );
+      FileOutputStream fos = new FileOutputStream(photo);
+      fos.write(data);
+      fos.close();
+
+      // Notify the gallery of the new image
+      Intent mediaScanIntent = new Intent(
+        Intent.ACTION_MEDIA_SCANNER_SCAN_FILE
+      );
+      Uri contentUri = Uri.fromFile(photo);
+      mediaScanIntent.setData(contentUri);
+      context.sendBroadcast(mediaScanIntent);
+    } catch (IOException e) {
+      Log.e(TAG, "Error saving image to gallery", e);
     }
-
-    @NonNull
-    @Override
-    public Lifecycle getLifecycle() {
-        return lifecycleRegistry;
+  }
+
+  public void startSession(CameraSessionConfiguration config) {
+    this.sessionConfig = config;
+    cameraExecutor = Executors.newSingleThreadExecutor();
+    mainExecutor.execute(() -> {
+      lifecycleRegistry.setCurrentState(Lifecycle.State.STARTED);
+      setupCamera();
+    });
+  }
+
+  public void stopSession() {
+    isRunning = false;
+    mainExecutor.execute(() -> {
+      if (cameraProvider != null) {
+        cameraProvider.unbindAll();
+      }
+      lifecycleRegistry.setCurrentState(Lifecycle.State.DESTROYED);
+      if (cameraExecutor != null) {
+        cameraExecutor.shutdownNow();
+      }
+      removePreviewView();
+    });
+  }
+
+  private void setupCamera() {
+    ListenableFuture<ProcessCameraProvider> cameraProviderFuture =
+      ProcessCameraProvider.getInstance(context);
+    cameraProviderFuture.addListener(
+      () -> {
+        try {
+          cameraProvider = cameraProviderFuture.get();
+          setupPreviewView();
+          bindCameraUseCases();
+        } catch (Exception e) {
+          if (listener != null) {
+            listener.onCameraStartError(
+              "Error initializing camera: " + e.getMessage()
+            );
+          }
+        }
+      },
+      mainExecutor
+    );
+  }
+
+  private void setupPreviewView() {
+    if (previewView != null) {
+      removePreviewView();
     }
-
-    public void setListener(CameraXViewListener listener) {
-        this.listener = listener;
+    if (sessionConfig.isToBack()) {
+      webView.setBackgroundColor(android.graphics.Color.TRANSPARENT);
     }
 
-    public boolean isRunning() {
-        return isRunning;
+    // Create a container to hold both the preview and grid overlay
+    previewContainer = new FrameLayout(context);
+
+    // Create and setup the preview view
+    previewView = new PreviewView(context);
+    previewView.setScaleType(PreviewView.ScaleType.FIT_CENTER);
+    previewContainer.addView(
+      previewView,
+      new FrameLayout.LayoutParams(
+        FrameLayout.LayoutParams.MATCH_PARENT,
+        FrameLayout.LayoutParams.MATCH_PARENT
+      )
+    );
+
+    // Create and setup the grid overlay
+    gridOverlayView = new GridOverlayView(context);
+    previewContainer.addView(
+      gridOverlayView,
+      new FrameLayout.LayoutParams(
+        FrameLayout.LayoutParams.MATCH_PARENT,
+        FrameLayout.LayoutParams.MATCH_PARENT
+      )
+    );
+    // Set grid mode after adding to container to ensure proper layout
+    gridOverlayView.post(() -> {
+      String currentGridMode = sessionConfig.getGridMode();
+      Log.d(TAG, "setupPreviewView: Setting grid mode to: " + currentGridMode);
+      gridOverlayView.setGridMode(currentGridMode);
+    });
+
+    ViewGroup parent = (ViewGroup) webView.getParent();
+    if (parent != null) {
+      FrameLayout.LayoutParams layoutParams = calculatePreviewLayoutParams();
+      parent.addView(previewContainer, layoutParams);
+      if (sessionConfig.isToBack()) webView.bringToFront();
     }
-
-    private void saveImageToGallery(byte[] data) {
+  }
+
+  private FrameLayout.LayoutParams calculatePreviewLayoutParams() {
+    // sessionConfig already contains pixel-converted coordinates with webview offsets applied
+    int x = sessionConfig.getX();
+    int y = sessionConfig.getY();
+    int width = sessionConfig.getWidth();
+    int height = sessionConfig.getHeight();
+    String aspectRatio = sessionConfig.getAspectRatio();
+
+    Log.d(
+      TAG,
+      "calculatePreviewLayoutParams: Using sessionConfig values - x:" +
+      x +
+      " y:" +
+      y +
+      " width:" +
+      width +
+      " height:" +
+      height +
+      " aspectRatio:" +
+      aspectRatio
+    );
+
+    // Apply aspect ratio if specified and no explicit size was given
+    if (aspectRatio != null && !aspectRatio.isEmpty()) {
+      String[] ratios = aspectRatio.split(":");
+      if (ratios.length == 2) {
         try {
-            File photo = new File(
-                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES),
-                "IMG_" + new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new java.util.Date()) + ".jpg"
-            );
-            FileOutputStream fos = new FileOutputStream(photo);
-            fos.write(data);
-            fos.close();
-
-            // Notify the gallery of the new image
-            Intent mediaScanIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
-            Uri contentUri = Uri.fromFile(photo);
-            mediaScanIntent.setData(contentUri);
-            context.sendBroadcast(mediaScanIntent);
-        } catch (IOException e) {
-            Log.e(TAG, "Error saving image to gallery", e);
+          // For camera, use portrait orientation: 4:3 becomes 3:4, 16:9 becomes 9:16
+          float ratio =
+            Float.parseFloat(ratios[1]) / Float.parseFloat(ratios[0]);
+
+          // Calculate optimal size while maintaining aspect ratio
+          int optimalWidth = width;
+          int optimalHeight = (int) (width / ratio);
+
+          if (optimalHeight > height) {
+            // Height constraint is tighter, fit by height
+            optimalHeight = height;
+            optimalWidth = (int) (height * ratio);
+          }
+
+          width = optimalWidth;
+          height = optimalHeight;
+          Log.d(
+            TAG,
+            "calculatePreviewLayoutParams: Applied aspect ratio " +
+            aspectRatio +
+            " - new size: " +
+            width +
+            "x" +
+            height
+          );
+        } catch (NumberFormatException e) {
+          Log.e(TAG, "Invalid aspect ratio format: " + aspectRatio, e);
         }
+      }
     }
 
-    public void startSession(CameraSessionConfiguration config) {
-        this.sessionConfig = config;
-        cameraExecutor = Executors.newSingleThreadExecutor();
-        mainExecutor.execute(() -> {
-            lifecycleRegistry.setCurrentState(Lifecycle.State.STARTED);
-            setupCamera();
-        });
+    FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(
+      width,
+      height
+    );
+
+    // Only add insets for positioning coordinates, not for full-screen sizes
+    int webViewTopInset = getWebViewTopInset();
+    int webViewLeftInset = getWebViewLeftInset();
+
+    // Don't add insets if this looks like a calculated full-screen coordinate (x=0, y=0)
+    if (x == 0 && y == 0) {
+      layoutParams.leftMargin = x;
+      layoutParams.topMargin = y;
+      Log.d(
+        TAG,
+        "calculatePreviewLayoutParams: Full-screen mode - keeping position (0,0) without insets"
+      );
+    } else {
+      layoutParams.leftMargin = x + webViewLeftInset;
+      layoutParams.topMargin = y + webViewTopInset;
+      Log.d(
+        TAG,
+        "calculatePreviewLayoutParams: Positioned mode - applying insets"
+      );
     }
 
-    public void stopSession() {
-        isRunning = false;
-        mainExecutor.execute(() -> {
-            if (cameraProvider != null) {
-                cameraProvider.unbindAll();
-            }
-            lifecycleRegistry.setCurrentState(Lifecycle.State.DESTROYED);
-            if (cameraExecutor != null) {
-                cameraExecutor.shutdownNow();
-            }
-            removePreviewView();
-        });
+    Log.d(
+      TAG,
+      "calculatePreviewLayoutParams: Applied insets - x:" +
+      x +
+      "+" +
+      webViewLeftInset +
+      "=" +
+      layoutParams.leftMargin +
+      ", y:" +
+      y +
+      "+" +
+      webViewTopInset +
+      "=" +
+      layoutParams.topMargin
+    );
+
+    Log.d(
+      TAG,
+      "calculatePreviewLayoutParams: Final layout - x:" +
+      x +
+      " y:" +
+      y +
+      " width:" +
+      width +
+      " height:" +
+      height
+    );
+    return layoutParams;
+  }
+
+  private void removePreviewView() {
+    if (previewContainer != null) {
+      ViewGroup parent = (ViewGroup) previewContainer.getParent();
+      if (parent != null) {
+        parent.removeView(previewContainer);
+      }
+      previewContainer = null;
     }
-
-    private void setupCamera() {
-        ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
-        cameraProviderFuture.addListener(() -> {
-            try {
-                cameraProvider = cameraProviderFuture.get();
-                setupPreviewView();
-                bindCameraUseCases();
-            } catch (Exception e) {
-                if (listener != null) {
-                    listener.onCameraStartError("Error initializing camera: " + e.getMessage());
-                }
-            }
-        }, mainExecutor);
+    if (previewView != null) {
+      previewView = null;
     }
+    if (gridOverlayView != null) {
+      gridOverlayView = null;
+    }
+    webView.setBackgroundColor(android.graphics.Color.WHITE);
+  }
+
+  @OptIn(markerClass = ExperimentalCamera2Interop.class)
+  private void bindCameraUseCases() {
+    if (cameraProvider == null) return;
+    mainExecutor.execute(() -> {
+      try {
+        Log.d(
+          TAG,
+          "Building camera selector with deviceId: " +
+          sessionConfig.getDeviceId() +
+          " and position: " +
+          sessionConfig.getPosition()
+        );
+        currentCameraSelector = buildCameraSelector();
 
-    private void setupPreviewView() {
-        if (previewView != null) {
-            removePreviewView();
-        }
-        if (sessionConfig.isToBack()) {
-            webView.setBackgroundColor(android.graphics.Color.TRANSPARENT);
+        ResolutionSelector.Builder resolutionSelectorBuilder =
+          new ResolutionSelector.Builder()
+            .setResolutionStrategy(
+              ResolutionStrategy.HIGHEST_AVAILABLE_STRATEGY
+            );
+
+        if (sessionConfig.getAspectRatio() != null) {
+          int aspectRatio;
+          if ("16:9".equals(sessionConfig.getAspectRatio())) {
+            aspectRatio = AspectRatio.RATIO_16_9;
+          } else { // "4:3"
+            aspectRatio = AspectRatio.RATIO_4_3;
+          }
+          resolutionSelectorBuilder.setAspectRatioStrategy(
+            new AspectRatioStrategy(
+              aspectRatio,
+              AspectRatioStrategy.FALLBACK_RULE_AUTO
+            )
+          );
         }
 
-        // Create a container to hold both the preview and grid overlay
-        previewContainer = new FrameLayout(context);
-
-        // Create and setup the preview view
-        previewView = new PreviewView(context);
-        previewView.setScaleType(PreviewView.ScaleType.FIT_CENTER);
-        previewContainer.addView(previewView, new FrameLayout.LayoutParams(
-            FrameLayout.LayoutParams.MATCH_PARENT,
-            FrameLayout.LayoutParams.MATCH_PARENT
-        ));
-
-        // Create and setup the grid overlay
-        gridOverlayView = new GridOverlayView(context);
-        previewContainer.addView(gridOverlayView, new FrameLayout.LayoutParams(
-            FrameLayout.LayoutParams.MATCH_PARENT,
-            FrameLayout.LayoutParams.MATCH_PARENT
-        ));
-        // Set grid mode after adding to container to ensure proper layout
-        gridOverlayView.post(() -> {
-            String currentGridMode = sessionConfig.getGridMode();
-            Log.d(TAG, "setupPreviewView: Setting grid mode to: " + currentGridMode);
-            gridOverlayView.setGridMode(currentGridMode);
-        });
+        ResolutionSelector resolutionSelector =
+          resolutionSelectorBuilder.build();
+
+        Preview preview = new Preview.Builder()
+          .setResolutionSelector(resolutionSelector)
+          .build();
+        imageCapture = new ImageCapture.Builder()
+          .setResolutionSelector(resolutionSelector)
+          .setCaptureMode(ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY)
+          .setFlashMode(currentFlashMode)
+          .build();
+        sampleImageCapture = imageCapture;
+        preview.setSurfaceProvider(previewView.getSurfaceProvider());
+        // Unbind any existing use cases and bind new ones
+        cameraProvider.unbindAll();
+        camera = cameraProvider.bindToLifecycle(
+          this,
+          currentCameraSelector,
+          preview,
+          imageCapture
+        );
+
+        // Log details about the active camera
+        Log.d(TAG, "Use cases bound. Inspecting active camera and use cases.");
+        CameraInfo cameraInfo = camera.getCameraInfo();
+        Log.d(
+          TAG,
+          "Bound Camera ID: " + Camera2CameraInfo.from(cameraInfo).getCameraId()
+        );
 
-        ViewGroup parent = (ViewGroup) webView.getParent();
-        if (parent != null) {
-            FrameLayout.LayoutParams layoutParams = calculatePreviewLayoutParams();
-            parent.addView(previewContainer, layoutParams);
-            if(sessionConfig.isToBack()) webView.bringToFront();
+        // Log zoom state
+        ZoomState zoomState = cameraInfo.getZoomState().getValue();
+        if (zoomState != null) {
+          Log.d(
+            TAG,
+            "Active Zoom State: " +
+            "min=" +
+            zoomState.getMinZoomRatio() +
+            ", " +
+            "max=" +
+            zoomState.getMaxZoomRatio() +
+            ", " +
+            "current=" +
+            zoomState.getZoomRatio()
+          );
         }
-    }
 
-    private FrameLayout.LayoutParams calculatePreviewLayoutParams() {
-        // sessionConfig already contains pixel-converted coordinates with webview offsets applied
-        int x = sessionConfig.getX();
-        int y = sessionConfig.getY();
-        int width = sessionConfig.getWidth();
-        int height = sessionConfig.getHeight();
-        String aspectRatio = sessionConfig.getAspectRatio();
-        
-        Log.d(TAG, "calculatePreviewLayoutParams: Using sessionConfig values - x:" + x + " y:" + y + " width:" + width + " height:" + height + " aspectRatio:" + aspectRatio);
-        
-        // Apply aspect ratio if specified and no explicit size was given
-        if (aspectRatio != null && !aspectRatio.isEmpty()) {
-            String[] ratios = aspectRatio.split(":");
-            if (ratios.length == 2) {
-                try {
-                    // For camera, use portrait orientation: 4:3 becomes 3:4, 16:9 becomes 9:16
-                    float ratio = Float.parseFloat(ratios[1]) / Float.parseFloat(ratios[0]);
-                    
-                    // Calculate optimal size while maintaining aspect ratio
-                    int optimalWidth = width;
-                    int optimalHeight = (int) (width / ratio);
-                    
-                    if (optimalHeight > height) {
-                        // Height constraint is tighter, fit by height
-                        optimalHeight = height;
-                        optimalWidth = (int) (height * ratio);
-                    }
-                    
-                    width = optimalWidth;
-                    height = optimalHeight;
-                    Log.d(TAG, "calculatePreviewLayoutParams: Applied aspect ratio " + aspectRatio + " - new size: " + width + "x" + height);
-                } catch (NumberFormatException e) {
-                    Log.e(TAG, "Invalid aspect ratio format: " + aspectRatio, e);
-                }
-            }
+        // Log physical cameras of the active camera
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+          Set<CameraInfo> physicalCameras = cameraInfo.getPhysicalCameraInfos();
+          Log.d(
+            TAG,
+            "Active camera has " + physicalCameras.size() + " physical cameras."
+          );
+          for (CameraInfo physical : physicalCameras) {
+            Log.d(
+              TAG,
+              "  - Physical camera ID: " +
+              Camera2CameraInfo.from(physical).getCameraId()
+            );
+          }
         }
-        
-        FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(width, height);
-        
-        // Only add insets for positioning coordinates, not for full-screen sizes
-        int webViewTopInset = getWebViewTopInset();
-        int webViewLeftInset = getWebViewLeftInset();
-        
-        // Don't add insets if this looks like a calculated full-screen coordinate (x=0, y=0)
-        if (x == 0 && y == 0) {
-            layoutParams.leftMargin = x;
-            layoutParams.topMargin = y;
-            Log.d(TAG, "calculatePreviewLayoutParams: Full-screen mode - keeping position (0,0) without insets");
-        } else {
-            layoutParams.leftMargin = x + webViewLeftInset;
-            layoutParams.topMargin = y + webViewTopInset;
-            Log.d(TAG, "calculatePreviewLayoutParams: Positioned mode - applying insets");
+
+        // Log resolution info
+        ResolutionInfo previewResolution = preview.getResolutionInfo();
+        if (previewResolution != null) {
+          Log.d(
+            TAG,
+            "Preview resolution: " + previewResolution.getResolution()
+          );
         }
-        
-        Log.d(TAG, "calculatePreviewLayoutParams: Applied insets - x:" + x + "+" + webViewLeftInset + "=" + layoutParams.leftMargin + 
-              ", y:" + y + "+" + webViewTopInset + "=" + layoutParams.topMargin);
-        
-        Log.d(TAG, "calculatePreviewLayoutParams: Final layout - x:" + x + " y:" + y + " width:" + width + " height:" + height);
-        return layoutParams;
-    }
-    
-    private void removePreviewView() {
-        if (previewContainer != null) {
-            ViewGroup parent = (ViewGroup) previewContainer.getParent();
-            if (parent != null) {
-                parent.removeView(previewContainer);
-            }
-            previewContainer = null;
+        ResolutionInfo imageCaptureResolution =
+          imageCapture.getResolutionInfo();
+        if (imageCaptureResolution != null) {
+          Log.d(
+            TAG,
+            "Image capture resolution: " +
+            imageCaptureResolution.getResolution()
+          );
         }
-        if (previewView != null) {
-            previewView = null;
+
+        // Set initial zoom if specified, prioritizing targetZoom over default zoomFactor
+        float initialZoom = sessionConfig.getTargetZoom() != 1.0f
+          ? sessionConfig.getTargetZoom()
+          : sessionConfig.getZoomFactor();
+        if (initialZoom != 1.0f) {
+          Log.d(TAG, "Applying initial zoom of " + initialZoom);
+          setZoomInternal(initialZoom);
         }
-        if (gridOverlayView != null) {
-            gridOverlayView = null;
+
+        isRunning = true;
+        Log.d(TAG, "bindCameraUseCases: Camera bound successfully");
+        if (listener != null) {
+          // Post the callback to ensure layout is complete
+          previewContainer.post(() -> {
+            // Return actual preview container dimensions instead of requested dimensions
+            int actualWidth = previewContainer != null
+              ? previewContainer.getWidth()
+              : sessionConfig.getWidth();
+            int actualHeight = previewContainer != null
+              ? previewContainer.getHeight()
+              : sessionConfig.getHeight();
+            int actualX = previewContainer != null
+              ? previewContainer.getLeft()
+              : sessionConfig.getX();
+            int actualY = previewContainer != null
+              ? previewContainer.getTop()
+              : sessionConfig.getY();
+            listener.onCameraStarted(
+              actualWidth,
+              actualHeight,
+              actualX,
+              actualY
+            );
+          });
+        }
+      } catch (Exception e) {
+        if (listener != null) listener.onCameraStartError(
+          "Error binding camera: " + e.getMessage()
+        );
+      }
+    });
+  }
+
+  @OptIn(markerClass = ExperimentalCamera2Interop.class)
+  private CameraSelector buildCameraSelector() {
+    CameraSelector.Builder builder = new CameraSelector.Builder();
+    final String deviceId = sessionConfig.getDeviceId();
+
+    if (deviceId != null && !deviceId.isEmpty()) {
+      builder.addCameraFilter(cameraInfos -> {
+        for (CameraInfo cameraInfo : cameraInfos) {
+          if (
+            deviceId.equals(Camera2CameraInfo.from(cameraInfo).getCameraId())
+          ) {
+            return Collections.singletonList(cameraInfo);
+          }
         }
-        webView.setBackgroundColor(android.graphics.Color.WHITE);
+        return Collections.emptyList();
+      });
+    } else {
+      String position = sessionConfig.getPosition();
+      int requiredFacing = "front".equals(position)
+        ? CameraSelector.LENS_FACING_FRONT
+        : CameraSelector.LENS_FACING_BACK;
+      builder.requireLensFacing(requiredFacing);
+    }
+    return builder.build();
+  }
+
+  private static String getCameraId(
+    androidx.camera.core.CameraInfo cameraInfo
+  ) {
+    try {
+      // Generate a stable ID based on camera characteristics
+      boolean isBack = isBackCamera(cameraInfo);
+      float minZoom = Objects.requireNonNull(
+        cameraInfo.getZoomState().getValue()
+      ).getMinZoomRatio();
+      float maxZoom = cameraInfo.getZoomState().getValue().getMaxZoomRatio();
+
+      // Create a unique ID based on camera properties
+      String position = isBack ? "back" : "front";
+      return position + "_" + minZoom + "_" + maxZoom;
+    } catch (Exception e) {
+      return "unknown_camera";
+    }
+  }
+
+  private static boolean isBackCamera(
+    androidx.camera.core.CameraInfo cameraInfo
+  ) {
+    try {
+      // Check if this camera matches the back camera selector
+      CameraSelector backSelector = new CameraSelector.Builder()
+        .requireLensFacing(CameraSelector.LENS_FACING_BACK)
+        .build();
+
+      // Try to filter cameras with back selector - if this camera is included, it's a back camera
+      List<androidx.camera.core.CameraInfo> backCameras = backSelector.filter(
+        Collections.singletonList(cameraInfo)
+      );
+      return !backCameras.isEmpty();
+    } catch (Exception e) {
+      Log.w(TAG, "Error determining camera direction, assuming back camera", e);
+      return true; // Default to back camera
+    }
+  }
+
+  public void capturePhoto(
+    int quality,
+    final boolean saveToGallery,
+    Integer width,
+    Integer height,
+    Location location
+  ) {
+    Log.d(TAG, "capturePhoto: Starting photo capture with quality: " + quality);
+
+    if (imageCapture == null) {
+      if (listener != null) {
+        listener.onPictureTakenError("Camera not ready");
+      }
+      return;
     }
 
-    @OptIn(markerClass = ExperimentalCamera2Interop.class)
-    private void bindCameraUseCases() {
-        if (cameraProvider == null) return;
-        mainExecutor.execute(() -> {
-            try {
-                Log.d(TAG, "Building camera selector with deviceId: " + sessionConfig.getDeviceId() + " and position: " + sessionConfig.getPosition());
-                currentCameraSelector = buildCameraSelector();
-
-                ResolutionSelector.Builder resolutionSelectorBuilder = new ResolutionSelector.Builder()
-                        .setResolutionStrategy(ResolutionStrategy.HIGHEST_AVAILABLE_STRATEGY);
-
-                if (sessionConfig.getAspectRatio() != null) {
-                    int aspectRatio;
-                    if ("16:9".equals(sessionConfig.getAspectRatio())) {
-                        aspectRatio = AspectRatio.RATIO_16_9;
-                    } else { // "4:3"
-                        aspectRatio = AspectRatio.RATIO_4_3;
-                    }
-                    resolutionSelectorBuilder.setAspectRatioStrategy(new AspectRatioStrategy(aspectRatio, AspectRatioStrategy.FALLBACK_RULE_AUTO));
-                }
+    File tempFile = new File(context.getCacheDir(), "temp_image.jpg");
+    ImageCapture.OutputFileOptions outputFileOptions =
+      new ImageCapture.OutputFileOptions.Builder(tempFile).build();
+
+    imageCapture.takePicture(
+      outputFileOptions,
+      cameraExecutor,
+      new ImageCapture.OnImageSavedCallback() {
+        @Override
+        public void onError(@NonNull ImageCaptureException exception) {
+          Log.e(TAG, "capturePhoto: Photo capture failed", exception);
+          if (listener != null) {
+            listener.onPictureTakenError(
+              "Photo capture failed: " + exception.getMessage()
+            );
+          }
+        }
 
-                ResolutionSelector resolutionSelector = resolutionSelectorBuilder.build();
-
-                Preview preview = new Preview.Builder().setResolutionSelector(resolutionSelector).build();
-                imageCapture = new ImageCapture.Builder().setResolutionSelector(resolutionSelector).setCaptureMode(ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY).setFlashMode(currentFlashMode).build();
-                sampleImageCapture = imageCapture;
-                preview.setSurfaceProvider(previewView.getSurfaceProvider());
-                // Unbind any existing use cases and bind new ones
-                cameraProvider.unbindAll();
-                camera = cameraProvider.bindToLifecycle(this, currentCameraSelector, preview, imageCapture);
-
-                // Log details about the active camera
-                Log.d(TAG, "Use cases bound. Inspecting active camera and use cases.");
-                CameraInfo cameraInfo = camera.getCameraInfo();
-                Log.d(TAG, "Bound Camera ID: " + Camera2CameraInfo.from(cameraInfo).getCameraId());
-
-                // Log zoom state
-                ZoomState zoomState = cameraInfo.getZoomState().getValue();
-                if (zoomState != null) {
-                    Log.d(TAG, "Active Zoom State: " +
-                        "min=" + zoomState.getMinZoomRatio() + ", " +
-                        "max=" + zoomState.getMaxZoomRatio() + ", " +
-                        "current=" + zoomState.getZoomRatio());
-                }
+        @Override
+        public void onImageSaved(
+          @NonNull ImageCapture.OutputFileResults output
+        ) {
+          try {
+            // Read file using FileInputStream for compatibility
+            byte[] bytes = new byte[(int) tempFile.length()];
+            java.io.FileInputStream fis = new java.io.FileInputStream(tempFile);
+            fis.read(bytes);
+            fis.close();
 
-                // Log physical cameras of the active camera
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                    Set<CameraInfo> physicalCameras = cameraInfo.getPhysicalCameraInfos();
-                    Log.d(TAG, "Active camera has " + physicalCameras.size() + " physical cameras.");
-                    for (CameraInfo physical : physicalCameras) {
-                        Log.d(TAG, "  - Physical camera ID: " + Camera2CameraInfo.from(physical).getCameraId());
-                    }
-                }
+            ExifInterface exifInterface = new ExifInterface(
+              tempFile.getAbsolutePath()
+            );
 
-                // Log resolution info
-                ResolutionInfo previewResolution = preview.getResolutionInfo();
-                if (previewResolution != null) {
-                    Log.d(TAG, "Preview resolution: " + previewResolution.getResolution());
-                }
-                ResolutionInfo imageCaptureResolution = imageCapture.getResolutionInfo();
-                if (imageCaptureResolution != null) {
-                    Log.d(TAG, "Image capture resolution: " + imageCaptureResolution.getResolution());
-                }
+            if (location != null) {
+              exifInterface.setGpsInfo(location);
+            }
 
-                // Set initial zoom if specified, prioritizing targetZoom over default zoomFactor
-                float initialZoom = sessionConfig.getTargetZoom() != 1.0f ? sessionConfig.getTargetZoom() : sessionConfig.getZoomFactor();
-                if (initialZoom != 1.0f) {
-                    Log.d(TAG, "Applying initial zoom of " + initialZoom);
-                    setZoomInternal(initialZoom);
-                }
+            JSONObject exifData = getExifData(exifInterface);
+
+            if (width != null && height != null) {
+              Bitmap bitmap = BitmapFactory.decodeByteArray(
+                bytes,
+                0,
+                bytes.length
+              );
+              Bitmap resizedBitmap = resizeBitmap(bitmap, width, height);
+              ByteArrayOutputStream stream = new ByteArrayOutputStream();
+              resizedBitmap.compress(
+                Bitmap.CompressFormat.JPEG,
+                quality,
+                stream
+              );
+              bytes = stream.toByteArray();
+
+              // Write EXIF data back to resized image
+              bytes = writeExifToImageBytes(bytes, exifInterface);
+            } else {
+              // For non-resized images, ensure EXIF is saved
+              exifInterface.saveAttributes();
+              bytes = new byte[(int) tempFile.length()];
+              java.io.FileInputStream fis2 = new java.io.FileInputStream(
+                tempFile
+              );
+              fis2.read(bytes);
+              fis2.close();
+            }
 
-                isRunning = true;
-                Log.d(TAG, "bindCameraUseCases: Camera bound successfully");
-                if (listener != null) {
-                    // Post the callback to ensure layout is complete
-                    previewContainer.post(() -> {
-                        // Return actual preview container dimensions instead of requested dimensions
-                        int actualWidth = previewContainer != null ? previewContainer.getWidth() : sessionConfig.getWidth();
-                        int actualHeight = previewContainer != null ? previewContainer.getHeight() : sessionConfig.getHeight();
-                        int actualX = previewContainer != null ? previewContainer.getLeft() : sessionConfig.getX();
-                        int actualY = previewContainer != null ? previewContainer.getTop() : sessionConfig.getY();
-                        listener.onCameraStarted(actualWidth, actualHeight, actualX, actualY);
-                    });
-                }
-            } catch (Exception e) {
-                if (listener != null) listener.onCameraStartError("Error binding camera: " + e.getMessage());
+            if (saveToGallery) {
+              saveImageToGallery(bytes);
             }
-        });
-    }
 
-    @OptIn(markerClass = ExperimentalCamera2Interop.class)
-    private CameraSelector buildCameraSelector() {
-        CameraSelector.Builder builder = new CameraSelector.Builder();
-        final String deviceId = sessionConfig.getDeviceId();
-
-        if (deviceId != null && !deviceId.isEmpty()) {
-            builder.addCameraFilter(cameraInfos -> {
-                for (CameraInfo cameraInfo : cameraInfos) {
-                    if (deviceId.equals(Camera2CameraInfo.from(cameraInfo).getCameraId())) {
-                        return Collections.singletonList(cameraInfo);
-                    }
-                }
-                return Collections.emptyList();
-            });
-        } else {
-            String position = sessionConfig.getPosition();
-            int requiredFacing = "front".equals(position) ? CameraSelector.LENS_FACING_FRONT : CameraSelector.LENS_FACING_BACK;
-            builder.requireLensFacing(requiredFacing);
-        }
-        return builder.build();
-    }
+            String base64 = Base64.encodeToString(bytes, Base64.NO_WRAP);
 
-    private static String getCameraId(androidx.camera.core.CameraInfo cameraInfo) {
-        try {
-            // Generate a stable ID based on camera characteristics
-            boolean isBack = isBackCamera(cameraInfo);
-            float minZoom = Objects.requireNonNull(cameraInfo.getZoomState().getValue()).getMinZoomRatio();
-            float maxZoom = cameraInfo.getZoomState().getValue().getMaxZoomRatio();
-
-            // Create a unique ID based on camera properties
-            String position = isBack ? "back" : "front";
-            return position + "_" +  minZoom + "_" + maxZoom;
-        } catch (Exception e) {
-            return "unknown_camera";
-        }
-    }
+            tempFile.delete();
 
-    private static boolean isBackCamera(androidx.camera.core.CameraInfo cameraInfo) {
-        try {
-            // Check if this camera matches the back camera selector
-            CameraSelector backSelector = new CameraSelector.Builder()
-                .requireLensFacing(CameraSelector.LENS_FACING_BACK)
-                .build();
-
-            // Try to filter cameras with back selector - if this camera is included, it's a back camera
-            List<androidx.camera.core.CameraInfo> backCameras = backSelector.filter(Collections.singletonList(cameraInfo));
-            return !backCameras.isEmpty();
-        } catch (Exception e) {
-            Log.w(TAG, "Error determining camera direction, assuming back camera", e);
-            return true; // Default to back camera
+            if (listener != null) {
+              listener.onPictureTaken(base64, exifData);
+            }
+          } catch (Exception e) {
+            Log.e(TAG, "capturePhoto: Error processing image", e);
+            if (listener != null) {
+              listener.onPictureTakenError(
+                "Error processing image: " + e.getMessage()
+              );
+            }
+          }
+        }
+      }
+    );
+  }
+
+  private Bitmap resizeBitmap(Bitmap bitmap, int width, int height) {
+    return Bitmap.createScaledBitmap(bitmap, width, height, true);
+  }
+
+  private JSONObject getExifData(ExifInterface exifInterface) {
+    JSONObject exifData = new JSONObject();
+    try {
+      // Add all available exif tags to a JSON object
+      for (String[] tag : EXIF_TAGS) {
+        String value = exifInterface.getAttribute(tag[0]);
+        if (value != null) {
+          exifData.put(tag[1], value);
         }
+      }
+    } catch (Exception e) {
+      Log.e(TAG, "getExifData: Error reading exif data", e);
     }
+    return exifData;
+  }
+
+  private static final String[][] EXIF_TAGS = new String[][] {
+    { ExifInterface.TAG_APERTURE_VALUE, "ApertureValue" },
+    { ExifInterface.TAG_ARTIST, "Artist" },
+    { ExifInterface.TAG_BITS_PER_SAMPLE, "BitsPerSample" },
+    { ExifInterface.TAG_BRIGHTNESS_VALUE, "BrightnessValue" },
+    { ExifInterface.TAG_CFA_PATTERN, "CFAPattern" },
+    { ExifInterface.TAG_COLOR_SPACE, "ColorSpace" },
+    { ExifInterface.TAG_COMPONENTS_CONFIGURATION, "ComponentsConfiguration" },
+    { ExifInterface.TAG_COMPRESSED_BITS_PER_PIXEL, "CompressedBitsPerPixel" },
+    { ExifInterface.TAG_COMPRESSION, "Compression" },
+    { ExifInterface.TAG_CONTRAST, "Contrast" },
+    { ExifInterface.TAG_COPYRIGHT, "Copyright" },
+    { ExifInterface.TAG_CUSTOM_RENDERED, "CustomRendered" },
+    { ExifInterface.TAG_DATETIME, "DateTime" },
+    { ExifInterface.TAG_DATETIME_DIGITIZED, "DateTimeDigitized" },
+    { ExifInterface.TAG_DATETIME_ORIGINAL, "DateTimeOriginal" },
+    {
+      ExifInterface.TAG_DEVICE_SETTING_DESCRIPTION,
+      "DeviceSettingDescription",
+    },
+    { ExifInterface.TAG_DIGITAL_ZOOM_RATIO, "DigitalZoomRatio" },
+    { ExifInterface.TAG_DNG_VERSION, "DNGVersion" },
+    { ExifInterface.TAG_EXIF_VERSION, "ExifVersion" },
+    { ExifInterface.TAG_EXPOSURE_BIAS_VALUE, "ExposureBiasValue" },
+    { ExifInterface.TAG_EXPOSURE_INDEX, "ExposureIndex" },
+    { ExifInterface.TAG_EXPOSURE_MODE, "ExposureMode" },
+    { ExifInterface.TAG_EXPOSURE_PROGRAM, "ExposureProgram" },
+    { ExifInterface.TAG_EXPOSURE_TIME, "ExposureTime" },
+    { ExifInterface.TAG_FILE_SOURCE, "FileSource" },
+    { ExifInterface.TAG_FLASH, "Flash" },
+    { ExifInterface.TAG_FLASHPIX_VERSION, "FlashpixVersion" },
+    { ExifInterface.TAG_FLASH_ENERGY, "FlashEnergy" },
+    { ExifInterface.TAG_FOCAL_LENGTH, "FocalLength" },
+    { ExifInterface.TAG_FOCAL_LENGTH_IN_35MM_FILM, "FocalLengthIn35mmFilm" },
+    {
+      ExifInterface.TAG_FOCAL_PLANE_RESOLUTION_UNIT,
+      "FocalPlaneResolutionUnit",
+    },
+    { ExifInterface.TAG_FOCAL_PLANE_X_RESOLUTION, "FocalPlaneXResolution" },
+    { ExifInterface.TAG_FOCAL_PLANE_Y_RESOLUTION, "FocalPlaneYResolution" },
+    { ExifInterface.TAG_F_NUMBER, "FNumber" },
+    { ExifInterface.TAG_GAIN_CONTROL, "GainControl" },
+    { ExifInterface.TAG_GPS_ALTITUDE, "GPSAltitude" },
+    { ExifInterface.TAG_GPS_ALTITUDE_REF, "GPSAltitudeRef" },
+    { ExifInterface.TAG_GPS_AREA_INFORMATION, "GPSAreaInformation" },
+    { ExifInterface.TAG_GPS_DATESTAMP, "GPSDateStamp" },
+    { ExifInterface.TAG_GPS_DEST_BEARING, "GPSDestBearing" },
+    { ExifInterface.TAG_GPS_DEST_BEARING_REF, "GPSDestBearingRef" },
+    { ExifInterface.TAG_GPS_DEST_DISTANCE, "GPSDestDistance" },
+    { ExifInterface.TAG_GPS_DEST_DISTANCE_REF, "GPSDestDistanceRef" },
+    { ExifInterface.TAG_GPS_DEST_LATITUDE, "GPSDestLatitude" },
+    { ExifInterface.TAG_GPS_DEST_LATITUDE_REF, "GPSDestLatitudeRef" },
+    { ExifInterface.TAG_GPS_DEST_LONGITUDE, "GPSDestLongitude" },
+    { ExifInterface.TAG_GPS_DEST_LONGITUDE_REF, "GPSDestLongitudeRef" },
+    { ExifInterface.TAG_GPS_DIFFERENTIAL, "GPSDifferential" },
+    { ExifInterface.TAG_GPS_DOP, "GPSDOP" },
+    { ExifInterface.TAG_GPS_IMG_DIRECTION, "GPSImgDirection" },
+    { ExifInterface.TAG_GPS_IMG_DIRECTION_REF, "GPSImgDirectionRef" },
+    { ExifInterface.TAG_GPS_LATITUDE, "GPSLatitude" },
+    { ExifInterface.TAG_GPS_LATITUDE_REF, "GPSLatitudeRef" },
+    { ExifInterface.TAG_GPS_LONGITUDE, "GPSLongitude" },
+    { ExifInterface.TAG_GPS_LONGITUDE_REF, "GPSLongitudeRef" },
+    { ExifInterface.TAG_GPS_MAP_DATUM, "GPSMapDatum" },
+    { ExifInterface.TAG_GPS_MEASURE_MODE, "GPSMeasureMode" },
+    { ExifInterface.TAG_GPS_PROCESSING_METHOD, "GPSProcessingMethod" },
+    { ExifInterface.TAG_GPS_SATELLITES, "GPSSatellites" },
+    { ExifInterface.TAG_GPS_SPEED, "GPSSpeed" },
+    { ExifInterface.TAG_GPS_SPEED_REF, "GPSSpeedRef" },
+    { ExifInterface.TAG_GPS_STATUS, "GPSStatus" },
+    { ExifInterface.TAG_GPS_TIMESTAMP, "GPSTimeStamp" },
+    { ExifInterface.TAG_GPS_TRACK, "GPSTrack" },
+    { ExifInterface.TAG_GPS_TRACK_REF, "GPSTrackRef" },
+    { ExifInterface.TAG_GPS_VERSION_ID, "GPSVersionID" },
+    { ExifInterface.TAG_IMAGE_DESCRIPTION, "ImageDescription" },
+    { ExifInterface.TAG_IMAGE_LENGTH, "ImageLength" },
+    { ExifInterface.TAG_IMAGE_UNIQUE_ID, "ImageUniqueID" },
+    { ExifInterface.TAG_IMAGE_WIDTH, "ImageWidth" },
+    { ExifInterface.TAG_INTEROPERABILITY_INDEX, "InteroperabilityIndex" },
+    { ExifInterface.TAG_ISO_SPEED, "ISOSpeed" },
+    { ExifInterface.TAG_ISO_SPEED_LATITUDE_YYY, "ISOSpeedLatitudeyyy" },
+    { ExifInterface.TAG_ISO_SPEED_LATITUDE_ZZZ, "ISOSpeedLatitudezzz" },
+    { ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT, "JPEGInterchangeFormat" },
+    {
+      ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH,
+      "JPEGInterchangeFormatLength",
+    },
+    { ExifInterface.TAG_LIGHT_SOURCE, "LightSource" },
+    { ExifInterface.TAG_MAKE, "Make" },
+    { ExifInterface.TAG_MAKER_NOTE, "MakerNote" },
+    { ExifInterface.TAG_MAX_APERTURE_VALUE, "MaxApertureValue" },
+    { ExifInterface.TAG_METERING_MODE, "MeteringMode" },
+    { ExifInterface.TAG_MODEL, "Model" },
+    { ExifInterface.TAG_NEW_SUBFILE_TYPE, "NewSubfileType" },
+    { ExifInterface.TAG_OECF, "OECF" },
+    { ExifInterface.TAG_OFFSET_TIME, "OffsetTime" },
+    { ExifInterface.TAG_OFFSET_TIME_DIGITIZED, "OffsetTimeDigitized" },
+    { ExifInterface.TAG_OFFSET_TIME_ORIGINAL, "OffsetTimeOriginal" },
+    { ExifInterface.TAG_ORF_ASPECT_FRAME, "ORFAspectFrame" },
+    { ExifInterface.TAG_ORF_PREVIEW_IMAGE_LENGTH, "ORFPreviewImageLength" },
+    { ExifInterface.TAG_ORF_PREVIEW_IMAGE_START, "ORFPreviewImageStart" },
+    { ExifInterface.TAG_ORF_THUMBNAIL_IMAGE, "ORFThumbnailImage" },
+    { ExifInterface.TAG_ORIENTATION, "Orientation" },
+    {
+      ExifInterface.TAG_PHOTOMETRIC_INTERPRETATION,
+      "PhotometricInterpretation",
+    },
+    { ExifInterface.TAG_PIXEL_X_DIMENSION, "PixelXDimension" },
+    { ExifInterface.TAG_PIXEL_Y_DIMENSION, "PixelYDimension" },
+    { ExifInterface.TAG_PLANAR_CONFIGURATION, "PlanarConfiguration" },
+    { ExifInterface.TAG_PRIMARY_CHROMATICITIES, "PrimaryChromaticities" },
+    {
+      ExifInterface.TAG_RECOMMENDED_EXPOSURE_INDEX,
+      "RecommendedExposureIndex",
+    },
+    { ExifInterface.TAG_REFERENCE_BLACK_WHITE, "ReferenceBlackWhite" },
+    { ExifInterface.TAG_RELATED_SOUND_FILE, "RelatedSoundFile" },
+    { ExifInterface.TAG_RESOLUTION_UNIT, "ResolutionUnit" },
+    { ExifInterface.TAG_ROWS_PER_STRIP, "RowsPerStrip" },
+    { ExifInterface.TAG_RW2_ISO, "RW2ISO" },
+    { ExifInterface.TAG_RW2_JPG_FROM_RAW, "RW2JpgFromRaw" },
+    { ExifInterface.TAG_RW2_SENSOR_BOTTOM_BORDER, "RW2SensorBottomBorder" },
+    { ExifInterface.TAG_RW2_SENSOR_LEFT_BORDER, "RW2SensorLeftBorder" },
+    { ExifInterface.TAG_RW2_SENSOR_RIGHT_BORDER, "RW2SensorRightBorder" },
+    { ExifInterface.TAG_RW2_SENSOR_TOP_BORDER, "RW2SensorTopBorder" },
+    { ExifInterface.TAG_SAMPLES_PER_PIXEL, "SamplesPerPixel" },
+    { ExifInterface.TAG_SATURATION, "Saturation" },
+    { ExifInterface.TAG_SCENE_CAPTURE_TYPE, "SceneCaptureType" },
+    { ExifInterface.TAG_SCENE_TYPE, "SceneType" },
+    { ExifInterface.TAG_SENSING_METHOD, "SensingMethod" },
+    { ExifInterface.TAG_SENSITIVITY_TYPE, "SensitivityType" },
+    { ExifInterface.TAG_SHARPNESS, "Sharpness" },
+    { ExifInterface.TAG_SHUTTER_SPEED_VALUE, "ShutterSpeedValue" },
+    { ExifInterface.TAG_SOFTWARE, "Software" },
+    {
+      ExifInterface.TAG_SPATIAL_FREQUENCY_RESPONSE,
+      "SpatialFrequencyResponse",
+    },
+    { ExifInterface.TAG_SPECTRAL_SENSITIVITY, "SpectralSensitivity" },
+    {
+      ExifInterface.TAG_STANDARD_OUTPUT_SENSITIVITY,
+      "StandardOutputSensitivity",
+    },
+    { ExifInterface.TAG_STRIP_BYTE_COUNTS, "StripByteCounts" },
+    { ExifInterface.TAG_STRIP_OFFSETS, "StripOffsets" },
+    { ExifInterface.TAG_SUBFILE_TYPE, "SubfileType" },
+    { ExifInterface.TAG_SUBJECT_AREA, "SubjectArea" },
+    { ExifInterface.TAG_SUBJECT_DISTANCE, "SubjectDistance" },
+    { ExifInterface.TAG_SUBJECT_DISTANCE_RANGE, "SubjectDistanceRange" },
+    { ExifInterface.TAG_SUBJECT_LOCATION, "SubjectLocation" },
+    { ExifInterface.TAG_SUBSEC_TIME, "SubSecTime" },
+    { ExifInterface.TAG_SUBSEC_TIME_DIGITIZED, "SubSecTimeDigitized" },
+    { ExifInterface.TAG_SUBSEC_TIME_ORIGINAL, "SubSecTimeOriginal" },
+    { ExifInterface.TAG_THUMBNAIL_IMAGE_LENGTH, "ThumbnailImageLength" },
+    { ExifInterface.TAG_THUMBNAIL_IMAGE_WIDTH, "ThumbnailImageWidth" },
+    { ExifInterface.TAG_TRANSFER_FUNCTION, "TransferFunction" },
+    { ExifInterface.TAG_USER_COMMENT, "UserComment" },
+    { ExifInterface.TAG_WHITE_BALANCE, "WhiteBalance" },
+    { ExifInterface.TAG_WHITE_POINT, "WhitePoint" },
+    { ExifInterface.TAG_X_RESOLUTION, "XResolution" },
+    { ExifInterface.TAG_Y_CB_CR_COEFFICIENTS, "YCbCrCoefficients" },
+    { ExifInterface.TAG_Y_CB_CR_POSITIONING, "YCbCrPositioning" },
+    { ExifInterface.TAG_Y_CB_CR_SUB_SAMPLING, "YCbCrSubSampling" },
+    { ExifInterface.TAG_Y_RESOLUTION, "YResolution" },
+  };
+
+  private byte[] writeExifToImageBytes(
+    byte[] imageBytes,
+    ExifInterface sourceExif
+  ) {
+    try {
+      // Create a temporary file to write the image with EXIF
+      File tempExifFile = File.createTempFile(
+        "temp_exif",
+        ".jpg",
+        context.getCacheDir()
+      );
+
+      // Write the image bytes to temp file
+      java.io.FileOutputStream fos = new java.io.FileOutputStream(tempExifFile);
+      fos.write(imageBytes);
+      fos.close();
+
+      // Create new ExifInterface for the temp file and copy all EXIF data
+      ExifInterface newExif = new ExifInterface(tempExifFile.getAbsolutePath());
+
+      // Copy all EXIF attributes from source to new
+      for (String[] tag : EXIF_TAGS) {
+        String value = sourceExif.getAttribute(tag[0]);
+        if (value != null) {
+          newExif.setAttribute(tag[0], value);
+        }
+      }
 
-    public void capturePhoto(int quality, final boolean saveToGallery, Integer width, Integer height, Location location) {
-        Log.d(TAG, "capturePhoto: Starting photo capture with quality: " + quality);
+      // Save the EXIF data
+      newExif.saveAttributes();
 
-        if (imageCapture == null) {
-            if (listener != null) {
-                listener.onPictureTakenError("Camera not ready");
-            }
-            return;
-        }
+      // Read the file back with EXIF embedded
+      byte[] result = new byte[(int) tempExifFile.length()];
+      java.io.FileInputStream fis = new java.io.FileInputStream(tempExifFile);
+      fis.read(result);
+      fis.close();
 
-        File tempFile = new File(context.getCacheDir(), "temp_image.jpg");
-        ImageCapture.OutputFileOptions outputFileOptions = new ImageCapture.OutputFileOptions.Builder(tempFile).build();
-
-        imageCapture.takePicture(
-            outputFileOptions,
-            cameraExecutor,
-            new ImageCapture.OnImageSavedCallback() {
-                @Override
-                public void onError(@NonNull ImageCaptureException exception) {
-                    Log.e(TAG, "capturePhoto: Photo capture failed", exception);
-                    if (listener != null) {
-                        listener.onPictureTakenError("Photo capture failed: " + exception.getMessage());
-                    }
-                }
+      // Clean up temp file
+      tempExifFile.delete();
 
-                @Override
-                public void onImageSaved(@NonNull ImageCapture.OutputFileResults output) {
-                    try {
-                        // Read file using FileInputStream for compatibility
-                        byte[] bytes = new byte[(int) tempFile.length()];
-                        java.io.FileInputStream fis = new java.io.FileInputStream(tempFile);
-                        fis.read(bytes);
-                        fis.close();
-
-                        ExifInterface exifInterface = new ExifInterface(tempFile.getAbsolutePath());
-
-                        if (location != null) {
-                            exifInterface.setGpsInfo(location);
-                        }
-
-                        JSONObject exifData = getExifData(exifInterface);
-
-                        if (width != null && height != null) {
-                            Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
-                            Bitmap resizedBitmap = resizeBitmap(bitmap, width, height);
-                            ByteArrayOutputStream stream = new ByteArrayOutputStream();
-                            resizedBitmap.compress(Bitmap.CompressFormat.JPEG, quality, stream);
-                            bytes = stream.toByteArray();
-                            
-                            // Write EXIF data back to resized image
-                            bytes = writeExifToImageBytes(bytes, exifInterface);
-                        } else {
-                            // For non-resized images, ensure EXIF is saved
-                            exifInterface.saveAttributes();
-                            bytes = new byte[(int) tempFile.length()];
-                            java.io.FileInputStream fis2 = new java.io.FileInputStream(tempFile);
-                            fis2.read(bytes);
-                            fis2.close();
-                        }
-
-                        if (saveToGallery) {
-                            saveImageToGallery(bytes);
-                        }
-
-                        String base64 = Base64.encodeToString(bytes, Base64.NO_WRAP);
-
-                        tempFile.delete();
-
-                        if (listener != null) {
-                            listener.onPictureTaken(base64, exifData);
-                        }
-                    } catch (Exception e) {
-                        Log.e(TAG, "capturePhoto: Error processing image", e);
-                        if (listener != null) {
-                            listener.onPictureTakenError("Error processing image: " + e.getMessage());
-                        }
-                    }
-                }
-            }
-        );
+      return result;
+    } catch (Exception e) {
+      Log.e(TAG, "writeExifToImageBytes: Error writing EXIF data", e);
+      return imageBytes; // Return original bytes if error
     }
+  }
 
-    private Bitmap resizeBitmap(Bitmap bitmap, int width, int height) {
-        return Bitmap.createScaledBitmap(bitmap, width, height, true);
-    }
+  public void captureSample(int quality) {
+    Log.d(
+      TAG,
+      "captureSample: Starting sample capture with quality: " + quality
+    );
 
-    private JSONObject getExifData(ExifInterface exifInterface) {
-        JSONObject exifData = new JSONObject();
-        try {
-            // Add all available exif tags to a JSON object
-            for (String[] tag : EXIF_TAGS) {
-                String value = exifInterface.getAttribute(tag[0]);
-                if (value != null) {
-                    exifData.put(tag[1], value);
-                }
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "getExifData: Error reading exif data", e);
-        }
-        return exifData;
+    if (sampleImageCapture == null) {
+      if (listener != null) {
+        listener.onSampleTakenError("Camera not ready");
+      }
+      return;
     }
 
-    private static final String[][] EXIF_TAGS = new String[][]{
-        {ExifInterface.TAG_APERTURE_VALUE, "ApertureValue"},
-        {ExifInterface.TAG_ARTIST, "Artist"},
-        {ExifInterface.TAG_BITS_PER_SAMPLE, "BitsPerSample"},
-        {ExifInterface.TAG_BRIGHTNESS_VALUE, "BrightnessValue"},
-        {ExifInterface.TAG_CFA_PATTERN, "CFAPattern"},
-        {ExifInterface.TAG_COLOR_SPACE, "ColorSpace"},
-        {ExifInterface.TAG_COMPONENTS_CONFIGURATION, "ComponentsConfiguration"},
-        {ExifInterface.TAG_COMPRESSED_BITS_PER_PIXEL, "CompressedBitsPerPixel"},
-        {ExifInterface.TAG_COMPRESSION, "Compression"},
-        {ExifInterface.TAG_CONTRAST, "Contrast"},
-        {ExifInterface.TAG_COPYRIGHT, "Copyright"},
-        {ExifInterface.TAG_CUSTOM_RENDERED, "CustomRendered"},
-        {ExifInterface.TAG_DATETIME, "DateTime"},
-        {ExifInterface.TAG_DATETIME_DIGITIZED, "DateTimeDigitized"},
-        {ExifInterface.TAG_DATETIME_ORIGINAL, "DateTimeOriginal"},
-        {ExifInterface.TAG_DEVICE_SETTING_DESCRIPTION, "DeviceSettingDescription"},
-        {ExifInterface.TAG_DIGITAL_ZOOM_RATIO, "DigitalZoomRatio"},
-        {ExifInterface.TAG_DNG_VERSION, "DNGVersion"},
-        {ExifInterface.TAG_EXIF_VERSION, "ExifVersion"},
-        {ExifInterface.TAG_EXPOSURE_BIAS_VALUE, "ExposureBiasValue"},
-        {ExifInterface.TAG_EXPOSURE_INDEX, "ExposureIndex"},
-        {ExifInterface.TAG_EXPOSURE_MODE, "ExposureMode"},
-        {ExifInterface.TAG_EXPOSURE_PROGRAM, "ExposureProgram"},
-        {ExifInterface.TAG_EXPOSURE_TIME, "ExposureTime"},
-        {ExifInterface.TAG_FILE_SOURCE, "FileSource"},
-        {ExifInterface.TAG_FLASH, "Flash"},
-        {ExifInterface.TAG_FLASHPIX_VERSION, "FlashpixVersion"},
-        {ExifInterface.TAG_FLASH_ENERGY, "FlashEnergy"},
-        {ExifInterface.TAG_FOCAL_LENGTH, "FocalLength"},
-        {ExifInterface.TAG_FOCAL_LENGTH_IN_35MM_FILM, "FocalLengthIn35mmFilm"},
-        {ExifInterface.TAG_FOCAL_PLANE_RESOLUTION_UNIT, "FocalPlaneResolutionUnit"},
-        {ExifInterface.TAG_FOCAL_PLANE_X_RESOLUTION, "FocalPlaneXResolution"},
-        {ExifInterface.TAG_FOCAL_PLANE_Y_RESOLUTION, "FocalPlaneYResolution"},
-        {ExifInterface.TAG_F_NUMBER, "FNumber"},
-        {ExifInterface.TAG_GAIN_CONTROL, "GainControl"},
-        {ExifInterface.TAG_GPS_ALTITUDE, "GPSAltitude"},
-        {ExifInterface.TAG_GPS_ALTITUDE_REF, "GPSAltitudeRef"},
-        {ExifInterface.TAG_GPS_AREA_INFORMATION, "GPSAreaInformation"},
-        {ExifInterface.TAG_GPS_DATESTAMP, "GPSDateStamp"},
-        {ExifInterface.TAG_GPS_DEST_BEARING, "GPSDestBearing"},
-        {ExifInterface.TAG_GPS_DEST_BEARING_REF, "GPSDestBearingRef"},
-        {ExifInterface.TAG_GPS_DEST_DISTANCE, "GPSDestDistance"},
-        {ExifInterface.TAG_GPS_DEST_DISTANCE_REF, "GPSDestDistanceRef"},
-        {ExifInterface.TAG_GPS_DEST_LATITUDE, "GPSDestLatitude"},
-        {ExifInterface.TAG_GPS_DEST_LATITUDE_REF, "GPSDestLatitudeRef"},
-        {ExifInterface.TAG_GPS_DEST_LONGITUDE, "GPSDestLongitude"},
-        {ExifInterface.TAG_GPS_DEST_LONGITUDE_REF, "GPSDestLongitudeRef"},
-        {ExifInterface.TAG_GPS_DIFFERENTIAL, "GPSDifferential"},
-        {ExifInterface.TAG_GPS_DOP, "GPSDOP"},
-        {ExifInterface.TAG_GPS_IMG_DIRECTION, "GPSImgDirection"},
-        {ExifInterface.TAG_GPS_IMG_DIRECTION_REF, "GPSImgDirectionRef"},
-        {ExifInterface.TAG_GPS_LATITUDE, "GPSLatitude"},
-        {ExifInterface.TAG_GPS_LATITUDE_REF, "GPSLatitudeRef"},
-        {ExifInterface.TAG_GPS_LONGITUDE, "GPSLongitude"},
-        {ExifInterface.TAG_GPS_LONGITUDE_REF, "GPSLongitudeRef"},
-        {ExifInterface.TAG_GPS_MAP_DATUM, "GPSMapDatum"},
-        {ExifInterface.TAG_GPS_MEASURE_MODE, "GPSMeasureMode"},
-        {ExifInterface.TAG_GPS_PROCESSING_METHOD, "GPSProcessingMethod"},
-        {ExifInterface.TAG_GPS_SATELLITES, "GPSSatellites"},
-        {ExifInterface.TAG_GPS_SPEED, "GPSSpeed"},
-        {ExifInterface.TAG_GPS_SPEED_REF, "GPSSpeedRef"},
-        {ExifInterface.TAG_GPS_STATUS, "GPSStatus"},
-        {ExifInterface.TAG_GPS_TIMESTAMP, "GPSTimeStamp"},
-        {ExifInterface.TAG_GPS_TRACK, "GPSTrack"},
-        {ExifInterface.TAG_GPS_TRACK_REF, "GPSTrackRef"},
-        {ExifInterface.TAG_GPS_VERSION_ID, "GPSVersionID"},
-        {ExifInterface.TAG_IMAGE_DESCRIPTION, "ImageDescription"},
-        {ExifInterface.TAG_IMAGE_LENGTH, "ImageLength"},
-        {ExifInterface.TAG_IMAGE_UNIQUE_ID, "ImageUniqueID"},
-        {ExifInterface.TAG_IMAGE_WIDTH, "ImageWidth"},
-        {ExifInterface.TAG_INTEROPERABILITY_INDEX, "InteroperabilityIndex"},
-        {ExifInterface.TAG_ISO_SPEED, "ISOSpeed"},
-        {ExifInterface.TAG_ISO_SPEED_LATITUDE_YYY, "ISOSpeedLatitudeyyy"},
-        {ExifInterface.TAG_ISO_SPEED_LATITUDE_ZZZ, "ISOSpeedLatitudezzz"},
-        {ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT, "JPEGInterchangeFormat"},
-        {ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, "JPEGInterchangeFormatLength"},
-        {ExifInterface.TAG_LIGHT_SOURCE, "LightSource"},
-        {ExifInterface.TAG_MAKE, "Make"},
-        {ExifInterface.TAG_MAKER_NOTE, "MakerNote"},
-        {ExifInterface.TAG_MAX_APERTURE_VALUE, "MaxApertureValue"},
-        {ExifInterface.TAG_METERING_MODE, "MeteringMode"},
-        {ExifInterface.TAG_MODEL, "Model"},
-        {ExifInterface.TAG_NEW_SUBFILE_TYPE, "NewSubfileType"},
-        {ExifInterface.TAG_OECF, "OECF"},
-        {ExifInterface.TAG_OFFSET_TIME, "OffsetTime"},
-        {ExifInterface.TAG_OFFSET_TIME_DIGITIZED, "OffsetTimeDigitized"},
-        {ExifInterface.TAG_OFFSET_TIME_ORIGINAL, "OffsetTimeOriginal"},
-        {ExifInterface.TAG_ORF_ASPECT_FRAME, "ORFAspectFrame"},
-        {ExifInterface.TAG_ORF_PREVIEW_IMAGE_LENGTH, "ORFPreviewImageLength"},
-        {ExifInterface.TAG_ORF_PREVIEW_IMAGE_START, "ORFPreviewImageStart"},
-        {ExifInterface.TAG_ORF_THUMBNAIL_IMAGE, "ORFThumbnailImage"},
-        {ExifInterface.TAG_ORIENTATION, "Orientation"},
-        {ExifInterface.TAG_PHOTOMETRIC_INTERPRETATION, "PhotometricInterpretation"},
-        {ExifInterface.TAG_PIXEL_X_DIMENSION, "PixelXDimension"},
-        {ExifInterface.TAG_PIXEL_Y_DIMENSION, "PixelYDimension"},
-        {ExifInterface.TAG_PLANAR_CONFIGURATION, "PlanarConfiguration"},
-        {ExifInterface.TAG_PRIMARY_CHROMATICITIES, "PrimaryChromaticities"},
-        {ExifInterface.TAG_RECOMMENDED_EXPOSURE_INDEX, "RecommendedExposureIndex"},
-        {ExifInterface.TAG_REFERENCE_BLACK_WHITE, "ReferenceBlackWhite"},
-        {ExifInterface.TAG_RELATED_SOUND_FILE, "RelatedSoundFile"},
-        {ExifInterface.TAG_RESOLUTION_UNIT, "ResolutionUnit"},
-        {ExifInterface.TAG_ROWS_PER_STRIP, "RowsPerStrip"},
-        {ExifInterface.TAG_RW2_ISO, "RW2ISO"},
-        {ExifInterface.TAG_RW2_JPG_FROM_RAW, "RW2JpgFromRaw"},
-        {ExifInterface.TAG_RW2_SENSOR_BOTTOM_BORDER, "RW2SensorBottomBorder"},
-        {ExifInterface.TAG_RW2_SENSOR_LEFT_BORDER, "RW2SensorLeftBorder"},
-        {ExifInterface.TAG_RW2_SENSOR_RIGHT_BORDER, "RW2SensorRightBorder"},
-        {ExifInterface.TAG_RW2_SENSOR_TOP_BORDER, "RW2SensorTopBorder"},
-        {ExifInterface.TAG_SAMPLES_PER_PIXEL, "SamplesPerPixel"},
-        {ExifInterface.TAG_SATURATION, "Saturation"},
-        {ExifInterface.TAG_SCENE_CAPTURE_TYPE, "SceneCaptureType"},
-        {ExifInterface.TAG_SCENE_TYPE, "SceneType"},
-        {ExifInterface.TAG_SENSING_METHOD, "SensingMethod"},
-        {ExifInterface.TAG_SENSITIVITY_TYPE, "SensitivityType"},
-        {ExifInterface.TAG_SHARPNESS, "Sharpness"},
-        {ExifInterface.TAG_SHUTTER_SPEED_VALUE, "ShutterSpeedValue"},
-        {ExifInterface.TAG_SOFTWARE, "Software"},
-        {ExifInterface.TAG_SPATIAL_FREQUENCY_RESPONSE, "SpatialFrequencyResponse"},
-        {ExifInterface.TAG_SPECTRAL_SENSITIVITY, "SpectralSensitivity"},
-        {ExifInterface.TAG_STANDARD_OUTPUT_SENSITIVITY, "StandardOutputSensitivity"},
-        {ExifInterface.TAG_STRIP_BYTE_COUNTS, "StripByteCounts"},
-        {ExifInterface.TAG_STRIP_OFFSETS, "StripOffsets"},
-        {ExifInterface.TAG_SUBFILE_TYPE, "SubfileType"},
-        {ExifInterface.TAG_SUBJECT_AREA, "SubjectArea"},
-        {ExifInterface.TAG_SUBJECT_DISTANCE, "SubjectDistance"},
-        {ExifInterface.TAG_SUBJECT_DISTANCE_RANGE, "SubjectDistanceRange"},
-        {ExifInterface.TAG_SUBJECT_LOCATION, "SubjectLocation"},
-        {ExifInterface.TAG_SUBSEC_TIME, "SubSecTime"},
-        {ExifInterface.TAG_SUBSEC_TIME_DIGITIZED, "SubSecTimeDigitized"},
-        {ExifInterface.TAG_SUBSEC_TIME_ORIGINAL, "SubSecTimeOriginal"},
-        {ExifInterface.TAG_THUMBNAIL_IMAGE_LENGTH, "ThumbnailImageLength"},
-        {ExifInterface.TAG_THUMBNAIL_IMAGE_WIDTH, "ThumbnailImageWidth"},
-        {ExifInterface.TAG_TRANSFER_FUNCTION, "TransferFunction"},
-        {ExifInterface.TAG_USER_COMMENT, "UserComment"},
-        {ExifInterface.TAG_WHITE_BALANCE, "WhiteBalance"},
-        {ExifInterface.TAG_WHITE_POINT, "WhitePoint"},
-        {ExifInterface.TAG_X_RESOLUTION, "XResolution"},
-        {ExifInterface.TAG_Y_CB_CR_COEFFICIENTS, "YCbCrCoefficients"},
-        {ExifInterface.TAG_Y_CB_CR_POSITIONING, "YCbCrPositioning"},
-        {ExifInterface.TAG_Y_CB_CR_SUB_SAMPLING, "YCbCrSubSampling"},
-        {ExifInterface.TAG_Y_RESOLUTION, "YResolution"}
-    };
-
-    private byte[] writeExifToImageBytes(byte[] imageBytes, ExifInterface sourceExif) {
-        try {
-            // Create a temporary file to write the image with EXIF
-            File tempExifFile = File.createTempFile("temp_exif", ".jpg", context.getCacheDir());
-            
-            // Write the image bytes to temp file
-            java.io.FileOutputStream fos = new java.io.FileOutputStream(tempExifFile);
-            fos.write(imageBytes);
-            fos.close();
-            
-            // Create new ExifInterface for the temp file and copy all EXIF data
-            ExifInterface newExif = new ExifInterface(tempExifFile.getAbsolutePath());
-            
-            // Copy all EXIF attributes from source to new
-            for (String[] tag : EXIF_TAGS) {
-                String value = sourceExif.getAttribute(tag[0]);
-                if (value != null) {
-                    newExif.setAttribute(tag[0], value);
-                }
-            }
-            
-            // Save the EXIF data
-            newExif.saveAttributes();
-            
-            // Read the file back with EXIF embedded
-            byte[] result = new byte[(int) tempExifFile.length()];
-            java.io.FileInputStream fis = new java.io.FileInputStream(tempExifFile);
-            fis.read(result);
-            fis.close();
-            
-            // Clean up temp file
-            tempExifFile.delete();
-            
-            return result;
-        } catch (Exception e) {
-            Log.e(TAG, "writeExifToImageBytes: Error writing EXIF data", e);
-            return imageBytes; // Return original bytes if error
+    sampleImageCapture.takePicture(
+      cameraExecutor,
+      new ImageCapture.OnImageCapturedCallback() {
+        @Override
+        public void onError(@NonNull ImageCaptureException exception) {
+          Log.e(TAG, "captureSample: Sample capture failed", exception);
+          if (listener != null) {
+            listener.onSampleTakenError(
+              "Sample capture failed: " + exception.getMessage()
+            );
+          }
         }
-    }
 
-    public void captureSample(int quality) {
-        Log.d(TAG, "captureSample: Starting sample capture with quality: " + quality);
+        @Override
+        public void onCaptureSuccess(@NonNull ImageProxy image) {
+          try {
+            // Convert ImageProxy to byte array
+            byte[] bytes = imageProxyToByteArray(image);
+            String base64 = Base64.encodeToString(bytes, Base64.NO_WRAP);
 
-        if (sampleImageCapture == null) {
             if (listener != null) {
-                listener.onSampleTakenError("Camera not ready");
+              listener.onSampleTaken(base64);
             }
-            return;
-        }
-
-        sampleImageCapture.takePicture(
-            cameraExecutor,
-            new ImageCapture.OnImageCapturedCallback() {
-                @Override
-                public void onError(@NonNull ImageCaptureException exception) {
-                    Log.e(TAG, "captureSample: Sample capture failed", exception);
-                    if (listener != null) {
-                        listener.onSampleTakenError("Sample capture failed: " + exception.getMessage());
-                    }
-                }
-
-                @Override
-                public void onCaptureSuccess(@NonNull ImageProxy image) {
-                    try {
-                        // Convert ImageProxy to byte array
-                        byte[] bytes = imageProxyToByteArray(image);
-                        String base64 = Base64.encodeToString(bytes, Base64.NO_WRAP);
-
-                        if (listener != null) {
-                            listener.onSampleTaken(base64);
-                        }
-                    } catch (Exception e) {
-                        Log.e(TAG, "captureSample: Error processing sample", e);
-                        if (listener != null) {
-                            listener.onSampleTakenError("Error processing sample: " + e.getMessage());
-                        }
-                    } finally {
-                        image.close();
-                    }
-                }
+          } catch (Exception e) {
+            Log.e(TAG, "captureSample: Error processing sample", e);
+            if (listener != null) {
+              listener.onSampleTakenError(
+                "Error processing sample: " + e.getMessage()
+              );
             }
+          } finally {
+            image.close();
+          }
+        }
+      }
+    );
+  }
+
+  private byte[] imageProxyToByteArray(ImageProxy image) {
+    ImageProxy.PlaneProxy[] planes = image.getPlanes();
+    ByteBuffer buffer = planes[0].getBuffer();
+    byte[] bytes = new byte[buffer.remaining()];
+    buffer.get(bytes);
+    return bytes;
+  }
+
+  // not workin for xiaomi https://xiaomi.eu/community/threads/mi-11-ultra-unable-to-access-camera-lenses-in-apps-camera2-api.61456/
+  @OptIn(markerClass = ExperimentalCamera2Interop.class)
+  public static List<
+    com.ahm.capacitor.camera.preview.model.CameraDevice
+  > getAvailableDevicesStatic(Context context) {
+    Log.d(
+      TAG,
+      "getAvailableDevicesStatic: Starting CameraX device enumeration with getPhysicalCameraInfos."
+    );
+    List<com.ahm.capacitor.camera.preview.model.CameraDevice> devices =
+      new ArrayList<>();
+    try {
+      ListenableFuture<ProcessCameraProvider> cameraProviderFuture =
+        ProcessCameraProvider.getInstance(context);
+      ProcessCameraProvider cameraProvider = cameraProviderFuture.get();
+      CameraManager cameraManager = (CameraManager) context.getSystemService(
+        Context.CAMERA_SERVICE
+      );
+
+      for (CameraInfo cameraInfo : cameraProvider.getAvailableCameraInfos()) {
+        String logicalCameraId = Camera2CameraInfo.from(
+          cameraInfo
+        ).getCameraId();
+        String position = isBackCamera(cameraInfo) ? "rear" : "front";
+
+        // Add logical camera
+        float minZoom = Objects.requireNonNull(
+          cameraInfo.getZoomState().getValue()
+        ).getMinZoomRatio();
+        float maxZoom = cameraInfo.getZoomState().getValue().getMaxZoomRatio();
+        List<LensInfo> logicalLenses = new ArrayList<>();
+        logicalLenses.add(new LensInfo(4.25f, "wideAngle", 1.0f, maxZoom));
+        devices.add(
+          new com.ahm.capacitor.camera.preview.model.CameraDevice(
+            logicalCameraId,
+            "Logical Camera (" + position + ")",
+            position,
+            logicalLenses,
+            minZoom,
+            maxZoom,
+            true
+          )
+        );
+        Log.d(
+          TAG,
+          "Found logical camera: " +
+          logicalCameraId +
+          " (" +
+          position +
+          ") with zoom " +
+          minZoom +
+          "-" +
+          maxZoom
         );
-    }
 
-    private byte[] imageProxyToByteArray(ImageProxy image) {
-        ImageProxy.PlaneProxy[] planes = image.getPlanes();
-        ByteBuffer buffer = planes[0].getBuffer();
-        byte[] bytes = new byte[buffer.remaining()];
-        buffer.get(bytes);
-        return bytes;
-    }
+        // Get and add physical cameras
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+          Set<CameraInfo> physicalCameraInfos =
+            cameraInfo.getPhysicalCameraInfos();
+          if (physicalCameraInfos.isEmpty()) continue;
+
+          Log.d(
+            TAG,
+            "Logical camera " +
+            logicalCameraId +
+            " has " +
+            physicalCameraInfos.size() +
+            " physical cameras."
+          );
+
+          for (CameraInfo physicalCameraInfo : physicalCameraInfos) {
+            String physicalId = Camera2CameraInfo.from(
+              physicalCameraInfo
+            ).getCameraId();
+            if (physicalId.equals(logicalCameraId)) continue; // Already added as logical
 
-// not workin for xiaomi https://xiaomi.eu/community/threads/mi-11-ultra-unable-to-access-camera-lenses-in-apps-camera2-api.61456/
-    @OptIn(markerClass = ExperimentalCamera2Interop.class)
-    public static List<com.ahm.capacitor.camera.preview.model.CameraDevice> getAvailableDevicesStatic(Context context) {
-        Log.d(TAG, "getAvailableDevicesStatic: Starting CameraX device enumeration with getPhysicalCameraInfos.");
-        List<com.ahm.capacitor.camera.preview.model.CameraDevice> devices = new ArrayList<>();
-        try {
-            ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
-            ProcessCameraProvider cameraProvider = cameraProviderFuture.get();
-            CameraManager cameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
-
-            for (CameraInfo cameraInfo : cameraProvider.getAvailableCameraInfos()) {
-                String logicalCameraId = Camera2CameraInfo.from(cameraInfo).getCameraId();
-                String position = isBackCamera(cameraInfo) ? "rear" : "front";
-
-                // Add logical camera
-                float minZoom = Objects.requireNonNull(cameraInfo.getZoomState().getValue()).getMinZoomRatio();
-                float maxZoom = cameraInfo.getZoomState().getValue().getMaxZoomRatio();
-                List<LensInfo> logicalLenses = new ArrayList<>();
-                logicalLenses.add(new LensInfo(4.25f, "wideAngle", 1.0f, maxZoom));
-                devices.add(new com.ahm.capacitor.camera.preview.model.CameraDevice(
-                    logicalCameraId, "Logical Camera (" + position + ")", position, logicalLenses, minZoom, maxZoom, true
-                ));
-                Log.d(TAG, "Found logical camera: " + logicalCameraId + " (" + position + ") with zoom " + minZoom + "-" + maxZoom);
-
-                // Get and add physical cameras
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                    Set<CameraInfo> physicalCameraInfos = cameraInfo.getPhysicalCameraInfos();
-                    if (physicalCameraInfos.isEmpty()) continue;
-
-                    Log.d(TAG, "Logical camera " + logicalCameraId + " has " + physicalCameraInfos.size() + " physical cameras.");
-
-                    for (CameraInfo physicalCameraInfo : physicalCameraInfos) {
-                        String physicalId = Camera2CameraInfo.from(physicalCameraInfo).getCameraId();
-                        if (physicalId.equals(logicalCameraId)) continue; // Already added as logical
-
-                        try {
-                            CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(physicalId);
-                            String deviceType = "wideAngle";
-                            float[] focalLengths = characteristics.get(CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS);
-                            android.util.SizeF sensorSize = characteristics.get(CameraCharacteristics.SENSOR_INFO_PHYSICAL_SIZE);
-
-                            if (focalLengths != null && focalLengths.length > 0 && sensorSize != null && sensorSize.getWidth() > 0) {
-                                double fov = 2 * Math.toDegrees(Math.atan(sensorSize.getWidth() / (2 * focalLengths[0])));
-                                if (fov > 90) deviceType = "ultraWide";
-                                else if (fov < 40) deviceType = "telephoto";
-                            } else if (focalLengths != null && focalLengths.length > 0) {
-                                if (focalLengths[0] < 3.0f) deviceType = "ultraWide";
-                                else if (focalLengths[0] > 5.0f) deviceType = "telephoto";
-                            }
-
-                            float physicalMinZoom = 1.0f;
-                            float physicalMaxZoom = 1.0f;
-                            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) {
-                                android.util.Range<Float> zoomRange = characteristics.get(CameraCharacteristics.CONTROL_ZOOM_RATIO_RANGE);
-                                if (zoomRange != null) {
-                                    physicalMinZoom = zoomRange.getLower();
-                                    physicalMaxZoom = zoomRange.getUpper();
-                                }
-                            }
-
-                            String label = "Physical " + deviceType + " (" + position + ")";
-                            List<LensInfo> physicalLenses = new ArrayList<>();
-                            physicalLenses.add(new LensInfo(focalLengths != null ? focalLengths[0] : 4.25f, deviceType, 1.0f, physicalMaxZoom));
-
-                            devices.add(new com.ahm.capacitor.camera.preview.model.CameraDevice(
-                                physicalId, label, position, physicalLenses, physicalMinZoom, physicalMaxZoom, false
-                            ));
-                            Log.d(TAG, "Found physical camera: " + physicalId + " (" + label + ")");
-                        } catch (CameraAccessException e) {
-                            Log.e(TAG, "Failed to access characteristics for physical camera " + physicalId, e);
-                        }
-                    }
+            try {
+              CameraCharacteristics characteristics =
+                cameraManager.getCameraCharacteristics(physicalId);
+              String deviceType = "wideAngle";
+              float[] focalLengths = characteristics.get(
+                CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS
+              );
+              android.util.SizeF sensorSize = characteristics.get(
+                CameraCharacteristics.SENSOR_INFO_PHYSICAL_SIZE
+              );
+
+              if (
+                focalLengths != null &&
+                focalLengths.length > 0 &&
+                sensorSize != null &&
+                sensorSize.getWidth() > 0
+              ) {
+                double fov =
+                  2 *
+                  Math.toDegrees(
+                    Math.atan(sensorSize.getWidth() / (2 * focalLengths[0]))
+                  );
+                if (fov > 90) deviceType = "ultraWide";
+                else if (fov < 40) deviceType = "telephoto";
+              } else if (focalLengths != null && focalLengths.length > 0) {
+                if (focalLengths[0] < 3.0f) deviceType = "ultraWide";
+                else if (focalLengths[0] > 5.0f) deviceType = "telephoto";
+              }
+
+              float physicalMinZoom = 1.0f;
+              float physicalMaxZoom = 1.0f;
+              if (
+                android.os.Build.VERSION.SDK_INT >=
+                android.os.Build.VERSION_CODES.R
+              ) {
+                android.util.Range<Float> zoomRange = characteristics.get(
+                  CameraCharacteristics.CONTROL_ZOOM_RATIO_RANGE
+                );
+                if (zoomRange != null) {
+                  physicalMinZoom = zoomRange.getLower();
+                  physicalMaxZoom = zoomRange.getUpper();
                 }
+              }
+
+              String label = "Physical " + deviceType + " (" + position + ")";
+              List<LensInfo> physicalLenses = new ArrayList<>();
+              physicalLenses.add(
+                new LensInfo(
+                  focalLengths != null ? focalLengths[0] : 4.25f,
+                  deviceType,
+                  1.0f,
+                  physicalMaxZoom
+                )
+              );
+
+              devices.add(
+                new com.ahm.capacitor.camera.preview.model.CameraDevice(
+                  physicalId,
+                  label,
+                  position,
+                  physicalLenses,
+                  physicalMinZoom,
+                  physicalMaxZoom,
+                  false
+                )
+              );
+              Log.d(
+                TAG,
+                "Found physical camera: " + physicalId + " (" + label + ")"
+              );
+            } catch (CameraAccessException e) {
+              Log.e(
+                TAG,
+                "Failed to access characteristics for physical camera " +
+                physicalId,
+                e
+              );
             }
-            return devices;
-        } catch (Exception e) {
-            Log.e(TAG, "getAvailableDevicesStatic: Error getting devices", e);
-            return Collections.emptyList();
+          }
         }
+      }
+      return devices;
+    } catch (Exception e) {
+      Log.e(TAG, "getAvailableDevicesStatic: Error getting devices", e);
+      return Collections.emptyList();
     }
-
-    public static ZoomFactors getZoomFactorsStatic() {
-        try {
-            // For static method, return default zoom factors
-            // We can try to detect if ultra-wide is available by checking device list
-
-            float minZoom = 1.0f;
-            float maxZoom = 10.0f;
-
-            Log.d(TAG, "getZoomFactorsStatic: Final range - minZoom: " + minZoom + ", maxZoom: " + maxZoom);
-            LensInfo defaultLens = new LensInfo(4.25f, "wideAngle", 1.0f, 1.0f);
-            return new ZoomFactors(minZoom, maxZoom, 1.0f, defaultLens);
-        } catch (Exception e) {
-            Log.e(TAG, "getZoomFactorsStatic: Error getting zoom factors", e);
-            LensInfo defaultLens = new LensInfo(4.25f, "wideAngle", 1.0f, 1.0f);
-            return new ZoomFactors(1.0f, 10.0f, 1.0f, defaultLens);
-        }
+  }
+
+  public static ZoomFactors getZoomFactorsStatic() {
+    try {
+      // For static method, return default zoom factors
+      // We can try to detect if ultra-wide is available by checking device list
+
+      float minZoom = 1.0f;
+      float maxZoom = 10.0f;
+
+      Log.d(
+        TAG,
+        "getZoomFactorsStatic: Final range - minZoom: " +
+        minZoom +
+        ", maxZoom: " +
+        maxZoom
+      );
+      LensInfo defaultLens = new LensInfo(4.25f, "wideAngle", 1.0f, 1.0f);
+      return new ZoomFactors(minZoom, maxZoom, 1.0f, defaultLens);
+    } catch (Exception e) {
+      Log.e(TAG, "getZoomFactorsStatic: Error getting zoom factors", e);
+      LensInfo defaultLens = new LensInfo(4.25f, "wideAngle", 1.0f, 1.0f);
+      return new ZoomFactors(1.0f, 10.0f, 1.0f, defaultLens);
     }
+  }
 
-    public ZoomFactors getZoomFactors() {
-        if (camera == null) {
-            return getZoomFactorsStatic();
-        }
-
-        try {
-            // Get the current zoom from active camera
-            float currentZoom = Objects.requireNonNull(camera.getCameraInfo().getZoomState().getValue()).getZoomRatio();
-            float minZoom = camera.getCameraInfo().getZoomState().getValue().getMinZoomRatio();
-            float maxZoom = camera.getCameraInfo().getZoomState().getValue().getMaxZoomRatio();
-
-            Log.d(TAG, "getZoomFactors: Combined range - minZoom: " + minZoom + ", maxZoom: " + maxZoom + ", currentZoom: " + currentZoom);
-
-            return new ZoomFactors(minZoom, maxZoom, currentZoom, getCurrentLensInfo());
-        } catch (Exception e) {
-            Log.e(TAG, "getZoomFactors: Error getting zoom factors", e);
-            return new ZoomFactors(1.0f, 1.0f, 1.0f, getCurrentLensInfo());
-        }
+  public ZoomFactors getZoomFactors() {
+    if (camera == null) {
+      return getZoomFactorsStatic();
     }
 
+    try {
+      // Get the current zoom from active camera
+      float currentZoom = Objects.requireNonNull(
+        camera.getCameraInfo().getZoomState().getValue()
+      ).getZoomRatio();
+      float minZoom = camera
+        .getCameraInfo()
+        .getZoomState()
+        .getValue()
+        .getMinZoomRatio();
+      float maxZoom = camera
+        .getCameraInfo()
+        .getZoomState()
+        .getValue()
+        .getMaxZoomRatio();
+
+      Log.d(
+        TAG,
+        "getZoomFactors: Combined range - minZoom: " +
+        minZoom +
+        ", maxZoom: " +
+        maxZoom +
+        ", currentZoom: " +
+        currentZoom
+      );
+
+      return new ZoomFactors(
+        minZoom,
+        maxZoom,
+        currentZoom,
+        getCurrentLensInfo()
+      );
+    } catch (Exception e) {
+      Log.e(TAG, "getZoomFactors: Error getting zoom factors", e);
+      return new ZoomFactors(1.0f, 1.0f, 1.0f, getCurrentLensInfo());
+    }
+  }
 
+  private LensInfo getCurrentLensInfo() {
+    if (camera == null) {
+      return new LensInfo(4.25f, "wideAngle", 1.0f, 1.0f);
+    }
 
-    private LensInfo getCurrentLensInfo() {
-        if (camera == null) {
-            return new LensInfo(4.25f, "wideAngle", 1.0f, 1.0f);
-        }
-
-        try {
-            float currentZoom = Objects.requireNonNull(camera.getCameraInfo().getZoomState().getValue()).getZoomRatio();
+    try {
+      float currentZoom = Objects.requireNonNull(
+        camera.getCameraInfo().getZoomState().getValue()
+      ).getZoomRatio();
 
-            // Determine device type based on zoom capabilities
-            String deviceType = "wideAngle";
-            float baseZoomRatio = 1.0f;
+      // Determine device type based on zoom capabilities
+      String deviceType = "wideAngle";
+      float baseZoomRatio = 1.0f;
 
-            float digitalZoom = currentZoom / baseZoomRatio;
+      float digitalZoom = currentZoom / baseZoomRatio;
 
-            return new LensInfo(4.25f, deviceType, baseZoomRatio, digitalZoom);
-        } catch (Exception e) {
-            Log.e(TAG, "getCurrentLensInfo: Error getting lens info", e);
-            return new LensInfo(4.25f, "wideAngle", 1.0f, 1.0f);
-        }
+      return new LensInfo(4.25f, deviceType, baseZoomRatio, digitalZoom);
+    } catch (Exception e) {
+      Log.e(TAG, "getCurrentLensInfo: Error getting lens info", e);
+      return new LensInfo(4.25f, "wideAngle", 1.0f, 1.0f);
     }
+  }
 
-    public void setZoom(float zoomRatio) throws Exception {
-        if (camera == null) {
-            throw new Exception("Camera not initialized");
-        }
-
-        Log.d(TAG, "setZoom: Requested zoom ratio: " + zoomRatio);
-
-        // Just let CameraX handle everything - it should automatically switch lenses
-        try {
-            ListenableFuture<Void> zoomFuture = camera.getCameraControl().setZoomRatio(zoomRatio);
-
-            // Add callback to see what actually happened
-            zoomFuture.addListener(() -> {
-                try {
-                    float actualZoom = Objects.requireNonNull(camera.getCameraInfo().getZoomState().getValue()).getZoomRatio();
-                    Log.d(TAG, "setZoom: CameraX set zoom to " + actualZoom + " (requested: " + zoomRatio + ")");
-                    if (Math.abs(actualZoom - zoomRatio) > 0.1f) {
-                        Log.w(TAG, "setZoom: CameraX clamped zoom from " + zoomRatio + " to " + actualZoom);
-                    } else {
-                        Log.d(TAG, "setZoom: CameraX successfully set requested zoom");
-                    }
-                } catch (Exception e) {
-                    Log.e(TAG, "setZoom: Error checking final zoom", e);
-                }
-            }, mainExecutor);
-
-        } catch (Exception e) {
-            Log.e(TAG, "setZoom: Failed to set zoom to " + zoomRatio, e);
-            throw e;
-        }
+  public void setZoom(float zoomRatio) throws Exception {
+    if (camera == null) {
+      throw new Exception("Camera not initialized");
     }
 
-    public static List<Size> getSupportedPictureSizes(String facing) {
-        List<Size> sizes = new ArrayList<>();
-        try {
-            CameraSelector.Builder builder = new CameraSelector.Builder();
-            if ("front".equals(facing)) {
-                builder.requireLensFacing(CameraSelector.LENS_FACING_FRONT);
+    Log.d(TAG, "setZoom: Requested zoom ratio: " + zoomRatio);
+
+    // Just let CameraX handle everything - it should automatically switch lenses
+    try {
+      ListenableFuture<Void> zoomFuture = camera
+        .getCameraControl()
+        .setZoomRatio(zoomRatio);
+
+      // Add callback to see what actually happened
+      zoomFuture.addListener(
+        () -> {
+          try {
+            float actualZoom = Objects.requireNonNull(
+              camera.getCameraInfo().getZoomState().getValue()
+            ).getZoomRatio();
+            Log.d(
+              TAG,
+              "setZoom: CameraX set zoom to " +
+              actualZoom +
+              " (requested: " +
+              zoomRatio +
+              ")"
+            );
+            if (Math.abs(actualZoom - zoomRatio) > 0.1f) {
+              Log.w(
+                TAG,
+                "setZoom: CameraX clamped zoom from " +
+                zoomRatio +
+                " to " +
+                actualZoom
+              );
             } else {
-                builder.requireLensFacing(CameraSelector.LENS_FACING_BACK);
+              Log.d(TAG, "setZoom: CameraX successfully set requested zoom");
             }
+          } catch (Exception e) {
+            Log.e(TAG, "setZoom: Error checking final zoom", e);
+          }
+        },
+        mainExecutor
+      );
+    } catch (Exception e) {
+      Log.e(TAG, "setZoom: Failed to set zoom to " + zoomRatio, e);
+      throw e;
+    }
+  }
+
+  public static List<Size> getSupportedPictureSizes(String facing) {
+    List<Size> sizes = new ArrayList<>();
+    try {
+      CameraSelector.Builder builder = new CameraSelector.Builder();
+      if ("front".equals(facing)) {
+        builder.requireLensFacing(CameraSelector.LENS_FACING_FRONT);
+      } else {
+        builder.requireLensFacing(CameraSelector.LENS_FACING_BACK);
+      }
 
-            // This part is complex because we need characteristics, which are not directly on CameraInfo.
-            // For now, returning a static list of common sizes.
-            // A more advanced implementation would use Camera2interop to get StreamConfigurationMap.
-            sizes.add(new Size(4032, 3024));
-            sizes.add(new Size(1920, 1080));
-            sizes.add(new Size(1280, 720));
-            sizes.add(new Size(640, 480));
-
-        } catch (Exception e) {
-            Log.e(TAG, "Error getting supported picture sizes", e);
-        }
-        return sizes;
+      // This part is complex because we need characteristics, which are not directly on CameraInfo.
+      // For now, returning a static list of common sizes.
+      // A more advanced implementation would use Camera2interop to get StreamConfigurationMap.
+      sizes.add(new Size(4032, 3024));
+      sizes.add(new Size(1920, 1080));
+      sizes.add(new Size(1280, 720));
+      sizes.add(new Size(640, 480));
+    } catch (Exception e) {
+      Log.e(TAG, "Error getting supported picture sizes", e);
     }
+    return sizes;
+  }
+
+  private void setZoomInternal(float zoomRatio) {
+    if (camera != null) {
+      try {
+        float minZoom = Objects.requireNonNull(
+          camera.getCameraInfo().getZoomState().getValue()
+        ).getMinZoomRatio();
+        float maxZoom = camera
+          .getCameraInfo()
+          .getZoomState()
+          .getValue()
+          .getMaxZoomRatio();
+        float currentZoom = camera
+          .getCameraInfo()
+          .getZoomState()
+          .getValue()
+          .getZoomRatio();
+
+        Log.d(
+          TAG,
+          "setZoomInternal: Current camera range: " +
+          minZoom +
+          "-" +
+          maxZoom +
+          ", current: " +
+          currentZoom
+        );
+        Log.d(TAG, "setZoomInternal: Requesting zoom: " + zoomRatio);
 
-    private void setZoomInternal(float zoomRatio) {
-        if (camera != null) {
-            try {
-                float minZoom = Objects.requireNonNull(camera.getCameraInfo().getZoomState().getValue()).getMinZoomRatio();
-                float maxZoom = camera.getCameraInfo().getZoomState().getValue().getMaxZoomRatio();
-                float currentZoom = camera.getCameraInfo().getZoomState().getValue().getZoomRatio();
-
-                Log.d(TAG, "setZoomInternal: Current camera range: " + minZoom + "-" + maxZoom + ", current: " + currentZoom);
-                Log.d(TAG, "setZoomInternal: Requesting zoom: " + zoomRatio);
-
-                // Try to set zoom directly - let CameraX handle lens switching
-                ListenableFuture<Void> zoomFuture = camera.getCameraControl().setZoomRatio(zoomRatio);
-
-                zoomFuture.addListener(() -> {
-                    try {
-                        zoomFuture.get(); // Check if zoom was successful
-                        float newZoom = Objects.requireNonNull(camera.getCameraInfo().getZoomState().getValue()).getZoomRatio();
-                        Log.d(TAG, "setZoomInternal: Zoom set successfully to " + newZoom + " (requested: " + zoomRatio + ")");
-
-                        // Check if CameraX switched cameras
-                        String newCameraId = getCameraId(camera.getCameraInfo());
-                        if (!newCameraId.equals(currentDeviceId)) {
-                            currentDeviceId = newCameraId;
-                            Log.d(TAG, "setZoomInternal: CameraX switched to camera: " + newCameraId);
-                        }
-                    } catch (Exception e) {
-                        Log.w(TAG, "setZoomInternal: Zoom operation failed: " + e.getMessage());
-                        // Fallback: clamp to current camera's range
-                        float clampedZoom = Math.max(minZoom, Math.min(zoomRatio, maxZoom));
-                        camera.getCameraControl().setZoomRatio(clampedZoom);
-                        Log.d(TAG, "setZoomInternal: Fallback - clamped zoom to " + clampedZoom);
-                    }
-                }, mainExecutor);
+        // Try to set zoom directly - let CameraX handle lens switching
+        ListenableFuture<Void> zoomFuture = camera
+          .getCameraControl()
+          .setZoomRatio(zoomRatio);
 
+        zoomFuture.addListener(
+          () -> {
+            try {
+              zoomFuture.get(); // Check if zoom was successful
+              float newZoom = Objects.requireNonNull(
+                camera.getCameraInfo().getZoomState().getValue()
+              ).getZoomRatio();
+              Log.d(
+                TAG,
+                "setZoomInternal: Zoom set successfully to " +
+                newZoom +
+                " (requested: " +
+                zoomRatio +
+                ")"
+              );
+
+              // Check if CameraX switched cameras
+              String newCameraId = getCameraId(camera.getCameraInfo());
+              if (!newCameraId.equals(currentDeviceId)) {
+                currentDeviceId = newCameraId;
+                Log.d(
+                  TAG,
+                  "setZoomInternal: CameraX switched to camera: " + newCameraId
+                );
+              }
             } catch (Exception e) {
-                Log.e(TAG, "setZoomInternal: Error setting zoom", e);
+              Log.w(
+                TAG,
+                "setZoomInternal: Zoom operation failed: " + e.getMessage()
+              );
+              // Fallback: clamp to current camera's range
+              float clampedZoom = Math.max(
+                minZoom,
+                Math.min(zoomRatio, maxZoom)
+              );
+              camera.getCameraControl().setZoomRatio(clampedZoom);
+              Log.d(
+                TAG,
+                "setZoomInternal: Fallback - clamped zoom to " + clampedZoom
+              );
             }
-        }
+          },
+          mainExecutor
+        );
+      } catch (Exception e) {
+        Log.e(TAG, "setZoomInternal: Error setting zoom", e);
+      }
     }
-
-    public static List<String> getSupportedFlashModesStatic() {
-        try {
-            // For static method, we can return common flash modes
-            // Most modern cameras support these modes
-            return Arrays.asList("off", "on", "auto");
-        } catch (Exception e) {
-            Log.e(TAG, "getSupportedFlashModesStatic: Error getting flash modes", e);
-            return Collections.singletonList("off");
-        }
+  }
+
+  public static List<String> getSupportedFlashModesStatic() {
+    try {
+      // For static method, we can return common flash modes
+      // Most modern cameras support these modes
+      return Arrays.asList("off", "on", "auto");
+    } catch (Exception e) {
+      Log.e(TAG, "getSupportedFlashModesStatic: Error getting flash modes", e);
+      return Collections.singletonList("off");
     }
+  }
 
-    public List<String> getSupportedFlashModes() {
-        if (camera == null) {
-            return getSupportedFlashModesStatic();
-        }
-
-        try {
-            boolean hasFlash = camera.getCameraInfo().hasFlashUnit();
-            if (hasFlash) {
-                return Arrays.asList("off", "on", "auto");
-            } else {
-                return Collections.singletonList("off");
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "getSupportedFlashModes: Error getting flash modes", e);
-            return Collections.singletonList("off");
-        }
+  public List<String> getSupportedFlashModes() {
+    if (camera == null) {
+      return getSupportedFlashModesStatic();
     }
 
-    public String getFlashMode() {
-        switch (currentFlashMode) {
-            case ImageCapture.FLASH_MODE_ON:
-                return "on";
-            case ImageCapture.FLASH_MODE_AUTO:
-                return "auto";
-            default:
-                return "off";
-        }
+    try {
+      boolean hasFlash = camera.getCameraInfo().hasFlashUnit();
+      if (hasFlash) {
+        return Arrays.asList("off", "on", "auto");
+      } else {
+        return Collections.singletonList("off");
+      }
+    } catch (Exception e) {
+      Log.e(TAG, "getSupportedFlashModes: Error getting flash modes", e);
+      return Collections.singletonList("off");
     }
-
-    public void setFlashMode(String mode) {
-        int flashMode;
-        switch (mode) {
-            case "on":
-                flashMode = ImageCapture.FLASH_MODE_ON;
-                break;
-            case "auto":
-                flashMode = ImageCapture.FLASH_MODE_AUTO;
-                break;
-            default:
-                flashMode = ImageCapture.FLASH_MODE_OFF;
-                break;
-        }
-
-        currentFlashMode = flashMode;
-
-        if (imageCapture != null) {
-            imageCapture.setFlashMode(flashMode);
-        }
-        if (sampleImageCapture != null) {
-            sampleImageCapture.setFlashMode(flashMode);
-        }
+  }
+
+  public String getFlashMode() {
+    switch (currentFlashMode) {
+      case ImageCapture.FLASH_MODE_ON:
+        return "on";
+      case ImageCapture.FLASH_MODE_AUTO:
+        return "auto";
+      default:
+        return "off";
     }
-
-    public String getCurrentDeviceId() {
-        return currentDeviceId != null ? currentDeviceId : "unknown";
+  }
+
+  public void setFlashMode(String mode) {
+    int flashMode;
+    switch (mode) {
+      case "on":
+        flashMode = ImageCapture.FLASH_MODE_ON;
+        break;
+      case "auto":
+        flashMode = ImageCapture.FLASH_MODE_AUTO;
+        break;
+      default:
+        flashMode = ImageCapture.FLASH_MODE_OFF;
+        break;
     }
 
-    @OptIn(markerClass = ExperimentalCamera2Interop.class)
-    public void switchToDevice(String deviceId) {
-        Log.d(TAG, "switchToDevice: Attempting to switch to device " + deviceId);
+    currentFlashMode = flashMode;
 
-        mainExecutor.execute(() -> {
-            try {
-                // Standard physical device selection logic...
-                List<CameraInfo> cameraInfos = cameraProvider.getAvailableCameraInfos();
-                CameraInfo targetCameraInfo = null;
-                for (CameraInfo cameraInfo : cameraInfos) {
-                    if (deviceId.equals(Camera2CameraInfo.from(cameraInfo).getCameraId())) {
-                        targetCameraInfo = cameraInfo;
-                        break;
-                    }
-                }
-
-                if (targetCameraInfo != null) {
-                    Log.d(TAG, "switchToDevice: Found matching CameraInfo for deviceId: " + deviceId);
-                    final CameraInfo finalTarget = targetCameraInfo;
-
-                    // This filter will receive a list of all cameras and must return the one we want.
-
-                    currentCameraSelector = new CameraSelector.Builder()
-                        .addCameraFilter(cameras -> {
-                            // This filter will receive a list of all cameras and must return the one we want.
-                            return Collections.singletonList(finalTarget);
-                        }).build();
-                    currentDeviceId = deviceId;
-                    bindCameraUseCases(); // Rebind with the new, highly specific selector
-                } else {
-                    Log.e(TAG, "switchToDevice: Could not find any CameraInfo matching deviceId: " + deviceId);
-                }
-            } catch (Exception e) {
-                Log.e(TAG, "switchToDevice: Error switching camera", e);
-            }
-        });
+    if (imageCapture != null) {
+      imageCapture.setFlashMode(flashMode);
     }
-
-    public void flipCamera() {
-        Log.d(TAG, "flipCamera: Flipping camera");
-
-        // Determine current position based on session config and flip it
-        String currentPosition = sessionConfig.getPosition();
-        String newPosition = "front".equals(currentPosition) ? "rear" : "front";
-
-        Log.d(TAG, "flipCamera: Switching from " + currentPosition + " to " + newPosition);
-
-        sessionConfig = new CameraSessionConfiguration(
-            null, // deviceId - clear device ID to force position-based selection
-            newPosition, // position
-            sessionConfig.getX(), // x
-            sessionConfig.getY(), // y
-            sessionConfig.getWidth(), // width
-            sessionConfig.getHeight(), // height
-            sessionConfig.getPaddingBottom(), // paddingBottom
-            sessionConfig.isToBack(), // toBack
-            sessionConfig.isStoreToFile(), // storeToFile
-            sessionConfig.isEnableOpacity(), // enableOpacity
-            sessionConfig.isEnableZoom(), // enableZoom
-            sessionConfig.isDisableExifHeaderStripping(), // disableExifHeaderStripping
-            sessionConfig.isDisableAudio(), // disableAudio
-            sessionConfig.getZoomFactor(), // zoomFactor
-            sessionConfig.getAspectRatio(), // aspectRatio
-            sessionConfig.getGridMode() // gridMode
-        );
-
-        // Clear current device ID to force position-based selection
-        currentDeviceId = null;
-
-        // Camera operations must run on main thread
-        cameraExecutor.execute(() -> {
-            currentCameraSelector = buildCameraSelector();
-            bindCameraUseCases();
-        });
+    if (sampleImageCapture != null) {
+      sampleImageCapture.setFlashMode(flashMode);
     }
-
-    public void setOpacity(float opacity) {
-        if (previewView != null) {
-            previewView.setAlpha(opacity);
+  }
+
+  public String getCurrentDeviceId() {
+    return currentDeviceId != null ? currentDeviceId : "unknown";
+  }
+
+  @OptIn(markerClass = ExperimentalCamera2Interop.class)
+  public void switchToDevice(String deviceId) {
+    Log.d(TAG, "switchToDevice: Attempting to switch to device " + deviceId);
+
+    mainExecutor.execute(() -> {
+      try {
+        // Standard physical device selection logic...
+        List<CameraInfo> cameraInfos = cameraProvider.getAvailableCameraInfos();
+        CameraInfo targetCameraInfo = null;
+        for (CameraInfo cameraInfo : cameraInfos) {
+          if (
+            deviceId.equals(Camera2CameraInfo.from(cameraInfo).getCameraId())
+          ) {
+            targetCameraInfo = cameraInfo;
+            break;
+          }
         }
-    }
-
-    private void updateLayoutParams() {
-        if (sessionConfig == null) return;
-
-        FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(
-                sessionConfig.getWidth(),
-                sessionConfig.getHeight()
-        );
-        layoutParams.leftMargin = sessionConfig.getX();
-        layoutParams.topMargin = sessionConfig.getY();
 
-        if (sessionConfig.getAspectRatio() != null) {
-            String[] ratios = sessionConfig.getAspectRatio().split(":");
-            // For camera, use portrait orientation: 4:3 becomes 3:4, 16:9 becomes 9:16
-            float ratio = Float.parseFloat(ratios[1]) / Float.parseFloat(ratios[0]);
-            if (sessionConfig.getWidth() > 0) {
-                layoutParams.height = (int) (sessionConfig.getWidth() / ratio);
-            } else if (sessionConfig.getHeight() > 0) {
-                layoutParams.width = (int) (sessionConfig.getHeight() * ratio);
-            }
+        if (targetCameraInfo != null) {
+          Log.d(
+            TAG,
+            "switchToDevice: Found matching CameraInfo for deviceId: " +
+            deviceId
+          );
+          final CameraInfo finalTarget = targetCameraInfo;
+
+          // This filter will receive a list of all cameras and must return the one we want.
+
+          currentCameraSelector = new CameraSelector.Builder()
+            .addCameraFilter(cameras -> {
+              // This filter will receive a list of all cameras and must return the one we want.
+              return Collections.singletonList(finalTarget);
+            })
+            .build();
+          currentDeviceId = deviceId;
+          bindCameraUseCases(); // Rebind with the new, highly specific selector
+        } else {
+          Log.e(
+            TAG,
+            "switchToDevice: Could not find any CameraInfo matching deviceId: " +
+            deviceId
+          );
         }
+      } catch (Exception e) {
+        Log.e(TAG, "switchToDevice: Error switching camera", e);
+      }
+    });
+  }
+
+  public void flipCamera() {
+    Log.d(TAG, "flipCamera: Flipping camera");
+
+    // Determine current position based on session config and flip it
+    String currentPosition = sessionConfig.getPosition();
+    String newPosition = "front".equals(currentPosition) ? "rear" : "front";
+
+    Log.d(
+      TAG,
+      "flipCamera: Switching from " + currentPosition + " to " + newPosition
+    );
+
+    sessionConfig = new CameraSessionConfiguration(
+      null, // deviceId - clear device ID to force position-based selection
+      newPosition, // position
+      sessionConfig.getX(), // x
+      sessionConfig.getY(), // y
+      sessionConfig.getWidth(), // width
+      sessionConfig.getHeight(), // height
+      sessionConfig.getPaddingBottom(), // paddingBottom
+      sessionConfig.isToBack(), // toBack
+      sessionConfig.isStoreToFile(), // storeToFile
+      sessionConfig.isEnableOpacity(), // enableOpacity
+      sessionConfig.isEnableZoom(), // enableZoom
+      sessionConfig.isDisableExifHeaderStripping(), // disableExifHeaderStripping
+      sessionConfig.isDisableAudio(), // disableAudio
+      sessionConfig.getZoomFactor(), // zoomFactor
+      sessionConfig.getAspectRatio(), // aspectRatio
+      sessionConfig.getGridMode() // gridMode
+    );
+
+    // Clear current device ID to force position-based selection
+    currentDeviceId = null;
+
+    // Camera operations must run on main thread
+    cameraExecutor.execute(() -> {
+      currentCameraSelector = buildCameraSelector();
+      bindCameraUseCases();
+    });
+  }
+
+  public void setOpacity(float opacity) {
+    if (previewView != null) {
+      previewView.setAlpha(opacity);
+    }
+  }
+
+  private void updateLayoutParams() {
+    if (sessionConfig == null) return;
+
+    FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(
+      sessionConfig.getWidth(),
+      sessionConfig.getHeight()
+    );
+    layoutParams.leftMargin = sessionConfig.getX();
+    layoutParams.topMargin = sessionConfig.getY();
+
+    if (sessionConfig.getAspectRatio() != null) {
+      String[] ratios = sessionConfig.getAspectRatio().split(":");
+      // For camera, use portrait orientation: 4:3 becomes 3:4, 16:9 becomes 9:16
+      float ratio = Float.parseFloat(ratios[1]) / Float.parseFloat(ratios[0]);
+      if (sessionConfig.getWidth() > 0) {
+        layoutParams.height = (int) (sessionConfig.getWidth() / ratio);
+      } else if (sessionConfig.getHeight() > 0) {
+        layoutParams.width = (int) (sessionConfig.getHeight() * ratio);
+      }
+    }
 
-        previewView.setLayoutParams(layoutParams);
+    previewView.setLayoutParams(layoutParams);
 
-        if (listener != null) {
-            listener.onCameraStarted(
-                sessionConfig.getWidth(),
-                sessionConfig.getHeight(),
-                sessionConfig.getX(),
-                sessionConfig.getY()
-            );
-        }
+    if (listener != null) {
+      listener.onCameraStarted(
+        sessionConfig.getWidth(),
+        sessionConfig.getHeight(),
+        sessionConfig.getX(),
+        sessionConfig.getY()
+      );
     }
+  }
 
-    public String getAspectRatio() {
-        if (sessionConfig != null) {
-            return sessionConfig.getAspectRatio();
-        }
-        return "4:3";
+  public String getAspectRatio() {
+    if (sessionConfig != null) {
+      return sessionConfig.getAspectRatio();
     }
+    return "4:3";
+  }
 
-    public String getGridMode() {
-        if (sessionConfig != null) {
-            return sessionConfig.getGridMode();
-        }
-        return "none";
+  public String getGridMode() {
+    if (sessionConfig != null) {
+      return sessionConfig.getGridMode();
     }
-
-    public void setAspectRatio(String aspectRatio) {
-        setAspectRatio(aspectRatio, null, null);
+    return "none";
+  }
+
+  public void setAspectRatio(String aspectRatio) {
+    setAspectRatio(aspectRatio, null, null);
+  }
+
+  public void setAspectRatio(String aspectRatio, Float x, Float y) {
+    setAspectRatio(aspectRatio, x, y, null);
+  }
+
+  public void setAspectRatio(
+    String aspectRatio,
+    Float x,
+    Float y,
+    Runnable callback
+  ) {
+    if (sessionConfig == null) {
+      if (callback != null) callback.run();
+      return;
     }
-    
-    public void setAspectRatio(String aspectRatio, Float x, Float y) {
-        setAspectRatio(aspectRatio, x, y, null);
+
+    String currentAspectRatio = sessionConfig.getAspectRatio();
+
+    // Don't restart camera if aspect ratio hasn't changed and no position specified
+    if (
+      aspectRatio != null &&
+      aspectRatio.equals(currentAspectRatio) &&
+      x == null &&
+      y == null
+    ) {
+      Log.d(
+        TAG,
+        "setAspectRatio: Aspect ratio " +
+        aspectRatio +
+        " is already set and no position specified, skipping"
+      );
+      if (callback != null) callback.run();
+      return;
     }
 
-    public void setAspectRatio(String aspectRatio, Float x, Float y, Runnable callback) {
-        if (sessionConfig == null) {
-            if (callback != null) callback.run();
-            return;
-        }
-        
-        String currentAspectRatio = sessionConfig.getAspectRatio();
-        
-        // Don't restart camera if aspect ratio hasn't changed and no position specified
-        if (aspectRatio != null && aspectRatio.equals(currentAspectRatio) && x == null && y == null) {
-            Log.d(TAG, "setAspectRatio: Aspect ratio " + aspectRatio + " is already set and no position specified, skipping");
-            if (callback != null) callback.run();
-            return;
-        }
-        
-        String currentGridMode = sessionConfig.getGridMode();
-        Log.d(TAG, "setAspectRatio: Changing from " + currentAspectRatio + " to " + aspectRatio + 
-              (x != null && y != null ? " at position (" + x + ", " + y + ")" : " with auto-centering") +
-              ", preserving grid mode: " + currentGridMode);
-        
-        sessionConfig = new CameraSessionConfiguration(
-                sessionConfig.getDeviceId(),
-                sessionConfig.getPosition(),
-                sessionConfig.getX(),
-                sessionConfig.getY(),
-                sessionConfig.getWidth(),
-                sessionConfig.getHeight(),
-                sessionConfig.getPaddingBottom(),
-                sessionConfig.getToBack(),
-                sessionConfig.getStoreToFile(),
-                sessionConfig.getEnableOpacity(),
-                sessionConfig.getEnableZoom(),
-                sessionConfig.getDisableExifHeaderStripping(),
-                sessionConfig.getDisableAudio(),
-                sessionConfig.getZoomFactor(),
-                aspectRatio,
-                currentGridMode
+    String currentGridMode = sessionConfig.getGridMode();
+    Log.d(
+      TAG,
+      "setAspectRatio: Changing from " +
+      currentAspectRatio +
+      " to " +
+      aspectRatio +
+      (x != null && y != null
+          ? " at position (" + x + ", " + y + ")"
+          : " with auto-centering") +
+      ", preserving grid mode: " +
+      currentGridMode
+    );
+
+    sessionConfig = new CameraSessionConfiguration(
+      sessionConfig.getDeviceId(),
+      sessionConfig.getPosition(),
+      sessionConfig.getX(),
+      sessionConfig.getY(),
+      sessionConfig.getWidth(),
+      sessionConfig.getHeight(),
+      sessionConfig.getPaddingBottom(),
+      sessionConfig.getToBack(),
+      sessionConfig.getStoreToFile(),
+      sessionConfig.getEnableOpacity(),
+      sessionConfig.getEnableZoom(),
+      sessionConfig.getDisableExifHeaderStripping(),
+      sessionConfig.getDisableAudio(),
+      sessionConfig.getZoomFactor(),
+      aspectRatio,
+      currentGridMode
+    );
+
+    // Update layout and rebind camera with new aspect ratio
+    if (isRunning && previewContainer != null) {
+      mainExecutor.execute(() -> {
+        // First update the UI layout
+        updatePreviewLayoutForAspectRatio(aspectRatio, x, y);
+
+        // Then rebind the camera with new aspect ratio configuration
+        Log.d(
+          TAG,
+          "setAspectRatio: Rebinding camera with new aspect ratio: " +
+          aspectRatio
         );
-        
-        // Update layout and rebind camera with new aspect ratio
-        if (isRunning && previewContainer != null) {
-            mainExecutor.execute(() -> {
-                // First update the UI layout
-                updatePreviewLayoutForAspectRatio(aspectRatio, x, y);
-                
-                // Then rebind the camera with new aspect ratio configuration
-                Log.d(TAG, "setAspectRatio: Rebinding camera with new aspect ratio: " + aspectRatio);
-                bindCameraUseCases();
-                
-                // Preserve grid mode and wait for completion
-                if (gridOverlayView != null) {
-                    gridOverlayView.post(() -> {
-                        Log.d(TAG, "setAspectRatio: Re-applying grid mode: " + currentGridMode);
-                        gridOverlayView.setGridMode(currentGridMode);
-                        
-                        // Wait one more frame for grid to be applied, then call callback
-                        if (callback != null) {
-                            gridOverlayView.post(callback);
-                        }
-                    });
-                } else {
-                    // No grid overlay, wait one frame for layout completion then call callback
-                    if (callback != null) {
-                        previewContainer.post(callback);
-                    }
-                }
-            });
-        } else {
-            if (callback != null) callback.run();
-        }
-    }
+        bindCameraUseCases();
 
-    public void setGridMode(String gridMode) {
-        if (sessionConfig != null) {
-            Log.d(TAG, "setGridMode: Changing grid mode to: " + gridMode);
-            sessionConfig = new CameraSessionConfiguration(
-                    sessionConfig.getDeviceId(),
-                    sessionConfig.getPosition(),
-                    sessionConfig.getX(),
-                    sessionConfig.getY(),
-                    sessionConfig.getWidth(),
-                    sessionConfig.getHeight(),
-                    sessionConfig.getPaddingBottom(),
-                    sessionConfig.getToBack(),
-                    sessionConfig.getStoreToFile(),
-                    sessionConfig.getEnableOpacity(),
-                    sessionConfig.getEnableZoom(),
-                    sessionConfig.getDisableExifHeaderStripping(),
-                    sessionConfig.getDisableAudio(),
-                    sessionConfig.getZoomFactor(),
-                    sessionConfig.getAspectRatio(),
-                    gridMode
+        // Preserve grid mode and wait for completion
+        if (gridOverlayView != null) {
+          gridOverlayView.post(() -> {
+            Log.d(
+              TAG,
+              "setAspectRatio: Re-applying grid mode: " + currentGridMode
             );
+            gridOverlayView.setGridMode(currentGridMode);
 
-            // Update the grid overlay immediately
-            if (gridOverlayView != null) {
-                gridOverlayView.post(() -> {
-                    Log.d(TAG, "setGridMode: Applying grid mode to overlay: " + gridMode);
-                    gridOverlayView.setGridMode(gridMode);
-                });
+            // Wait one more frame for grid to be applied, then call callback
+            if (callback != null) {
+              gridOverlayView.post(callback);
             }
+          });
+        } else {
+          // No grid overlay, wait one frame for layout completion then call callback
+          if (callback != null) {
+            previewContainer.post(callback);
+          }
         }
+      });
+    } else {
+      if (callback != null) callback.run();
     }
-
-    public int getPreviewX() {
-      if (previewContainer == null) return 0;
-      ViewGroup.LayoutParams layoutParams = previewContainer.getLayoutParams();
-      if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
-        // Return position relative to WebView content (subtract insets)
-        int margin = ((ViewGroup.MarginLayoutParams) layoutParams).leftMargin;
-        int leftInset = getWebViewLeftInset();
-        int result = margin - leftInset;
-        Log.d(TAG, "getPreviewX: leftMargin=" + margin + ", leftInset=" + leftInset + ", result=" + result);
-        return result;
-      }
-      return previewContainer.getLeft();
-    }
-    public int getPreviewY() {
-      if (previewContainer == null) return 0;
-      ViewGroup.LayoutParams layoutParams = previewContainer.getLayoutParams();
-      if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
-        // Return position relative to WebView content (subtract insets)
-        int margin = ((ViewGroup.MarginLayoutParams) layoutParams).topMargin;
-        int topInset = getWebViewTopInset();
-        int result = margin - topInset;
-        Log.d(TAG, "getPreviewY: topMargin=" + margin + ", topInset=" + topInset + ", result=" + result);
-        return result;
+  }
+
+  public void setGridMode(String gridMode) {
+    if (sessionConfig != null) {
+      Log.d(TAG, "setGridMode: Changing grid mode to: " + gridMode);
+      sessionConfig = new CameraSessionConfiguration(
+        sessionConfig.getDeviceId(),
+        sessionConfig.getPosition(),
+        sessionConfig.getX(),
+        sessionConfig.getY(),
+        sessionConfig.getWidth(),
+        sessionConfig.getHeight(),
+        sessionConfig.getPaddingBottom(),
+        sessionConfig.getToBack(),
+        sessionConfig.getStoreToFile(),
+        sessionConfig.getEnableOpacity(),
+        sessionConfig.getEnableZoom(),
+        sessionConfig.getDisableExifHeaderStripping(),
+        sessionConfig.getDisableAudio(),
+        sessionConfig.getZoomFactor(),
+        sessionConfig.getAspectRatio(),
+        gridMode
+      );
+
+      // Update the grid overlay immediately
+      if (gridOverlayView != null) {
+        gridOverlayView.post(() -> {
+          Log.d(TAG, "setGridMode: Applying grid mode to overlay: " + gridMode);
+          gridOverlayView.setGridMode(gridMode);
+        });
       }
-      return previewContainer.getTop();
     }
-    public int getPreviewWidth() {
-      return previewContainer != null ? previewContainer.getWidth() : 0;
+  }
+
+  public int getPreviewX() {
+    if (previewContainer == null) return 0;
+    ViewGroup.LayoutParams layoutParams = previewContainer.getLayoutParams();
+    if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
+      // Return position relative to WebView content (subtract insets)
+      int margin = ((ViewGroup.MarginLayoutParams) layoutParams).leftMargin;
+      int leftInset = getWebViewLeftInset();
+      int result = margin - leftInset;
+      Log.d(
+        TAG,
+        "getPreviewX: leftMargin=" +
+        margin +
+        ", leftInset=" +
+        leftInset +
+        ", result=" +
+        result
+      );
+      return result;
     }
-    public int getPreviewHeight() {
-      return previewContainer != null ? previewContainer.getHeight() : 0;
+    return previewContainer.getLeft();
+  }
+
+  public int getPreviewY() {
+    if (previewContainer == null) return 0;
+    ViewGroup.LayoutParams layoutParams = previewContainer.getLayoutParams();
+    if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
+      // Return position relative to WebView content (subtract insets)
+      int margin = ((ViewGroup.MarginLayoutParams) layoutParams).topMargin;
+      int topInset = getWebViewTopInset();
+      int result = margin - topInset;
+      Log.d(
+        TAG,
+        "getPreviewY: topMargin=" +
+        margin +
+        ", topInset=" +
+        topInset +
+        ", result=" +
+        result
+      );
+      return result;
     }
-    public void setPreviewSize(int x, int y, int width, int height) {
-        setPreviewSize(x, y, width, height, null);
+    return previewContainer.getTop();
+  }
+
+  public int getPreviewWidth() {
+    return previewContainer != null ? previewContainer.getWidth() : 0;
+  }
+
+  public int getPreviewHeight() {
+    return previewContainer != null ? previewContainer.getHeight() : 0;
+  }
+
+  public void setPreviewSize(int x, int y, int width, int height) {
+    setPreviewSize(x, y, width, height, null);
+  }
+
+  public void setPreviewSize(
+    int x,
+    int y,
+    int width,
+    int height,
+    Runnable callback
+  ) {
+    if (previewContainer == null) {
+      if (callback != null) callback.run();
+      return;
     }
 
-    public void setPreviewSize(int x, int y, int width, int height, Runnable callback) {
-        if (previewContainer == null) {
-            if (callback != null) callback.run();
-            return;
+    // Ensure this runs on the main UI thread
+    mainExecutor.execute(() -> {
+      ViewGroup.LayoutParams layoutParams = previewContainer.getLayoutParams();
+      if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
+        ViewGroup.MarginLayoutParams params =
+          (ViewGroup.MarginLayoutParams) layoutParams;
+
+        // Only add insets for positioning coordinates, not for full-screen sizes
+        int webViewTopInset = getWebViewTopInset();
+        int webViewLeftInset = getWebViewLeftInset();
+
+        // Handle positioning - preserve current values if new values are not specified (negative)
+        if (x >= 0) {
+          // Don't add insets if this looks like a calculated full-screen coordinate (x=0, y=0)
+          if (x == 0 && y == 0) {
+            params.leftMargin = x;
+            Log.d(
+              TAG,
+              "setPreviewSize: Full-screen mode - keeping x=0 without insets"
+            );
+          } else {
+            params.leftMargin = x + webViewLeftInset;
+            Log.d(
+              TAG,
+              "setPreviewSize: Positioned mode - x=" +
+              x +
+              " + inset=" +
+              webViewLeftInset +
+              " = " +
+              (x + webViewLeftInset)
+            );
+          }
         }
-        
-        // Ensure this runs on the main UI thread
-        mainExecutor.execute(() -> {
-            ViewGroup.LayoutParams layoutParams = previewContainer.getLayoutParams();
-            if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
-                ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) layoutParams;
-                
-                // Only add insets for positioning coordinates, not for full-screen sizes
-                int webViewTopInset = getWebViewTopInset();
-                int webViewLeftInset = getWebViewLeftInset();
-                
-                // Handle positioning - preserve current values if new values are not specified (negative)
-                if (x >= 0) {
-                    // Don't add insets if this looks like a calculated full-screen coordinate (x=0, y=0)
-                    if (x == 0 && y == 0) {
-                        params.leftMargin = x;
-                        Log.d(TAG, "setPreviewSize: Full-screen mode - keeping x=0 without insets");
-                    } else {
-                        params.leftMargin = x + webViewLeftInset;
-                        Log.d(TAG, "setPreviewSize: Positioned mode - x=" + x + " + inset=" + webViewLeftInset + " = " + (x + webViewLeftInset));
-                    }
-                }
-                if (y >= 0) {
-                    // Don't add insets if this looks like a calculated full-screen coordinate (x=0, y=0)
-                    if (x == 0 && y == 0) {
-                        params.topMargin = y;
-                        Log.d(TAG, "setPreviewSize: Full-screen mode - keeping y=0 without insets");
-                    } else {
-                        params.topMargin = y + webViewTopInset;
-                        Log.d(TAG, "setPreviewSize: Positioned mode - y=" + y + " + inset=" + webViewTopInset + " = " + (y + webViewTopInset));
-                    }
-                } 
-                if (width > 0) params.width = width;
-                if (height > 0) params.height = height;
-                
-                previewContainer.setLayoutParams(params);
-                previewContainer.requestLayout();
-                
-                Log.d(TAG, "setPreviewSize: Updated to " + params.width + "x" + params.height + " at (" + params.leftMargin + "," + params.topMargin + ")");
-                
-                // Update session config to reflect actual layout
-                if (sessionConfig != null) {
-                    String currentAspectRatio = sessionConfig.getAspectRatio();
-                    
-                    // Calculate aspect ratio from actual dimensions if both width and height are provided
-                    String calculatedAspectRatio = currentAspectRatio;
-                    if (params.width > 0 && params.height > 0) {
-                        // Always use larger dimension / smaller dimension for consistent comparison
-                        float ratio = Math.max(params.width, params.height) / (float) Math.min(params.width, params.height);
-                        // Standard ratios: 16:9 ≈ 1.778, 4:3 ≈ 1.333
-                        float ratio16_9 = 16f / 9f; // 1.778
-                        float ratio4_3 = 4f / 3f;   // 1.333
-                        
-                        // Determine closest standard aspect ratio
-                        if (Math.abs(ratio - ratio16_9) < Math.abs(ratio - ratio4_3)) {
-                            calculatedAspectRatio = "16:9";
-                        } else {
-                            calculatedAspectRatio = "4:3";
-                        }
-                        Log.d(TAG, "setPreviewSize: Calculated aspect ratio from " + params.width + "x" + params.height + " = " + calculatedAspectRatio + " (normalized ratio=" + ratio + ")");
-                    }
-                    
-                    sessionConfig = new CameraSessionConfiguration(
-                            sessionConfig.getDeviceId(),
-                            sessionConfig.getPosition(),
-                            params.leftMargin,
-                            params.topMargin,
-                            params.width,
-                            params.height,
-                            sessionConfig.getPaddingBottom(),
-                            sessionConfig.getToBack(),
-                            sessionConfig.getStoreToFile(),
-                            sessionConfig.getEnableOpacity(),
-                            sessionConfig.getEnableZoom(),
-                            sessionConfig.getDisableExifHeaderStripping(),
-                            sessionConfig.getDisableAudio(),
-                            sessionConfig.getZoomFactor(),
-                            calculatedAspectRatio,
-                            sessionConfig.getGridMode()
-                    );
-                    
-                    // If aspect ratio changed due to size update, rebind camera
-                    if (isRunning && !Objects.equals(currentAspectRatio, calculatedAspectRatio)) {
-                        Log.d(TAG, "setPreviewSize: Aspect ratio changed from " + currentAspectRatio + " to " + calculatedAspectRatio + ", rebinding camera");
-                        bindCameraUseCases();
-                        
-                        // Wait for camera rebinding to complete, then call callback
-                        if (callback != null) {
-                            previewContainer.post(() -> previewContainer.post(callback));
-                        }
-                    } else {
-                        // No camera rebinding needed, wait for layout to complete then call callback
-                        if (callback != null) {
-                            previewContainer.post(callback);
-                        }
-                    }
-                } else {
-                    // No sessionConfig, just wait for layout then call callback
-                    if (callback != null) {
-                        previewContainer.post(callback);
-                    }
-                }
+        if (y >= 0) {
+          // Don't add insets if this looks like a calculated full-screen coordinate (x=0, y=0)
+          if (x == 0 && y == 0) {
+            params.topMargin = y;
+            Log.d(
+              TAG,
+              "setPreviewSize: Full-screen mode - keeping y=0 without insets"
+            );
+          } else {
+            params.topMargin = y + webViewTopInset;
+            Log.d(
+              TAG,
+              "setPreviewSize: Positioned mode - y=" +
+              y +
+              " + inset=" +
+              webViewTopInset +
+              " = " +
+              (y + webViewTopInset)
+            );
+          }
+        }
+        if (width > 0) params.width = width;
+        if (height > 0) params.height = height;
+
+        previewContainer.setLayoutParams(params);
+        previewContainer.requestLayout();
+
+        Log.d(
+          TAG,
+          "setPreviewSize: Updated to " +
+          params.width +
+          "x" +
+          params.height +
+          " at (" +
+          params.leftMargin +
+          "," +
+          params.topMargin +
+          ")"
+        );
+
+        // Update session config to reflect actual layout
+        if (sessionConfig != null) {
+          String currentAspectRatio = sessionConfig.getAspectRatio();
+
+          // Calculate aspect ratio from actual dimensions if both width and height are provided
+          String calculatedAspectRatio = currentAspectRatio;
+          if (params.width > 0 && params.height > 0) {
+            // Always use larger dimension / smaller dimension for consistent comparison
+            float ratio =
+              Math.max(params.width, params.height) /
+              (float) Math.min(params.width, params.height);
+            // Standard ratios: 16:9 ≈ 1.778, 4:3 ≈ 1.333
+            float ratio16_9 = 16f / 9f; // 1.778
+            float ratio4_3 = 4f / 3f; // 1.333
+
+            // Determine closest standard aspect ratio
+            if (Math.abs(ratio - ratio16_9) < Math.abs(ratio - ratio4_3)) {
+              calculatedAspectRatio = "16:9";
             } else {
-                Log.w(TAG, "setPreviewSize: Cannot set margins on layout params of type " + layoutParams.getClass().getSimpleName());
-                // Fallback: just set width and height if specified
-                if (width > 0) layoutParams.width = width;
-                if (height > 0) layoutParams.height = height;
-                previewContainer.setLayoutParams(layoutParams);
-                previewContainer.requestLayout();
-                
-                // Wait for layout then call callback
-                if (callback != null) {
-                    previewContainer.post(callback);
-                }
+              calculatedAspectRatio = "4:3";
             }
-        });
-    }
-    
-    private void updatePreviewLayoutForAspectRatio(String aspectRatio) {
-        updatePreviewLayoutForAspectRatio(aspectRatio, null, null);
-    }
-    
-    private void updatePreviewLayoutForAspectRatio(String aspectRatio, Float x, Float y) {
-        if (previewContainer == null || aspectRatio == null) return;
-        
-        // Parse aspect ratio
-        String[] ratios = aspectRatio.split(":");
-        if (ratios.length != 2) return;
-        
-        try {
-            // For camera, use portrait orientation: 4:3 becomes 3:4, 16:9 becomes 9:16
-            float ratio = Float.parseFloat(ratios[1]) / Float.parseFloat(ratios[0]);
-            
-            // Get available space from webview dimensions
-            int availableWidth = webView.getWidth();
-            int availableHeight = webView.getHeight();
-            
-            // Calculate position and size
-            int finalX, finalY, finalWidth, finalHeight;
-            
-            if (x != null && y != null) {
-                // Account for WebView insets from edge-to-edge support
-                int webViewTopInset = getWebViewTopInset();
-                int webViewLeftInset = getWebViewLeftInset();
-                
-                // Use provided coordinates with boundary checking, adjusted for insets
-                finalX = Math.max(0, Math.min(x.intValue() + webViewLeftInset, availableWidth));
-                finalY = Math.max(0, Math.min(y.intValue() + webViewTopInset, availableHeight));
-                
-                // Calculate maximum available space from the given position
-                int maxWidth = availableWidth - finalX;
-                int maxHeight = availableHeight - finalY;
-                
-                // Calculate optimal size while maintaining aspect ratio within available space
-                finalWidth = maxWidth;
-                finalHeight = (int) (maxWidth / ratio);
-                
-                if (finalHeight > maxHeight) {
-                    // Height constraint is tighter, fit by height
-                    finalHeight = maxHeight;
-                    finalWidth = (int) (maxHeight * ratio);
-                }
-                
-                // Ensure final position stays within bounds
-                finalX = Math.max(0, Math.min(finalX, availableWidth - finalWidth));
-                finalY = Math.max(0, Math.min(finalY, availableHeight - finalHeight));
-            } else {
-                // Auto-center the view
-                // Calculate size based on aspect ratio, using a reasonable base size
-                // Use 80% of available space to ensure aspect ratio differences are visible
-                int maxAvailableWidth = (int) (availableWidth * 0.8);
-                int maxAvailableHeight = (int) (availableHeight * 0.8);
-                
-                // Start with width-based calculation
-                finalWidth = maxAvailableWidth;
-                finalHeight = (int) (finalWidth / ratio);
-                
-                // If height exceeds available space, use height-based calculation
-                if (finalHeight > maxAvailableHeight) {
-                    finalHeight = maxAvailableHeight;
-                    finalWidth = (int) (finalHeight * ratio);
-                }
-                
-                // Center the view
-                finalX = (availableWidth - finalWidth) / 2;
-                finalY = (availableHeight - finalHeight) / 2;
-                
-                Log.d(TAG, "updatePreviewLayoutForAspectRatio: Auto-center mode - ratio=" + ratio + 
-                      ", calculated size=" + finalWidth + "x" + finalHeight + 
-                      ", available=" + availableWidth + "x" + availableHeight);
+            Log.d(
+              TAG,
+              "setPreviewSize: Calculated aspect ratio from " +
+              params.width +
+              "x" +
+              params.height +
+              " = " +
+              calculatedAspectRatio +
+              " (normalized ratio=" +
+              ratio +
+              ")"
+            );
+          }
+
+          sessionConfig = new CameraSessionConfiguration(
+            sessionConfig.getDeviceId(),
+            sessionConfig.getPosition(),
+            params.leftMargin,
+            params.topMargin,
+            params.width,
+            params.height,
+            sessionConfig.getPaddingBottom(),
+            sessionConfig.getToBack(),
+            sessionConfig.getStoreToFile(),
+            sessionConfig.getEnableOpacity(),
+            sessionConfig.getEnableZoom(),
+            sessionConfig.getDisableExifHeaderStripping(),
+            sessionConfig.getDisableAudio(),
+            sessionConfig.getZoomFactor(),
+            calculatedAspectRatio,
+            sessionConfig.getGridMode()
+          );
+
+          // If aspect ratio changed due to size update, rebind camera
+          if (
+            isRunning &&
+            !Objects.equals(currentAspectRatio, calculatedAspectRatio)
+          ) {
+            Log.d(
+              TAG,
+              "setPreviewSize: Aspect ratio changed from " +
+              currentAspectRatio +
+              " to " +
+              calculatedAspectRatio +
+              ", rebinding camera"
+            );
+            bindCameraUseCases();
+
+            // Wait for camera rebinding to complete, then call callback
+            if (callback != null) {
+              previewContainer.post(() -> previewContainer.post(callback));
             }
-            
-            // Update layout params
-            ViewGroup.LayoutParams currentParams = previewContainer.getLayoutParams();
-            if (currentParams instanceof ViewGroup.MarginLayoutParams) {
-                ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) currentParams;
-                params.width = finalWidth;
-                params.height = finalHeight;
-                params.leftMargin = finalX;
-                params.topMargin = finalY;
-                previewContainer.setLayoutParams(params);
-                previewContainer.requestLayout();
-                Log.d(TAG, "updatePreviewLayoutForAspectRatio: Updated to " + finalWidth + "x" + finalHeight + " at (" + finalX + "," + finalY + ")");
+          } else {
+            // No camera rebinding needed, wait for layout to complete then call callback
+            if (callback != null) {
+              previewContainer.post(callback);
             }
-        } catch (NumberFormatException e) {
-            Log.e(TAG, "Invalid aspect ratio format: " + aspectRatio, e);
+          }
+        } else {
+          // No sessionConfig, just wait for layout then call callback
+          if (callback != null) {
+            previewContainer.post(callback);
+          }
         }
-    }
-    
-    private void updatePreviewLayout() {
-        if (previewContainer == null || sessionConfig == null) return;
-        
-        String aspectRatio = sessionConfig.getAspectRatio();
-        if (aspectRatio == null) return;
-        
-        updatePreviewLayoutForAspectRatio(aspectRatio);
-    }
+      } else {
+        Log.w(
+          TAG,
+          "setPreviewSize: Cannot set margins on layout params of type " +
+          layoutParams.getClass().getSimpleName()
+        );
+        // Fallback: just set width and height if specified
+        if (width > 0) layoutParams.width = width;
+        if (height > 0) layoutParams.height = height;
+        previewContainer.setLayoutParams(layoutParams);
+        previewContainer.requestLayout();
+
+        // Wait for layout then call callback
+        if (callback != null) {
+          previewContainer.post(callback);
+        }
+      }
+    });
+  }
 
-    private int getWebViewTopInset() {
-        try {
-            if (webView != null) {
-                ViewGroup.LayoutParams layoutParams = webView.getLayoutParams();
-                if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
-                    return ((ViewGroup.MarginLayoutParams) layoutParams).topMargin;
-                }
-            }
-        } catch (Exception e) {
-            Log.w(TAG, "Failed to get WebView top inset", e);
+  private void updatePreviewLayoutForAspectRatio(String aspectRatio) {
+    updatePreviewLayoutForAspectRatio(aspectRatio, null, null);
+  }
+
+  private void updatePreviewLayoutForAspectRatio(
+    String aspectRatio,
+    Float x,
+    Float y
+  ) {
+    if (previewContainer == null || aspectRatio == null) return;
+
+    // Parse aspect ratio
+    String[] ratios = aspectRatio.split(":");
+    if (ratios.length != 2) return;
+
+    try {
+      // For camera, use portrait orientation: 4:3 becomes 3:4, 16:9 becomes 9:16
+      float ratio = Float.parseFloat(ratios[1]) / Float.parseFloat(ratios[0]);
+
+      // Get available space from webview dimensions
+      int availableWidth = webView.getWidth();
+      int availableHeight = webView.getHeight();
+
+      // Calculate position and size
+      int finalX, finalY, finalWidth, finalHeight;
+
+      if (x != null && y != null) {
+        // Account for WebView insets from edge-to-edge support
+        int webViewTopInset = getWebViewTopInset();
+        int webViewLeftInset = getWebViewLeftInset();
+
+        // Use provided coordinates with boundary checking, adjusted for insets
+        finalX = Math.max(
+          0,
+          Math.min(x.intValue() + webViewLeftInset, availableWidth)
+        );
+        finalY = Math.max(
+          0,
+          Math.min(y.intValue() + webViewTopInset, availableHeight)
+        );
+
+        // Calculate maximum available space from the given position
+        int maxWidth = availableWidth - finalX;
+        int maxHeight = availableHeight - finalY;
+
+        // Calculate optimal size while maintaining aspect ratio within available space
+        finalWidth = maxWidth;
+        finalHeight = (int) (maxWidth / ratio);
+
+        if (finalHeight > maxHeight) {
+          // Height constraint is tighter, fit by height
+          finalHeight = maxHeight;
+          finalWidth = (int) (maxHeight * ratio);
         }
-        return 0;
-    }
 
-    private int getWebViewLeftInset() {
-        try {
-            if (webView != null) {
-                ViewGroup.LayoutParams layoutParams = webView.getLayoutParams();
-                if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
-                    return ((ViewGroup.MarginLayoutParams) layoutParams).leftMargin;
-                }
-            }
-        } catch (Exception e) {
-            Log.w(TAG, "Failed to get WebView left inset", e);
+        // Ensure final position stays within bounds
+        finalX = Math.max(0, Math.min(finalX, availableWidth - finalWidth));
+        finalY = Math.max(0, Math.min(finalY, availableHeight - finalHeight));
+      } else {
+        // Auto-center the view
+        // Calculate size based on aspect ratio, using a reasonable base size
+        // Use 80% of available space to ensure aspect ratio differences are visible
+        int maxAvailableWidth = (int) (availableWidth * 0.8);
+        int maxAvailableHeight = (int) (availableHeight * 0.8);
+
+        // Start with width-based calculation
+        finalWidth = maxAvailableWidth;
+        finalHeight = (int) (finalWidth / ratio);
+
+        // If height exceeds available space, use height-based calculation
+        if (finalHeight > maxAvailableHeight) {
+          finalHeight = maxAvailableHeight;
+          finalWidth = (int) (finalHeight * ratio);
         }
-        return 0;
+
+        // Center the view
+        finalX = (availableWidth - finalWidth) / 2;
+        finalY = (availableHeight - finalHeight) / 2;
+
+        Log.d(
+          TAG,
+          "updatePreviewLayoutForAspectRatio: Auto-center mode - ratio=" +
+          ratio +
+          ", calculated size=" +
+          finalWidth +
+          "x" +
+          finalHeight +
+          ", available=" +
+          availableWidth +
+          "x" +
+          availableHeight
+        );
+      }
+
+      // Update layout params
+      ViewGroup.LayoutParams currentParams = previewContainer.getLayoutParams();
+      if (currentParams instanceof ViewGroup.MarginLayoutParams) {
+        ViewGroup.MarginLayoutParams params =
+          (ViewGroup.MarginLayoutParams) currentParams;
+        params.width = finalWidth;
+        params.height = finalHeight;
+        params.leftMargin = finalX;
+        params.topMargin = finalY;
+        previewContainer.setLayoutParams(params);
+        previewContainer.requestLayout();
+        Log.d(
+          TAG,
+          "updatePreviewLayoutForAspectRatio: Updated to " +
+          finalWidth +
+          "x" +
+          finalHeight +
+          " at (" +
+          finalX +
+          "," +
+          finalY +
+          ")"
+        );
+      }
+    } catch (NumberFormatException e) {
+      Log.e(TAG, "Invalid aspect ratio format: " + aspectRatio, e);
     }
+  }
+
+  private void updatePreviewLayout() {
+    if (previewContainer == null || sessionConfig == null) return;
 
-    /**
-     * Get the current preview position and size in DP units (without insets)
-     */
-    public int[] getCurrentPreviewBounds() {
-        if (previewContainer == null) {
-            return new int[]{0, 0, 0, 0}; // x, y, width, height
+    String aspectRatio = sessionConfig.getAspectRatio();
+    if (aspectRatio == null) return;
+
+    updatePreviewLayoutForAspectRatio(aspectRatio);
+  }
+
+  private int getWebViewTopInset() {
+    try {
+      if (webView != null) {
+        ViewGroup.LayoutParams layoutParams = webView.getLayoutParams();
+        if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
+          return ((ViewGroup.MarginLayoutParams) layoutParams).topMargin;
         }
-        
-        ViewGroup.LayoutParams layoutParams = previewContainer.getLayoutParams();
-        int x = 0, y = 0, width = 0, height = 0;
-        
+      }
+    } catch (Exception e) {
+      Log.w(TAG, "Failed to get WebView top inset", e);
+    }
+    return 0;
+  }
+
+  private int getWebViewLeftInset() {
+    try {
+      if (webView != null) {
+        ViewGroup.LayoutParams layoutParams = webView.getLayoutParams();
         if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
-            ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) layoutParams;
-            
-            // Remove insets to get original coordinates in DP
-            DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-            float pixelRatio = metrics.density;
-            
-            int webViewTopInset = getWebViewTopInset();
-            int webViewLeftInset = getWebViewLeftInset();
-            
-            x = Math.max(0, (int) ((params.leftMargin - webViewLeftInset) / pixelRatio));
-            y = Math.max(0, (int) ((params.topMargin - webViewTopInset) / pixelRatio));
-            width = (int) (params.width / pixelRatio);
-            height = (int) (params.height / pixelRatio);
+          return ((ViewGroup.MarginLayoutParams) layoutParams).leftMargin;
         }
-        
-        return new int[]{x, y, width, height};
+      }
+    } catch (Exception e) {
+      Log.w(TAG, "Failed to get WebView left inset", e);
+    }
+    return 0;
+  }
+
+  /**
+   * Get the current preview position and size in DP units (without insets)
+   */
+  public int[] getCurrentPreviewBounds() {
+    if (previewContainer == null) {
+      return new int[] { 0, 0, 0, 0 }; // x, y, width, height
     }
+
+    ViewGroup.LayoutParams layoutParams = previewContainer.getLayoutParams();
+    int x = 0, y = 0, width = 0, height = 0;
+
+    if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
+      ViewGroup.MarginLayoutParams params =
+        (ViewGroup.MarginLayoutParams) layoutParams;
+
+      // Remove insets to get original coordinates in DP
+      DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+      float pixelRatio = metrics.density;
+
+      int webViewTopInset = getWebViewTopInset();
+      int webViewLeftInset = getWebViewLeftInset();
+
+      x = Math.max(
+        0,
+        (int) ((params.leftMargin - webViewLeftInset) / pixelRatio)
+      );
+      y = Math.max(
+        0,
+        (int) ((params.topMargin - webViewTopInset) / pixelRatio)
+      );
+      width = (int) (params.width / pixelRatio);
+      height = (int) (params.height / pixelRatio);
+    }
+
+    return new int[] { x, y, width, height };
+  }
 }