Merge branch 'main' of github.com:flutter/plugins into ios-optional-p…

…ermissions � Conflicts: � packages/image_picker/image_picker/CHANGELOG.md � packages/image_picker/image_picker/pubspec.yaml � packages/image_picker/image_picker_ios/CHANGELOG.md � packages/image_picker/image_picker_ios/pubspec.yaml � packages/image_picker/image_picker_platform_interface/CHANGELOG.md � packages/image_picker/image_picker_platform_interface/lib/src/platform_interface/image_picker_platform.dart � packages/image_picker/image_picker_platform_interface/lib/src/types/image_picker_options.dart � packages/image_picker/image_picker_platform_interface/test/new_method_channel_image_picker_test.dart
flutter · auto-submit · Oct 5, 2022 · Jan 3, 2022 · Jan 3, 2022 · Jan 3, 2022
commit 6f32405437df75c4fb0373daaf4276c20b72425b
@@ -2,6 +2,15 @@
 
 * Adds `requestFullMetadata` option to `pickImage`, so images on iOS can be picked without `Photo Library Usage` permission.
 
+## 0.8.5+2
+
+* Minor fixes for new analysis options.
+
+## 0.8.5+1
+
+* Fixes library_private_types_in_public_api, sort_child_properties_last and use_key_in_widget_constructors
+  lint warnings.
+
 ## 0.8.5
 
 * Moves Android and iOS implementations to federated packages.

@@ -32,9 +32,3 @@ dev_dependencies:
     sdk: flutter
   mockito: ^5.0.0
   plugin_platform_interface: ^2.0.0
-
-# FOR TESTING ONLY. DO NOT MERGE.
-dependency_overrides:
-  image_picker_platform_interface:
-    path:
-      ../image_picker_platform_interface
diff --git a/packages/image_picker/image_picker_ios/CHANGELOG.md b/packages/image_picker/image_picker_ios/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 * Adds `requestFullMetadata` option to `pickImage`, so images on iOS can be picked without `Photo Library Usage` permission.
 
+## 0.8.5+2
+
+* Minor fixes for new analysis options.
+
+## 0.8.5+1
+
+* Removes unnecessary imports.
+* Fixes library_private_types_in_public_api, sort_child_properties_last and use_key_in_widget_constructors
+  lint warnings.
+
 ## 0.8.5
 
 * Switches to an in-package method channel based on Pigeon.

diff --git a/packages/image_picker/image_picker_platform_interface/CHANGELOG.md b/packages/image_picker/image_picker_platform_interface/CHANGELOG.md
@@ -1,7 +1,10 @@
 ## 2.5.0
 
-* Re-adds `requestFullMetadata` option, but as a parameter of a new `pickImageFromSource` 
-  method.
+* Deprecates `getImage` in favor of a new method `getImageFromSource`.
+    * Adds `requestFullMetadata` option that allows disabling extra permission requests
+      on certain platforms.
+    * Moves optional image picking parameters to `ImagePickerOptions` class.
+* Minor fixes for new analysis options. 
 
 ## 2.4.4
 
@@ -22,10 +25,10 @@
 
 ## 2.4.0
 
-* Add `requestFullMetadata` option to `pickImage`.
-  * To keep this non-breaking `requestFullMetadata` defaults to `true`, so the plugin tries
+* Add `forceFullMetadata` option to `pickImage`.
+  * To keep this non-breaking `forceFullMetadata` defaults to `true`, so the plugin tries
    to get the full image metadata which may require extra permission requests on certain platforms.
-  * If `requestFullMetadata` is set to `false`, the plugin fetches the image in a way that reduces
+  * If `forceFullMetadata` is set to `false`, the plugin fetches the image in a way that reduces
    permission requests from the platform (e.g on iOS the plugin won’t ask for the `NSPhotoLibraryUsageDescription` permission).
 
 ## 2.3.0

