Merge pull request #319 from fzyzcjy/develop

remove need for package:image to shrink package size

Author: renefloor

flutter_cache_manager/lib/src/cache_managers/image_cache_manager.dart

@@ -1,8 +1,10 @@
+import 'dart:async';
 import 'dart:math';
-import 'dart:typed_data';
+import 'dart:ui' as ui;
 
+import 'package:file/file.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:image/image.dart';
 
 const supportedFileNames = ['jpg', 'jpeg', 'png', 'tga', 'gif', 'cur', 'ico'];
 mixin ImageCacheManager on BaseCacheManager {
@@ -60,6 +62,7 @@ mixin ImageCacheManager on BaseCacheManager {
   }
 
   final Map<String, Stream<FileResponse>> _runningResizes = {};
+
   Future<FileInfo> _resizeImageFile(
     FileInfo originalFile,
     String key,
@@ -72,7 +75,14 @@ mixin ImageCacheManager on BaseCacheManager {
       return originalFile;
     }
 
-    var image = decodeImage(await originalFile.file.readAsBytes())!;
+    var image = await _decodeImage(originalFile.file);
+
+    var shouldResize = maxWidth != null
+        ? image.width > maxWidth
+        : false || maxHeight != null
+            ? image.height > maxHeight
+            : false;
+    if (!shouldResize) return originalFile;
     if (maxWidth != null && maxHeight != null) {
       var resizeFactorWidth = image.width / maxWidth;
       var resizeFactorHeight = image.height / maxHeight;
@@ -82,13 +92,17 @@ mixin ImageCacheManager on BaseCacheManager {
       maxHeight = (image.height / resizeFactor).round();
     }
 
-    var resized = copyResize(image, width: maxWidth, height: maxHeight);
-    var resizedFile = encodeNamedImage(resized, originalFileName)!;
+    var resized = await _decodeImage(originalFile.file,
+        width: maxWidth, height: maxHeight, allowUpscaling: false);
+    var resizedFile =
+        (await resized.toByteData(format: ui.ImageByteFormat.png))!
+            .buffer
+            .asUint8List();
     var maxAge = originalFile.validTill.difference(DateTime.now());
 
     var file = await putFile(
       originalFile.originalUrl,
-      Uint8List.fromList(resizedFile),
+      resizedFile,
       key: key,
       maxAge: maxAge,
       fileExtension: fileExtension,
@@ -131,3 +145,21 @@ mixin ImageCacheManager on BaseCacheManager {
     }
   }
 }
+
+Future<ui.Image> _decodeImage(File file,
+    {int? width, int? height, bool allowUpscaling = false}) {
+  var shouldResize = width != null || height != null;
+  var fileImage = FileImage(file);
+  final image = shouldResize
+      ? ResizeImage(fileImage,
+          width: width, height: height, allowUpscaling: allowUpscaling)
+      : fileImage as ImageProvider;
+  final completer = Completer<ui.Image>();
+  image
+      .resolve(const ImageConfiguration())
+      .addListener(ImageStreamListener((info, _) {
+    completer.complete(info.image);
+    image.evict();
+  }));
+  return completer.future;
+}

flutter_cache_manager/pubspec.yaml

@@ -13,7 +13,6 @@ dependencies:
   flutter:
     sdk: flutter
   http: ^0.13.0
-  image: ^3.0.1
   path: ^1.8.0
   path_provider: ^2.0.0
   pedantic: ^1.10.0

flutter_cache_manager/test/image_cache_manager_test.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 import 'dart:typed_data';
 import 'dart:ui';
 
+import 'package:flutter/material.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'cache_manager_test.dart';
@@ -13,6 +14,15 @@ const fileName = 'test.jpg';
 const fileUrl = 'baseflow.com/test';
 final validTill = DateTime.now().add(const Duration(days: 1));
 void main() {
+  setUp(() {
+    WidgetsFlutterBinding.ensureInitialized();
+  });
+
+  tearDown(() {
+    PaintingBinding.instance?.imageCache?.clear();
+    PaintingBinding.instance?.imageCache?.clearLiveImages();
+  });
+
   group('Test image resizing', () {
     test('Test original image size', () async {
       final bytes = await getExampleImage();