Copy Image context menu (#2508)

deltachat · Jan 10, 2025 · 1d6b016 · 1d6b016
1 parent c01c406
commit 1d6b016
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/deltachat-ios/Chat/ChatViewController.swift b/deltachat-ios/Chat/ChatViewController.swift
@@ -1724,8 +1724,11 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate {
         replyToMessage(at: indexPath)
     }
 
-    private func copyToClipboard(at indexPath: IndexPath) {
-        copyToClipboard(ids: [self.messageIds[indexPath.row]])
+    private func copyTextToClipboard(at indexPath: IndexPath) {
+        copyTextToClipboard(ids: [self.messageIds[indexPath.row]])
+    }
+    private func copyImageToClipboard(at indexPath: IndexPath) {
+        copyImagesToClipboard(ids: [self.messageIds[indexPath.row]])
     }
 
     private func cancelSearch() {
@@ -1945,7 +1948,7 @@ extension ChatViewController {
                     image = UIImage(named: "ic_forward_white_36pt")
                 }
                 children.append(
-                    UIAction.menuAction(localizationKey: "forward", image: image, indexPath: indexPath, action: { self.forward(at: $0 ) })
+                    UIAction.menuAction(localizationKey: "forward", image: image, indexPath: indexPath, action: forward)
                 )
 
                 if let link = isLinkTapped(indexPath: indexPath, point: point) {
@@ -1957,14 +1960,19 @@ extension ChatViewController {
                 } else if let text = message.text, !text.isEmpty {
                     let copyTitle = message.file == nil ? "global_menu_edit_copy_desktop" : "menu_copy_text_to_clipboard"
                     children.append(
-                        UIAction.menuAction(localizationKey: copyTitle, systemImageName: "doc.on.doc", indexPath: indexPath, action: { self.copyToClipboard(at: $0 ) })
+                        UIAction.menuAction(localizationKey: copyTitle, systemImageName: "doc.on.doc", indexPath: indexPath, action: copyTextToClipboard)
+                    )
+                }
+                if message.image != nil {
+                    children.append(
+                        UIAction.menuAction(localizationKey: "menu_copy_image_to_clipboard", systemImageName: "photo.on.rectangle", indexPath: indexPath, action: copyImageToClipboard)
                     )
                 }
 
                 children.append(contentsOf: [
-                    UIAction.menuAction(localizationKey: "info", systemImageName: "info", indexPath: indexPath, action: { self.info(at: $0 ) }),
+                    UIAction.menuAction(localizationKey: "info", systemImageName: "info", indexPath: indexPath, action: info),
                     UIMenu(options: [.displayInline], children: [
-                        UIAction.menuAction(localizationKey: "menu_more_options", systemImageName: "checkmark.circle", indexPath: indexPath, action: { self.selectMore(at: $0 ) }),
+                        UIAction.menuAction(localizationKey: "menu_more_options", systemImageName: "checkmark.circle", indexPath: indexPath, action: selectMore),
                     ])
                 ])
 
@@ -2165,7 +2173,7 @@ extension ChatViewController {
         view.image = UIImage(named: traitCollection.userInterfaceStyle == .light ? "background_light" : "background_dark")
     }
 
-    private func copyToClipboard(ids: [Int]) {
+    private func copyTextToClipboard(ids: [Int]) {
         var stringsToCopy = ""
         if ids.count > 1 {
             let sortedIds = ids.sorted()
@@ -2202,6 +2210,12 @@ extension ChatViewController {
         }
         UIPasteboard.general.string = stringsToCopy
     }
+
+    func copyImagesToClipboard(ids: [Int]) {
+        let images = ids.map(dcContext.getMessage).compactMap(\.image)
+        guard !images.isEmpty else { return }
+        UIPasteboard.general.images = images
+    }
 }
 
 // MARK: - BaseMessageCellDelegate
@@ -2453,7 +2467,7 @@ extension ChatViewController: ChatEditingDelegate {
     func onCopyPressed() {
         if let rows = tableView.indexPathsForSelectedRows {
             let ids = rows.compactMap { messageIds[$0.row] }
-            copyToClipboard(ids: ids)
+            copyTextToClipboard(ids: ids)
             setEditing(isEditing: false)
         }
     }