Merge remote-tracking branch 'customization/nmc/2341-Trash-view'

Nextcloud GmbH · Nextcloud GmbH · commit f1aaf5296e83 · 2026-06-05T14:57:57.000+02:00
diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj
@@ -7602,6 +7602,8 @@
 			requirement = {
 				kind = exactVersion;
 				version = 7.3.1;
+				branch = main;
+				kind = branch;
 			};
 		};
 		F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {
diff --git a/iOSClient/NCGlobal.swift b/iOSClient/NCGlobal.swift
@@ -354,6 +354,25 @@ final class NCGlobal: Sendable {
     let notificationCenterCreateMediaCacheEnded                 = "createMediaCacheEnded"
     let notificationCenterUpdateNotification                    = "updateNotification"
     let notificationCenterDidCreateShareLink                    = "didCreateShareLink"
+    let notificationCenterDidCreateShareLink                    = "didCreateShareLink"
+
+    let notificationCenterDeleteFile                            = "deleteFile"                      // userInfo: [ocId], error
+    let notificationCenterCopyMoveFile                          = "copyMoveFile"                    // userInfo: [ocId] serverUrl, account, dragdrop, type (copy, move)
+    let notificationCenterMoveFile                              = "moveFile"                        // userInfo: [ocId], [indexPath], error
+    let notificationCenterCopyFile                              = "copyFile"                        // userInfo: [ocId], [indexPath], error
+    let notificationCenterRenameFile                            = "renameFile"                      // userInfo: serverUrl, account, error
+    let notificationCenterFavoriteFile                          = "favoriteFile"                    // userInfo: ocId, serverUrl
+    let notificationCenterFileExists                            = "fileExists"                      // userInfo: ocId, fileExists
+    let notificationCenterReloadDataSource                      = "reloadDataSource"                // userInfo: serverUrl?, clearDataSource
+
+    let notificationCenterDeleteFile                            = "deleteFile"                      // userInfo: [ocId], error
+    let notificationCenterCopyMoveFile                          = "copyMoveFile"                    // userInfo: [ocId] serverUrl, account, dragdrop, type (copy, move)
+    let notificationCenterMoveFile                              = "moveFile"                        // userInfo: [ocId], [indexPath], error
+    let notificationCenterCopyFile                              = "copyFile"                        // userInfo: [ocId], [indexPath], error
+    let notificationCenterRenameFile                            = "renameFile"                      // userInfo: serverUrl, account, error
+    let notificationCenterFavoriteFile                          = "favoriteFile"                    // userInfo: ocId, serverUrl
+    let notificationCenterFileExists                            = "fileExists"                      // userInfo: ocId, fileExists
+    let notificationCenterReloadDataSource                      = "reloadDataSource"                // userInfo: serverUrl?, clearDataSource
 
     let notificationCenterDeleteFile                            = "deleteFile"                      // userInfo: [ocId], error
     let notificationCenterCopyMoveFile                          = "copyMoveFile"                    // userInfo: [ocId] serverUrl, account, dragdrop, type (copy, move)
diff --git a/iOSClient/Trash/Cell/NCTrashCellProtocol.swift b/iOSClient/Trash/Cell/NCTrashCellProtocol.swift
@@ -36,12 +36,13 @@ extension NCTrashCellProtocol where Self: UICollectionViewCell {
             self.labelInfo?.text = dateFormatter.string(from: tableTrash.trashbinDeletionTime as Date)
         }
         if tableTrash.directory {
-            self.imageItem.image = NCImageCache.shared.getFolder(account: tableTrash.account)
+            self.imageItem.image = NCImageCache.shared.getFolder()
         } else {
             self.imageItem.image = image
-            self.labelInfo?.text = (self.labelInfo?.text ?? "") + " · " + NCUtilityFileSystem().transformedSize(tableTrash.size)
+//            self.labelInfo?.text = (self.labelInfo?.text ?? "") + " · " + NCUtilityFileSystem().transformedSize(tableTrash.size)
         }
 
+        self.labelInfo?.text = (self.labelInfo?.text ?? "") + " · " + NCUtilityFileSystem().transformedSize(tableTrash.size)
         self.accessibilityLabel = tableTrash.trashbinFileName + ", " + (self.labelInfo?.text ?? "")
 
         if self is NCTrashGridCell {
diff --git a/iOSClient/Trash/Cell/NCTrashGridCell.swift b/iOSClient/Trash/Cell/NCTrashGridCell.swift
@@ -25,6 +25,32 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
         get { return nil }
         set { imageItem = newValue }
     }
+    var indexPath = IndexPath()
+    var account = ""
+    var user = ""
+
+    var namedButtonMore = ""
+
+    var fileObjectId: String? {
+        get { return objectId }
+        set { objectId = newValue ?? "" }
+    }
+    var filePreviewImageView: UIImageView? {
+        get { return imageItem }
+        set { imageItem = newValue }
+    }
+    var fileUser: String? {
+        get { return user }
+        set { user = newValue ?? "" }
+    }
+    var fileTitleLabel: UILabel? {
+        get { return labelTitle }
+        set { labelTitle = newValue }
+    }
+    var fileInfoLabel: UILabel? {
+        get { return labelInfo }
+        set { labelInfo = newValue }
+    }
 
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -77,6 +103,10 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
         // adjustsFontForContentSizeCategory:
         //     Enables live updates when accessibility settings change.
         //
+//        progressView.tintColor = NCBrandColor.shared.brandElement
+//        progressView.transform = CGAffineTransform(scaleX: 1.0, y: 0.5)
+//        progressView.trackTintColor = .clear
+
         labelTitle.text = ""
         labelTitle.font = .callout()
         labelTitle.adjustsFontForContentSizeCategory = true
@@ -90,9 +120,9 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
         labelInfo.font = .footnote()
         labelInfo.adjustsFontForContentSizeCategory = true
 
-        labelSubinfo.text = ""
-        labelSubinfo.font = .footnote()
-        labelSubinfo.adjustsFontForContentSizeCategory = true
+//        labelSubinfo.text = ""
+//        labelSubinfo.font = .footnote()
+//        labelSubinfo.adjustsFontForContentSizeCategory = true
 
         if labelExtension.isHidden {
             labelTitle.numberOfLines = 2
@@ -101,6 +131,9 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
             labelTitle.numberOfLines = 1
             labelTitle.lineBreakMode = .byTruncatingTail
         }
+        labelTitle.textColor = .label
+        labelInfo.textColor = .systemGray
+        labelSubinfo.text = ""
     }
 
     override func snapshotView(afterScreenUpdates afterUpdates: Bool) -> UIView? {
@@ -134,9 +167,17 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
             setA11yActions()
         }
 
-        imageVisualEffect.alpha = status ? 1 : 0
-        imageSelect.alpha = status ? 1 : 0
-        imageSelect.image = NCImageCache.shared.getImageCheckedYes(color: color)
+//        imageVisualEffect.alpha = status ? 1 : 0
+//        imageSelect.alpha = status ? 1 : 0
+//        imageSelect.image = NCImageCache.shared.getImageCheckedYes(color: color)
+        if status {
+            imageSelect.image = NCImageCache.shared.getImageCheckedYes(color: color)
+            imageSelect.isHidden = false
+            imageVisualEffect.isHidden = false
+        } else {
+            imageSelect.isHidden = true
+            imageVisualEffect.isHidden = true
+        }
     }
 
     func writeInfoDateSize(date: NSDate, size: Int64) {
diff --git a/iOSClient/Trash/Cell/NCTrashListCell.swift b/iOSClient/Trash/Cell/NCTrashListCell.swift
@@ -31,6 +31,7 @@ class NCTrashListCell: UICollectionViewCell, NCTrashCellProtocol {
         get { return imageStatus }
         set { imageStatus = newValue }
     }
+    var account = ""
 
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -57,8 +58,10 @@ class NCTrashListCell: UICollectionViewCell, NCTrashCellProtocol {
 
         ]
 
-        imageRestore.image = NCUtility().loadImage(named: "arrow.counterclockwise", colors: [NCBrandColor.shared.iconImageColor])
-        imageMore.image = NCUtility().loadImage(named: "trash", colors: [.red])
+//        imageRestore.image = NCUtility().loadImage(named: "arrow.counterclockwise", colors: [NCBrandColor.shared.iconImageColor])
+//        imageMore.image = NCUtility().loadImage(named: "trash", colors: [.red])
+        imageRestore.image = NCUtility().loadImage(named: "restore", colors: [NCBrandColor.shared.iconImageColor])
+        imageMore.image = NCUtility().loadImage(named: "trashIcon", colors: [NCBrandColor.shared.iconImageColor]) //NCUtility().loadImage(named: "trashIcon", colors: [.red])
         imageItem.layer.cornerRadius = 6
         imageItem.layer.masksToBounds = true
 
diff --git a/iOSClient/Trash/NCTrash+CollectionView.swift b/iOSClient/Trash/NCTrash+CollectionView.swift
@@ -50,7 +50,6 @@ extension NCTrash: UICollectionViewDataSource {
             gridCell.delegate = self
             cell = gridCell
         }
-
         guard let resultTableTrash = datasource?[indexPath.item] else { return cell }
 
         let contextMenu = NCContextMenuTrash(objectId: resultTableTrash.fileId, trashController: self)
@@ -85,9 +84,11 @@ extension NCTrash: UICollectionViewDataSource {
             }
         }
 
