@capgo/camera-preview 7.4.0-alpha.3 → 7.4.0-alpha.4

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

@@ -102,6 +102,7 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
   private GridOverlayView gridOverlayView;
   private FrameLayout previewContainer;
   private View focusIndicatorView;
+  private long focusIndicatorAnimationId = 0; // Incrementing token to invalidate previous animations
   private CameraSelector currentCameraSelector;
   private String currentDeviceId;
   private int currentFlashMode = ImageCapture.FLASH_MODE_OFF;
@@ -1776,8 +1777,11 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
       return;
     }
 
-    // Remove any existing focus indicator
+    // Remove any existing focus indicator and cancel its animation
     if (focusIndicatorView != null) {
+      try {
+        focusIndicatorView.clearAnimation();
+      } catch (Exception ignore) {}
       previewContainer.removeView(focusIndicatorView);
       focusIndicatorView = null;
     }
@@ -1811,6 +1815,9 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     container.setBackground(drawable);
 
     focusIndicatorView = container;
+    // Bump animation token; everything after this must validate against this token
+    final long thisAnimationId = ++focusIndicatorAnimationId;
+    final View thisIndicatorView = focusIndicatorView;
 
     // Set initial state for smooth animation
     focusIndicatorView.setAlpha(1f); // Start visible
@@ -1863,7 +1870,12 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
       new Runnable() {
         @Override
         public void run() {
-          if (focusIndicatorView != null) {
+          // Ensure this runnable belongs to the latest indicator
+          if (
+            focusIndicatorView != null &&
+            thisIndicatorView == focusIndicatorView &&
+            thisAnimationId == focusIndicatorAnimationId
+          ) {
             // Smooth fade to semi-transparent
             AlphaAnimation fadeToTransparent = new AlphaAnimation(1f, 0.4f);
             fadeToTransparent.setDuration(400);
@@ -1885,7 +1897,11 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
                     "showFocusIndicator: Fade to transparent ended, starting final fade out"
                   );
                   // Final smooth fade out and scale down
-                  if (focusIndicatorView != null) {
+                  if (
+                    focusIndicatorView != null &&
+                    thisIndicatorView == focusIndicatorView &&
+                    thisAnimationId == focusIndicatorAnimationId
+                  ) {
                     AnimationSet finalAnimation = new AnimationSet(false);
 
                     AlphaAnimation finalFadeOut = new AlphaAnimation(0.4f, 0f);
@@ -1933,8 +1949,13 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
                           // Remove the focus indicator
                           if (
                             focusIndicatorView != null &&
-                            previewContainer != null
+                            previewContainer != null &&
+                            thisIndicatorView == focusIndicatorView &&
+                            thisAnimationId == focusIndicatorAnimationId
                           ) {
+                            try {
+                              focusIndicatorView.clearAnimation();
+                            } catch (Exception ignore) {}
                             previewContainer.removeView(focusIndicatorView);
                             focusIndicatorView = null;
                           }
@@ -1945,7 +1966,12 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
                       }
                     );
 
-                    focusIndicatorView.startAnimation(finalAnimation);
+                    if (
+                      thisIndicatorView == focusIndicatorView &&
+                      thisAnimationId == focusIndicatorAnimationId
+                    ) {
+                      focusIndicatorView.startAnimation(finalAnimation);
+                    }
                   }
                 }
 
@@ -1954,7 +1980,12 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
               }
             );
 
-            focusIndicatorView.startAnimation(fadeToTransparent);
+            if (
+              thisIndicatorView == focusIndicatorView &&
+              thisAnimationId == focusIndicatorAnimationId
+            ) {
+              focusIndicatorView.startAnimation(fadeToTransparent);
+            }
           }
         }
       },

package/ios/Sources/CapgoCameraPreviewPlugin/CameraController.swift

