From 724fc6c10b15d738323332bb447c41bf2c6ed857 Mon Sep 17 00:00:00 2001 From: valconetti Date: Tue, 15 Sep 2020 11:55:53 +0200 Subject: [PATCH 1/3] [image_picker] changed ExifInterface to AndroidX version, including documentation and an added dependency --- packages/image_picker/image_picker/CHANGELOG.md | 5 +++++ packages/image_picker/image_picker/android/build.gradle | 1 + .../java/io/flutter/plugins/imagepicker/ExifDataCopier.java | 4 +++- packages/image_picker/image_picker/lib/image_picker.dart | 6 +++--- packages/image_picker/image_picker/pubspec.yaml | 2 +- .../image_picker_platform_interface/CHANGELOG.md | 4 ++++ .../lib/src/platform_interface/image_picker_platform.dart | 6 +++--- .../image_picker_platform_interface/pubspec.yaml | 2 +- 8 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md index 100fe9989354..6350b42b6090 100644 --- a/packages/image_picker/image_picker/CHANGELOG.md +++ b/packages/image_picker/image_picker/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.6.7+9 + +* Updated the ExifInterface to the AndroidX version to support more file formats; +* Update documentation of `getImage()` regarding compression support for specific image types. + ## 0.6.7+8 * Update documentation of getImage() about Android's disability to preference front/rear camera. diff --git a/packages/image_picker/image_picker/android/build.gradle b/packages/image_picker/image_picker/android/build.gradle index 19f14a286a61..3a4bca7c4399 100755 --- a/packages/image_picker/image_picker/android/build.gradle +++ b/packages/image_picker/image_picker/android/build.gradle @@ -37,5 +37,6 @@ android { dependencies { implementation 'androidx.core:core:1.0.2' implementation 'androidx.annotation:annotation:1.0.0' + implementation 'androidx.exifinterface:exifinterface:1.1.0' } } diff --git a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ExifDataCopier.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ExifDataCopier.java index fd7db57e96cc..d570ca0e12d9 100644 --- a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ExifDataCopier.java +++ b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ExifDataCopier.java @@ -4,8 +4,10 @@ package io.flutter.plugins.imagepicker; -import android.media.ExifInterface; import android.util.Log; + +import androidx.exifinterface.media.ExifInterface; + import java.util.Arrays; import java.util.List; diff --git a/packages/image_picker/image_picker/lib/image_picker.dart b/packages/image_picker/image_picker/lib/image_picker.dart index 6fe513dc25f1..ff9aa2cbecc3 100755 --- a/packages/image_picker/image_picker/lib/image_picker.dart +++ b/packages/image_picker/image_picker/lib/image_picker.dart @@ -81,9 +81,9 @@ class ImagePicker { /// original width and height. /// The `imageQuality` argument 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 original quality will be returned. Compression is only supportted for certain - /// image types such as JPEG. If compression is not supported for the image that is picked, - /// an warning message will be logged. + /// the original quality will be returned. Compression is only supported for certain + /// 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. /// /// Use `preferredCameraDevice` 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. diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml index 5a0dfdafe8c2..15af59536a54 100755 --- 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+8 +version: 0.6.7+9 flutter: plugin: diff --git a/packages/image_picker/image_picker_platform_interface/CHANGELOG.md b/packages/image_picker/image_picker_platform_interface/CHANGELOG.md index 33c1cf8ddba7..e82e62028668 100644 --- a/packages/image_picker/image_picker_platform_interface/CHANGELOG.md +++ b/packages/image_picker/image_picker_platform_interface/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.2 + +* Update documentation of `pickImage()` regarding compression support for specific image types. + ## 1.1.1 * Update documentation of getImage() about Android's disability to preference front/rear camera. diff --git a/packages/image_picker/image_picker_platform_interface/lib/src/platform_interface/image_picker_platform.dart b/packages/image_picker/image_picker_platform_interface/lib/src/platform_interface/image_picker_platform.dart index 38bf0858dd6f..f33c80bc4995 100644 --- a/packages/image_picker/image_picker_platform_interface/lib/src/platform_interface/image_picker_platform.dart +++ b/packages/image_picker/image_picker_platform_interface/lib/src/platform_interface/image_picker_platform.dart @@ -50,9 +50,9 @@ abstract class ImagePickerPlatform extends PlatformInterface { /// /// The `imageQuality` argument 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 original quality will be returned. Compression is only supportted for certain - /// image types such as JPEG. If compression is not supported for the image that is picked, - /// an warning message will be logged. + /// the original quality will be returned. Compression is only supported for certain + /// 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. /// /// Use `preferredCameraDevice` 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. diff --git a/packages/image_picker/image_picker_platform_interface/pubspec.yaml b/packages/image_picker/image_picker_platform_interface/pubspec.yaml index 2a5f9d0380d0..16300488368b 100644 --- a/packages/image_picker/image_picker_platform_interface/pubspec.yaml +++ b/packages/image_picker/image_picker_platform_interface/pubspec.yaml @@ -3,7 +3,7 @@ description: A common platform interface for the image_picker plugin. homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker_platform_interface # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 1.1.1 +version: 1.1.2 dependencies: flutter: From 430c93cb9dd7c1bb693eac7ab1453def6c9d8361 Mon Sep 17 00:00:00 2001 From: Anniek Date: Wed, 16 Sep 2020 12:42:47 +0200 Subject: [PATCH 2/3] Style fix (deleted empty lines) --- .../java/io/flutter/plugins/imagepicker/ExifDataCopier.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ExifDataCopier.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ExifDataCopier.java index d570ca0e12d9..08b010072585 100644 --- a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ExifDataCopier.java +++ b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ExifDataCopier.java @@ -5,9 +5,7 @@ package io.flutter.plugins.imagepicker; import android.util.Log; - import androidx.exifinterface.media.ExifInterface; - import java.util.Arrays; import java.util.List; From 5cb825371e7280b1482b1f4e3fc6249431e46f46 Mon Sep 17 00:00:00 2001 From: Maurits van Beusekom Date: Fri, 18 Sep 2020 22:12:15 +0200 Subject: [PATCH 3/3] Update to latest version of the androidx.exifinterface library --- packages/image_picker/image_picker/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/image_picker/image_picker/android/build.gradle b/packages/image_picker/image_picker/android/build.gradle index 3a4bca7c4399..493d72caf1a8 100755 --- a/packages/image_picker/image_picker/android/build.gradle +++ b/packages/image_picker/image_picker/android/build.gradle @@ -37,6 +37,6 @@ android { dependencies { implementation 'androidx.core:core:1.0.2' implementation 'androidx.annotation:annotation:1.0.0' - implementation 'androidx.exifinterface:exifinterface:1.1.0' + implementation 'androidx.exifinterface:exifinterface:1.3.0' } }