Merge branch 'master' into feature/camera_exposure_auto_platform_interface

BeMacized · BeMacized · commit a09b02f55e54 · 2020-12-24T14:11:50.000+01:00
# Conflicts:
#	packages/camera/camera/CHANGELOG.md
#	packages/camera/camera/ios/Classes/CameraPlugin.m
diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 * Adds torch mode as a flash mode for Android and iOS implementations.
 
+## 0.6.2+1
+
+* Fix the API documentation for the `CameraController.takePicture` method.
+
 ## 0.6.2
 
 * Add zoom support for Android and iOS implementations.
diff --git a/packages/camera/camera/ios/Classes/CameraPlugin.m b/packages/camera/camera/ios/Classes/CameraPlugin.m
@@ -913,12 +913,6 @@ - (BOOL)setupWriterForPath:(NSString *)path {
     [self.captureDevice unlockForConfiguration];
   }
 
-  if (_flashMode == FlashModeTorch) {
-    [self.captureDevice lockForConfiguration:nil];
-    [self.captureDevice setTorchMode:AVCaptureTorchModeOn];
-    [self.captureDevice unlockForConfiguration];
-  }
-
   [_videoWriter addInput:_videoWriterInput];
   [_captureVideoOutput setSampleBufferDelegate:self queue:_dispatchQueue];
 
diff --git a/packages/camera/camera/lib/src/camera_controller.dart b/packages/camera/camera/lib/src/camera_controller.dart
@@ -226,13 +226,7 @@ class CameraController extends ValueNotifier<CameraValue> {
     await CameraPlatform.instance.prepareForVideoRecording();
   }
 
-  /// Captures an image and saves it to [path].
-  ///
-  /// A path can for example be obtained using
-  /// [path_provider](https://pub.dartlang.org/packages/path_provider).
-  ///
-  /// If a file already exists at the provided path an error will be thrown.
-  /// The file can be read as this function returns.
+  /// Captures an image and returns the file where it was saved.
   ///
   /// Throws a [CameraException] if the capture fails.
   Future<XFile> takePicture() async {
diff --git a/packages/cross_file/CHANGELOG.md b/packages/cross_file/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0
+
+* **breaking change** Make sure the `saveTo` method returns a `Future` so it can be awaited and users are sure the file has been written to disk.
+
 ## 0.1.0+2
 
 * Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))
