[image_picker] Support reading WebP images for iOS

packages/image_picker/image_picker/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.4+4
+
+* Support adding WebP for iOS
+
 ## 0.8.4+3
 
 * Suppress a unchecked cast build warning.

packages/image_picker/image_picker/ios/Classes/FLTPHPickerSaveImageToPathOperation.m

@@ -82,51 +82,61 @@ - (void)start {
   }
   if (@available(iOS 14, *)) {
     [self setExecuting:YES];
-    [self.result.itemProvider
-        loadObjectOfClass:[UIImage class]
-        completionHandler:^(__kindof id<NSItemProviderReading> _Nullable image,
-                            NSError *_Nullable error) {
-          if ([image isKindOfClass:[UIImage class]]) {
-            __block UIImage *localImage = image;
-            PHAsset *originalAsset =
-                [FLTImagePickerPhotoAssetUtil getAssetFromPHPickerResult:self.result];
-
-            if (self.maxWidth != (id)[NSNull null] || self.maxHeight != (id)[NSNull null]) {
-              localImage = [FLTImagePickerImageUtil scaledImage:localImage
-                                                       maxWidth:self.maxWidth
-                                                      maxHeight:self.maxHeight
-                                            isMetadataAvailable:originalAsset != nil];
-            }
-            __block NSString *savedPath;
-            if (!originalAsset) {
-              // Image picked without an original asset (e.g. User pick image without permission)
-              savedPath =
-                  [FLTImagePickerPhotoAssetUtil saveImageWithPickerInfo:nil
-                                                                  image:localImage
-                                                           imageQuality:self.desiredImageQuality];
-              [self completeOperationWithPath:savedPath];
-            } else {
-              [[PHImageManager defaultManager]
-                  requestImageDataForAsset:originalAsset
-                                   options:nil
-                             resultHandler:^(
-                                 NSData *_Nullable imageData, NSString *_Nullable dataUTI,
-                                 UIImageOrientation orientation, NSDictionary *_Nullable info) {
-                               // maxWidth and maxHeight are used only for GIF images.
-                               savedPath = [FLTImagePickerPhotoAssetUtil
-                                   saveImageWithOriginalImageData:imageData
-                                                            image:localImage
-                                                         maxWidth:self.maxWidth
-                                                        maxHeight:self.maxHeight
-                                                     imageQuality:self.desiredImageQuality];
-                               [self completeOperationWithPath:savedPath];
-                             }];
-            }
-          }
+    NSString *webpIdentifier = @"org.webmproject.webp";
+    if ([self.result.itemProvider hasItemConformingToTypeIdentifier:webpIdentifier]) {
+        [self.result.itemProvider loadDataRepresentationForTypeIdentifier:webpIdentifier completionHandler:^(NSData * _Nullable data, NSError * _Nullable error) {
+            __block UIImage *image = [[UIImage alloc] initWithData:data];
+            [self processImage:image];
         }];
+        return;
+    }
+
+    [self.result.itemProvider loadObjectOfClass:[UIImage class] completionHandler:^(__kindof id<NSItemProviderReading> _Nullable image, NSError *_Nullable error) {
+        if ([image isKindOfClass:[UIImage class]]) {
+            [self processImage:image];
+        }
+    }];
   } else {
     [self setFinished:YES];
   }
 }
 
+- (void)processImage:(UIImage *)image API_AVAILABLE(ios(14)); {
+    __block UIImage *localImage = image;
+    PHAsset *originalAsset =
+    [FLTImagePickerPhotoAssetUtil getAssetFromPHPickerResult:self.result];
+
+    if (self.maxWidth != (id)[NSNull null] || self.maxHeight != (id)[NSNull null]) {
+        localImage = [FLTImagePickerImageUtil scaledImage:localImage
+                                                 maxWidth:self.maxWidth
+                                                maxHeight:self.maxHeight
+                                      isMetadataAvailable:originalAsset != nil];
+    }
+    __block NSString *savedPath;
+    if (!originalAsset) {
+        // Image picked without an original asset (e.g. User pick image without permission)
+        savedPath =
+        [FLTImagePickerPhotoAssetUtil saveImageWithPickerInfo:nil
+                                                        image:localImage
+                                                 imageQuality:self.desiredImageQuality];
+        [self completeOperationWithPath:savedPath];
+    } else {
+        [[PHImageManager defaultManager]
+         requestImageDataForAsset:originalAsset
+         options:nil
+         resultHandler:^(
+                         NSData *_Nullable imageData, NSString *_Nullable dataUTI,
+                         UIImageOrientation orientation, NSDictionary *_Nullable info) {
+                             // maxWidth and maxHeight are used only for GIF images.
+                             savedPath = [FLTImagePickerPhotoAssetUtil
+                                          saveImageWithOriginalImageData:imageData
+                                          image:localImage
+                                          maxWidth:self.maxWidth
+                                          maxHeight:self.maxHeight
+                                          imageQuality:self.desiredImageQuality];
+                             [self completeOperationWithPath:savedPath];
+                         }];
+    }
+}
+
 @end

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/plugins/tree/master/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: 0.8.4+3
+version: 0.8.4+4
 
 environment:
   sdk: ">=2.14.0 <3.0.0"