✨ Add native orientation support

README.md

@@ -1,9 +1,8 @@
 <p align="center">
-	<a href="https://google.fr/">
-		<img src="https://via.placeholder.com/456x180" width="456" alt="camerawesome_logo">
+	<a href="https://apparence.io/">
+		<img src="logo/banner.png" width="456" alt="camerawesome_logo">
 	</a>
 </p>
-<br />
 
 ## 🚀&nbsp; Overview
 

example/lib/main.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 import 'dart:math';
 
+import 'package:camerawesome/models/orientations.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'dart:async';
@@ -154,13 +155,6 @@ class _MyAppState extends State<MyApp> {
                     child: Text("zoom x1", style: TextStyle(color: Colors.white)),
                     onPressed: () => zoomNotifier.value = 0
                   ),
-                  FlatButton(
-                    color: Colors.blue[200],
-                    child: Text("switch sensor", style: TextStyle(color: Colors.white)),
-                    onPressed: () => sensor.value == Sensors.BACK
-                      ? sensor.value = Sensors.FRONT
-                      : sensor.value = Sensors.BACK
-                  ),
                 ],
               ),
             )
@@ -185,6 +179,10 @@ class _MyAppState extends State<MyApp> {
                 sensor: sensor,
                 switchFlashMode: switchFlash,
                 zoom: zoomNotifier,
+                onOrientationChanged: (CameraOrientations orientation) {
+                  // TODO: Orientation change here
+                  print(orientation);
+                },
               ),
             )
           );
@@ -212,12 +210,14 @@ class _MyAppState extends State<MyApp> {
               fitted: true,
               switchFlashMode: switchFlash,
               zoom: zoomNotifier,
+              onOrientationChanged: (CameraOrientations orientation) {
+                print('-- ORIENTATION CHANGED --');
+                print(orientation);
+              },
             ),
           ),
         ),
       )
     );
   }
-
-
 }

ios/Classes/CameraView.h

@@ -34,12 +34,17 @@ NS_ASSUME_NONNULL_BEGIN
 @property(readonly, nonatomic) AVCaptureTorchMode torchMode;
 @property(readonly, nonatomic) CameraSensor cameraSensor;
 @property(readonly, nonatomic) FlutterResult result;
+@property(readonly, nonatomic) NSString *currentPresset;
+@property(readonly, nonatomic) NSObject<FlutterBinaryMessenger> *messenger;
 @property(readonly) CVPixelBufferRef volatile latestPixelBuffer;
-@property(readonly, nonatomic) CGSize previewSize;
+@property(readonly, nonatomic) CGSize currentPreviewSize;
 @property(nonatomic) FlutterEventSink eventSink;
 @property(nonatomic, copy) void (^onFrameAvailable)(void);
 
-- (instancetype)initWithCameraSensor:(CameraSensor)sensor andResult:(nonnull FlutterResult)result;
+- (instancetype)initWithCameraSensor:(CameraSensor)sensor
+                              result:(nonnull FlutterResult)result
+                           messenger:(NSObject<FlutterBinaryMessenger> *)messenger
+                               event:(FlutterEventSink)eventSink;
 - (void)setPreviewSize:(CGSize)previewSize;
 - (void)setFlashMode:(CameraFlashMode)flashMode;
 - (void)start;
@@ -51,6 +56,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)flipCamera;
 - (void)setZoom:(float)value;
 - (CGFloat)getMaxZoom;
+- (CGSize)getEffectivPreviewSize;
 
 @end
 

ios/Classes/CameraView.m

@@ -9,15 +9,12 @@
 
 @implementation CameraView
 