@@ -25,7 +25,7 @@ class CameraController: NSObject {
     var focusIndicatorView: UIView?
 
     var flashMode = AVCaptureDevice.FlashMode.off
-    var photoCaptureCompletionBlock: ((UIImage?, Error?) -> Void)?
+    var photoCaptureCompletionBlock: ((UIImage?, Data?, [AnyHashable: Any]?, Error?) -> Void)?
 
     var sampleBufferCaptureCompletionBlock: ((UIImage?, Error?) -> Void)?
 
@@ -555,11 +555,11 @@ extension CameraController {
         self.updateVideoOrientation()
     }
 
-    func captureImage(width: Int?, height: Int?, aspectRatio: String?, quality: Float, gpsLocation: CLLocation?, completion: @escaping (UIImage?, Error?) -> Void) {
+    func captureImage(width: Int?, height: Int?, aspectRatio: String?, quality: Float, gpsLocation: CLLocation?, completion: @escaping (UIImage?, Data?, [AnyHashable: Any]?, Error?) -> Void) {
         print("[CameraPreview] captureImage called - width: \(width ?? -1), height: \(height ?? -1), aspectRatio: \(aspectRatio ?? "nil")")
 
         guard let photoOutput = self.photoOutput else {
-            completion(nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Photo output is not available"]))
+            completion(nil, nil, nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Photo output is not available"]))
             return
         }
 
@@ -585,14 +585,14 @@ extension CameraController {
             }
         }
 
-        self.photoCaptureCompletionBlock = { (image, error) in
+        self.photoCaptureCompletionBlock = { (image, photoData, metadata, error) in
             if let error = error {
-                completion(nil, error)
+                completion(nil, nil, nil, error)
                 return
             }
 
             guard let image = image else {
-                completion(nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Failed to capture image"]))
+                completion(nil, nil, nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Failed to capture image"]))
                 return
             }
 
@@ -646,7 +646,7 @@ extension CameraController {
                 }
             }
 
-            completion(finalImage, nil)
+            completion(finalImage, photoData, metadata, nil)
         }
 
         photoOutput.capturePhoto(with: settings, delegate: self)
@@ -1460,22 +1460,23 @@ extension CameraController: UIGestureRecognizerDelegate {
 extension CameraController: AVCapturePhotoCaptureDelegate {
     public func photoOutput(_ output: AVCapturePhotoOutput, didFinishProcessingPhoto photo: AVCapturePhoto, error: Error?) {
         if let error = error {
-            self.photoCaptureCompletionBlock?(nil, error)
+            self.photoCaptureCompletionBlock?(nil, nil, nil, error)
             return
         }
 
         // Get the photo data using the modern API
         guard let imageData = photo.fileDataRepresentation() else {
-            self.photoCaptureCompletionBlock?(nil, CameraControllerError.unknown)
+            self.photoCaptureCompletionBlock?(nil, nil, nil, CameraControllerError.unknown)
             return
         }
 
         guard let image = UIImage(data: imageData) else {
-            self.photoCaptureCompletionBlock?(nil, CameraControllerError.unknown)
+            self.photoCaptureCompletionBlock?(nil, nil, nil, CameraControllerError.unknown)
             return
         }
 
-        self.photoCaptureCompletionBlock?(image.fixedOrientation(), nil)
+        // Pass through original file data and metadata so callers can preserve EXIF
+        self.photoCaptureCompletionBlock?(image.fixedOrientation(), imageData, photo.metadata, nil)
     }
 }
 

package/ios/Sources/CapgoCameraPreviewPlugin/Plugin.swift

@@ -705,7 +705,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         print("[CameraPreview] Current location: \(self.currentLocation?.description ?? "nil")")
         print("[CameraPreview] Preview dimensions: \(self.previewView.frame.width)x\(self.previewView.frame.height)")
 
-        self.cameraController.captureImage(width: width, height: height, aspectRatio: captureAspectRatio, quality: quality, gpsLocation: self.currentLocation) { (image, error) in
+        self.cameraController.captureImage(width: width, height: height, aspectRatio: captureAspectRatio, quality: quality, gpsLocation: self.currentLocation) { (image, originalPhotoData, originalMetadata, error) in
             print("[CameraPreview] captureImage callback received")
             DispatchQueue.main.async {
                 print("[CameraPreview] Processing capture on main thread")
@@ -719,7 +719,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                       let imageDataWithExif = self.createImageDataWithExif(
                         from: image,
                         quality: Int(quality),
-                        location: withExifLocation ? self.currentLocation : nil
+                        location: withExifLocation ? self.currentLocation : nil,
+                        originalPhotoData: originalPhotoData
                       )
                 else {
                     print("[CameraPreview] Failed to create image data with EXIF")
@@ -792,24 +793,29 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         return exifData
     }
 
-    private func createImageDataWithExif(from image: UIImage, quality: Int, location: CLLocation?) -> Data? {
-        guard let originalImageData = image.jpegData(compressionQuality: CGFloat(Double(quality) / 100.0)) else {
+    private func createImageDataWithExif(from image: UIImage, quality: Int, location: CLLocation?, originalPhotoData: Data?) -> Data? {
+        guard let jpegDataAtQuality = image.jpegData(compressionQuality: CGFloat(Double(quality) / 100.0)) else {
             return nil
         }
 
-        guard let imageSource = CGImageSourceCreateWithData(originalImageData as CFData, nil),
+        // Prefer metadata from the original AVCapturePhoto file data to preserve lens/EXIF
+        let sourceDataForMetadata = (originalPhotoData ?? jpegDataAtQuality) as CFData
+        guard let imageSource = CGImageSourceCreateWithData(sourceDataForMetadata, nil),
               let imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, nil) as? [String: Any],
               let cgImage = image.cgImage else {
-            return originalImageData
+            return jpegDataAtQuality
         }
 
         let mutableData = NSMutableData()
         guard let destination = CGImageDestinationCreateWithData(mutableData, kUTTypeJPEG, 1, nil) else {
-            return originalImageData
+            return jpegDataAtQuality
         }
 
         var finalProperties = imageProperties
 
+        // Ensure orientation reflects the pixel data (we pass an orientation-fixed UIImage)
+        finalProperties[kCGImagePropertyOrientation as String] = 1
+
         // Add GPS location if available
         if let location = location {
             let formatter = DateFormatter()
@@ -829,10 +835,11 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             finalProperties[kCGImagePropertyGPSDictionary as String] = gpsDict
         }
 
-        // Create or update TIFF dictionary for device info
+        // Create or update TIFF dictionary for device info and set orientation to Up
         var tiffDict = finalProperties[kCGImagePropertyTIFFDictionary as String] as? [String: Any] ?? [:]
         tiffDict[kCGImagePropertyTIFFMake as String] = "Apple"
         tiffDict[kCGImagePropertyTIFFModel as String] = UIDevice.current.model
+        tiffDict[kCGImagePropertyTIFFOrientation as String] = 1
         finalProperties[kCGImagePropertyTIFFDictionary as String] = tiffDict
 
         CGImageDestinationAddImage(destination, cgImage, finalProperties as CFDictionary)
@@ -841,7 +848,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             return mutableData as Data
         }
 
-        return originalImageData
+        return jpegDataAtQuality
     }
 
     @objc func captureSample(_ call: CAPPluginCall) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/camera-preview",
-  "version": "7.4.0-alpha.3",
+  "version": "7.4.0-alpha.4",
   "description": "Camera preview",
   "license": "MIT",
   "repository": {