@capgo/camera-preview 8.1.4 → 8.2.0

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

@@ -172,6 +172,29 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     private final Object accelerometerLock = new Object();
     private volatile int lastCaptureRotation = -1; // -1 unknown
 
+    // Compass heading (degrees, 0-360, true north); -1 means not yet available
+    private Sensor rotationVectorSensor;
+    private volatile float lastCompassHeading = -1f;
+
+    private final SensorEventListener rotationVectorListener = new SensorEventListener() {
+        @Override
+        public void onSensorChanged(SensorEvent event) {
+            if (event.sensor.getType() == Sensor.TYPE_ROTATION_VECTOR) {
+                float[] rotationMatrix = new float[9];
+                SensorManager.getRotationMatrixFromVector(rotationMatrix, event.values);
+                float[] orientation = new float[3];
+                SensorManager.getOrientation(rotationMatrix, orientation);
+                float azimuthDeg = (float) Math.toDegrees(orientation[0]);
+                lastCompassHeading = (azimuthDeg + 360) % 360;
+            }
+        }
+
+        @Override
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
+            // Not needed
+        }
+    };
+
     private final SensorEventListener accelerometerListener = new SensorEventListener() {
         @Override
         public void onSensorChanged(SensorEvent event) {
@@ -382,10 +405,15 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
         if (sensorManager == null) {
             sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
             accelerometer = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+            rotationVectorSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR);
         }
         if (accelerometer != null) {
             sensorManager.registerListener(accelerometerListener, accelerometer, SensorManager.SENSOR_DELAY_UI);
         }
+        if (rotationVectorSensor != null) {
+            sensorManager.registerListener(rotationVectorListener, rotationVectorSensor, SensorManager.SENSOR_DELAY_NORMAL);
+        }
+        lastCompassHeading = -1f;
         synchronized (operationLock) {
             activeOperations = 0;
             stopPending = false;
@@ -436,10 +464,13 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
 
     private void performImmediateStop() {
         isRunning = false;
-        // Stop accelerometer
+        // Stop accelerometer and rotation vector sensor
         if (sensorManager != null && accelerometer != null) {
             sensorManager.unregisterListener(accelerometerListener);
         }
+        if (sensorManager != null && rotationVectorSensor != null) {
+            sensorManager.unregisterListener(rotationVectorListener);
+        }
         // Cancel any ongoing focus operation when stopping session
         if (currentFocusFuture != null && !currentFocusFuture.isDone()) {
             currentFocusFuture.cancel(true);
@@ -1222,6 +1253,8 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
                             int finalWidthOut = -1;
                             int finalHeightOut = -1;
                             boolean transformedPixels = false;
+                            // Snapshot compass heading at capture time for EXIF injection
+                            final float captureCompassHeading = lastCompassHeading;
 
                             ExifInterface exifInterface = new ExifInterface(new ByteArrayInputStream(originalCaptureBytes));
                             // Build EXIF JSON from captured bytes (location applied by metadata if provided)
@@ -1290,6 +1323,17 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
                                 bytes = injectExifInMemory(bytes, originalCaptureBytes, fW, fH);
                             }
 
+                            // Inject GPS image direction (compass heading) when a location was requested
+                            if (location != null && captureCompassHeading >= 0) {
+                                bytes = injectGpsHeadingIntoExif(bytes, captureCompassHeading);
+                                try {
+                                    exifData.put("GPSImgDirection", String.valueOf(captureCompassHeading));
+                                    exifData.put("GPSImgDirectionRef", "T");
+                                } catch (Exception e) {
+                                    Log.d(TAG, "capturePhoto: Failed to update EXIF JSON with heading data", e);
+                                }
+                            }
+
                             // Save to gallery asynchronously if requested, copy EXIF to file
                             if (saveToGallery) {
                                 final byte[] finalBytes = bytes;
@@ -1624,6 +1668,44 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
         }
     }
 
+    // Inject GPS image direction (compass heading) into a JPEG in memory using Apache Commons Imaging
+    private byte[] injectGpsHeadingIntoExif(byte[] jpeg, float headingDegrees) {
+        try {
+            org.apache.commons.imaging.formats.jpeg.JpegImageMetadata jpegMetadata =
+                (org.apache.commons.imaging.formats.jpeg.JpegImageMetadata) org.apache.commons.imaging.Imaging.getMetadata(jpeg);
+            org.apache.commons.imaging.formats.tiff.TiffImageMetadata exif = jpegMetadata != null ? jpegMetadata.getExif() : null;
+
+            org.apache.commons.imaging.formats.tiff.write.TiffOutputSet outputSet = exif != null
+                ? exif.getOutputSet()
+                : new org.apache.commons.imaging.formats.tiff.write.TiffOutputSet();
+
+            org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory gpsDir = outputSet.getOrCreateGpsDirectory();
+
+            gpsDir.removeField(org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF);
+            gpsDir.add(
+                org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF,
+                org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF_VALUE_MAGNETIC_NORTH
+            );
+
+            gpsDir.removeField(org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION);
+            gpsDir.add(
+                org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION,
+                org.apache.commons.imaging.common.RationalNumber.valueOf(headingDegrees)
+            );
+
+            java.io.ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
+            new org.apache.commons.imaging.formats.jpeg.exif.ExifRewriter().updateExifMetadataLossless(
+                new java.io.ByteArrayInputStream(jpeg),
+                out,
+                outputSet
+            );
+            return out.toByteArray();
+        } catch (Throwable t) {
+            Log.w(TAG, "injectGpsHeadingIntoExif: Failed to inject heading EXIF", t);
+            return jpeg;
+        }
+    }
+
     private void updateResizedDimensions(
         org.apache.commons.imaging.formats.tiff.write.TiffOutputSet outputSet,
         Integer finalWidth,
@@ -2251,10 +2333,11 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
         MeteringPointFactory factory = previewView.getMeteringPointFactory();
         MeteringPoint point = factory.createPoint(x * viewWidth, y * viewHeight);
 
-        // Create focus and metering action (persistent, no auto-cancel) to match iOS behavior
-        FocusMeteringAction action = new FocusMeteringAction.Builder(point, FocusMeteringAction.FLAG_AF | FocusMeteringAction.FLAG_AE)
-            .disableAutoCancel()
-            .build();
+        // Create focus and metering action (resets after time to allow for auto focusing on movement later)
+        FocusMeteringAction action = new FocusMeteringAction.Builder(
+            point,
+            FocusMeteringAction.FLAG_AF | FocusMeteringAction.FLAG_AE
+        ).build();
 
         if (IsOperationRunning("setFocus")) {
             Log.d(TAG, "setFocus: Ignored because stop is pending");

package/ios/Sources/CapgoCameraPreviewPlugin/CameraController.swift

@@ -56,6 +56,43 @@ class CameraController: NSObject {
         }
     }
 
+    // Continuous focus with significant movement if focus was locked from setFocus earlier
+    @objc private func subjectAreaDidChange(notification: NSNotification) {
+        guard let device = self.currentCameraPosition == .rear ? rearCamera : frontCamera else { return }
+
+        do {
+            try device.lockForConfiguration()
+            defer { device.unlockForConfiguration() }
+
+            // Reset Focus to the center and make it continuous
+            if device.isFocusModeSupported(.continuousAutoFocus) {
+                device.focusMode = .continuousAutoFocus
+                if device.isFocusPointOfInterestSupported {
+                    device.focusPointOfInterest = CGPoint(x: 0.5, y: 0.5)
+                }
+            }
+
+            // 2. Reset Exposure to the center ONLY if it is not explicitly locked
+            if device.exposureMode != .locked {
+                if device.isExposureModeSupported(.continuousAutoExposure) {
+                    device.exposureMode = .continuousAutoExposure
+                    if device.isExposurePointOfInterestSupported {
+                        device.exposurePointOfInterest = CGPoint(x: 0.5, y: 0.5)
+                    }
+                    device.setExposureTargetBias(0.0) { _ in }
+                }
+            }
+
+            // 3. Turn off monitoring until the user taps to focus again
+            device.isSubjectAreaChangeMonitoringEnabled = false
+
+            print("[CameraPreview] Phone moved: Reset focus. Exposure reset skipped if locked.")
+
+        } catch {
+            print("[CameraPreview] Failed to reset focus after subject area change: \(error)")
+        }
+    }
+
     var captureSession: AVCaptureSession?
     var disableFocusIndicator: Bool = false
 
@@ -446,6 +483,10 @@ extension CameraController {
                 // Set initial zoom
                 self.setInitialZoom(level: initialZoomLevel)
 
+                // Set up listener for change in subject area of camera feed
+                NotificationCenter.default.removeObserver(self, name: .AVCaptureDeviceSubjectAreaDidChange, object: nil)
+                NotificationCenter.default.addObserver(self, selector: #selector(self.subjectAreaDidChange), name: .AVCaptureDeviceSubjectAreaDidChange, object: nil)
+
                 // Start the session - all outputs are already configured
                 captureSession.startRunning()
 
@@ -1827,6 +1868,9 @@ extension CameraController {
                 }
             }
 
+            // Turn on subject area monitor for switch to continuous focus if needed
+            device.isSubjectAreaChangeMonitoringEnabled = true
+
             device.unlockForConfiguration()
         } catch {
             throw CameraControllerError.unknown
@@ -1999,6 +2043,8 @@ extension CameraController {
             captureSession.inputs.forEach { captureSession.removeInput($0) }
             captureSession.outputs.forEach { captureSession.removeOutput($0) }
         }
+        // Remove listener for subject area change
+        NotificationCenter.default.removeObserver(self, name: .AVCaptureDeviceSubjectAreaDidChange, object: nil)
 
         self.motionManager.stopAccelerometerUpdates()
         self.previewLayer?.removeFromSuperlayer()
@@ -2240,7 +2286,7 @@ extension CameraController {
             if connection.isEnabled == false { connection.isEnabled = true }
             // Goes off accelerometer now
             connection.videoOrientation = self.getPhysicalOrientation()
-            
+
             // Front camera: mirror the recorded video so it looks natural (selfie style).
             if self.currentCameraPosition == .front, connection.isVideoMirroringSupported {
                 connection.isVideoMirrored = true
@@ -2317,6 +2363,10 @@ extension CameraController: UIGestureRecognizerDelegate {
                     device.setExposureTargetBias(0.0) { _ in }
                 }
             }
+
+            // Turn on subject area monitor for switch to continuous focus if needed
+            device.isSubjectAreaChangeMonitoringEnabled = true
+
         } catch {
             debugPrint(error)
         }

package/ios/Sources/CapgoCameraPreviewPlugin/Plugin.swift

@@ -34,7 +34,7 @@ extension UIWindow {
  */
 @objc(CameraPreview)
 public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelegate {
-    private let pluginVersion: String = "8.1.4"
+    private let pluginVersion: String = "8.2.0"
     public let identifier = "CameraPreviewPlugin"
     public let jsName = "CameraPreview"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -100,6 +100,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
     var disableFocusIndicator: Bool = false
     var locationManager: CLLocationManager?
     var currentLocation: CLLocation?
+    var currentHeading: CLHeading?
     private var aspectRatio: String?
     private var aspectMode: String = "contain"
     private var gridMode: String = "none"
@@ -1211,6 +1212,13 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             print("[CameraPreview] captureImage callback received")
             DispatchQueue.main.async {
                 print("[CameraPreview] Processing capture on main thread")
+                // Ensure heading updates are stopped on all exit paths (error, guard failure, or success)
+                defer {
+                    if withExifLocation ?? false {
+                        self.locationManager?.stopUpdatingHeading()
+                        self.currentHeading = nil
+                    }
+                }
                 if let error = error {
                     print("[CameraPreview] Capture error: \(error.localizedDescription)")
                     call.reject(error.localizedDescription)
@@ -1222,6 +1230,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                         from: image,
                         quality: Int(quality),
                         location: withExifLocation ? self.currentLocation : nil,
+                        heading: withExifLocation ? self.currentHeading : nil,
                         originalPhotoData: originalPhotoData
                       )
                 else {
@@ -1358,7 +1367,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         }
     }
 
-    private func createImageDataWithExif(from image: UIImage, quality: Int, location: CLLocation?, originalPhotoData: Data?) -> Data? {
+    private func createImageDataWithExif(from image: UIImage, quality: Int, location: CLLocation?, heading: CLHeading?, originalPhotoData: Data?) -> Data? {
         guard let jpegDataAtQuality = image.jpegData(compressionQuality: CGFloat(Double(quality) / 100.0)) else {
             return nil
         }
@@ -1387,7 +1396,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZ"
             formatter.timeZone = TimeZone(abbreviation: "UTC")
 
-            let gpsDict: [String: Any] = [
+            var gpsDict: [String: Any] = [
                 kCGImagePropertyGPSLatitude as String: abs(location.coordinate.latitude),
                 kCGImagePropertyGPSLatitudeRef as String: location.coordinate.latitude >= 0 ? "N" : "S",
                 kCGImagePropertyGPSLongitude as String: abs(location.coordinate.longitude),
@@ -1397,6 +1406,21 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                 kCGImagePropertyGPSAltitudeRef as String: location.altitude >= 0 ? 0 : 1
             ]
 
+            // Add image direction (compass heading) when available
+            if let heading = heading {
+                let directionDegrees: Double
+                let directionRef: String
+                if heading.trueHeading >= 0 {
+                    directionDegrees = heading.trueHeading
+                    directionRef = "T"
+                } else {
+                    directionDegrees = heading.magneticHeading
+                    directionRef = "M"
+                }
+                gpsDict[kCGImagePropertyGPSImgDirection as String] = directionDegrees
+                gpsDict[kCGImagePropertyGPSImgDirectionRef as String] = directionRef
+            }
+
             finalProperties[kCGImagePropertyGPSDictionary as String] = gpsDict
         }
 
@@ -1836,9 +1860,14 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
 
     private func getCurrentLocation(completion: @escaping (CLLocation?) -> Void) {
         print("[CameraPreview] getCurrentLocation called")
+        self.currentHeading = nil
         self.locationCompletion = completion
         self.locationManager?.startUpdatingLocation()
         print("[CameraPreview] Started updating location")
+        if CLLocationManager.headingAvailable() {
+            self.locationManager?.startUpdatingHeading()
+            print("[CameraPreview] Started updating heading")
+        }
     }
 
     private var locationCompletion: ((CLLocation?) -> Void)?
@@ -1856,6 +1885,13 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         }
     }
 
+    public func locationManager(_ manager: CLLocationManager, didUpdateHeading newHeading: CLHeading) {
+        print("[CameraPreview] locationManager didUpdateHeading: trueHeading=\(newHeading.trueHeading), magneticHeading=\(newHeading.magneticHeading), accuracy=\(newHeading.headingAccuracy)")
+        if newHeading.headingAccuracy >= 0 {
+            self.currentHeading = newHeading
+        }
+    }
+
     private func saveImageDataToGallery(imageData: Data, completion: @escaping (Bool, Error?) -> Void) {
         // Check if NSPhotoLibraryUsageDescription is present in Info.plist
         guard Bundle.main.object(forInfoDictionaryKey: "NSPhotoLibraryUsageDescription") != nil else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/camera-preview",
-  "version": "8.1.4",
+  "version": "8.2.0",
   "description": "Camera preview",
   "license": "MPL-2.0",
   "repository": {