Merged with master

Author: mvanbeusekom

.cirrus.yml

@@ -14,6 +14,9 @@ task:
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
+  submodules_script:
+    - git submodule init
+    - git submodule update
   matrix:
     - name: publishable
       script:
@@ -121,6 +124,9 @@ task:
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
+  submodules_script:
+    - git submodule init
+    - git submodule update
   matrix:
     - name: build-linux+drive-examples
       install_script:
@@ -145,6 +151,9 @@ task:
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
+  submodules_script:
+    - git submodule init
+    - git submodule update
   create_simulator_script:
     - xcrun simctl list
     - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.iOS-14-3 | xargs xcrun simctl boot
@@ -198,6 +207,9 @@ task:
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
+  submodules_script:
+    - git submodule init
+    - git submodule update
   create_simulator_script:
     - xcrun simctl list
     - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-3 | xargs xcrun simctl boot
@@ -227,6 +239,9 @@ task:
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
+  submodules_script:
+    - git submodule init
+    - git submodule update
   matrix:
     - name: build_all_plugins_app
       script:

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "script/plugin_tools"]
+	path = script/plugin_tools
+	url = https://github.com/flutter/plugin_tools.git

CODEOWNERS

@@ -4,23 +4,12 @@
 # These names are just suggestions. It is fine to have your changes
 # reviewed by someone else.
 
