new context menu

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1366,7 +1366,7 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
 
         }, actionProvider: { _ in
 
-            return NCContextMenu().viewMenu(ocId: metadata.ocId, viewController: self, enableDeleteLocal: true, enableViewInFolder: false, image: image)
+            return NCContextMenu().viewMenu(ocId: metadata.ocId, viewController: self, image: image)
         })
     }
 

iOSClient/Media/NCMedia.swift

@@ -329,7 +329,7 @@ extension NCMedia: UICollectionViewDelegate {
         return UIContextMenuConfiguration(identifier: identifier, previewProvider: {
             return NCViewerProviderContextMenu(metadata: metadata, image: image)
         }, actionProvider: { _ in
-            return NCContextMenu().viewMenu(ocId: metadata.ocId, viewController: self, enableDeleteLocal: false, enableViewInFolder: true, image: image)
+            return NCContextMenu().viewMenu(ocId: metadata.ocId, viewController: self, image: image)
         })
     }
 

iOSClient/Menu/NCContextMenu.swift

@@ -26,7 +26,7 @@ import NextcloudKit
 
 class NCContextMenu: NSObject {
 
-    func viewMenu(ocId: String, viewController: UIViewController, enableDeleteLocal: Bool, enableViewInFolder: Bool, image: UIImage?) -> UIMenu {
+    func viewMenu(ocId: String, viewController: UIViewController, image: UIImage?) -> UIMenu {
 
         let appDelegate = UIApplication.shared.delegate as? AppDelegate
         guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else {
@@ -43,20 +43,6 @@ class NCContextMenu: NSObject {
         }
         let titleFavorite = metadata.favorite ? NSLocalizedString("_remove_favorites_", comment: "") : NSLocalizedString("_add_favorites_", comment: "")
 
-        let serverUrl = metadata.serverUrl + "/" + metadata.fileName
-        var isOffline = false
-        if metadata.directory {
-            if let directory = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", appDelegate!.account, serverUrl)) {
-                isOffline = directory.offline
-            }
-        } else {
-            if let localFile = NCManageDatabase.shared.getTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId)) {
-                isOffline = localFile.offline
-            }
-        }
-        let titleOffline = isOffline ? NSLocalizedString("_remove_available_offline_", comment: "") : NSLocalizedString("_set_available_offline_", comment: "")
-        let titleLock = metadata.lock ? NSLocalizedString("_unlock_file_", comment: "") : NSLocalizedString("_lock_file_", comment: "")
-        let iconLock = metadata.lock ? "lock.open" : "lock"
         let copy = UIAction(title: NSLocalizedString("_copy_file_", comment: ""), image: UIImage(systemName: "doc.on.doc")) { _ in
             NCFunctionCenter.shared.copyPasteboard(pasteboardOcIds: [metadata.ocId], hudView: viewController.view)
         }
@@ -65,16 +51,6 @@ class NCContextMenu: NSObject {
             NCFunctionCenter.shared.openShare(viewController: viewController, metadata: metadata, indexPage: .activity)
         }
 
-        let offline = UIAction(title: titleOffline, image: UIImage(systemName: "tray.and.arrow.down")) { _ in
-            NCFunctionCenter.shared.setMetadataAvalableOffline(metadata, isOffline: isOffline)
-            if let viewController = viewController as? NCCollectionViewCommon {
-                viewController.reloadDataSource()
-            }
-        }
-
-        let lockUnlock = UIAction(title: titleLock, image: UIImage(systemName: iconLock)) { _ in
-            NCNetworking.shared.lockUnlockFile(metadata, shoulLock: !metadata.lock)
-        }
         let save = UIAction(title: titleSave, image: UIImage(systemName: "square.and.arrow.down")) { _ in
             if metadataMOV != nil {
                 NCFunctionCenter.shared.saveLivePhoto(metadata: metadata, metadataMOV: metadataMOV!)
@@ -87,45 +63,18 @@ class NCContextMenu: NSObject {
             }
         }
 
-        let viewInFolder = UIAction(title: NSLocalizedString("_view_in_folder_", comment: ""), image: UIImage(systemName: "arrow.forward.square")) { _ in
-            NCFunctionCenter.shared.openFileViewInFolder(serverUrl: metadata.serverUrl, fileNameBlink: metadata.fileName, fileNameOpen: nil)
-        }
-
         let openIn = UIAction(title: NSLocalizedString("_open_in_", comment: ""), image: UIImage(systemName: "square.and.arrow.up") ) { _ in
             NCFunctionCenter.shared.openDownload(metadata: metadata, selector: NCGlobal.shared.selectorOpenIn)
         }
 
-        let print = UIAction(title: NSLocalizedString("_print_", comment: ""), image: UIImage(systemName: "printer") ) { _ in
-            NCFunctionCenter.shared.openDownload(metadata: metadata, selector: NCGlobal.shared.selectorPrint)
+        let viewInFolder = UIAction(title: NSLocalizedString("_view_in_folder_", comment: ""), image: UIImage(systemName: "arrow.forward.square")) { _ in
+            NCFunctionCenter.shared.openFileViewInFolder(serverUrl: metadata.serverUrl, fileNameBlink: metadata.fileName, fileNameOpen: nil)
         }
 
         let modify = UIAction(title: NSLocalizedString("_modify_", comment: ""), image: UIImage(systemName: "pencil.tip.crop.circle")) { _ in
             NCFunctionCenter.shared.openDownload(metadata: metadata, selector: NCGlobal.shared.selectorLoadFileQuickLook)
         }
 
-        let saveAsScan = UIAction(title: NSLocalizedString("_save_as_scan_", comment: ""), image: UIImage(systemName: "viewfinder.circle")) { _ in
-            NCFunctionCenter.shared.openDownload(metadata: metadata, selector: NCGlobal.shared.selectorSaveAsScan)
-        }
-
-        // let open = UIMenu(title: NSLocalizedString("_open_", comment: ""), image: UIImage(systemName: "square.and.arrow.up"), children: [openIn, openQuickLook])
-
-        let moveCopy = UIAction(title: NSLocalizedString("_move_or_copy_", comment: ""), image: UIImage(systemName: "arrow.up.right.square")) { _ in
-            NCFunctionCenter.shared.openSelectView(items: [metadata])
-        }
-
-        let rename = UIAction(title: NSLocalizedString("_rename_", comment: ""), image: UIImage(systemName: "pencil")) { _ in
-
-            if let vcRename = UIStoryboard(name: "NCRenameFile", bundle: nil).instantiateInitialViewController() as? NCRenameFile {
-
-                vcRename.metadata = metadata
-                vcRename.imagePreview = image
-
-                let popup = NCPopupViewController(contentController: vcRename, popupWidth: vcRename.width, popupHeight: vcRename.height)
-
-                viewController.present(popup, animated: true)
-            }
-        }
-
         let favorite = UIAction(title: titleFavorite, image: NCUtility.shared.loadImage(named: "star.fill", color: NCBrandColor.shared.yellowFavorite)) { _ in
 
             NCNetworking.shared.favoriteMetadata(metadata) { error in
@@ -150,14 +99,10 @@ class NCContextMenu: NSObject {
 
         var delete = UIMenu(title: NSLocalizedString("_delete_file_", comment: ""), image: UIImage(systemName: "trash"), options: .destructive, children: [deleteConfirmLocal, deleteConfirmFile])
 
-        if !enableDeleteLocal {
+        if viewController is NCMedia || metadata.directory {
             delete = UIMenu(title: NSLocalizedString("_delete_file_", comment: ""), image: UIImage(systemName: "trash"), options: .destructive, children: [deleteConfirmFile])
         }
 
-        if metadata.directory {
-            delete = UIMenu(title: NSLocalizedString("_delete_folder_", comment: ""), image: UIImage(systemName: "trash"), options: .destructive, children: [deleteConfirmFile])
-        }
-
         // ------ MENU -----
 
         // DIR
@@ -165,9 +110,9 @@ class NCContextMenu: NSObject {
         guard !metadata.directory else {
             var submenu = UIMenu()
             if !isDirectoryE2EE && metadata.e2eEncrypted {
-                submenu = UIMenu(title: "", options: .displayInline, children: [favorite, offline, rename, moveCopy])
+                submenu = UIMenu(title: "", options: .displayInline, children: [favorite])
             } else {
-                submenu = UIMenu(title: "", options: .displayInline, children: [favorite, offline, rename, moveCopy, delete])
+                submenu = UIMenu(title: "", options: .displayInline, children: [favorite, delete])
             }
             guard appDelegate!.disableSharesView == false else { return submenu }
             return UIMenu(title: "", children: [detail, submenu])
@@ -175,34 +120,41 @@ class NCContextMenu: NSObject {
 
         // FILE
 
-        var children: [UIMenuElement] = [offline, openIn, moveCopy, copy]
+        var menu: [UIMenuElement] = []
+
+        if metadata.lock {
+            menu.append(openIn)
+            menu.append(save)
+            menu.append(copy)
+        } else {
+            menu.append(favorite)
+            menu.append(openIn)
+            menu.append(save)
+            if viewController is NCMedia {
+                menu.append(viewInFolder)
+            }
+            menu.append(copy)
+            menu.append(modify)
+            menu.append(delete)
+        }
+        return UIMenu(title: "", children: [detail, UIMenu(title: "", options: .displayInline, children: menu)])
+
+        /*
+        var children: [UIMenuElement] = [openIn, copy]
 
         if !metadata.lock {
             // Workaround: PROPPATCH doesn't work (favorite)
             // https://github.com/nextcloud/files_lock/issues/68
             children.insert(favorite, at: 0)
             children.append(delete)
-            children.insert(rename, at: 3)
         } else if enableDeleteLocal {
             children.append(deleteConfirmLocal)
         }
 
-        if NCManageDatabase.shared.getCapabilitiesServerInt(account: appDelegate!.account, elements: NCElementsJSON.shared.capabilitiesFilesLockVersion) >= 1, metadata.canUnlock(as: appDelegate!.userId) {
-            children.insert(lockUnlock, at: metadata.lock ? 0 : 1)
-        }
-
         if (metadata.contentType != "image/svg+xml") && (metadata.classFile == NKCommon.typeClassFile.image.rawValue || metadata.classFile == NKCommon.typeClassFile.video.rawValue) {
             children.insert(save, at: 2)
         }
 
-        if (metadata.contentType != "image/svg+xml") && (metadata.classFile == NKCommon.typeClassFile.image.rawValue) {
-            children.insert(saveAsScan, at: 2)
-        }
-
-        if (metadata.contentType != "image/svg+xml") && (metadata.classFile == NKCommon.typeClassFile.image.rawValue || metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf") {
-            children.insert(print, at: 2)
-        }
-
         if enableViewInFolder {
             children.insert(viewInFolder, at: children.count - 1)
         }
@@ -214,5 +166,6 @@ class NCContextMenu: NSObject {
         let submenu = UIMenu(title: "", options: .displayInline, children: children)
         guard appDelegate!.disableSharesView == false else { return submenu }
         return UIMenu(title: "", children: [detail, submenu])
+        */
     }
 }