+        cell.account = resultTableTrash.account
         cell.objectId = resultTableTrash.fileId
         cell.setupCellUI(tableTrash: resultTableTrash, image: image)
-        cell.selected(selectOcId.contains(resultTableTrash.fileId), isEditMode: isEditMode, color: NCBrandColor.shared.getElement(account: session.account))
+        cell.selected(selectOcId.contains(resultTableTrash.fileId), isEditMode: isEditMode, account: resultTableTrash.account)
+//        cell.selected(selectOcId.contains(resultTableTrash.fileId), isEditMode: isEditMode, color: NCBrandColor.shared.getElement(account: session.account))
 
         return cell
     }
@@ -129,12 +130,66 @@ extension NCTrash: UICollectionViewDataSource {
 
         return text
     }
+    
+    func setTitleLabel(directories: Int, files: Int, size: Int64) -> String {
+        var foldersText = ""
+        var filesText = ""
+        var text = ""
+
+        if directories > 1 {
+            foldersText = "\(directories) " + NSLocalizedString("_folders_", comment: "")
+        } else if directories == 1 {
+            foldersText = "1 " + NSLocalizedString("_folder_", comment: "")
+        }
+
+        if files > 1 {
+            filesText = "\(files) " + NSLocalizedString("_files_", comment: "") + " • " + utilityFileSystem.transformedSize(size)
+        } else if files == 1 {
+            filesText = "1 " + NSLocalizedString("_file_", comment: "") + " • " + utilityFileSystem.transformedSize(size)
+        }
+
+        if foldersText.isEmpty {
+            text = filesText
+        } else if filesText.isEmpty {
+            text = foldersText
+        } else {
+            text = foldersText + " • " + filesText
+        }
+        return text
+    }
+    
+    func setTitleLabel(directories: Int, files: Int, size: Int64) -> String {
+        var foldersText = ""
+        var filesText = ""
+        var text = ""
+
+        if directories > 1 {
+            foldersText = "\(directories) " + NSLocalizedString("_folders_", comment: "")
+        } else if directories == 1 {
+            foldersText = "1 " + NSLocalizedString("_folder_", comment: "")
+        }
+
+        if files > 1 {
+            filesText = "\(files) " + NSLocalizedString("_files_", comment: "") + " • " + utilityFileSystem.transformedSize(size)
+        } else if files == 1 {
+            filesText = "1 " + NSLocalizedString("_file_", comment: "") + " • " + utilityFileSystem.transformedSize(size)
+        }
+
+        if foldersText.isEmpty {
+            text = filesText
+        } else if filesText.isEmpty {
+            text = foldersText
+        } else {
+            text = foldersText + " • " + filesText
+        }
+        return text
+    }
 
     func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
         if kind == UICollectionView.elementKindSectionHeader {
             guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFirstHeaderEmptyData", for: indexPath) as? NCSectionFirstHeaderEmptyData
             else { return NCSectionFirstHeaderEmptyData() }
-            header.emptyImage.image = utility.loadImage(named: "trash", colors: [NCBrandColor.shared.getElement(account: session.account)])
+            header.emptyImage.image = utility.loadImage(named: "trashIcon", colors: [NCBrandColor.shared.getElement(account: session.account)])
             header.emptyTitle.text = NSLocalizedString("_trash_no_trash_", comment: "")
             header.emptyDescription.text = NSLocalizedString("_trash_no_trash_description_", comment: "")
             return header
@@ -143,6 +198,8 @@ extension NCTrash: UICollectionViewDataSource {
             else { return NCSectionFooter() }
             if let datasource {
                 footer.setTitleLabel(setTextFooter(datasource: datasource))
+//                let info = self.getFooterInformation(datasource: datasource)
+//                footer.setTitleLabel(directories: info.directories, files: info.files, size: info.size)
             }
             return footer
         }
diff --git a/iOSClient/Trash/NCTrash.swift b/iOSClient/Trash/NCTrash.swift
@@ -30,6 +30,11 @@ class NCTrash: UIViewController, NCTrashListCellDelegate, NCTrashGridCellDelegat
     var session: NCSession.Session {
         NCSession.shared.getSession(controller: tabBarController)
     }
+    
+    var serverUrl = ""
+    var selectableDataSource: [RealmSwiftObject] { datasource }
+    private let appDelegate = (UIApplication.shared.delegate as? AppDelegate)!
+    var emptyDataSet: NCEmptyDataSet?
 
     @MainActor
     var controller: NCMainTabBarController? {
@@ -101,6 +106,7 @@ class NCTrash: UIViewController, NCTrashListCellDelegate, NCTrashGridCellDelegat
             await self.reloadDataSource()
             await loadListingTrash()
         }
+        AnalyticsHelper.shared.trackEvent(eventName: .SCREEN_EVENT__DELETED_FILES)
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -144,6 +150,22 @@ class NCTrash: UIViewController, NCTrashListCellDelegate, NCTrashGridCellDelegat
             collectionView(self.collectionView, didSelectItemAt: indexPath!)
         }
     }