-packages/android_alarm_manager/**              @bkonyi
-packages/android_intent/**                     @mklim @matthew-carroll
-packages/battery/**                            @matthew-carroll
+
 packages/camera/**                             @bparrishMines
-packages/connectivity/**                       @matthew-carroll
 packages/cross_file/**                         @ditman @mvanbeusekom
-packages/device_info/**                        @matthew-carroll
-packages/espresso/**                           @collinjackson @adazh
 packages/file_selector/**                      @ditman
 packages/google_maps_flutter/**                @cyanglaz
-packages/google_sign_in/**                     @mehmetf
 packages/image_picker/**                       @cyanglaz
 packages/integration_test/**                   @dnfield
-packages/in_app_purchase/**                    @mklim @cyanglaz @LHLL
+packages/in_app_purchase/**                    @cyanglaz @LHLL
 packages/ios_platform_images/**                @gaaclarke
-packages/package_info/**                       @matthew-carroll
-packages/path_provider/**                      @matthew-carroll
-packages/shared_preferences/**                 @matthew-carroll
-packages/url_launcher/**                       @mklim
-packages/video_player/**                       @iskakaushik

CONTRIBUTING.md

@@ -5,6 +5,25 @@
 
 _See also: [Flutter's code of conduct](https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md)_
 
+## Important note
+
+As of January 2021, we are no longer accepting non-critical PRs for plugins
+for which there is a corresponding [Flutter Community Plus
+Plugin](https://plus.fluttercommunity.dev/), as we hope in time to be able
+to transition users to those versions of the plugins. If you have a PR for
+something other than a critical issue (crashes, build failures, null safety, etc.)
+for any of the following plugins, we encourage you to submit it
+[there](https://github.com/fluttercommunity/plus_plugins/pulls) instead:
+- `android_alarm_manager`
+- `android_intent`
+- `battery`
+- `connectivity`
+- `device_info`
+- `package_info`
+- `sensors`
+- `share`
+- `wifi_info_flutter` (corresponds to `network_info_plus`)
+
 ## Things you will need
 
 

packages/camera/camera/CHANGELOG.md

@@ -1,10 +1,11 @@
-# 0.7.0+3
+## 0.7.0+3
 
-* Revert compileSdkVersion back to 29 (from 30) as this is causing problems with add-to-app configurations.
+* Clockwise rotation of focus point in android 
 
 ## 0.7.0+2
 
 * Fix example reference in README.
+* Revert compileSdkVersion back to 29 (from 30) as this is causing problems with add-to-app configurations.
 
 ## 0.7.0+1
 

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

@@ -786,7 +786,7 @@ public void setExposurePoint(@NonNull final Result result, Double x, Double y)
     }
     // Set the metering rectangle
     if (x == null || y == null) cameraRegions.resetAutoExposureMeteringRectangle();
-    else cameraRegions.setAutoExposureMeteringRectangleFromPoint(x, y);
+    else cameraRegions.setAutoExposureMeteringRectangleFromPoint(y, 1 - x);
     // Apply it
     updateExposure(exposureMode);
     refreshPreviewCaptureSession(
@@ -838,7 +838,7 @@ public void setFocusPoint(@NonNull final Result result, Double x, Double y)
     if (x == null || y == null) {
       cameraRegions.resetAutoFocusMeteringRectangle();
     } else {
-      cameraRegions.setAutoFocusMeteringRectangleFromPoint(x, y);
+      cameraRegions.setAutoFocusMeteringRectangleFromPoint(y, 1 - x);
     }
 
     // Apply the new metering rectangle

packages/camera/camera_platform_interface/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 - Migrate to null safety.
 
+## 1.6.0
+
+- Added VideoRecordedEvent to support ending a video recording in the native implementation. 
+
 ## 1.5.0
 
 - Introduces interface methods for locking and unlocking the capture orientation.

packages/camera/camera_platform_interface/lib/src/events/camera_event.dart

@@ -235,3 +235,49 @@ class CameraErrorEvent extends CameraEvent {
   @override
   int get hashCode => super.hashCode ^ description.hashCode;
 }
+
+/// An event fired when a video has finished recording.
+class VideoRecordedEvent extends CameraEvent {
+  /// XFile of the recorded video.
+  final XFile file;
+
+  /// Maximum duration of the recorded video.
+  final Duration? maxVideoDuration;
+
+  /// Build a VideoRecordedEvent triggered from the camera with the `cameraId`.
+  ///
+  /// The `file` represents the file of the video.
+  /// The `maxVideoDuration` shows if a maxVideoDuration shows if a maximum
+  /// video duration was set.
+  VideoRecordedEvent(int cameraId, this.file, this.maxVideoDuration)
+      : super(cameraId);
+
+  /// Converts the supplied [Map] to an instance of the [VideoRecordedEvent]
+  /// class.
+  VideoRecordedEvent.fromJson(Map<String, dynamic> json)
+      : file = XFile(json['path']),
+        maxVideoDuration = json['maxVideoDuration'] != null
+            ? Duration(milliseconds: json['maxVideoDuration'] as int)
+            : null,
+        super(json['cameraId']);
+
+  /// Converts the [VideoRecordedEvent] instance into a [Map] instance that can be
+  /// serialized to JSON.
+  Map<String, dynamic> toJson() => {
+        'cameraId': cameraId,
+        'path': file.path,
+        'maxVideoDuration': maxVideoDuration?.inMilliseconds
+      };
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      super == other &&
+          other is VideoRecordedEvent &&
+          runtimeType == other.runtimeType &&
+          maxVideoDuration == other.maxVideoDuration;
+
+  @override
+  int get hashCode =>
+      super.hashCode ^ file.hashCode ^ maxVideoDuration.hashCode;
+}

packages/camera/camera_platform_interface/lib/src/method_channel/method_channel_camera.dart

@@ -59,7 +59,7 @@ class MethodChannelCamera extends CameraPlatform {
   @override
   Future<List<CameraDescription>> availableCameras() async {
     try {
-      final cameras = await _channel
+      final List<Map<dynamic, dynamic>>? cameras = await _channel
           .invokeListMethod<Map<dynamic, dynamic>>('availableCameras');
 
       if (cameras == null) {
@@ -82,7 +82,7 @@ class MethodChannelCamera extends CameraPlatform {
   Future<int> createCamera(
     CameraDescription cameraDescription,
     ResolutionPreset? resolutionPreset, {
-    bool enableAudio = true,
+    bool enableAudio = false,
   }) async {
     try {
       final reply = await _channel
@@ -163,6 +163,11 @@ class MethodChannelCamera extends CameraPlatform {
     return _cameraEvents(cameraId).whereType<CameraErrorEvent>();
   }
 
+  @override
+  Stream<VideoRecordedEvent> onVideoRecordedEvent(int cameraId) {
+    return _cameraEvents(cameraId).whereType<VideoRecordedEvent>();
+  }
+
   @override
   Stream<DeviceOrientationChangedEvent> onDeviceOrientationChanged() {
     return deviceEventStreamController.stream
@@ -480,6 +485,15 @@ class MethodChannelCamera extends CameraPlatform {
           cameraId,
         ));
         break;
+      case 'video_recorded':
+        cameraEventStreamController.add(VideoRecordedEvent(
+          cameraId,
+          XFile(call.arguments['path']),
+          call.arguments['maxVideoDuration'] != null
+              ? Duration(milliseconds: call.arguments['maxVideoDuration'])
+              : null,
+        ));
+        break;
       case 'error':
         cameraEventStreamController.add(CameraErrorEvent(
           cameraId,

packages/camera/camera_platform_interface/lib/src/platform_interface/camera_platform.dart

@@ -44,6 +44,8 @@ abstract class CameraPlatform extends PlatformInterface {
   }
 
   /// Completes with a list of available cameras.
+  ///
+  /// This method returns an empty list when no cameras are available.
   Future<List<CameraDescription>> availableCameras() {
     throw UnimplementedError('availableCameras() is not implemented.');
   }
@@ -52,7 +54,7 @@ abstract class CameraPlatform extends PlatformInterface {
   Future<int> createCamera(
     CameraDescription cameraDescription,
     ResolutionPreset? resolutionPreset, {
-    bool enableAudio = true,
+    bool enableAudio = false,
   }) {
     throw UnimplementedError('createCamera() is not implemented.');
   }
@@ -89,6 +91,11 @@ abstract class CameraPlatform extends PlatformInterface {
     throw UnimplementedError('onCameraError() is not implemented.');
   }
 
+  /// The camera finished recording a video
+  Stream<VideoRecordedEvent> onVideoRecordedEvent(int cameraId) {
+    throw UnimplementedError('onCameraTimeLimitReached() is not implemented.');
+  }
+
   /// The device orientation changed.
   ///
   /// Implementations for this:
@@ -125,7 +132,8 @@ abstract class CameraPlatform extends PlatformInterface {
   /// The length of the recording can be limited by specifying the [maxVideoDuration].
   /// By default no maximum duration is specified,
   /// meaning the recording will continue until manually stopped.
-  /// The video is returned as a [XFile] after calling [stopVideoRecording].
+  /// With [maxVideoDuration] set the video is returned in a [VideoRecordedEvent]
+  /// through the [onVideoRecordedEvent] stream when the set duration is reached.
   Future<void> startVideoRecording(int cameraId, {Duration? maxVideoDuration}) {
     throw UnimplementedError('startVideoRecording() is not implemented.');
   }