Skip to content

[stable-4.9.7] Context menu customisation #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
TSI-amrutwaghmare wants to merge 1 commit into from
Closed

[stable-4.9.7] Context menu customisation #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 109 additions & 43 deletions iOSClient/Menu/NCContextMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ import NextcloudKit
import JGProgressHUD

class NCContextMenu: NSObject {

// swiftlint:disable force_cast
let appDelegate = UIApplication.shared.delegate as! AppDelegate
// swiftlint:enable force_cast

let utilityFileSystem = NCUtilityFileSystem()
let utility = NCUtility()
Expand All @@ -41,6 +45,15 @@ class NCContextMenu: NSObject {

if metadata.directory { titleDeleteConfirmFile = NSLocalizedString("_delete_folder_", comment: "") }
if metadataMOV != nil { titleSave = NSLocalizedString("_livephoto_save_", comment: "") }

let serverUrl = metadata.serverUrl + "/" + metadata.fileName
var isOffline: Bool = false

if metadata.directory, 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 hud = JGProgressHUD()
hud.indicatorView = JGProgressHUDRingIndicatorView()
Expand All @@ -55,10 +68,59 @@ class NCContextMenu: NSObject {

// MENU ITEMS

let detail = UIAction(title: NSLocalizedString("_details_", comment: ""),
image: UIImage(systemName: "info")) { _ in
let detail = UIAction(title: NSLocalizedString("_details_", comment: "")) { _ in
NCActionCenter.shared.openShare(viewController: viewController, metadata: metadata, page: .activity)
}

let titleOffline = isOffline ? NSLocalizedString("_remove_available_offline_", comment: "") : NSLocalizedString("_set_available_offline_", comment: "")

let offline = UIAction(title: titleOffline, image: UIImage(systemName: "tray.and.arrow.down")) { _ in
NCActionCenter.shared.setMetadataAvalableOffline(metadata, isOffline: isOffline)
if let viewController = viewController as? NCCollectionViewCommon {
viewController.reloadDataSource()
}
}

let print = UIAction(title: NSLocalizedString("_print_", comment: ""), image: UIImage(systemName: "printer") ) { _ in
NCNetworking.shared.download(metadata: metadata, selector: NCGlobal.shared.selectorPrint) { _, _ in }
}

let moveCopy = UIAction(title: NSLocalizedString("_move_or_copy_", comment: ""), image: UIImage(systemName: "arrow.up.right.square")) { action in
NCActionCenter.shared.openSelectView(items: [metadata], indexPath: [indexPath])
}

let rename = UIAction(title: NSLocalizedString("_rename_", comment: ""), image: UIImage(systemName: "pencil")) { action in
if let vcRename = UIStoryboard(name: "NCRenameFile", bundle: nil).instantiateInitialViewController() as? NCRenameFile {
vcRename.metadata = metadata
vcRename.imagePreview = image
vcRename.indexPath = indexPath
let popup = NCPopupViewController(contentController: vcRename, popupWidth: vcRename.width, popupHeight: vcRename.height)
viewController.present(popup, animated: true)
}
}

let decrypt = UIAction(title: NSLocalizedString("_e2e_remove_folder_encrypted_", comment: ""), image: UIImage(systemName: "lock") ) { action in
NextcloudKit.shared.markE2EEFolder(fileId: metadata.fileId, delete: true) { _, error in
if error == .success {
NCManageDatabase.shared.deleteE2eEncryption(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", self.appDelegate.account, serverUrl))
NCManageDatabase.shared.setDirectory(serverUrl: serverUrl, serverUrlTo: nil, etag: nil, ocId: nil, fileId: nil, encrypted: false, richWorkspace: nil, account: metadata.account)
NCManageDatabase.shared.setMetadataEncrypted(ocId: metadata.ocId, encrypted: false)

NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterChangeStatusFolderE2EE, userInfo: ["serverUrl": metadata.serverUrl])
} else {
NCContentPresenter().messageNotification(NSLocalizedString("_e2e_error_", comment: ""), error: error, delay: NCGlobal.shared.dismissAfterSecond, type: .error)
}
}
}

let encrypt = UIAction(title: NSLocalizedString("_e2e_set_folder_encrypted_", comment: ""), image: UIImage(systemName: "lock") ) { action in
Task {
let error = await NCNetworkingE2EEMarkFolder().markFolderE2ee(account: metadata.account, fileName: metadata.fileName, serverUrl: metadata.serverUrl, userId: metadata.userId)
if error != .success {
NCContentPresenter().showError(error: error)
}
}
}

let favorite = UIAction(title: metadata.favorite ?
NSLocalizedString("_remove_favorites_", comment: "") :
Expand Down Expand Up @@ -94,7 +156,7 @@ class NCContextMenu: NSObject {
}

let viewInFolder = UIAction(title: NSLocalizedString("_view_in_folder_", comment: ""),
image: UIImage(systemName: "questionmark.folder")) { _ in
image: UIImage(systemName: "arrow.forward.square")) { _ in
NCActionCenter.shared.openFileViewInFolder(serverUrl: metadata.serverUrl, fileNameBlink: metadata.fileName, fileNameOpen: nil)
}

Expand Down Expand Up @@ -123,6 +185,11 @@ class NCContextMenu: NSObject {
}
}
}

let copy = UIAction(title: NSLocalizedString("_copy_file_", comment: ""),
image: UIImage(systemName: "doc.on.doc")) { _ in
NCActionCenter.shared.copyPasteboard(pasteboardOcIds: [metadata.ocId])
}

let modify = UIAction(title: NSLocalizedString("_modify_", comment: ""),
image: UIImage(systemName: "pencil.tip.crop.circle")) { _ in
Expand Down Expand Up @@ -191,54 +258,53 @@ class NCContextMenu: NSObject {

// ------ MENU -----

var menu: [UIMenuElement] = []

if metadata.directory {

if metadata.isDirectoryE2EE || metadata.e2eEncrypted {
menu.append(favorite)
} else {
menu.append(favorite)
menu.append(deleteConfirmFile)
}
return UIMenu(title: "", children: [detail, UIMenu(title: "", options: .displayInline, children: menu)])
let serverUrlHome = utilityFileSystem.getHomeServer(urlBase: appDelegate.urlBase, userId: appDelegate.userId)
let isEncryptionDisabled = metadata.isDirectoryUnsettableE2EE
let isEncrytptionEnabled = metadata.serverUrl == serverUrlHome && metadata.isDirectoySettableE2EE
let submenu = UIMenu(title: "", options: .displayInline, children: isEncrytptionEnabled ? [favorite, offline, rename, moveCopy, encrypt, deleteSubMenu] : [favorite, offline, rename, moveCopy, deleteSubMenu])
let childrenArray = metadata.e2eEncrypted ? ( isEncryptionDisabled ? [offline, decrypt] : (metadata.serverUrl == serverUrlHome) ? [offline] : [offline, deleteSubMenu]) : [detail,submenu]
return UIMenu(title: "", children: childrenArray)

} else {

var children: [UIMenuElement] = metadata.e2eEncrypted ? [openIn, copy, deleteSubMenu] : [offline, openIn, deleteSubMenu]

if metadata.lock {
menu.append(favorite)
if metadata.isDocumentViewableOnly {
//
} else {
menu.append(openIn)
// SAVE CAMERA ROLL
menu.append(save)
}
} else {
menu.append(favorite)
if metadata.isDocumentViewableOnly {
if viewController is NCMedia {
menu.append(viewInFolder)
}
} else {
menu.append(openIn)
// SAVE CAMERA ROLL
menu.append(save)
if viewController is NCMedia {
menu.append(viewInFolder)
}
// MODIFY WITH QUICK LOOK
if metadata.isModifiableWithQuickLook {
menu.append(modify)
}
if !metadata.lock {
// Workaround: PROPPATCH doesn't work (favorite)
// https://github.com/nextcloud/files_lock/issues/68
if !metadata.isDirectoryE2EE {
children.insert(favorite, at: 0)
children.insert(moveCopy, at: 2)
children.insert(rename, at: 3)
children.insert(copy, at: 3)
}
}

children.append(deleteSubMenu)

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.e2eEncrypted, (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 !metadata.e2eEncrypted {
if viewController is NCMedia {
menu.append(deleteConfirmFile)
} else {
menu.append(deleteSubMenu)
children.insert(viewInFolder, at: children.count - 1)
}
}
return UIMenu(title: "", children: [detail, UIMenu(title: "", options: .displayInline, children: menu)])

if (!metadata.isDirectoryE2EE && metadata.contentType != "image/gif" && metadata.contentType != "image/svg+xml") && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.classFile == NKCommon.TypeClassFile.image.rawValue) {
children.insert(modify, at: children.count - 1)
}

let submenu = UIMenu(title: "", options: .displayInline, children: children)
guard appDelegate.disableSharesView == false else { return submenu }
let childrenArray = metadata.isDirectoryE2EE ? [submenu] : [detail, submenu]
return UIMenu(title: "", children: childrenArray)
}
}
}
15 changes: 0 additions & 15 deletions iOSClient/Menu/NCViewer+Menu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,21 +207,6 @@ extension NCViewer {
actions.append(.copyAction(selectOcId: [metadata.ocId]))
}

//
// DOWNLOAD LOCALLY
//
if !webView, metadata.session.isEmpty, !self.utilityFileSystem.fileProviderStorageExists(metadata) {
actions.append(
NCMenuAction(
title: NSLocalizedString("_download_locally_", comment: ""),
icon: utility.loadImage(named: "icloud.and.arrow.down"),
action: { _ in
NCNetworking.shared.download(metadata: metadata, selector: "") { _, _ in }
}
)
)
}

//
// PDF
//
Expand Down