+    func tapButtonSwitch(_ sender: Any) {
+        if layoutForView?.layout == NCGlobal.shared.layoutGrid {
+            onListSelected()
+        } else {
+            onGridSelected()
+        }
+    }
+    
+    func tapButtonOrder(_ sender: Any) {
+
+        let sortMenu = NCSortMenu()
+//        sortMenu.toggleMenu(viewController: self, account: appDelegate.account, key: layoutKey, sortButton: sender as? UIButton, serverUrl: serverUrl)
+        sortMenu.toggleMenu(viewController: self, account: session.account, key: layoutKey, sortButton: sender as? UIButton, serverUrl: serverUrl)
+    }
+
+    func longPressGridItem(with objectId: String, gestureRecognizer: UILongPressGestureRecognizer) { }
 
     func longPressMoreGridItem(with objectId: String, gestureRecognizer: UILongPressGestureRecognizer) { }
 
@@ -153,6 +175,13 @@ class NCTrash: UIViewController, NCTrashListCellDelegate, NCTrashGridCellDelegat
         let results = await self.database.getTableTrashAsync(filePath: getFilePath(), account: session.account)
 
         await mainNavigationController?.updateMenuOption()
+//            // Switch back to main thread for UI updates
+//            await MainActor.run {
+//                self.datasource = results
+//                self.collectionView.reloadData()
+//                setNavigationRightItems()
+////                (self.navigationController as? NCMainNavigationController)?.updateRightMenu()
+//        await (self.navigationController as? NCMainNavigationController)?.updateRightMenu()
 
         await MainActor.run {
             self.datasource = results
@@ -187,4 +216,22 @@ class NCTrash: UIViewController, NCTrashListCellDelegate, NCTrashGridCellDelegat
             return filePath + "/"
         }
     }
