fix: Keep camera preview stable like native iOS Camera app

Reverts orientation tracking and RotatedBox rotation that caused
viewport shifting on iPads. Restores setPreferredOrientations portrait
lock and adds native hardening to keep AVCaptureConnection locked to
portrait regardless of device motion.

Addresses feedback on PR Apparence-io#639.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: damianr13

ios/camerawesome/Sources/camerawesome/CameraPreview/SingleCameraPreview/SingleCameraPreview.m

@@ -66,7 +66,16 @@ - (instancetype)initWithCameraSensor:(PigeonSensorPosition)sensor
   _physicalButtonController = [[PhysicalButtonController alloc] init];
 
   [_motionController startMotionDetection];
-  
+
+  // Keep the capture connection locked to portrait so the preview texture
+  // never rotates with the device — mimics the native iOS Camera app.
+  __weak typeof(self) weakSelf = self;
+  _motionController.onOrientationChanged = ^(UIDeviceOrientation newOrientation) {
+    if (weakSelf.captureConnection.isVideoOrientationSupported) {
+      [weakSelf.captureConnection setVideoOrientation:AVCaptureVideoOrientationPortrait];
+    }
+  };
+
   if (enablePhysicalButton) {
     [_physicalButtonController startListening];
   }

lib/src/widgets/camera_awesome_builder.dart

@@ -4,6 +4,7 @@ import 'package:camerawesome/camerawesome_plugin.dart';
 import 'package:camerawesome/pigeon.dart';
 import 'package:camerawesome/src/orchestrator/camera_context.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 
 /// This is the builder for your camera interface
 /// Using the [state] you can do anything you need without having to think about the camera flow
@@ -279,8 +280,7 @@ class CameraAwesomeBuilder extends StatefulWidget {
     Alignment previewAlignment = Alignment.center,
     PictureInPictureConfigBuilder? pictureInPictureConfigBuilder,
   }) : this._(
-          sensorConfig: sensorConfig ??
-              SensorConfig.single(sensor: Sensor.position(SensorPosition.back)),
+          sensorConfig: sensorConfig ?? SensorConfig.single(sensor: Sensor.position(SensorPosition.back)),
           enablePhysicalButton: false,
           progressIndicator: progressIndicator,
           builder: builder,
@@ -314,8 +314,7 @@ class CameraAwesomeBuilder extends StatefulWidget {
     required OnImageForAnalysis onImageForAnalysis,
     AnalysisConfig? imageAnalysisConfig,
   }) : this._(
-          sensorConfig: sensorConfig ??
-              SensorConfig.single(sensor: Sensor.position(SensorPosition.back)),
+          sensorConfig: sensorConfig ?? SensorConfig.single(sensor: Sensor.position(SensorPosition.back)),
           enablePhysicalButton: false,
           progressIndicator: progressIndicator,
           builder: builder,
@@ -341,8 +340,7 @@ class CameraAwesomeBuilder extends StatefulWidget {
   }
 }
 
