fix: Group local and remote add actions (#370)

inseven · Sep 14, 2024 · 43757d0 · 43757d0
1 parent e5e875f
commit 43757d0
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/OpoLua/View Controllers/BrowserViewController.swift b/OpoLua/View Controllers/BrowserViewController.swift
@@ -23,7 +23,20 @@ import UIKit
 class BrowserViewController: UICollectionViewController {
 
     internal lazy var addBarButtonItem: UIBarButtonItem = {
-        let actions = actions()
+        let softwareIndexAction = UIAction(title: "Psion Software Index",
+                                           image: UIImage(systemName: "list.dash.header.rectangle")) { [weak self] action in
+            self?.showSoftwareIndex()
+        }
+        let addFolderAction = UIAction(title: "Add Folder",
+                                       image: UIImage(systemName: "folder.badge.plus")) { [weak self] action in
+            self?.addFolder()
+        }
+        let localActionsMenu = UIMenu(options: [.displayInline], children: [softwareIndexAction])
+        let remoteActionsMenu = UIMenu(options: [.displayInline], children: [addFolderAction])
+        let actions = [
+            localActionsMenu,
+            remoteActionsMenu,
+        ]
         let menu = UIMenu(title: "", image: nil, identifier: nil, options: [], children: actions)
         let addBarButtonItem = UIBarButtonItem(title: nil,
                                                image: UIImage(systemName: "plus"),
@@ -43,21 +56,6 @@ class BrowserViewController: UICollectionViewController {
         fatalError("init(coder:) has not been implemented")
     }
 
-    func actions() -> [UIMenuElement] {
-        let softwareIndexAction = UIAction(title: "Psion Software Index",
-                                           image: UIImage(systemName: "list.dash.header.rectangle")) { [weak self] action in
-            self?.showSoftwareIndex()
-        }
-        let addFolderAction = UIAction(title: "Add Folder",
-                                       image: UIImage(systemName: "folder.badge.plus")) { [weak self] action in
-            self?.addFolder()
-        }
-        return [UIMenu(options: [.displayInline], children: [
-            softwareIndexAction,
-            addFolderAction,
-        ])]
-    }
-
     @objc func showSoftwareIndex() {
         let softwareIndexViewController = SoftwareIndexViewController()
         softwareIndexViewController.delegate = self