Fix iOS rotation issue

Author: mvanbeusekom

packages/camera/camera/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.0-nullsafety.3
+
+* Solved a rotation issue on iOS which caused the default preview to be displayed as landscape right instead of portrait.
+
 ## 0.8.0-nullsafety.2
 
 * Solved delay when using the zoom feature on iOS.

packages/camera/camera/ios/Classes/CameraPlugin.m

@@ -392,7 +392,7 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
   if ([_captureDevice position] == AVCaptureDevicePositionFront) {
     connection.videoMirrored = YES;
   }
-  connection.videoOrientation = AVCaptureVideoOrientationLandscapeRight;
+  connection.videoOrientation = AVCaptureVideoOrientationPortrait;
   [_captureSession addInputWithNoConnections:_captureVideoInput];
   [_captureSession addOutputWithNoConnections:_captureVideoOutput];
   [_captureSession addConnection:connection];

packages/camera/camera/lib/src/camera_preview.dart

@@ -4,7 +4,6 @@
 
 import 'package:camera/camera.dart';
 import 'package:camera_platform_interface/camera_platform_interface.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -41,26 +40,25 @@ class CameraPreview extends StatelessWidget {
         : Container();
   }
 
-  DeviceOrientation _getApplicableOrientation() {
-    return controller.value.isRecordingVideo
-        ? controller.value.recordingOrientation!
-        : (controller.value.lockedCaptureOrientation ??
-            controller.value.deviceOrientation);
-  }
-
   bool _isLandscape() {
     return [DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]
         .contains(_getApplicableOrientation());
   }
 
   int _getQuarterTurns() {
-    int platformOffset = defaultTargetPlatform == TargetPlatform.iOS ? 1 : 0;
     Map<DeviceOrientation, int> turns = {
       DeviceOrientation.portraitUp: 0,
       DeviceOrientation.landscapeLeft: 1,
       DeviceOrientation.portraitDown: 2,
       DeviceOrientation.landscapeRight: 3,
     };
-    return turns[_getApplicableOrientation()]! + platformOffset;
+    return turns[_getApplicableOrientation()]!;
+  }
+
+  DeviceOrientation _getApplicableOrientation() {
+    return controller.value.isRecordingVideo
+        ? controller.value.recordingOrientation!
+        : (controller.value.lockedCaptureOrientation ??
+            controller.value.deviceOrientation);
   }
 }

packages/camera/camera/pubspec.yaml

@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.8.0-nullsafety.2
+version: 0.8.0-nullsafety.3
 homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera
 
 dependencies: