Merge pull request 'Fix Preview View Aspect Ratio Orientation Issues in android' (#8) from ivan/fix-android-preview-view-aspect-ratio-orientation-issues into main

Reviewed-on: #8

package/android/src/main/java/com/mrousavy/camera/core/PreviewView.kt

@@ -1,6 +1,7 @@
 package com.mrousavy.camera.core
 
 import android.annotation.SuppressLint
+import android.content.res.Configuration
 import android.content.Context
 import android.graphics.Point
 import android.util.Log
@@ -97,14 +98,47 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
     }
   }
 
-  override fun requestLayout() {
+  private fun getSize(contentSize: Size, containerSize: Size, resizeMode: ResizeMode): Size {
-    super.requestLayout()
+    var contentSize = contentSize
-    // Manually trigger measure & layout, as RN on Android skips those.
+    var androidOrientation = context.getResources().getConfiguration().orientation;
-    // See this issue: https://github.com/facebook/react-native/issues/17968#issuecomment-721958427
+
-    post {
+    if (androidOrientation == Configuration.ORIENTATION_LANDSCAPE) {
-      measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY))
+      contentSize = Size(contentSize.height, contentSize.width)
-      layout(left, top, right, bottom)
     }
+
+    val contentAspectRatio = contentSize.width.toDouble() / contentSize.height
+    val containerAspectRatio = containerSize.width.toDouble() / containerSize.height
+    if (!(contentAspectRatio > 0 && containerAspectRatio > 0)) {
+      // One of the aspect ratios is 0 or NaN, maybe the view hasn't been laid out yet.
+      return contentSize
+    }
+
+    val widthOverHeight = when (resizeMode) {
+      ResizeMode.COVER -> contentAspectRatio > containerAspectRatio
+      ResizeMode.CONTAIN -> contentAspectRatio < containerAspectRatio
+    }
+
+    return if (widthOverHeight) {
+      // Scale by width to cover height
+      val scaledWidth = containerSize.height * contentAspectRatio
+      Size(scaledWidth.roundToInt(), containerSize.height)
+    } else {
+      // Scale by height to cover width
+      val scaledHeight = containerSize.width / contentAspectRatio
+      Size(containerSize.width, scaledHeight.roundToInt())
+    }
+  }
+
+  @SuppressLint("DrawAllocation")
+  override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+
+    val measuredViewSize = Size(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec))
+    val surfaceSize = size.rotatedBy(inputOrientation)
+    val fittedSize = getSize(surfaceSize, measuredViewSize, resizeMode)
+
+    Log.i(TAG, "PreviewView is $measuredViewSize rendering $surfaceSize orientation ($orientation). Resizing to: $fittedSize ($resizeMode)")
+    setMeasuredDimension(fittedSize.width, fittedSize.height)
   }
 
   companion object {

package/ios/CameraView+RecordVideo.swift

@@ -50,4 +50,12 @@ extension CameraView: AVCaptureVideoDataOutputSampleBufferDelegate, AVCaptureAud
   func resumeRecording(promise: Promise) {
     cameraSession.resumeRecording(promise: promise)
   }
+  
+  func lockExposure(promise: Promise) {
+    cameraSession.lockCurrentExposure(promise: promise)
+  }
+  
+  func unlockExposure(promise: Promise) {
+    cameraSession.unlockCurrentExposure(promise: promise)
+  }
 }

package/ios/CameraViewManager.m

@@ -86,5 +86,13 @@ RCT_EXTERN_METHOD(focus
                   : (NSDictionary*)point resolve
                   : (RCTPromiseResolveBlock)resolve reject
                   : (RCTPromiseRejectBlock)reject);
+RCT_EXTERN_METHOD(lockCurrentExposure
+                  : (nonnull NSNumber*)node resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject);
+RCT_EXTERN_METHOD(unlockCurrentExposure
+                  : (nonnull NSNumber*)node resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject);
 
 @end

package/ios/CameraViewManager.swift

@@ -111,6 +111,18 @@ final class CameraViewManager: RCTViewManager {
     }
   }
   
+  @objc
+  final func lockCurrentExposure(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    let component = getCameraView(withTag: node)
+    component.lockExposure(promise: Promise(resolver: resolve, rejecter: reject))
+  }
+  
+  @objc
+  final func unlockCurrentExposure(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    let component = getCameraView(withTag: node)
+    component.unlockExposure(promise: Promise(resolver: resolve, rejecter: reject))
+  }
+
   // MARK: Private
 
   private func getCameraView(withTag tag: NSNumber) -> CameraView {

package/ios/Core/CameraSession+Video.swift

@@ -191,4 +191,68 @@ extension CameraSession {
       }
     }
   }
+
+  func lockCurrentExposure(promise: Promise) {
+    CameraQueues.cameraQueue.async {
+      withPromise(promise) {
+        guard let captureDevice = AVCaptureDevice.default(for: .video) else {
+          print("No capture device available")
+          return
+        }
+
+        guard captureDevice.isExposureModeSupported(.custom) else {
+          ReactLogger.log(level: .info, message: "Custom exposure mode not supported")
+          return
+        }
+        do {
+          // Lock the device for configuration
+          try captureDevice.lockForConfiguration()
+
+          // Get the current exposure duration and ISO
+          let currentExposureDuration = captureDevice.exposureDuration
+          let currentISO = captureDevice.iso
+
+          // Check if the device supports custom exposure settings
+          if captureDevice.isExposureModeSupported(.custom) {
+            // Lock the current exposure and ISO by setting custom exposure mode
+            captureDevice.setExposureModeCustom(duration: currentExposureDuration, iso: currentISO, completionHandler: nil)
+            ReactLogger.log(level: .info, message: "Exposure and ISO locked at current values")
+          } else {
+            ReactLogger.log(level: .info, message:"Custom exposure mode not supported")
+          }
+
+          // Unlock the device after configuration
+          captureDevice.unlockForConfiguration()
+
+        } catch {
+          ReactLogger.log(level: .warning, message:"Error locking exposure: \(error)")
+        }
+
+        return nil
+      }
+    }
+  }
+
+  func unlockCurrentExposure(promise: Promise) {
+    CameraQueues.cameraQueue.async {
+      withPromise(promise) {
+        guard let captureDevice = AVCaptureDevice.default(for: .video) else {
+          print("No capture device available")
+          return
+        }
+
+        do {
+          if captureDevice.isExposureModeSupported(.autoExpose) {
+            try captureDevice.lockForConfiguration()
+            captureDevice.exposureMode = .continuousAutoExposure
+            captureDevice.unlockForConfiguration()
+          }
+        } catch {
+          ReactLogger.log(level: .warning, message:"Error unlocking exposure: \(error)")
+        }
+
+        return nil
+      }
+    }
+  }
 }

package/src/Camera.tsx

@@ -319,6 +319,22 @@ export class Camera extends React.PureComponent<CameraProps, CameraState> {
       throw tryParseNativeCameraError(e)
     }
   }
+
+  public async lockCurrentExposure(): Promise<void> {
+    try {
+      return await CameraModule.lockCurrentExposure(this.handle)
+    } catch (e) {
+      throw tryParseNativeCameraError(e)
+    }
+  }
+
+  public async unlockCurrentExposure(): Promise<void> {
+    try {
+      return await CameraModule.unlockCurrentExposure(this.handle)
+    } catch (e) {
+      throw tryParseNativeCameraError(e)
+    }
+  }
   //#endregion
 
   //#region Static Functions (NativeModule)