diff --git a/...ker/image_picker_platform_interface/lib/src/platform_interface/image_picker_platform.dart b/...ker/image_picker_platform_interface/lib/src/platform_interface/image_picker_platform.dart
@@ -259,14 +259,16 @@ abstract class ImagePickerPlatform extends PlatformInterface {
   /// The `source` argument controls where the image comes from. This can
   /// be either [ImageSource.camera] or [ImageSource.gallery].
   ///
-  /// The `options` argument controls additional settings that can be used when picking an image. See [ImagePickerOptions]
-  /// for more details.
+  /// The `options` argument controls additional settings that can be used when
+  /// picking an image. See [ImagePickerOptions] for more details.
   ///
-  /// Where iOS supports HEIC images, Android 8 and below doesn't. Android 9 and above only support HEIC images if used
-  /// in addition to a size modification, of which the usage is explained in [ImagePickerOptions].
+  /// Where iOS supports HEIC images, Android 8 and below doesn't. Android 9 and
+  /// above only support HEIC images if used in addition to a size modification,
+  /// of which the usage is explained in [ImagePickerOptions].
   ///
-  /// In Android, the MainActivity can be destroyed for various reasons. If that happens, the result will be lost
-  /// in this call. You can then call [getLostData] when your app relaunches to retrieve the lost data.
+  /// In Android, the MainActivity can be destroyed for various reasons. If that
+  /// happens, the result will be lost in this call. You can then call [getLostData]
+  /// when your app relaunches to retrieve the lost data.
   ///
   /// If no images were picked, the return value is null.
   Future<XFile?> getImageFromSource({

diff --git a/...ages/image_picker/image_picker_platform_interface/lib/src/types/image_picker_options.dart b/...ages/image_picker/image_picker_platform_interface/lib/src/types/image_picker_options.dart
@@ -7,7 +7,7 @@ import 'package:image_picker_platform_interface/src/types/types.dart';
 /// Specifies options for picking a single image from the device's camera or gallery.
 class ImagePickerOptions {
   /// Creates an instance with the given [maxHeight], [maxWidth], [imageQuality],
-  /// [referredCameraDevice] and [requestFullMetadata]. Any of the params may be null.
+  /// [referredCameraDevice] and [requestFullMetadata].
   const ImagePickerOptions({
     this.maxHeight,
     this.maxWidth,
@@ -16,33 +16,35 @@ class ImagePickerOptions {
     this.requestFullMetadata = true,
   });
 
-  /// If specified, the image will be at most `maxWidth` wide. Otherwise,
-  /// the image will be returned at its original width.
+  /// The maximum width of the image, in pixels.
+  ///
+  /// If null, the image will only be resized if [maxHeight] is specified.
   final double? maxWidth;
 
-  /// If specified, the image will be at most`maxHeight` tall.
-  /// Otherwise the image will be returned at its original height.
+  /// The maximum height of the image, in pixels.
+  ///
+  /// If null, the image will only be resized if [maxWidth] is specified.
   final double? maxHeight;
 
-  /// Modifies the quality of the image, ranging from 0-100 where 100 is the original/max
-  /// quality. If `imageQuality` is null, the image with the originalquality will
-  /// be returned. Compression is only supported for certain image types such as
-  /// JPEG. If compression is not supported for the image that is picked, a warning
+  /// Modifies the quality of the image, ranging from 0-100 where 100 is the
+  /// original/max quality.
+  ///
+  /// Compression is only supported for certain image types such as JPEG. If
+  /// compression is not supported for the image that is picked, a warning
   /// message will be logged.
+  ///
+  /// If null, the image will be returned with the original quality.
   final int? imageQuality;
 
   /// Used to specify the camera to use when the `source` is [ImageSource.camera].
-  /// The `preferredCameraDevice` is ignored when `source` is [ImageSource.gallery].
-  /// It is also ignored if the chosen camera is not supported on the device.
-  /// Defaults to [CameraDevice.rear]. Note that Android has no documented parameter
-  /// for an intent to specify if the front or rear camera should be opened, this
-  /// function is not guaranteed to work on an Android device.
+  ///
+  /// Ignored if the source is not [ImageSource.camera], or the chosen camera is not
+  /// supported on the device. Defaults to [CameraDevice.rear].
   final CameraDevice preferredCameraDevice;
 
-  /// `requestFullMetadata` defaults to `true`, so the plugin tries to get the
-  /// full image metadata which may require extra permission requests on certain platforms.
-  /// If `requestFullMetadata` is set to `false`, the plugin fetches the image
-  /// in a way that reduces permission requests from the platform (e.g. on iOS
-  /// the plugin won’t ask for the `NSPhotoLibraryUsageDescription` permission).
+  /// If true, requests full image metadata, which may require extra permissions
+  /// on some platforms, (e.g., NSPhotoLibraryUsageDescription on iOS).
+  //
+  // Defaults to true.
   final bool requestFullMetadata;
 }
diff --git a/...age_picker/image_picker_platform_interface/test/new_method_channel_image_picker_test.dart b/...age_picker/image_picker_platform_interface/test/new_method_channel_image_picker_test.dart
@@ -1133,7 +1133,7 @@ void main() {
         );
       });
 
-      test('does not accept a invalid imageQuality argument', () {
+      test('does not accept an invalid imageQuality argument', () {
         expect(
           () => picker.getImageFromSource(
             source: ImageSource.gallery,