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,22 +98,14 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
     }
   }
 
-  override fun requestLayout() {
-    super.requestLayout()
-    // Manually trigger measure & layout, as RN on Android skips those.
-    // See this issue: https://github.com/facebook/react-native/issues/17968#issuecomment-721958427
-    post {
-      measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY))
-      layout(left, top, right, bottom)
-    }
-  }
-
   private fun getSize(contentSize: Size, containerSize: Size, resizeMode: ResizeMode): Size {
     var contentSize = contentSize
-    // Swap dimensions if orientation is landscape
-    if (orientation.isLandscape()) {
+    var androidOrientation = context.getResources().getConfiguration().orientation;
+
+    if (androidOrientation == Configuration.ORIENTATION_LANDSCAPE) {
       contentSize = Size(contentSize.height, contentSize.width)
     }
+
     val contentAspectRatio = contentSize.width.toDouble() / contentSize.height
     val containerAspectRatio = containerSize.width.toDouble() / containerSize.height
     if (!(contentAspectRatio > 0 && containerAspectRatio > 0)) {

package/ios/Core/CameraSession+Video.swift

@@ -34,7 +34,7 @@ extension CameraSession {
       }
 
       let enableAudio = self.configuration?.audio != .disabled
-      
+
       // Callback for when new chunks are ready
       let onChunkReady: (ChunkedRecorder.Chunk) -> Void = { chunk in
         guard let delegate = self.delegate else {
@@ -191,7 +191,7 @@ extension CameraSession {
       }
     }
   }
-  
+
   func lockCurrentExposure(promise: Promise) {
     CameraQueues.cameraQueue.async {
       withPromise(promise) {
@@ -199,15 +199,19 @@ extension CameraSession {
           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
@@ -216,19 +220,19 @@ extension CameraSession {
           } 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) {
@@ -236,7 +240,7 @@ extension CameraSession {
           print("No capture device available")
           return
         }
-        
+
         do {
           if captureDevice.isExposureModeSupported(.autoExpose) {
             try captureDevice.lockForConfiguration()
@@ -246,7 +250,7 @@ extension CameraSession {
         } catch {
           ReactLogger.log(level: .warning, message:"Error unlocking exposure: \(error)")
         }
-        
+
         return nil
       }
     }