Merge pull request #141 from Apparence-io/fix/ios-orientation

🐛 Fix iOS front sensor orientation

Author: g-apparence

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,7 +8,7 @@ Before creating any Pull Request, confirm that it meets all requirements listed
 
 - [ ] 📕 I read the [Contributing page](https://github.com/Apparence-io/camera_awesome/blob/master/CONTRIBUTING.md).
 - [ ] 🤝 I match the actual coding style.
-- [ ] ✅ I ran ```flutter analyse``` without any issues.
+- [ ] ✅ I ran ```flutter analyze``` without any issues.
 
 ## Breaking Change
 

example/lib/main.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:camerawesome/models/orientations.dart';
 import 'package:camerawesome_example/widgets/bottom_bar.dart';

example/pubspec.lock

@@ -28,7 +28,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.3.4"
+    version: "0.3.5"
   characters:
     dependency: transitive
     description:

ios/Classes/CameraPreview/CameraPreview.m

@@ -33,6 +33,8 @@ - (instancetype)initWithCameraSensor:(CameraSensor)sensor
     [_captureVideoOutput setAlwaysDiscardsLateVideoFrames:YES];
     [_captureVideoOutput setSampleBufferDelegate:self queue:dispatch_get_main_queue()];
     [_captureSession addOutputWithNoConnections:_captureVideoOutput];
+
+    _cameraSensor = sensor;
 
     [self initCameraPreview:sensor];
 
@@ -47,8 +49,6 @@ - (instancetype)initWithCameraSensor:(CameraSensor)sensor
     _previewLayer = [AVCaptureVideoPreviewLayer layerWithSession:_captureSession];
     _previewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
 
-    _cameraSensor = sensor;
-    
     // Controllers init
     _videoController = [[VideoController alloc] initWithEventSink:videoRecordingEventSink result:result];
     _imageStreamController = [[ImageStreamController alloc] initWithEventSink:imageStreamEventSink];
@@ -88,7 +88,7 @@ - (void)initCameraPreview:(CameraSensor)sensor {
 
     // Mirror the preview only on portrait mode
     [_captureConnection setAutomaticallyAdjustsVideoMirroring:NO];
-    [_captureConnection setVideoMirrored:(_cameraSensor == Back)];
+    [_captureConnection setVideoMirrored:(_cameraSensor == Front)];
     [_captureConnection setVideoOrientation:AVCaptureVideoOrientationPortrait];
 
     [self setCameraPresset:CGSizeMake(0, 0)];
@@ -188,12 +188,12 @@ - (void)setSensor:(CameraSensor)sensor {
     [_captureSession removeOutput:_capturePhotoOutput];
     [_captureSession removeConnection:_captureConnection];
 
+    _cameraSensor = sensor;
+
     // Init the camera preview with the selected sensor
     [self initCameraPreview:sensor];
 
     [_captureSession commitConfiguration];
-    
-    _cameraSensor = sensor;
 }
 
 /// Set zoom level

ios/Classes/Controllers/Picture/CameraPictureController.m

@@ -56,7 +56,7 @@ - (void)captureOutput:(AVCapturePhotoOutput *)output
 - (UIImageOrientation)getJpegOrientation {
     switch (_orientation) {
         case UIDeviceOrientationPortrait:
-            return UIImageOrientationRight;
+            return (_sensor == Back) ? UIImageOrientationRight : UIImageOrientationLeftMirrored;
             break;
         case UIDeviceOrientationLandscapeRight:
             return (_sensor == Back) ? UIImageOrientationUp : UIImageOrientationDown;

lib/camerapreview.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:camerawesome/camerawesome_plugin.dart';
 import 'package:camerawesome/models/orientations.dart';
@@ -471,6 +470,7 @@ class _CameraPreviewWidget extends StatelessWidget {
     this.size,
     this.textureId,
     this.fitted = false,
+    // ignore: unused_element
     this.testMode = false,
   });
 

lib/camerawesome_plugin.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';

pubspec.yaml

@@ -1,6 +1,6 @@
 name: camerawesome
 description: Easiest Flutter camera Plugin supporting capturing images, streaming images, video recording, switch sensors, autofocus, flash... on Android and iOS
-version: 0.3.4
+version: 0.3.5
 homepage: https://Apparence.io
 repository: https://github.com/Apparence-io/camera_awesome