diff --git a/packages/cross_file/lib/src/types/base.dart b/packages/cross_file/lib/src/types/base.dart
@@ -18,7 +18,7 @@ abstract class XFileBase {
   XFileBase(String path);
 
   /// Save the CrossFile at the indicated file path.
-  void saveTo(String path) async {
+  Future<void> saveTo(String path) {
     throw UnimplementedError('saveTo has not been implemented.');
   }
 
diff --git a/packages/cross_file/lib/src/types/html.dart b/packages/cross_file/lib/src/types/html.dart
@@ -108,7 +108,7 @@ class XFile extends XFileBase {
 
   /// Saves the data of this CrossFile at the location indicated by path.
   /// For the web implementation, the path variable is ignored.
-  void saveTo(String path) async {
+  Future<void> saveTo(String path) async {
     // Create a DOM container where we can host the anchor.
     _target = ensureInitialized('__x_file_dom_element');
 
diff --git a/packages/cross_file/lib/src/types/io.dart b/packages/cross_file/lib/src/types/io.dart
@@ -57,7 +57,7 @@ class XFile extends XFileBase {
   }
 
   @override
-  void saveTo(String path) async {
+  Future<void> saveTo(String path) async {
     File fileToSave = File(path);
     await fileToSave.writeAsBytes(_bytes ?? (await readAsBytes()));
     await fileToSave.create();
diff --git a/packages/cross_file/pubspec.yaml b/packages/cross_file/pubspec.yaml
@@ -1,7 +1,7 @@
 name: cross_file
 description: An abstraction to allow working with files across multiple platforms.
 homepage: https://github.com/flutter/plugins/tree/master/packages/cross_file
-version: 0.1.0+2
+version: 0.2.0
 
 dependencies:
   flutter:
diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.7+19
+
+* Do not copy static field to another static field.
+
 ## 0.6.7+18
 
 * Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))
diff --git a/packages/image_picker/image_picker/lib/image_picker.dart b/packages/image_picker/image_picker/lib/image_picker.dart
@@ -27,7 +27,7 @@ export 'package:image_picker_platform_interface/image_picker_platform_interface.
 class ImagePicker {
   /// The platform interface that drives this plugin
   @visibleForTesting
-  static ImagePickerPlatform platform = ImagePickerPlatform.instance;
+  static ImagePickerPlatform get platform => ImagePickerPlatform.instance;
 
   /// Returns a [File] object pointing to the image that was picked.
   ///
diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
@@ -2,7 +2,7 @@ name: image_picker
 description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
-version: 0.6.7+18
+version: 0.6.7+19
 
 flutter:
   plugin:
@@ -25,7 +25,9 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     path: ../../integration_test
+  mockito: ^4.1.3
   pedantic: ^1.8.0
+  plugin_platform_interface: ^1.0.3
 
 environment:
   sdk: ">=2.1.0 <3.0.0"
diff --git a/packages/image_picker/image_picker/test/image_picker_test.dart b/packages/image_picker/image_picker/test/image_picker_test.dart
@@ -5,6 +5,9 @@
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:image_picker/image_picker.dart';
+import 'package:image_picker_platform_interface/image_picker_platform_interface.dart';
+import 'package:mockito/mockito.dart';
+import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
@@ -26,6 +29,15 @@ void main() {
       log.clear();
     });
 
+    test('ImagePicker platform instance overrides the actual platform used',
+        () {
+      final ImagePickerPlatform savedPlatform = ImagePickerPlatform.instance;
+      final MockPlatform mockPlatform = MockPlatform();
+      ImagePickerPlatform.instance = mockPlatform;
+      expect(ImagePicker.platform, mockPlatform);
+      ImagePickerPlatform.instance = savedPlatform;
+    });
+
     group('#pickImage', () {
       test('passes the image source argument correctly', () async {
         await picker.getImage(source: ImageSource.camera);
@@ -336,3 +348,7 @@ void main() {
     });
   });
 }
+
+class MockPlatform extends Mock
+    with MockPlatformInterfaceMixin
+    implements ImagePickerPlatform {}
diff --git a/packages/url_launcher/url_launcher/CHANGELOG.md b/packages/url_launcher/url_launcher/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 6.0.0-nullsafety.3
+
+* forceSafariVC should be nullable.
+
 ## 6.0.0-nullsafety.2
 
 * Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))
diff --git a/packages/url_launcher/url_launcher/lib/url_launcher.dart b/packages/url_launcher/url_launcher/lib/url_launcher.dart
@@ -62,7 +62,7 @@ import 'package:url_launcher_platform_interface/url_launcher_platform_interface.
 /// is set to true and the universal link failed to launch.
 Future<bool> launch(
   String urlString, {
-  bool forceSafariVC = true,
+  bool? forceSafariVC,
   bool forceWebView = false,
   bool enableJavaScript = false,
   bool enableDomStorage = false,
@@ -95,7 +95,7 @@ Future<bool> launch(
 
   final bool result = await UrlLauncherPlatform.instance.launch(
     urlString,
-    useSafariVC: forceSafariVC,
+    useSafariVC: forceSafariVC ?? isWebURL,
     useWebView: forceWebView,
     enableJavaScript: enableJavaScript,
     enableDomStorage: enableDomStorage,
diff --git a/packages/url_launcher/url_launcher/pubspec.yaml b/packages/url_launcher/url_launcher/pubspec.yaml
@@ -2,7 +2,7 @@ name: url_launcher
 description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher
-version: 6.0.0-nullsafety.2
+version: 6.0.0-nullsafety.3
 
 flutter:
   plugin:
diff --git a/packages/video_player/video_player/CHANGELOG.md b/packages/video_player/video_player/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0-nullsafety.6
+
+* Fix `VideoPlayerValue toString()` test.
+
 ## 2.0.0-nullsafety.5
 
 * Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))
diff --git a/packages/video_player/video_player/pubspec.yaml b/packages/video_player/video_player/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for displaying inline video with other Flutter
 # 0.10.y+z is compatible with 1.0.0, if you land a breaking change bump
 # the version to 2.0.0.
 # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 2.0.0-nullsafety.5
+version: 2.0.0-nullsafety.6
 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player/video_player
 
 flutter:
diff --git a/packages/video_player/video_player/test/video_player_test.dart b/packages/video_player/video_player/test/video_player_test.dart
@@ -567,7 +567,7 @@ void main() {
           'VideoPlayerValue(duration: 0:00:05.000000, '
           'size: Size(400.0, 300.0), '
           'position: 0:00:01.000000, '
-          'caption: Caption(number: null, start: null, end: null, text: foo), '
+          'caption: Caption(number: 0, start: 0:00:00.000000, end: 0:00:00.000000, text: foo), '
           'buffered: [DurationRange(start: 0:00:00.000000, end: 0:00:04.000000)], '
           'isInitialized: true, '
           'isPlaying: true, '

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ abstract class XFileBase {`
`18`	`18`	`XFileBase(String path);`
`19`	`19`
`20`	`20`	`/// Save the CrossFile at the indicated file path.`
`21`		`- void saveTo(String path) async {`
	`21`	`+ Future<void> saveTo(String path) {`
`22`	`22`	`throw UnimplementedError('saveTo has not been implemented.');`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class XFile extends XFileBase {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@override`
`60`		`- void saveTo(String path) async {`
	`60`	`+ Future<void> saveTo(String path) async {`
`61`	`61`	`File fileToSave = File(path);`
`62`	`62`	`await fileToSave.writeAsBytes(_bytes ?? (await readAsBytes()));`
`63`	`63`	`await fileToSave.create();`