TW-731: support copy/paste image for ios

linagora · Oct 11, 2023 · b6afc4d · b6afc4d
1 parent 81240c1
commit b6afc4d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 16 deletions.
diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
@@ -2764,5 +2764,7 @@
     "paste": "Paste",
     "cut": "Cut",
     "pasteImageFailed": "Paste image failed",
-    "copyImageFailed": "Copy image failed"
+    "copyImageFailed": "Copy image failed",
+    "fileFormatNotSupported": "File format not supported",
+    "copyImageSuccess": "Image copied to clipboard"
 }
diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
@@ -787,15 +787,21 @@ class ChatController extends State<Chat>
           );
       if (event.messageType == MessageTypes.Image) {
         if (matrixFile.filePath != null) {
-          Clipboard.instance.copyImageAsStream(
+          await Clipboard.instance.copyImageAsStream(
             File(matrixFile.filePath!),
             mimeType: event.mimeType,
           );
+          if (!PlatformInfos.isAndroid) {
+            TwakeSnackBar.show(context, L10n.of(context)!.copyImageSuccess);
+          }
         } else if (matrixFile.bytes != null) {
-          Clipboard.instance.copyImageAsBytes(
+          await Clipboard.instance.copyImageAsBytes(
             matrixFile.bytes!,
             mimeType: event.mimeType,
           );
+          if (!PlatformInfos.isAndroid) {
+            TwakeSnackBar.show(context, L10n.of(context)!.copyImageSuccess);
+          }
         } else {
           TwakeSnackBar.show(context, L10n.of(context)!.copyImageFailed);
           Logs().e(

diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart
@@ -461,7 +461,7 @@ class InputBar extends StatelessWidget with PasteImageMixin {
                             // FIXME: need to handle the case when in draft chat
                             return;
                           }
-
+                          await Clipboard.instance.initReader();
                           if (await Clipboard.instance
                               .isReadableImageFormat()) {
                             await pasteImage(context, room!);

diff --git a/lib/pages/chat/send_file_dialog.dart b/lib/pages/chat/send_file_dialog.dart
@@ -1,3 +1,5 @@
+import 'package:fluffychat/presentation/extensions/send_file_web_extension.dart';
+import 'package:fluffychat/utils/localized_exception_extension.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
@@ -43,18 +45,18 @@ class SendFileDialogState extends State<SendFileDialog> {
       }
       // ignore: unused_local_variable
       final scaffoldMessenger = ScaffoldMessenger.of(context);
-      // widget.room
-      //     .sendFileEvent(
-      //   file,
-      //   thumbnail: thumbnail,
-      //   shrinkImageMaxDimension: origImage ? null : 1600,
-      // )
-      //     .catchError((e) {
-      //   scaffoldMessenger.showSnackBar(
-      //     SnackBar(content: Text((e as Object).toLocalizedString(context))),
-      //   );
-      //   return null;
-      // });
+      widget.room
+          .sendFileOnWebEvent(
+        file,
+        thumbnail: thumbnail,
+        shrinkImageMaxDimension: origImage ? null : 1600,
+      )
+          .catchError((e) {
+        scaffoldMessenger.showSnackBar(
+          SnackBar(content: Text((e as Object).toLocalizedString(context))),
+        );
+        return null;
+      });
     }
     Navigator.of(context, rootNavigator: false).pop();
 

diff --git a/lib/presentation/mixins/paste_image_mixin.dart b/lib/presentation/mixins/paste_image_mixin.dart
@@ -13,6 +13,7 @@ mixin PasteImageMixin {
   Future<void> pasteImage(BuildContext context, Room room) async {
     await Clipboard.instance.initReader();
     if (!(await Clipboard.instance.isReadableImageFormat())) {
+      TwakeSnackBar.show(context, L10n.of(context)!.fileFormatNotSupported);
       Logs().e('PasteImageMixin::pasteImage(): not readable image format');
       return;
     }