Merge branch 'master' into fix/video-photo-preview-rotation

# Conflicts:
#	packages/camera/camera/CHANGELOG.md
#	packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java
#	packages/camera/camera/ios/Classes/CameraPlugin.m
#	packages/camera/camera/lib/src/camera_controller.dart
#	packages/camera/camera/pubspec.yaml
#	packages/camera/camera/test/camera_value_test.dart

packages/camera/camera/CHANGELOG.md

@@ -6,6 +6,14 @@
 * Fixed videos & photos saving with the incorrect rotation on iOS.
 * BREAKING CHANGE: `CameraValue.aspectRatio` now returns `width / height` rather than `height / width`.
 
+## 0.6.6
+
+* Adds auto focus support for Android and iOS implementations.
+
+## 0.6.5
+
+* Adds ImageFormat selection for ImageStream and Video(iOS only).
+
 ## 0.6.4+5
 
 * Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java

@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugins.camera;
 
 import android.app.Activity;

packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/CameraUtilsTest.java

@@ -1,3 +1,7 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugins.camera;
 
 import static org.junit.Assert.assertEquals;

packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java

@@ -64,8 +64,8 @@ public void sendCameraErrorEvent_includesErrorDescriptions() {
   }
 
   @Test
-  public void sendCameraInitializedEvent_includesParams() {
-    dartMessenger.sendCameraInitializedEvent(0, 0, ExposureMode.auto, true);
+  public void sendCameraInitializedEvent_includesPreviewSize() {
+    dartMessenger.sendCameraInitializedEvent(0, 0, ExposureMode.auto, FocusMode.auto, true, true);
 
     List<ByteBuffer> sentMessages = fakeBinaryMessenger.getMessages();
     assertEquals(1, sentMessages.size());

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

@@ -226,6 +226,44 @@ static UIDeviceOrientation getUIDeviceOrientationForString(NSString *orientation
   };
 }
 
+// Mirrors FocusMode in camera.dart
+typedef enum {
+  FocusModeAuto,
+  FocusModeLocked,
+} FocusMode;
+
+static NSString *getStringForFocusMode(FocusMode mode) {
+  switch (mode) {
+    case FocusModeAuto:
+      return @"auto";
+    case FocusModeLocked:
+      return @"locked";
+  }
+  NSError *error = [NSError errorWithDomain:NSCocoaErrorDomain
+                                       code:NSURLErrorUnknown
+                                   userInfo:@{
+                                     NSLocalizedDescriptionKey : [NSString
+                                         stringWithFormat:@"Unknown string for focus mode"]
+                                   }];
+  @throw error;
+}
+
+static FocusMode getFocusModeForString(NSString *mode) {
+  if ([mode isEqualToString:@"auto"]) {
+    return FocusModeAuto;
+  } else if ([mode isEqualToString:@"locked"]) {
+    return FocusModeLocked;
+  } else {
+    NSError *error = [NSError errorWithDomain:NSCocoaErrorDomain
+                                         code:NSURLErrorUnknown
+                                     userInfo:@{
+                                       NSLocalizedDescriptionKey : [NSString
+                                           stringWithFormat:@"Unknown focus mode %@", mode]
+                                     }];
+    @throw error;
+  }
+}
+
 // Mirrors ResolutionPreset in camera.dart
 typedef enum {
   veryLow,
@@ -328,6 +366,8 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
   _dispatchQueue = dispatchQueue;
   _captureSession = [[AVCaptureSession alloc] init];
   _flashMode = FlashModeAuto;
+  _exposureMode = ExposureModeAuto;
+  _focusMode = FocusModeAuto;
   _lockedCaptureOrientation = UIDeviceOrientationUnknown;
 
   _captureDevice = [AVCaptureDevice deviceWithUniqueID:cameraName];
@@ -1316,14 +1356,17 @@ - (void)handleMethodCallAsync:(FlutterMethodCall *)call result:(FlutterResult)re
                                                            (unsigned long)cameraId]
                 binaryMessenger:_messenger];
       _camera.methodChannel = methodChannel;
-      [methodChannel invokeMethod:@"initialized"
-                        arguments:@{
-                          @"previewWidth" : @(_camera.previewSize.width),
-                          @"previewHeight" : @(_camera.previewSize.height),
-                          @"exposureMode" : getStringForExposureMode([_camera exposureMode]),
-                          @"exposurePointSupported" :
-                              @([_camera.captureDevice isExposurePointOfInterestSupported]),
-                        }];
+      [methodChannel
+          invokeMethod:@"initialized"
+             arguments:@{
+               @"previewWidth" : @(_camera.previewSize.width),
+               @"previewHeight" : @(_camera.previewSize.height),
+               @"exposureMode" : getStringForExposureMode([_camera exposureMode]),
+               @"focusMode" : getStringForFocusMode([_camera focusMode]),
+               @"exposurePointSupported" :
+                   @([_camera.captureDevice isExposurePointOfInterestSupported]),
+               @"focusPointSupported" : @([_camera.captureDevice isFocusPointOfInterestSupported]),
+             }];
       [self sendDeviceOrientation:[UIDevice currentDevice].orientation];
       [_camera start];
       result(nil);
