Account for orientation in PreviewView

package/android/src/main/java/com/mrousavy/camera/CameraView.kt

@@ -72,6 +72,10 @@ class CameraView(context: Context) :
   var zoom: Float = 1f // in "factor"
   var exposure: Double = 1.0
   var orientation: Orientation = Orientation.PORTRAIT
+      set(value) {
+        field = value
+        previewView.orientation = value
+      }
   var enableZoomGesture = false
     set(value) {
       field = value

package/android/src/main/java/com/mrousavy/camera/CameraViewManager.kt

@@ -10,6 +10,7 @@ import com.mrousavy.camera.types.CodeScannerOptions
 import com.mrousavy.camera.types.Orientation
 import com.mrousavy.camera.types.PixelFormat
 import com.mrousavy.camera.types.ResizeMode
+import android.util.Log
 import com.mrousavy.camera.types.Torch
 import com.mrousavy.camera.types.VideoStabilizationMode
 
@@ -182,6 +183,7 @@ class CameraViewManager : ViewGroupManager<CameraView>() {
   fun setOrientation(view: CameraView, orientation: String?) {
     if (orientation != null) {
       val newMode = Orientation.fromUnionValue(orientation)
+      Log.i(TAG, "Orientation set to: $newMode")
       view.orientation = newMode
     } else {
       view.orientation = Orientation.PORTRAIT

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

@@ -312,7 +312,7 @@ class CameraSession(private val context: Context, private val cameraManager: Cam
         enableHdr
       )
       outputs.add(output)
-      // Size is usually landscape, so we flip it here
+
       previewView?.setSurfaceSize(size.width, size.height, deviceDetails.sensorOrientation)
     }
 

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

@@ -36,6 +36,13 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
         updateLayout()
       }
     }
+  var orientation: Orientation = Orientation.PORTRAIT
+      set(value) {
+        if (field != value) {
+          Log.i(TAG, "View Orientation changed: $field -> $value")
+          field = value
+        }
+      }
   private var inputOrientation: Orientation = Orientation.LANDSCAPE_LEFT
     set(value) {
       if (field != value) {
@@ -101,6 +108,11 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
   }
 
   private fun getSize(contentSize: Size, containerSize: Size, resizeMode: ResizeMode): Size {
+    var contentSize = contentSize
+    // Swap dimensions if orientation is landscape
+    if (orientation.isLandscape()) {
+      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)) {
@@ -128,11 +140,11 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
     super.onMeasure(widthMeasureSpec, heightMeasureSpec)
 
-    val viewSize = Size(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec))
+    val measuredViewSize = Size(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec))
     val surfaceSize = size.rotatedBy(inputOrientation)
-    val fittedSize = getSize(surfaceSize, viewSize, resizeMode)
+    val fittedSize = getSize(surfaceSize, measuredViewSize, resizeMode)
 
-    Log.i(TAG, "PreviewView is $viewSize, rendering $surfaceSize content ($inputOrientation). Resizing to: $fittedSize ($resizeMode)")
+    Log.i(TAG, "PreviewView is $measuredViewSize rendering $surfaceSize orientation ($orientation). Resizing to: $fittedSize ($resizeMode)")
     setMeasuredDimension(fittedSize.width, fittedSize.height)
   }
 

package/ios/CameraView.swift

@@ -303,15 +303,6 @@ public final class CameraView: UIView, CameraSessionDelegate {
     }
     onInitialized([:])
   }
-  
-  func onCameraConfigurationChanged(_ configuration: CameraConfiguration?, _ difference: CameraConfiguration.Difference?) {
-    guard let configuration, let difference else { return }
-    
-    if difference.orientationChanged, let connection = previewView.videoPreviewLayer.connection {
-      let videoPreviewLayer = previewView.videoPreviewLayer
-      connection.setOrientation(configuration.orientation)
-    }
-  }
 
   func onCameraStarted() {
     ReactLogger.log(level: .info, message: "Camera started!")

package/ios/Core/CameraSession.swift

@@ -195,7 +195,6 @@ class CameraSession: NSObject, AVCaptureVideoDataOutputSampleBufferDelegate, AVC
           self.delegate?.onSessionInitialized()
         }
 
