From 27ee417539dddc93bd15f2198f4086f07c80172e Mon Sep 17 00:00:00 2001 From: LinXunFeng Date: Tue, 7 May 2024 14:16:09 +0800 Subject: [PATCH 1/7] Adds comment for the limit parameter --- packages/image_picker/image_picker/AUTHORS | 1 + packages/image_picker/image_picker/CHANGELOG.md | 4 ++++ .../image_picker/image_picker/lib/image_picker.dart | 12 ++++++++++++ packages/image_picker/image_picker/pubspec.yaml | 2 +- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/packages/image_picker/image_picker/AUTHORS b/packages/image_picker/image_picker/AUTHORS index 493a0b4ef9c2..3b9449f8d518 100644 --- a/packages/image_picker/image_picker/AUTHORS +++ b/packages/image_picker/image_picker/AUTHORS @@ -64,3 +64,4 @@ Aleksandr Yurkovskiy Anton Borries Alex Li Rahul Raj <64.rahulraj@gmail.com> +LinXunFeng diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md index a054eea85267..29fb408f8b45 100644 --- a/packages/image_picker/image_picker/CHANGELOG.md +++ b/packages/image_picker/image_picker/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.2 + +* Adds comment for the limit parameter. + ## 1.1.1 * Updates documentation to note that Android Photo Picker use is not optional on Android 13+. diff --git a/packages/image_picker/image_picker/lib/image_picker.dart b/packages/image_picker/image_picker/lib/image_picker.dart index 246fe3a4ca18..aedeaf1ea066 100755 --- a/packages/image_picker/image_picker/lib/image_picker.dart +++ b/packages/image_picker/image_picker/lib/image_picker.dart @@ -112,6 +112,12 @@ class ImagePicker { /// image types such as JPEG and on Android PNG and WebP, too. If compression is not /// supported for the image that is picked, a warning message will be logged. /// + /// The `limit` parameter modifies the maximum number of images that can be selected. + /// On Android, you need to set ImagePickerAndroid's useAndroidPhotoPicker to + /// true for this parameter to be valid. + /// See: https://github.com/flutter/packages/blob/main/packages/image_picker/image_picker_android/README.md#photo-picker + /// for code. + /// /// Use `requestFullMetadata` (defaults to `true`) to control how much additional /// information the plugin tries to get. /// If `requestFullMetadata` is set to `true`, the plugin tries to get the full @@ -225,6 +231,12 @@ class ImagePicker { /// image types such as JPEG and on Android PNG and WebP, too. If compression is not /// supported for the image that is picked, a warning message will be logged. /// + /// The `limit` parameter modifies the maximum number of media that can be selected. + /// On Android, you need to set ImagePickerAndroid's useAndroidPhotoPicker to + /// true for this parameter to be valid. + /// See: https://github.com/flutter/packages/blob/main/packages/image_picker/image_picker_android/README.md#photo-picker + /// for code. + /// /// Use `requestFullMetadata` (defaults to `true`) to control how much additional /// information the plugin tries to get. /// If `requestFullMetadata` is set to `true`, the plugin tries to get the full diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml index 3eaabc0a8994..ee854ea43ad5 100755 --- a/packages/image_picker/image_picker/pubspec.yaml +++ b/packages/image_picker/image_picker/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image library, and taking new pictures with the camera. repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 1.1.1 +version: 1.1.2 environment: sdk: ^3.3.0 From fca4bcb615a12ae0a3458fd4ca05b539b7f5793c Mon Sep 17 00:00:00 2001 From: LinXunFeng Date: Tue, 7 May 2024 18:38:40 +0800 Subject: [PATCH 2/7] Update comment --- .../image_picker/image_picker/lib/image_picker.dart | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/image_picker/image_picker/lib/image_picker.dart b/packages/image_picker/image_picker/lib/image_picker.dart index aedeaf1ea066..4109ef0de0c8 100755 --- a/packages/image_picker/image_picker/lib/image_picker.dart +++ b/packages/image_picker/image_picker/lib/image_picker.dart @@ -113,10 +113,8 @@ class ImagePicker { /// supported for the image that is picked, a warning message will be logged. /// /// The `limit` parameter modifies the maximum number of images that can be selected. - /// On Android, you need to set ImagePickerAndroid's useAndroidPhotoPicker to - /// true for this parameter to be valid. - /// See: https://github.com/flutter/packages/blob/main/packages/image_picker/image_picker_android/README.md#photo-picker - /// for code. + /// On Android, [ImagePickerAndroid.useAndroidPhotoPicker] must be set to `true` + /// to use the `limit` functionality. /// /// Use `requestFullMetadata` (defaults to `true`) to control how much additional /// information the plugin tries to get. @@ -232,10 +230,8 @@ class ImagePicker { /// supported for the image that is picked, a warning message will be logged. /// /// The `limit` parameter modifies the maximum number of media that can be selected. - /// On Android, you need to set ImagePickerAndroid's useAndroidPhotoPicker to - /// true for this parameter to be valid. - /// See: https://github.com/flutter/packages/blob/main/packages/image_picker/image_picker_android/README.md#photo-picker - /// for code. + /// On Android, [ImagePickerAndroid.useAndroidPhotoPicker] must be set to `true` + /// to use the `limit` functionality. /// /// Use `requestFullMetadata` (defaults to `true`) to control how much additional /// information the plugin tries to get. From d9feefd7f446849a2ef403428c476fd86da8ecaf Mon Sep 17 00:00:00 2001 From: LinXunFeng Date: Wed, 8 May 2024 10:42:16 +0800 Subject: [PATCH 3/7] Update comment --- packages/image_picker/image_picker/lib/image_picker.dart | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/image_picker/image_picker/lib/image_picker.dart b/packages/image_picker/image_picker/lib/image_picker.dart index 4109ef0de0c8..037cfd8cc4ed 100755 --- a/packages/image_picker/image_picker/lib/image_picker.dart +++ b/packages/image_picker/image_picker/lib/image_picker.dart @@ -114,7 +114,9 @@ class ImagePicker { /// /// The `limit` parameter modifies the maximum number of images that can be selected. /// On Android, [ImagePickerAndroid.useAndroidPhotoPicker] must be set to `true` - /// to use the `limit` functionality. + /// to use the `limit` functionality. And it can only be ensured to take effect + /// on Android 13 or above. Otherwise, it depends on whether the corresponding + /// system app supports it. /// /// Use `requestFullMetadata` (defaults to `true`) to control how much additional /// information the plugin tries to get. @@ -231,7 +233,9 @@ class ImagePicker { /// /// The `limit` parameter modifies the maximum number of media that can be selected. /// On Android, [ImagePickerAndroid.useAndroidPhotoPicker] must be set to `true` - /// to use the `limit` functionality. + /// to use the `limit` functionality. And it can only be ensured to take effect + /// on Android 13 or above. Otherwise, it depends on whether the corresponding + /// system app supports it. /// /// Use `requestFullMetadata` (defaults to `true`) to control how much additional /// information the plugin tries to get. From a6150df5ab31104b38279dc64087abf5e7fe7a70 Mon Sep 17 00:00:00 2001 From: LinXunFeng Date: Thu, 9 May 2024 09:04:00 +0800 Subject: [PATCH 4/7] Update commnet --- .../image_picker/image_picker/lib/image_picker.dart | 10 ++-------- packages/image_picker/image_picker_android/README.md | 3 +++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/image_picker/image_picker/lib/image_picker.dart b/packages/image_picker/image_picker/lib/image_picker.dart index 037cfd8cc4ed..3e51cc13dac2 100755 --- a/packages/image_picker/image_picker/lib/image_picker.dart +++ b/packages/image_picker/image_picker/lib/image_picker.dart @@ -113,10 +113,7 @@ class ImagePicker { /// supported for the image that is picked, a warning message will be logged. /// /// The `limit` parameter modifies the maximum number of images that can be selected. - /// On Android, [ImagePickerAndroid.useAndroidPhotoPicker] must be set to `true` - /// to use the `limit` functionality. And it can only be ensured to take effect - /// on Android 13 or above. Otherwise, it depends on whether the corresponding - /// system app supports it. + /// This value may be ignored by platforms that cannot support it. /// /// Use `requestFullMetadata` (defaults to `true`) to control how much additional /// information the plugin tries to get. @@ -232,10 +229,7 @@ class ImagePicker { /// supported for the image that is picked, a warning message will be logged. /// /// The `limit` parameter modifies the maximum number of media that can be selected. - /// On Android, [ImagePickerAndroid.useAndroidPhotoPicker] must be set to `true` - /// to use the `limit` functionality. And it can only be ensured to take effect - /// on Android 13 or above. Otherwise, it depends on whether the corresponding - /// system app supports it. + /// This value may be ignored by platforms that cannot support it. /// /// Use `requestFullMetadata` (defaults to `true`) to control how much additional /// information the plugin tries to get. diff --git a/packages/image_picker/image_picker_android/README.md b/packages/image_picker/image_picker_android/README.md index 0a20e39897c5..498080187522 100755 --- a/packages/image_picker/image_picker_android/README.md +++ b/packages/image_picker/image_picker_android/README.md @@ -33,5 +33,8 @@ import 'package:image_picker_platform_interface/image_picker_platform_interface. } ``` +In addition, `[ImagePickerAndroid.useAndroidPhotoPicker]` must be set to `true` to use the `limit` functionality. It is implemented based on [`ActivityResultContract`][3], so it can only be ensured to take effect on Android 13 or above. Otherwise, it depends on whether the corresponding system app supports it. + [1]: https://pub.dev/packages/image_picker [2]: https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin +[3]: https://developer.android.google.cn/reference/kotlin/androidx/activity/result/contract/ActivityResultContracts.PickMultipleVisualMedia From 174414f8f7af58597d8bfaaaaa81c123e6c0554e Mon Sep 17 00:00:00 2001 From: LinXunFeng Date: Fri, 31 May 2024 08:27:58 +0800 Subject: [PATCH 5/7] Resolve conflicts --- packages/image_picker/image_picker_android/AUTHORS | 1 + packages/image_picker/image_picker_android/CHANGELOG.md | 4 ++++ packages/image_picker/image_picker_android/pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/image_picker/image_picker_android/AUTHORS b/packages/image_picker/image_picker_android/AUTHORS index 57d4f75a1d35..e563a24b660e 100644 --- a/packages/image_picker/image_picker_android/AUTHORS +++ b/packages/image_picker/image_picker_android/AUTHORS @@ -65,3 +65,4 @@ Anton Borries Alex Li Rahul Raj <64.rahulraj@gmail.com> André Sousa +LinXunFeng diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md index 0d91ddddcdda..226d51299be7 100644 --- a/packages/image_picker/image_picker_android/CHANGELOG.md +++ b/packages/image_picker/image_picker_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.8.13 + +* Update documentation to note that limit is not always supported. + ## 0.8.12+2 * Updates minimum supported SDK version to Flutter 3.22/Dart 3.4. diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml index 4e4980c581cf..692a97b949bf 100755 --- a/packages/image_picker/image_picker_android/pubspec.yaml +++ b/packages/image_picker/image_picker_android/pubspec.yaml @@ -2,7 +2,7 @@ name: image_picker_android description: Android implementation of the image_picker plugin. repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 0.8.12+2 +version: 0.8.13 environment: sdk: ^3.4.0 From 2e0a102d9ce8247ef3de7ad751f6e31e24a41b16 Mon Sep 17 00:00:00 2001 From: LinXunFeng Date: Fri, 31 May 2024 21:06:43 +0800 Subject: [PATCH 6/7] Remove brackets --- packages/image_picker/image_picker_android/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/image_picker/image_picker_android/README.md b/packages/image_picker/image_picker_android/README.md index 498080187522..14cbc4891260 100755 --- a/packages/image_picker/image_picker_android/README.md +++ b/packages/image_picker/image_picker_android/README.md @@ -33,7 +33,7 @@ import 'package:image_picker_platform_interface/image_picker_platform_interface. } ``` -In addition, `[ImagePickerAndroid.useAndroidPhotoPicker]` must be set to `true` to use the `limit` functionality. It is implemented based on [`ActivityResultContract`][3], so it can only be ensured to take effect on Android 13 or above. Otherwise, it depends on whether the corresponding system app supports it. +In addition, `ImagePickerAndroid.useAndroidPhotoPicker` must be set to `true` to use the `limit` functionality. It is implemented based on [`ActivityResultContract`][3], so it can only be ensured to take effect on Android 13 or above. Otherwise, it depends on whether the corresponding system app supports it. [1]: https://pub.dev/packages/image_picker [2]: https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin From 2bc3ba54ba52e41066c4288404fb4df1dd323723 Mon Sep 17 00:00:00 2001 From: LinXunFeng Date: Fri, 31 May 2024 21:07:39 +0800 Subject: [PATCH 7/7] Update version --- packages/image_picker/image_picker_android/CHANGELOG.md | 2 +- packages/image_picker/image_picker_android/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md index 226d51299be7..dde51eef8103 100644 --- a/packages/image_picker/image_picker_android/CHANGELOG.md +++ b/packages/image_picker/image_picker_android/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.8.13 +## 0.8.12+3 * Update documentation to note that limit is not always supported. diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml index 692a97b949bf..1bb91c514db2 100755 --- a/packages/image_picker/image_picker_android/pubspec.yaml +++ b/packages/image_picker/image_picker_android/pubspec.yaml @@ -2,7 +2,7 @@ name: image_picker_android description: Android implementation of the image_picker plugin. repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 0.8.13 +version: 0.8.12+3 environment: sdk: ^3.4.0