From bd6b180b7ca5435be254c11555e5e827412696c7 Mon Sep 17 00:00:00 2001 From: Krille Date: Tue, 21 May 2024 13:17:17 +0200 Subject: [PATCH 1/5] chore: Re-add native_imaging --- pubspec.lock | 8 ++++++++ pubspec.yaml | 1 + 2 files changed, 9 insertions(+) diff --git a/pubspec.lock b/pubspec.lock index 8f1a59d73..27413c9a8 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1247,6 +1247,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.16.7" + native_imaging: + dependency: "direct main" + description: + name: native_imaging + sha256: "182ccd8e0815a8a2158500ef66c828c030f6b9e05783e41e22f33bbcfd46a3d5" + url: "https://pub.dev" + source: hosted + version: "0.1.1" nested: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 673d8f7b0..d189b5d13 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -68,6 +68,7 @@ dependencies: git: url: https://github.com/famedly/matrix-dart-sdk.git ref: krille/create-missing-object-box + native_imaging: ^0.1.1 package_info_plus: ^6.0.0 pasteboard: ^0.2.0 path: ^1.9.0 From 8a738ad25ff31b5e2aa0a34e4c31e7f3e5fa26ee Mon Sep 17 00:00:00 2001 From: Krille Date: Tue, 21 May 2024 13:42:02 +0200 Subject: [PATCH 2/5] chore: Go back to pub.dev matrix sdk --- pubspec.lock | 11 +++++------ pubspec.yaml | 5 +---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 27413c9a8..d36768cdd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1209,12 +1209,11 @@ packages: matrix: dependency: "direct main" description: - path: "." - ref: "krille/create-missing-object-box" - resolved-ref: f3e631b2eb477097c8fbfa188f81e6b80ee1dc58 - url: "https://github.com/famedly/matrix-dart-sdk.git" - source: git - version: "0.29.2" + name: matrix + sha256: "8aa55b91cc436082a80d478810197867e95316141f339cfbaf61b6ea722d6bed" + url: "https://pub.dev" + source: hosted + version: "0.29.4" meta: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index d189b5d13..2cda05a93 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -64,10 +64,7 @@ dependencies: keyboard_shortcuts: ^0.1.4 latlong2: ^0.9.1 linkify: ^5.0.0 - matrix: - git: - url: https://github.com/famedly/matrix-dart-sdk.git - ref: krille/create-missing-object-box + matrix: ^0.29.4 native_imaging: ^0.1.1 package_info_plus: ^6.0.0 pasteboard: ^0.2.0 From 71ff94b622207f62287235faeee283b67003af58 Mon Sep 17 00:00:00 2001 From: Krille Date: Thu, 23 May 2024 10:53:28 +0200 Subject: [PATCH 3/5] build: Update matrix dart sdk --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index d36768cdd..74e1f9f9a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1210,10 +1210,10 @@ packages: dependency: "direct main" description: name: matrix - sha256: "8aa55b91cc436082a80d478810197867e95316141f339cfbaf61b6ea722d6bed" + sha256: b96f16ec227138a61d148f2812c4d558b2930edbb6cd05d03b3a41c4fffd2f47 url: "https://pub.dev" source: hosted - version: "0.29.4" + version: "0.29.7" meta: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 2cda05a93..705c8fe52 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -64,7 +64,7 @@ dependencies: keyboard_shortcuts: ^0.1.4 latlong2: ^0.9.1 linkify: ^5.0.0 - matrix: ^0.29.4 + matrix: ^0.29.7 native_imaging: ^0.1.1 package_info_plus: ^6.0.0 pasteboard: ^0.2.0 From 8ea9e26bac4fee38a1b420c3c0cfe3812bc49847 Mon Sep 17 00:00:00 2001 From: Krille Date: Thu, 23 May 2024 10:53:57 +0200 Subject: [PATCH 4/5] chore: Fix formatting --- lib/pages/chat/events/message.dart | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index dd7e995d5..9d2c6cb5d 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -236,7 +236,9 @@ class Message extends StatelessWidget { if (!nextEventSameSender) Padding( padding: const EdgeInsets.only( - left: 8.0, bottom: 4), + left: 8.0, + bottom: 4, + ), child: ownMessage || event.room.isDirectChat ? const SizedBox(height: 12) : FutureBuilder( @@ -315,8 +317,10 @@ class Message extends StatelessWidget { FutureBuilder( future: event .getReplyEvent(timeline), - builder: (BuildContext context, - snapshot) { + builder: ( + BuildContext context, + snapshot, + ) { final replyEvent = snapshot .hasData ? snapshot.data! From 8da714b0d27ec00f44ffe612fd3411a32794d787 Mon Sep 17 00:00:00 2001 From: Krille Date: Thu, 23 May 2024 15:50:29 +0200 Subject: [PATCH 5/5] fix: Stickers from gboard have black background --- lib/pages/chat/input_bar.dart | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart index 26a8d7e30..5cd801e04 100644 --- a/lib/pages/chat/input_bar.dart +++ b/lib/pages/chat/input_bar.dart @@ -9,7 +9,6 @@ import 'package:pasteboard/pasteboard.dart'; import 'package:slugify/slugify.dart'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/mxc_image.dart'; import '../../widgets/avatar.dart'; @@ -465,8 +464,11 @@ class InputBar extends StatelessWidget { mimeType: content.mimeType, bytes: data, name: content.uri.split('/').last, - ).detectFileType; - room.sendFileEvent(file, shrinkImageMaxDimension: 1600); + ); + room.sendFileEvent( + file, + shrinkImageMaxDimension: 1600, + ); }, ), minLines: minLines,