From 68aaa1a0fe22e92c03280f58febb41743b143049 Mon Sep 17 00:00:00 2001 From: Krille Fear Date: Wed, 6 Apr 2022 07:59:01 +0200 Subject: [PATCH] chore: Follow up fix image resizer --- lib/utils/client_manager.dart | 2 -- lib/utils/custom_image_resizer.dart | 55 ----------------------------- pubspec.lock | 25 +++++++------ pubspec.yaml | 2 -- 4 files changed, 15 insertions(+), 69 deletions(-) delete mode 100644 lib/utils/custom_image_resizer.dart diff --git a/lib/utils/client_manager.dart b/lib/utils/client_manager.dart index 5dc0c5ac..1e9e0cf9 100644 --- a/lib/utils/client_manager.dart +++ b/lib/utils/client_manager.dart @@ -7,7 +7,6 @@ import 'package:matrix/encryption/utils/key_verification.dart'; import 'package:matrix/matrix.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:fluffychat/utils/custom_image_resizer.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'famedlysdk_store.dart'; import 'matrix_sdk_extensions.dart/fluffybox_database.dart'; @@ -100,6 +99,5 @@ abstract class ClientManager { AuthenticationTypes.sso }, compute: compute, - customImageResizer: PlatformInfos.isMobile ? customImageResizer : null, ); } diff --git a/lib/utils/custom_image_resizer.dart b/lib/utils/custom_image_resizer.dart deleted file mode 100644 index b4005e51..00000000 --- a/lib/utils/custom_image_resizer.dart +++ /dev/null @@ -1,55 +0,0 @@ -import 'dart:typed_data'; -import 'dart:ui'; - -import 'package:matrix/matrix.dart'; -import 'package:native_imaging/native_imaging.dart' as native; - -Future customImageResizer( - MatrixImageFileResizeArguments arguments) async { - await native.init(); - var nativeImg = await native.Image.loadEncoded(arguments.bytes); - - try { - nativeImg = await native.Image.loadEncoded(arguments.bytes); // load on web - } on UnsupportedError { - // for the other platforms - final dartCodec = await instantiateImageCodec(arguments.bytes); - final dartFrame = await dartCodec.getNextFrame(); - final rgbaData = await dartFrame.image.toByteData(); - if (rgbaData == null) { - return null; - } - final rgba = Uint8List.view( - rgbaData.buffer, rgbaData.offsetInBytes, rgbaData.lengthInBytes); - dartFrame.image.dispose(); - dartCodec.dispose(); - - nativeImg = native.Image.fromRGBA( - dartFrame.image.width, dartFrame.image.height, rgba); - } - - final width = nativeImg.width; - final height = nativeImg.height; - - final max = arguments.maxDimension; - if (width > max || height > max) { - var w = max, h = max; - if (width > height) { - h = max * height ~/ width; - } else { - w = max * width ~/ height; - } - - final scaledImg = nativeImg.resample(w, h, native.Transform.lanczos); - nativeImg.free(); - nativeImg = scaledImg; - } - final jpegBytes = await nativeImg.toJpeg(75); - - return MatrixImageFileResizedResponse( - bytes: jpegBytes, - width: nativeImg.width, - height: nativeImg.height, - blurhash: arguments.calcBlurhash ? nativeImg.toBlurhash(3, 3) : null, - ); -} diff --git a/pubspec.lock b/pubspec.lock index 6bef89ca..382490fd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1026,15 +1026,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.2" - native_imaging: - dependency: "direct main" - description: - path: "." - ref: HEAD - resolved-ref: "8c6a5afe2c965b79b5959bb4b49c4aad020cb980" - url: "https://gitlab.com/famedly/libraries/native_imaging.git" - source: git - version: "0.1.0" nested: dependency: transitive description: @@ -1697,7 +1688,21 @@ packages: name: unifiedpush url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "4.0.0" + unifiedpush_android: + dependency: transitive + description: + name: unifiedpush_android + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + unifiedpush_platform_interface: + dependency: transitive + description: + name: unifiedpush_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" universal_html: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index ac3f7bc3..ca9e6141 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -60,8 +60,6 @@ dependencies: lottie: ^1.2.2 matrix: ^0.8.17 matrix_link_text: ^1.0.2 - native_imaging: - git: https://gitlab.com/famedly/libraries/native_imaging.git open_noti_settings: ^0.4.0 package_info_plus: ^1.3.0 path_provider: ^2.0.9