Merge branch 'master' into navigation_delegate

Author: amirh

AUTHORS

@@ -25,3 +25,4 @@ Tuyển Vũ Xuân <[email protected]>
 Sarthak Verma <[email protected]>
 Mike Diarmid <[email protected]>
 Invertase <[email protected]>
+Elliot Hesp <[email protected]>

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 Contributing to Flutter
 =======================
 
-[![Build Status](https://travis-ci.org/flutter/plugins.svg)](https://travis-ci.org/flutter/plugins)
+[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)
 
 _See also: [Flutter's code of conduct](https://flutter.io/design-principles/#code-of-conduct)_
 

packages/camera/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.2
+
+* Add sensor orientation value to `CameraDescription`.
+
 ## 0.4.1
 
 * Camera methods are ran in a background thread on iOS.

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

@@ -164,6 +164,9 @@ public void onMethodCall(MethodCall call, final Result result) {
                 cameraManager.getCameraCharacteristics(cameraName);
             details.put("name", cameraName);
             @SuppressWarnings("ConstantConditions")
+            int sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
+            details.put("sensorOrientation", sensorOrientation);
+
             int lensFacing = characteristics.get(CameraCharacteristics.LENS_FACING);
             switch (lensFacing) {
               case CameraMetadata.LENS_FACING_FRONT:

packages/camera/ios/Classes/CameraPlugin.m

@@ -670,6 +670,7 @@ - (void)handleMethodCallAsync:(FlutterMethodCall *)call result:(FlutterResult)re
       [reply addObject:@{
         @"name" : [device uniqueID],
         @"lensFacing" : lensFacing,
+        @"sensorOrientation" : @90,
       }];
     }
     result(reply);

packages/camera/lib/camera.dart

@@ -58,6 +58,7 @@ Future<List<CameraDescription>> availableCameras() async {
       return CameraDescription(
         name: camera['name'],
         lensDirection: _parseCameraLensDirection(camera['lensFacing']),
+        sensorOrientation: camera['sensorOrientation'],
       );
     }).toList();
   } on PlatformException catch (e) {
@@ -66,11 +67,20 @@ Future<List<CameraDescription>> availableCameras() async {
 }
 
 class CameraDescription {
-  CameraDescription({this.name, this.lensDirection});
+  CameraDescription({this.name, this.lensDirection, this.sensorOrientation});
 
   final String name;
   final CameraLensDirection lensDirection;
 
+  /// Clockwise angle through which the output image needs to be rotated to be upright on the device screen in its native orientation.
+  ///
+  /// **Range of valid values:**
+  /// 0, 90, 180, 270
+  ///
+  /// On Android, also defines the direction of rolling shutter readout, which
+  /// is from top to bottom in the sensor's coordinate system.
+  final int sensorOrientation;
+
   @override
   bool operator ==(Object o) {
     return o is CameraDescription &&
@@ -85,7 +95,7 @@ class CameraDescription {
 
   @override
   String toString() {
-    return '$runtimeType($name, $lensDirection)';
+    return '$runtimeType($name, $lensDirection, $sensorOrientation)';
   }
 }
 

packages/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.4.1
+version: 0.4.2
 authors:
   - Flutter Team <[email protected]>
   - Luigi Agosti <[email protected]>

packages/cloud_functions/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.2
+
+* Specifying a version for Cloud Functions CocoaPod dependency to prevent build errors on iOS.
+* Fix on iOS when using a null region.
+* Upgrade the firebase_core dependency of the example app.
+
 ## 0.1.1+1
 
 * Log messages about automatic configuration of the default app are now less confusing.

packages/cloud_functions/example/pubspec.yaml

@@ -9,7 +9,7 @@ dependencies:
   cupertino_icons: ^0.1.2
   cloud_functions:
     path: ..
-  firebase_core: 0.3.0
+  firebase_core: ^0.3.1
 
 dev_dependencies:
   flutter_test:

packages/cloud_functions/ios/Classes/CloudFunctionsPlugin.m

@@ -41,42 +41,42 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     NSString *region = call.arguments[@"region"];
     FIRApp *app = [FIRApp appNamed:appName];
     FIRFunctions *functions;
-    if (region != nil) {
+    if (region != nil && region != (id)[NSNull null]) {
       functions = [FIRFunctions functionsForApp:app region:region];
     } else {
       functions = [FIRFunctions functionsForApp:app];
     }
-    [functions callFunction:functionName
-                 withObject:parameters
-                 completion:^(FIRHTTPSCallableResult *callableResult, NSError *error) {
-                   if (error) {
-                     FlutterError *flutterError;
-                     if (error.domain == FIRFunctionsErrorDomain) {
-                       NSDictionary *details = [NSMutableDictionary dictionary];
-                       [details setValue:[self mapFunctionsErrorCodes:error.code] forKey:@"code"];
-                       if (error.localizedDescription != nil) {
-                         [details setValue:error.localizedDescription forKey:@"message"];
-                       }
-                       if (error.userInfo[FIRFunctionsErrorDetailsKey] != nil) {
-                         [details setValue:error.userInfo[FIRFunctionsErrorDetailsKey]
-                                    forKey:@"details"];
-                       }
+    FIRHTTPSCallable *function = [functions HTTPSCallableWithName:functionName];
+    [function callWithObject:parameters
+                  completion:^(FIRHTTPSCallableResult *callableResult, NSError *error) {
+                    if (error) {
+                      FlutterError *flutterError;
+                      if (error.domain == FIRFunctionsErrorDomain) {
+                        NSDictionary *details = [NSMutableDictionary dictionary];
+                        [details setValue:[self mapFunctionsErrorCodes:error.code] forKey:@"code"];
+                        if (error.localizedDescription != nil) {
+                          [details setValue:error.localizedDescription forKey:@"message"];
+                        }
+                        if (error.userInfo[FIRFunctionsErrorDetailsKey] != nil) {
+                          [details setValue:error.userInfo[FIRFunctionsErrorDetailsKey]
+                                     forKey:@"details"];
+                        }
 
-                       flutterError =
-                           [FlutterError errorWithCode:@"functionsError"
-                                               message:@"Firebase function failed with exception."
-                                               details:details];
-                     } else {
-                       flutterError = [FlutterError
-                           errorWithCode:[NSString stringWithFormat:@"%ld", error.code]
-                                 message:error.localizedDescription
-                                 details:nil];
-                     }
-                     result(flutterError);
-                   } else {
-                     result(callableResult.data);
-                   }
-                 }];
+                        flutterError =
+                            [FlutterError errorWithCode:@"functionsError"
+                                                message:@"Firebase function failed with exception."
+                                                details:details];
+                      } else {
+                        flutterError = [FlutterError
+                            errorWithCode:[NSString stringWithFormat:@"%ld", error.code]
+                                  message:error.localizedDescription
+                                  details:nil];
+                      }
+                      result(flutterError);
+                    } else {
+                      result(callableResult.data);
+                    }
+                  }];
   } else {
     result(FlutterMethodNotImplemented);
   }