+    
+    func getFooterInformation(datasource: [tableTrash]) -> (directories: Int, files: Int, size: Int64) {
+        let validMetadatas = datasource.filter { !$0.isInvalidated }
+        let directories = validMetadatas.filter({ $0.directory == true})
+        let files = validMetadatas.filter({ $0.directory == false})
+
+        var size: Int64 = 0
+
+        directories.forEach { metadata in
+            size += metadata.size
+        }
+        
+        files.forEach { metadata in
+            size += metadata.size
+        }
+
+        return (directories.count, files.count, size)
+    }
 }
diff --git a/iOSClient/Trash/NCTrashSelectTabBar.swift b/iOSClient/Trash/NCTrashSelectTabBar.swift
@@ -107,8 +107,11 @@ struct NCTrashSelectTabBarView: View {
                 Button {
                     tabBarSelect.delegate?.recover()
                 } label: {
-                    Image(systemName: "arrow.counterclockwise")
-                        .font(.icon())
+//                    Image(systemName: "arrow.counterclockwise")
+//                        .font(.icon())
+                    Image(systemName: "arrow.circlepath")
+                        .font(Font.system(.body).weight(.light))
+                        .imageScale(sizeClass == .compact ? .medium : .large)
                 }
                 .tint(Color(NCBrandColor.shared.iconImageColor))
                 .frame(maxWidth: .infinity)

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,13 @@ extension NCTrashCellProtocol where Self: UICollectionViewCell {`
`36`	`36`	`self.labelInfo?.text = dateFormatter.string(from: tableTrash.trashbinDeletionTime as Date)`
`37`	`37`	`}`
`38`	`38`	`if tableTrash.directory {`
`39`		`- self.imageItem.image = NCImageCache.shared.getFolder(account: tableTrash.account)`
	`39`	`+ self.imageItem.image = NCImageCache.shared.getFolder()`
`40`	`40`	`} else {`
`41`	`41`	`self.imageItem.image = image`
`42`		`- self.labelInfo?.text = (self.labelInfo?.text ?? "") + " · " + NCUtilityFileSystem().transformedSize(tableTrash.size)`
	`42`	`+// self.labelInfo?.text = (self.labelInfo?.text ?? "") + " · " + NCUtilityFileSystem().transformedSize(tableTrash.size)`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ self.labelInfo?.text = (self.labelInfo?.text ?? "") + " · " + NCUtilityFileSystem().transformedSize(tableTrash.size)`
`45`	`46`	`self.accessibilityLabel = tableTrash.trashbinFileName + ", " + (self.labelInfo?.text ?? "")`
`46`	`47`
`47`	`48`	`if self is NCTrashGridCell {`