-class _CameraWidgetBuilder extends State<CameraAwesomeBuilder>
-    with WidgetsBindingObserver {
+class _CameraWidgetBuilder extends State<CameraAwesomeBuilder> with WidgetsBindingObserver {
   late CameraContext _cameraContext;
   final _cameraPreviewKey = GlobalKey<AwesomeCameraPreviewState>();
   StreamSubscription<MediaCapture?>? _captureStateListener;
@@ -362,6 +360,7 @@ class _CameraWidgetBuilder extends State<CameraAwesomeBuilder>
 
   @override
   void didChangeDependencies() {
+    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     super.didChangeDependencies();
   }
 
@@ -392,15 +391,11 @@ class _CameraWidgetBuilder extends State<CameraAwesomeBuilder>
       widget.sensorConfig,
       enablePhysicalButton: widget.enablePhysicalButton,
       filter: widget.defaultFilter ?? AwesomeFilter.None,
-      initialCaptureMode: widget.saveConfig?.initialCaptureMode ??
-          (widget.showPreview
-              ? CaptureMode.preview
-              : CaptureMode.analysis_only),
+      initialCaptureMode: widget.saveConfig?.initialCaptureMode ?? (widget.showPreview ? CaptureMode.preview : CaptureMode.analysis_only),
       saveConfig: widget.saveConfig,
       onImageForAnalysis: widget.onImageForAnalysis,
       analysisConfig: widget.imageAnalysisConfig,
-      exifPreferences: widget.saveConfig?.exifPreferences ??
-          ExifPreferences(saveGPSLocation: false),
+      exifPreferences: widget.saveConfig?.exifPreferences ?? ExifPreferences(saveGPSLocation: false),
       availableFilters: widget.availableFilters,
     );
 
@@ -421,9 +416,7 @@ class _CameraWidgetBuilder extends State<CameraAwesomeBuilder>
       child: StreamBuilder<CameraState>(
         stream: _cameraContext.state$,
         builder: (context, snapshot) {
-          if (!snapshot.hasData ||
-              snapshot.data!.captureMode == null ||
-              snapshot.requireData is PreparingCameraState) {
+          if (!snapshot.hasData || snapshot.data!.captureMode == null || snapshot.requireData is PreparingCameraState) {
             return widget.progressIndicator ??
                 const Center(
                   child: CircularProgressIndicator.adaptive(),
@@ -444,54 +437,46 @@ class _CameraWidgetBuilder extends State<CameraAwesomeBuilder>
                         state: snapshot.requireData,
                         padding: widget.previewPadding,
                         alignment: widget.previewAlignment,
-                        onPreviewTap: widget.onPreviewTapBuilder
-                                ?.call(snapshot.requireData) ??
+                        onPreviewTap: widget.onPreviewTapBuilder?.call(snapshot.requireData) ??
                             OnPreviewTap(
                               onTap: (
                                 position,
                                 flutterPreviewSize,
                                 pixelPreviewSize,
                               ) {
                                 snapshot.requireData.when(
-                                  onPhotoMode: (photoState) =>
-                                      photoState.focusOnPoint(
+                                  onPhotoMode: (photoState) => photoState.focusOnPoint(
                                     flutterPosition: position,
                                     pixelPreviewSize: pixelPreviewSize,
                                     flutterPreviewSize: flutterPreviewSize,
                                   ),
-                                  onVideoMode: (videoState) =>
-                                      videoState.focusOnPoint(
+                                  onVideoMode: (videoState) => videoState.focusOnPoint(
                                     flutterPosition: position,
                                     pixelPreviewSize: pixelPreviewSize,
                                     flutterPreviewSize: flutterPreviewSize,
                                   ),
-                                  onVideoRecordingMode: (videoRecState) =>
-                                      videoRecState.focusOnPoint(
+                                  onVideoRecordingMode: (videoRecState) => videoRecState.focusOnPoint(
                                     flutterPosition: position,
                                     pixelPreviewSize: pixelPreviewSize,
                                     flutterPreviewSize: flutterPreviewSize,
                                   ),
-                                  onPreviewMode: (previewState) =>
-                                      previewState.focusOnPoint(
+                                  onPreviewMode: (previewState) => previewState.focusOnPoint(
                                     flutterPosition: position,
                                     pixelPreviewSize: pixelPreviewSize,
                                     flutterPreviewSize: flutterPreviewSize,
                                   ),
                                 );
                               },
                             ),
-                        onPreviewScale: widget.onPreviewScaleBuilder
-                                ?.call(snapshot.requireData) ??
+                        onPreviewScale: widget.onPreviewScaleBuilder?.call(snapshot.requireData) ??
                             OnPreviewScale(
                               onScale: (scale) {
-                                snapshot.requireData.sensorConfig
-                                    .setZoom(scale);
+                                snapshot.requireData.sensorConfig.setZoom(scale);
                               },
                             ),
                         interfaceBuilder: widget.builder,
                         previewDecoratorBuilder: widget.previewDecoratorBuilder,
-                        pictureInPictureConfigBuilder:
-                            widget.pictureInPictureConfigBuilder,
+                        pictureInPictureConfigBuilder: widget.pictureInPictureConfigBuilder,
                       ),
               ),
             ],

lib/src/widgets/preview/awesome_camera_preview.dart

@@ -58,11 +58,9 @@ class AwesomeCameraPreviewState extends State<AwesomeCameraPreview> {
 
   StreamSubscription? _sensorConfigSubscription;
   StreamSubscription? _aspectRatioSubscription;
-  StreamSubscription? _orientationSubscription;
   CameraAspectRatios? _aspectRatio;
   double? _aspectRatioValue;
   AnalysisPreview? _preview;
-  CameraOrientations _currentOrientation = CameraOrientations.portrait_up;
 
   // TODO: fetch this value from the native side
   final int kMaximumSupportedFloatingPreview = 3;
@@ -81,16 +79,6 @@ class AwesomeCameraPreviewState extends State<AwesomeCameraPreview> {
       }
     });
 
-    // Track device orientation for rotating the camera preview texture
-    _orientationSubscription =
-        CamerawesomePlugin.getNativeOrientation()?.listen((orientation) {
-      if (_currentOrientation != orientation && mounted) {
-        setState(() {
-          _currentOrientation = orientation;
-        });
-      }
-    });
-
     // refactor this
     _sensorConfigSubscription =
         widget.state.sensorConfig$.listen((sensorConfig) {
@@ -149,7 +137,6 @@ class AwesomeCameraPreviewState extends State<AwesomeCameraPreview> {
 
   @override
   void dispose() {
-    _orientationSubscription?.cancel();
     _sensorConfigSubscription?.cancel();
     _aspectRatioSubscription?.cancel();
     super.dispose();
@@ -166,14 +153,10 @@ class AwesomeCameraPreviewState extends State<AwesomeCameraPreview> {
           );
     }
 
-    // Determine rotation needed to compensate for device orientation.
-    // The camera buffer is always portrait; when the UI rotates to landscape
-    // we rotate the texture and swap the preview dimensions for correct layout.
-    final quarterTurns = _quarterTurnsForOrientation(_currentOrientation);
-    final isLandscape = quarterTurns == 1 || quarterTurns == 3;
-    final effectivePreviewSize = isLandscape
-        ? PreviewSize(width: _previewSize!.height, height: _previewSize!.width)
-        : _previewSize!;
+    // Don't rotate the camera preview texture when the device rotates —
+    // keep it stable like the native iOS Camera app.
+    const quarterTurns = 0;
+    final effectivePreviewSize = _previewSize!;
 
     return Container(
       color: Colors.black,
@@ -253,21 +236,6 @@ class AwesomeCameraPreviewState extends State<AwesomeCameraPreview> {
     );
   }
 
-  /// Returns the number of clockwise 90° turns needed to rotate the portrait
-  /// camera buffer so it appears upright for the current device orientation.
-  int _quarterTurnsForOrientation(CameraOrientations orientation) {
-    switch (orientation) {
-      case CameraOrientations.portrait_up:
-        return 0;
-      case CameraOrientations.landscape_left:
-        return 1;
-      case CameraOrientations.portrait_down:
-        return 2;
-      case CameraOrientations.landscape_right:
-        return 3;
-    }
-  }
-
   List<Widget> _buildPreviewTextures() {
     final previewFrames = <Widget>[];
     // if there is only one texture