-        self.delegate?.onCameraConfigurationChanged(config, difference)
         // After configuring, set this to the new configuration.
         self.configuration = config
       } catch {

package/ios/Core/CameraSessionDelegate.swift

@@ -21,8 +21,6 @@ protocol CameraSessionDelegate: AnyObject {
    Called when the [CameraSession] successfully initializes
    */
   func onSessionInitialized()
-  
-  func onCameraConfigurationChanged(_ configuration: CameraConfiguration?, _ difference: CameraConfiguration.Difference?)
   /**
    Called when the [CameraSession] starts streaming frames. (isActive=true)
    */

package/ios/Extensions/AVCaptureOutput+mirror.swift

@@ -32,36 +32,28 @@ extension AVCaptureOutput {
   func setOrientation(_ orientation: Orientation) {
     // Set orientation for each connection
     for connection in connections {
-      connection.setOrientation(orientation)
+      #if swift(>=5.9)
+        if #available(iOS 17.0, *) {
+          // Camera Sensors are always in landscape rotation (90deg).
+          // We are setting the target rotation here, so we need to rotate by landscape once.
+          let cameraOrientation = orientation.rotateBy(orientation: .landscapeLeft)
+          let degrees = cameraOrientation.toDegrees()
+
+          // TODO: Don't rotate the video output because it adds overhead. Instead just use EXIF flags for the .mp4 file if recording.
+          //       Does that work when we flip the camera?
+          if connection.isVideoRotationAngleSupported(degrees) {
+            connection.videoRotationAngle = degrees
+          }
+        } else {
+          if connection.isVideoOrientationSupported {
+            connection.videoOrientation = orientation.toAVCaptureVideoOrientation()
+          }
+        }
+      #else
+        if connection.isVideoOrientationSupported {
+          connection.videoOrientation = orientation.toAVCaptureVideoOrientation()
+        }
+      #endif
     }
   }
 }
-
-
-
-extension AVCaptureConnection {
-  func setOrientation(_ orientation: Orientation) {
-    #if swift(>=5.9)
-      if #available(iOS 17.0, *) {
-        // Camera Sensors are always in landscape rotation (90deg).
-        // We are setting the target rotation here, so we need to rotate by landscape once.
-        let cameraOrientation = orientation.rotateBy(orientation: .landscapeLeft)
-        let degrees = cameraOrientation.toDegrees()
-
-        // TODO: Don't rotate the video output because it adds overhead. Instead just use EXIF flags for the .mp4 file if recording.
-        //       Does that work when we flip the camera?
-        if isVideoRotationAngleSupported(degrees) {
-          videoRotationAngle = degrees
-        }
-      } else {
-        if isVideoOrientationSupported {
-          videoOrientation = orientation.toAVCaptureVideoOrientation()
-        }
-      }
-    #else
-      if isVideoOrientationSupported {
-        videoOrientation = orientation.toAVCaptureVideoOrientation()
-      }
-    #endif
-  }
-}

package/ios/TestRecorder/ViewController.swift

@@ -113,19 +113,5 @@ class ViewController: UIViewController {
     }
   }
   
-  override func viewWillTransition(to size: CGSize, with coordinator: any UIViewControllerTransitionCoordinator) {
-    switch UIDevice.current.orientation {
-    case .landscapeLeft:
-      cameraView.orientation = "landscape-right"
-    case .landscapeRight:
-      cameraView.orientation = "landscape-left"
-    default:
-      cameraView.orientation = "portrait"
-    }
-    
-    cameraView.didSetProps([])
-    super.viewWillTransition(to: size, with: coordinator)
-  }
-  
 }