-- (instancetype)initWithCameraSensor:(CameraSensor)sensor andResult:(nonnull FlutterResult)result {
+- (instancetype)initWithCameraSensor:(CameraSensor)sensor result:(nonnull FlutterResult)result messenger:(NSObject<FlutterBinaryMessenger> *)messenger event:(FlutterEventSink)eventSink {
     self = [super init];
 
     _result = result;
-
-    // Creating motion detection
-    _motionManager = [[CMMotionManager alloc] init];
-    _motionManager.deviceMotionUpdateInterval = 0.2f;
-    [self startMyMotionDetect];
+    _messenger = messenger;
+    _eventSink = eventSink;
 
     // Creating capture session
     _captureSession = [[AVCaptureSession alloc] init];
@@ -42,23 +39,57 @@ - (instancetype)initWithCameraSensor:(CameraSensor)sensor andResult:(nonnull Flu
 
     _cameraSensor = sensor;
 
+    // Creating motion detection
+    _motionManager = [[CMMotionManager alloc] init];
+    _motionManager.deviceMotionUpdateInterval = 0.2f;
+    [self startMyMotionDetect];
+
     return self;
 }
 
 - (void)startMyMotionDetect {
     // TODO: Add weakself
     [_motionManager startDeviceMotionUpdatesToQueue:[NSOperationQueue mainQueue]
                                         withHandler:^(CMDeviceMotion *data, NSError *error) {
+        UIDeviceOrientation newOrientation;
         if(fabs(data.gravity.x) > fabs(data.gravity.y)) {
             // Landscape
-            self->_deviceOrientation = (data.gravity.x >= 0) ? UIDeviceOrientationLandscapeLeft : UIDeviceOrientationLandscapeRight;
+            newOrientation = (data.gravity.x >= 0) ? UIDeviceOrientationLandscapeLeft : UIDeviceOrientationLandscapeRight;
         } else {
             // Portrait
-            self->_deviceOrientation = (data.gravity.y >= 0) ? UIDeviceOrientationPortraitUpsideDown : UIDeviceOrientationPortrait;
-        }}];
+            newOrientation = (data.gravity.y >= 0) ? UIDeviceOrientationPortraitUpsideDown : UIDeviceOrientationPortrait;
+        }
+        if (self->_deviceOrientation != newOrientation) {
+            self->_deviceOrientation = newOrientation;
+
+            NSString *orientationString;
+            switch (newOrientation) {
+                case UIDeviceOrientationLandscapeLeft:
+                    orientationString = @"LANDSCAPE_LEFT";
+                    break;
+                case UIDeviceOrientationLandscapeRight:
+                    orientationString = @"LANDSCAPE_RIGHT";
+                    break;
+                case UIDeviceOrientationPortrait:
+                    orientationString = @"PORTRAIT_UP";
+                    break;
+                case UIDeviceOrientationPortraitUpsideDown:
+                    orientationString = @"PORTRAIT_DOWN";
+                    break;
+                default:
+                    break;
+            }
+            if (self->_eventSink != nil) {
+                self->_eventSink(orientationString);
+            }
+        }
+    }];
 }
 
 - (void)initCamera:(CameraSensor)sensor {
+    // Here we set a preset which wont crash the device before switching to front or back
+    [_captureSession setSessionPreset:AVCaptureSessionPresetPhoto];
+
     NSError *error;
     _captureDevice = [AVCaptureDevice deviceWithUniqueID:[self selectAvailableCamera:sensor]];
     _captureVideoInput = [AVCaptureDeviceInput deviceInputWithDevice:_captureDevice error:&error];
@@ -68,13 +99,6 @@ - (void)initCamera:(CameraSensor)sensor {
         return;
     }
 
-    // Set preset
-    if (sensor == Back) {
-        [self setPreviewSize:_previewSize];
-    } else {
-        [_captureSession setSessionPreset:AVCaptureSessionPresetPhoto];
-    }
-
     // Create connection
     _captureConnection = [AVCaptureConnection connectionWithInputPorts:_captureVideoInput.ports
                                                                 output:_captureVideoOutput];
@@ -92,6 +116,28 @@ - (void)initCamera:(CameraSensor)sensor {
     [_captureConnection setAutomaticallyAdjustsVideoMirroring:NO];
     [_captureConnection setVideoMirrored:(_cameraSensor == Back)];
     [_captureConnection setVideoOrientation:AVCaptureVideoOrientationPortrait];
+
+    [self setCameraPresset:CGSizeMake(0, 0)];
+}
+
+- (void)setCameraPresset:(CGSize)currentPreviewSize {
+    NSString *presetSelected;
+    if (!CGSizeEqualToSize(CGSizeZero, currentPreviewSize)) {
+        // Try to get the quality requested
+        presetSelected = [CameraQualities selectVideoCapturePresset:currentPreviewSize session:_captureSession];
+    } else {
+        // Compute the best quality supported by the camera device
+        presetSelected = [CameraQualities selectVideoCapturePresset:_captureSession];
+    }
+    [_captureSession setSessionPreset:presetSelected];
+    _currentPresset = presetSelected;
+
+    // Get preview size according to presset selected
+    _currentPreviewSize = [CameraQualities getSizeForPresset:presetSelected];
+}
+
+- (CGSize)getEffectivPreviewSize {
+    return _currentPreviewSize;
 }
 
 - (void)setResult:(nonnull FlutterResult)result {
@@ -103,9 +149,7 @@ - (void)dispose {
 }
 
 - (void)setPreviewSize:(CGSize)previewSize {
-    NSString *selectedPresset = [CameraQualities selectVideoCapturePresset:previewSize session:_captureSession];
-    _previewSize = previewSize;
-    _captureSession.sessionPreset = selectedPresset;
+    [self setCameraPresset:previewSize];
 }
 
 - (void)start {
@@ -147,7 +191,7 @@ - (void)setZoom:(float)value {
         _captureDevice.videoZoomFactor = scaledZoom;
         [_captureDevice unlockForConfiguration];
     } else {
-        NSLog(@"error: %@", error);
+        _result([FlutterError errorWithCode:@"ZOOM_NOT_SET" message:@"can't set the zoom value" details:[error localizedDescription]]);
     }
 }
 
@@ -198,8 +242,8 @@ - (void)instantFocus {
     NSError *error;
 
     // Get center point of the preview size
-    double focus_x = _previewSize.width / 2;
-    double focus_y = _previewSize.height / 2;
+    double focus_x = _currentPreviewSize.width / 2;
+    double focus_y = _currentPreviewSize.height / 2;
 
     CGPoint thisFocusPoint = [_previewLayer captureDevicePointOfInterestForPoint:CGPointMake(focus_x, focus_y)];
     if ([_captureDevice isFocusModeSupported:AVCaptureFocusModeAutoFocus] && [_captureDevice isFocusPointOfInterestSupported]) {

ios/Classes/CamerawesomePlugin.h

@@ -2,7 +2,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface CamerawesomePlugin : NSObject<FlutterPlugin>
+@interface CamerawesomePlugin : NSObject<FlutterPlugin, FlutterStreamHandler>
 @end
 
 NS_ASSUME_NONNULL_END

ios/Classes/CamerawesomePlugin.m

@@ -5,6 +5,7 @@ @interface CamerawesomePlugin ()
 
 @property(readonly, nonatomic) NSObject<FlutterTextureRegistry> *registry;
 @property(readonly, nonatomic) NSObject<FlutterBinaryMessenger> *messenger;
+@property FlutterEventSink eventSink;
 @property int64_t textureId;
 @property CameraView *camera;
 
@@ -15,19 +16,35 @@ - (instancetype)initWithRegistry:(NSObject<FlutterTextureRegistry> *)registry me
 @implementation CamerawesomePlugin
 - (instancetype)initWithRegistry:(NSObject<FlutterTextureRegistry> *)registry
                        messenger:(NSObject<FlutterBinaryMessenger> *)messenger {
-  self = [super init];
-  NSAssert(self, @"super init cannot be nil");
-  _registry = registry;
-  _messenger = messenger;
+    self = [super init];
+    NSAssert(self, @"super init cannot be nil");
+    _registry = registry;
+    _messenger = messenger;
+
     return self;
 }
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-    FlutterMethodChannel* channel = [FlutterMethodChannel
-                                     methodChannelWithName:@"camerawesome"
-                                     binaryMessenger:[registrar messenger]];
-    CamerawesomePlugin* instance = [[CamerawesomePlugin alloc] initWithRegistry:[registrar textures] messenger:[registrar messenger]];
-    [registrar addMethodCallDelegate:instance channel:channel];
+    CamerawesomePlugin *instance = [[CamerawesomePlugin alloc] initWithRegistry:[registrar textures] messenger:[registrar messenger]];
+
+    FlutterEventChannel *eventChannel = [FlutterEventChannel eventChannelWithName:@"camerawesome/orientation"
+    binaryMessenger:[registrar messenger]];
+    [eventChannel setStreamHandler:instance];
+
+    // TODO: Change to "camerawesome/methods"
+    FlutterMethodChannel *methodChannel = [FlutterMethodChannel methodChannelWithName:@"camerawesome" binaryMessenger:[registrar messenger]];
+    [registrar addMethodCallDelegate:instance channel:methodChannel];
+}
+
+- (FlutterError* _Nullable)onListenWithArguments:(id _Nullable)arguments
+                                       eventSink:(FlutterEventSink)events {
+    _eventSink = events;
+    return nil;
+}
+
+- (FlutterError* _Nullable)onCancelWithArguments:(id _Nullable)arguments {
+    _eventSink = nil;
+    return nil;
 }
 
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
@@ -49,6 +66,8 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
         [self _handleGetTextures:call result:result];
     } else if ([@"setPreviewSize" isEqualToString:call.method]) {
         [self _handlePreviewSize:call result:result];
+    } else if ([@"getEffectivPreviewSize" isEqualToString:call.method]) {
+        [self _handleGetEffectivPreviewSize:call result:result];
     } else if ([@"setPhotoSize" isEqualToString:call.method]) {
         [self _handlePhotoSize:call result:result];
     } else if ([@"takePhoto" isEqualToString:call.method]) {
@@ -71,6 +90,14 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     }
 }
 
+- (void)_handleGetEffectivPreviewSize:(FlutterMethodCall*)call result:(FlutterResult)result {
+    CGSize previewSize = [_camera getEffectivPreviewSize];
+    result(@{
+        @"width": [NSNumber numberWithInt:previewSize.width],
+        @"height": [NSNumber numberWithInt:previewSize.height],
+    });
+}
+
 - (void)_handleSetZoom:(FlutterMethodCall*)call result:(FlutterResult)result {
     float value = [call.arguments[@"zoom"] floatValue];
 
@@ -188,7 +215,10 @@ - (void)_handleSetup:(FlutterMethodCall*)call result:(FlutterResult)result  {
     }
 
     CameraSensor sensor = ([sensorName isEqualToString:@"FRONT"]) ? Front : Back;
-    self.camera = [[CameraView alloc] initWithCameraSensor:sensor andResult:result];
+    self.camera = [[CameraView alloc] initWithCameraSensor:sensor
+                                                    result:result
+                                                 messenger:_messenger
+                                                     event:_eventSink];
     [self->_registry textureFrameAvailable:_textureId];
 
     __weak typeof(self) weakSelf = self;

ios/Classes/Constants/CameraQualities.h

@@ -35,6 +35,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CameraQualities : NSObject
 
 + (NSString *)selectVideoCapturePresset:(CGSize)size session:(AVCaptureSession *)session;
++ (NSString *)selectVideoCapturePresset:(AVCaptureSession *)session;
++ (CGSize)getSizeForPresset:(NSString *)presset;
 
 @end