@@ -1382,6 +1425,17 @@ - (void)handleMethodCallAsync:(FlutterMethodCall *)call result:(FlutterResult)re
       [_camera lockCaptureOrientationWithResult:result orientation:call.arguments[@"orientation"]];
     } else if ([@"unlockCaptureOrientation" isEqualToString:call.method]) {
       [_camera unlockCaptureOrientationWithResult:result];
+    } else if ([@"setFocusMode" isEqualToString:call.method]) {
+      [_camera setFocusModeWithResult:result mode:call.arguments[@"mode"]];
+    } else if ([@"setFocusPoint" isEqualToString:call.method]) {
+      BOOL reset = ((NSNumber *)call.arguments[@"reset"]).boolValue;
+      double x = 0.5;
+      double y = 0.5;
+      if (!reset) {
+        x = ((NSNumber *)call.arguments[@"x"]).doubleValue;
+        y = ((NSNumber *)call.arguments[@"y"]).doubleValue;
+      }
+      [_camera setFocusPointWithResult:result x:x y:y];
     } else {
       result(FlutterMethodNotImplemented);
     }

packages/camera/camera/lib/src/camera_controller.dart

@@ -43,6 +43,7 @@ class CameraValue {
     this.exposureMode,
     this.focusMode,
     this.exposurePointSupported,
+    this.focusPointSupported,
     this.deviceOrientation,
     this.lockedCaptureOrientation,
     this.recordingOrientation,
@@ -58,6 +59,7 @@ class CameraValue {
           isRecordingPaused: false,
           flashMode: FlashMode.auto,
           exposurePointSupported: false,
+          focusPointSupported: false,
           deviceOrientation: DeviceOrientation.portraitUp,
         );
 
@@ -111,6 +113,9 @@ class CameraValue {
   /// Whether setting the exposure point is supported.
   final bool exposurePointSupported;
 
+  /// Whether setting the focus point is supported.
+  final bool focusPointSupported;
+
   /// The current device orientation.
   final DeviceOrientation deviceOrientation;
 
@@ -139,6 +144,7 @@ class CameraValue {
     ExposureMode exposureMode,
     FocusMode focusMode,
     bool exposurePointSupported,
+    bool focusPointSupported,
     DeviceOrientation deviceOrientation,
     Optional<DeviceOrientation> lockedCaptureOrientation,
     Optional<DeviceOrientation> recordingOrientation,
@@ -156,6 +162,7 @@ class CameraValue {
       focusMode: focusMode ?? this.focusMode,
       exposurePointSupported:
           exposurePointSupported ?? this.exposurePointSupported,
+      focusPointSupported: focusPointSupported ?? this.focusPointSupported,
       deviceOrientation: deviceOrientation ?? this.deviceOrientation,
       lockedCaptureOrientation: lockedCaptureOrientation == null
           ? this.lockedCaptureOrientation
@@ -176,7 +183,9 @@ class CameraValue {
         'isStreamingImages: $isStreamingImages, '
         'flashMode: $flashMode, '
         'exposureMode: $exposureMode, '
+        'focusMode: $focusMode, '
         'exposurePointSupported: $exposurePointSupported, '
+        'focusPointSupported: $focusPointSupported, '
         'deviceOrientation: $deviceOrientation, '
         'lockedCaptureOrientation: $lockedCaptureOrientation, '
         'recordingOrientation: $recordingOrientation)';
@@ -769,6 +778,16 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
   }
 
+  /// Sets the focus mode for taking pictures.
+  Future<void> setFocusMode(FocusMode mode) async {
+    try {
+      await CameraPlatform.instance.setFocusMode(_cameraId, mode);
+      value = value.copyWith(focusMode: mode);
+    } on PlatformException catch (e) {
+      throw CameraException(e.code, e.message);
+    }
+  }
+
   /// Unlocks the capture orientation.
   Future<void> unlockCaptureOrientation() async {
     try {
@@ -779,6 +798,28 @@ class CameraController extends ValueNotifier<CameraValue> {
     }
   }
 
+  /// Sets the focus point for automatically determining the focus value.
+  Future<void> setFocusPoint(Offset point) async {
+    if (point != null &&
+        (point.dx < 0 || point.dx > 1 || point.dy < 0 || point.dy > 1)) {
+      throw ArgumentError(
+          'The values of point should be anywhere between (0,0) and (1,1).');
+    }
+    try {
+      await CameraPlatform.instance.setFocusPoint(
+        _cameraId,
+        point == null
+            ? null
+            : Point<double>(
+                point.dx,
+                point.dy,
+              ),
+      );
+    } on PlatformException catch (e) {
+      throw CameraException(e.code, e.message);
+    }
+  }
+
   /// Releases the resources of this camera.
   @override
   Future<void> dispose() async {

packages/camera/camera/test/camera_value_test.dart

@@ -124,13 +124,14 @@ void main() {
         exposureMode: ExposureMode.auto,
         focusMode: FocusMode.auto,
         exposurePointSupported: true,
+        focusPointSupported: true,
         deviceOrientation: DeviceOrientation.portraitUp,
         lockedCaptureOrientation: DeviceOrientation.portraitUp,
         recordingOrientation: DeviceOrientation.portraitUp,
       );
 
       expect(cameraValue.toString(),
-          'CameraValue(isRecordingVideo: false, isInitialized: false, errorDescription: null, previewSize: Size(10.0, 10.0), isStreamingImages: false, flashMode: FlashMode.auto, exposureMode: null, exposurePointSupported: true, deviceOrientation: DeviceOrientation.portraitUp, lockedCaptureOrientation: DeviceOrientation.portraitUp, recordingOrientation: DeviceOrientation.portraitUp)');
+          'CameraValue(isRecordingVideo: false, isInitialized: false, errorDescription: null, previewSize: Size(10.0, 10.0), isStreamingImages: false, flashMode: FlashMode.auto, exposureMode: ExposureMode.auto, focusMode: FocusMode.auto, exposurePointSupported: true, focusPointSupported: true, deviceOrientation: DeviceOrientation.portraitUp, lockedCaptureOrientation: DeviceOrientation.portraitUp, recordingOrientation: DeviceOrientation.portraitUp)');
     });
   });
 }