use modern UIMenu

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Detect Stickers when dropped, pasted or picked from Gallery (#2535)
+- Modernize menus (#2543)
 - Fix: In 'View Log', hide keyboard when scrolling down (#2541)
 - Fix: Experimental location sharing now ends at the specified interval even if you don't move (#2537)
 - minimum system version is iOS 14 now (all iOS 13 devices can upgrade to iOS 14) (#2459)

deltachat-ios/Chat/ChatViewController.swift

@@ -1229,7 +1229,7 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate {
                 }
                 actions.append(action("contact", "person.crop.circle", showContactList))
 
-                completion([UIMenu(options: .displayInline, children: actions)])
+                completion(actions)
             })
         ])
     }
@@ -1246,30 +1246,15 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate {
         present(alert, animated: true, completion: nil)
     }
 
-    private func showMoreMenu() {
-        let alert = UIAlertController(title: nil, message: nil, preferredStyle: .safeActionSheet)
-        if canResend() {
-            alert.addAction(UIAlertAction(title: String.localized("resend"), style: .default, handler: onResendActionPressed(_:)))
-        }
-        if canShare() {
-            alert.addAction(UIAlertAction(title: String.localized("menu_share"), style: .default, handler: onShareActionPressed(_:)))
-        }
-        if canInfo() {
-            alert.addAction(UIAlertAction(title: String.localized("info"), style: .default, handler: onInfoActionPressed(_:)))
-        }
-        alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
-        present(alert, animated: true, completion: nil)
-    }
-
-    private func onResendActionPressed(_ action: UIAlertAction) {
+    private func onResendActionPressed() {
         if let rows = tableView.indexPathsForSelectedRows {
             let selectedMsgIds = rows.compactMap { messageIds[$0.row] }
             dcContext.resendMessages(msgIds: selectedMsgIds)
             setEditing(isEditing: false)
         }
     }
 
-    private func onShareActionPressed(_ action: UIAlertAction) {
+    private func onShareActionPressed() {
         if let rows = tableView.indexPathsForSelectedRows {
             let selectedMsgIds = rows.compactMap { messageIds[$0.row] }
             if let msgId = selectedMsgIds.first {
@@ -1279,7 +1264,7 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate {
         }
     }
 
-    private func onInfoActionPressed(_ action: UIAlertAction) {
+    private func onInfoActionPressed() {
         if let rows = tableView.indexPathsForSelectedRows, let firstRow = rows.first {
             info(at: firstRow)
         }
@@ -2430,8 +2415,24 @@ extension ChatViewController: ChatEditingDelegate {
         }
     }
 
-    func onMorePressed() {
-        showMoreMenu()
+    func onMorePressed() -> UIMenu {
+        var actions = [UIMenuElement]()
+        if canResend() {
+            actions.append(UIAction(title: String.localized("resend"), image: UIImage(systemName: "paperplane")) { [weak self] _ in
+                self?.onResendActionPressed()
+            })
+        }
+        if canShare() {
+            actions.append(UIAction(title: String.localized("menu_share"), image: UIImage(systemName: "square.and.arrow.up")) { [weak self] _ in
+                self?.onShareActionPressed()
+            })
+        }
+        if canInfo() {
+            actions.append(UIAction(title: String.localized("info"), image: UIImage(systemName: "info.circle")) { [weak self] _ in
+                self?.onInfoActionPressed()
+            })
+        }
+        return UIMenu(children: actions)
     }
 
     func onForwardPressed() {

deltachat-ios/Chat/Views/ChatEditingBar.swift

@@ -6,7 +6,7 @@ public protocol ChatEditingDelegate: AnyObject {
     func onForwardPressed()
     func onCancelPressed()
     func onCopyPressed()
-    func onMorePressed()
+    func onMorePressed() -> UIMenu
 }
 
 public class ChatEditingBar: UIView {
@@ -110,19 +110,21 @@ public class ChatEditingBar: UIView {
         ])
 
         copyButton.addTarget(self, action: #selector(ChatEditingBar.onCopyPressed), for: .touchUpInside)
-        moreButton.addTarget(self, action: #selector(ChatEditingBar.onMorePressed), for: .touchUpInside)
         forwardButton.addTarget(self, action: #selector(ChatEditingBar.onForwardPressed), for: .touchUpInside)
         deleteButton.addTarget(self, action: #selector(ChatEditingBar.onDeletePressed), for: .touchUpInside)
+
+        moreButton.showsMenuAsPrimaryAction = true
+        moreButton.menu = UIMenu() // otherwise .menuActionTriggered is not triggered
+        moreButton.addAction(UIAction { [weak self] _ in
+            guard let self else { return }
+            moreButton.menu = delegate?.onMorePressed()
+        }, for: .menuActionTriggered)
     }
 
     @objc func onCopyPressed() {
         delegate?.onCopyPressed()
     }
 
-    @objc func onMorePressed() {
-        delegate?.onMorePressed()
-    }
-
     @objc func onForwardPressed() {
         delegate?.onForwardPressed()
     }

deltachat-ios/Controller/AccountSetup/Instand Onboarding/InstantOnboardingViewController.swift

@@ -21,15 +21,12 @@ class InstantOnboardingViewController: UIViewController {
     private var qrCodeData: String?
     private lazy var menuButton: UIBarButtonItem = {
         let image = UIImage(systemName: "ellipsis.circle")
-        let menuButton = UIBarButtonItem(image: image, style: .plain, target: self, action: #selector(InstantOnboardingViewController.showMenu(_:)))
-        menuButton.tintColor = DcColors.primary
-        return menuButton
+        return UIBarButtonItem(image: image, menu: moreButtonMenu())
     }()
 
     private lazy var proxyShieldButton: UIBarButtonItem = {
-        let button = UIBarButtonItem(image: UIImage(systemName: "checkmark.shield"), style: .plain, target: self, action: #selector(InstantOnboardingViewController.showProxySettings(_:)))
-        button.tintColor = DcColors.primary
-        return button
+        let image = UIImage(systemName: "checkmark.shield")
+        return UIBarButtonItem(image: image, style: .plain, target: self, action: #selector(showProxySettings))
     }()
 
     var progressAlertHandler: ProgressAlertHandler?
@@ -221,22 +218,16 @@ class InstantOnboardingViewController: UIViewController {
         present(alertController, animated: true)
     }
 
-    @objc private func showMenu(_ sender: Any) {
-        let sheet = UIAlertController(title: nil, message: nil, preferredStyle: .safeActionSheet)
-
-        let showProxySettings = UIAlertAction(title: String.localized("proxy_settings"), style: .default) { [weak self] _ in
-            self?.showProxySettings(sender)
-        }
-
-        let cancelAction = UIAlertAction(title: String.localized("cancel"), style: .cancel)
-
-        sheet.addAction(showProxySettings)
-        sheet.addAction(cancelAction)
-
-        present(sheet, animated: true)
+    private func moreButtonMenu() -> UIMenu {
+        let actions = [
+            UIAction(title: String.localized("proxy_use_proxy"), image: UIImage(systemName: "shield")) { [weak self] _ in
+                self?.showProxySettings()
+            },
+        ]
+        return UIMenu(children: actions)
     }
 
-    @objc private func showProxySettings(_ sender: Any) {
+    @objc private func showProxySettings() {
         let proxySettingsController = ProxySettingsViewController(dcContext: dcContext, dcAccounts: dcAccounts)
         navigationController?.pushViewController(proxySettingsController, animated: true)
     }

deltachat-ios/Controller/BackupTransferViewController.swift

@@ -23,11 +23,6 @@ class BackupTransferViewController: UIViewController {
         return UIBarButtonItem(title: String.localized("cancel"), style: .plain, target: self, action: #selector(cancelButtonPressed))
     }
 
-    private lazy var moreButton: UIBarButtonItem = {
-        let image = UIImage(systemName: "ellipsis.circle")
-        return UIBarButtonItem(image: image, style: .plain, target: self, action: #selector(moreButtonPressed))
-    }()
-
     private let statusLine: UILabel
     private let experimentalLine: UILabel
     private let qrContentView: UIImageView
@@ -100,7 +95,7 @@ class BackupTransferViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationItem.leftBarButtonItem = cancelButton
-        navigationItem.rightBarButtonItem = moreButton
+        updateMenuItems()
 
         triggerLocalNetworkPrivacyAlert()
 
@@ -124,6 +119,7 @@ class BackupTransferViewController: UIViewController {
                 self.statusLine.text = "➊ " + String.localized("multidevice_same_network_hint")
                                  + "\n\n➋ " + String.localized("multidevice_install_dc_on_other_device")
                                  + "\n\n➌ " + String.localized("multidevice_tap_scan_on_other_device")
+                self.updateMenuItems()
                 DispatchQueue.global(qos: .userInitiated).async { [weak self] in
                     guard let self else { return }
                     self.dcBackupProvider?.wait()
@@ -190,6 +186,7 @@ class BackupTransferViewController: UIViewController {
                 self.statusLine.textAlignment = .center
                 experimentalLine.isHidden = true
                 self.qrContentView.isHidden = true
+                updateMenuItems()
             }
         }
     }
@@ -264,20 +261,26 @@ class BackupTransferViewController: UIViewController {
         }
     }
 
-    @objc private func moreButtonPressed() {
-        let alert = UIAlertController(title: nil, message: nil, preferredStyle: .safeActionSheet)
-        alert.addAction(UIAlertAction(title: String.localized("troubleshooting"), style: .default, handler: { _ in
-            self.navigationController?.pushViewController(HelpViewController(dcContext: self.dcContext, fragment: "#multiclient"), animated: true)
-        }))
-        if !self.qrContentView.isHidden {
-            alert.addAction(UIAlertAction(title: String.localized("menu_copy_to_clipboard"), style: .default, handler: { [weak self] _ in
+    private func updateMenuItems() {
+        let menu = moreButtonMenu()
+        let button =  UIBarButtonItem(image: UIImage(systemName: "ellipsis.circle"), menu: menu)
+        navigationItem.rightBarButtonItem = button
+    }
+
+    private func moreButtonMenu() -> UIMenu {
+        var actions = [UIMenuElement]()
+        if !qrContentView.isHidden {
+            actions.append(UIAction(title: String.localized("menu_copy_to_clipboard"), image: UIImage(systemName: "document.on.document")) { [weak self] _ in
                 guard let self else { return }
-                self.warnAboutCopiedQrCodeOnAbort = true
-                UIPasteboard.general.string = self.dcBackupProvider?.getQr()
-            }))
+                warnAboutCopiedQrCodeOnAbort = true
+                UIPasteboard.general.string = dcBackupProvider?.getQr()
+            })
         }
-        alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
-        self.present(alert, animated: true, completion: nil)
+        actions.append(UIAction(title: String.localized("troubleshooting"), image: UIImage(systemName: "questionmark.circle")) { [weak self] _ in
+            guard let self else { return }
+            navigationController?.pushViewController(HelpViewController(dcContext: dcContext, fragment: "#multiclient"), animated: true)
+        })
+        return UIMenu(children: actions)
     }
 }
 

deltachat-ios/Controller/ChatListViewController.swift

@@ -1031,10 +1031,10 @@ extension ChatListViewController: ChatListEditingBarDelegate {
         setLongTapEditing(false)
     }
 
-    func onMorePressed() {
-        guard let userDefaults = UserDefaults.shared, let viewModel else { return }
-        let alert = UIAlertController(title: nil, message: nil, preferredStyle: .safeActionSheet)
+    func onMorePressed() -> UIMenu {
+        guard let userDefaults = UserDefaults.shared, let viewModel else { return UIMenu() }
         let chatIds = viewModel.chatIdsFor(indexPaths: tableView.indexPathsForSelectedRows)
+        var actions = [UIMenuElement]()
 
         if #available(iOS 17.0, *),
            chatIds.count == 1,
@@ -1051,33 +1051,34 @@ extension ChatListViewController: ChatListEditingBarDelegate {
                 }
 
             let chatPresentInHomescreenWidget = allHomescreenChatsIds.contains(chatId)
-            let action: UIAlertAction
+            let action: UIAction
             if chatPresentInHomescreenWidget {
-                action = UIAlertAction(title: String.localized("remove_from_widget"), style: .default) { [weak self] _ in
+                action = UIAction(title: String.localized("remove_from_widget"), image: UIImage(systemName: "minus.square")) { [weak self] _ in
                     guard let self else { return }
                     userDefaults.removeChatFromHomescreenWidget(accountId: self.dcContext.id, chatId: chatId)
                     setLongTapEditing(false)
                 }
             } else {
-                action = UIAlertAction(title: String.localized("add_to_widget"), style: .default) { [weak self] _ in
+                action = UIAction(title: String.localized("add_to_widget"), image: UIImage(systemName: "plus.square")) { [weak self] _ in
                     guard let self else { return }
                     userDefaults.addChatToHomescreenWidget(accountId: self.dcContext.id, chatId: chatId)
                     setLongTapEditing(false)
                 }
             }
-            alert.addAction(action)
+            actions.append(action)
         }
 
         let onlyPinndedSelected = viewModel.hasOnlyPinnedChatsSelected(in: tableView.indexPathsForSelectedRows)
         let pinTitle = String.localized(onlyPinndedSelected ? "unpin" : "pin")
-        alert.addAction(UIAlertAction(title: pinTitle, style: .default) { [weak self] _ in
+        let pinImage = UIImage(systemName: onlyPinndedSelected ? "pin.slash" : "pin")
+        actions.append(UIAction(title: pinTitle, image: pinImage) { [weak self] _ in
             guard let self else { return }
             viewModel.pinChatsToggle(indexPaths: tableView.indexPathsForSelectedRows)
             setLongTapEditing(false)
         })
 
         if viewModel.hasAnyUnmutedChatSelected(in: tableView.indexPathsForSelectedRows) {
-            alert.addAction(UIAlertAction(title: String.localized("menu_mute"), style: .default) { [weak self] _ in
+            actions.append(UIAction(title: String.localized("menu_mute"), image: UIImage(systemName: "speaker.slash")) { [weak self] _ in
                 guard let self else { return }
                 MuteDialog.show(viewController: self) { [weak self] duration in
                     guard let self else { return }
@@ -1086,14 +1087,13 @@ extension ChatListViewController: ChatListEditingBarDelegate {
                 }
             })
         } else {
-            alert.addAction(UIAlertAction(title: String.localized("menu_unmute"), style: .default) { [weak self] _ in
+            actions.append(UIAction(title: String.localized("menu_unmute"), image: UIImage(systemName: "speaker.wave.2")) { [weak self] _ in
                 guard let self else { return }
                 viewModel.setMuteDurations(in: tableView.indexPathsForSelectedRows, duration: 0)
                 setLongTapEditing(false)
             })
         }
 
-        alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
-        present(alert, animated: true, completion: nil)
+        return UIMenu(children: actions)
     }
 }

deltachat-ios/Controller/FullMessageViewController.swift

@@ -5,7 +5,12 @@ import DcCore
 class FullMessageViewController: WebViewViewController {
 
     var loadButton: UIBarButtonItem {
+        // to not encourages people to get used to tap the load button
+        // just to see whether the message they get will change, this is a very generic icon.
+        // (best would be if we know before if an HTML message contains images and thelike,
+        // but we don't and this is probably also not worth  the effort. so we used the second best approach :)
         let image = UIImage(systemName: "ellipsis.circle")
+
         let button = UIBarButtonItem(image: image, style: .plain, target: self, action: #selector(showLoadOptions))
         button.accessibilityLabel = String.localized("load_remote_content")
         return button

deltachat-ios/Controller/HelpViewController.swift

@@ -18,7 +18,7 @@ class HelpViewController: WebViewViewController {
 
     private lazy var moreButton: UIBarButtonItem = {
         let image = UIImage(systemName: "ellipsis.circle")
-        return UIBarButtonItem(image: image, style: .plain, target: self, action: #selector(moreButtonPressed))
+        return UIBarButtonItem(image: image, menu: moreButtonMenu())
     }()
 
     override func viewDidLoad() {
@@ -66,29 +66,29 @@ class HelpViewController: WebViewViewController {
         }
     }
 
-    @objc private func moreButtonPressed() {
-        let alert = UIAlertController(title: nil, message: nil, preferredStyle: .safeActionSheet)
-        alert.addAction(UIAlertAction(title: String.localized("global_menu_help_learn_desktop"), style: .default, handler: { _ in
-            if let url = URL(string: "https://delta.chat") {
-                UIApplication.shared.open(url)
-            }
-        }))
-        alert.addAction(UIAlertAction(title: String.localized("privacy_policy"), style: .default, handler: { _ in
-            if let url = URL(string: "https://delta.chat/gdpr") {
-                UIApplication.shared.open(url)
-            }
-        }))
-        alert.addAction(UIAlertAction(title: String.localized("global_menu_help_contribute_desktop"), style: .default, handler: { _ in
-            if let url = URL(string: "https://github.com/deltachat/deltachat-ios") {
-                UIApplication.shared.open(url)
-            }
-        }))
-        alert.addAction(UIAlertAction(title: String.localized("global_menu_help_report_desktop"), style: .default, handler: { _ in
-            if let url = URL(string: "https://github.com/deltachat/deltachat-ios/issues") {
-                UIApplication.shared.open(url)
-            }
-        }))
-        alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
-        self.present(alert, animated: true, completion: nil)
+    private func moreButtonMenu() -> UIMenu {
+        let actions = [
+            UIAction(title: String.localized("delta_chat_homepage"), image: UIImage(systemName: "globe")) { _ in
+                if let url = URL(string: "https://delta.chat") {
+                    UIApplication.shared.open(url)
+                }
+            },
+            UIAction(title: String.localized("privacy_policy"), image: UIImage(systemName: "hand.raised")) { _ in
+                if let url = URL(string: "https://delta.chat/gdpr") {
+                    UIApplication.shared.open(url)
+                }
+            },
+            UIAction(title: String.localized("contribute"), image: UIImage(systemName: "wrench.and.screwdriver")) { _ in
+                if let url = URL(string: "https://delta.chat/contribute") {
+                    UIApplication.shared.open(url)
+                }
+            },
+            UIAction(title: String.localized("global_menu_help_report_desktop"), image: UIImage(systemName: "ant")) { _ in
+                if let url = URL(string: "https://github.com/deltachat/deltachat-ios/issues") {
+                    UIApplication.shared.open(url)
+                }
+            },
+        ]
+        return UIMenu(children: actions)
     }
 }