coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>

iOSClient/Activity/NCActivityTableViewCell.swift

@@ -53,42 +53,56 @@ class NCActivityTableViewCell: UITableViewCell, NCCellProtocol {
     var viewController: UIViewController?
 
     var fileAvatarImageView: UIImageView? {
-        get {
-            return avatar
-        }
+        get { return avatar }
     }
     var fileObjectId: String? {
-        get {
-            return nil
-        }
+        get { return nil }
         set {}
     }
     var filePreviewImageView: UIImageView? {
-        get {
-            return nil
-        }
+        get { return nil }
     }
     var fileUser: String? {
-        get {
-            return user
-        }
-        set {
-            user = newValue ?? ""
-        }
+        get { return user }
+        set { user = newValue ?? "" }
     }
-    var title: UILabel? {
+    var fileTitleLabel: UILabel? {
         get { return nil }
         set {}
     }
-    var info: UILabel? {
+    var fileInfoLabel: UILabel? {
         get { return nil }
         set {}
     }
-    var progress: UIProgressView? {
+    var fileProgressView: UIProgressView? {
         get { return nil }
         set {}
     }
-
+    var fileSelectImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileStatusImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileLocalImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileFavoriteImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileSharedImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileMoreImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    
     override func awakeFromNib() {
         super.awakeFromNib()
 

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -596,22 +596,22 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         if let cell = collectionView?.cellForItem(at: indexPath) {
             if let cell = cell as? NCCellProtocol {
                 if progressNumber.floatValue == 1 {
-                    cell.progress?.isHidden = true
-                    cell.progress?.progress = .zero
+                    cell.fileProgressView?.isHidden = true
+                    cell.fileProgressView?.progress = .zero
                     cell.setButtonMore(named: NCGlobal.shared.buttonMoreMore, image: NCBrandColor.cacheImages.buttonMore)
                     if let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
                         cell.writeInfoDateSize(date: metadata.date, totalBytes: metadata.size)
                     } else {
-                        cell.info?.text = ""
+                        cell.fileInfoLabel?.text = ""
                     }
                 } else {
-                    cell.progress?.isHidden = false
-                    cell.progress?.progress = progressNumber.floatValue
+                    cell.fileProgressView?.isHidden = false
+                    cell.fileProgressView?.progress = progressNumber.floatValue
                     cell.setButtonMore(named: NCGlobal.shared.buttonMoreStop, image: NCBrandColor.cacheImages.buttonStop)
                     if status == NCGlobal.shared.metadataStatusInDownload {
-                        cell.info?.text = CCUtility.transformedSize(totalBytesExpected) + " - ↓ " + CCUtility.transformedSize(totalBytes)
+                        cell.fileInfoLabel?.text = CCUtility.transformedSize(totalBytesExpected) + " - ↓ " + CCUtility.transformedSize(totalBytes)
                     } else if status == NCGlobal.shared.metadataStatusInUpload {
-                        cell.info?.text = CCUtility.transformedSize(totalBytesExpected) + " - ↑ " + CCUtility.transformedSize(totalBytes)
+                        cell.fileInfoLabel?.text = CCUtility.transformedSize(totalBytesExpected) + " - ↑ " + CCUtility.transformedSize(totalBytes)
                     }
                 }
             }
@@ -1504,18 +1504,27 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                 (cell as? NCGridCell)?.delegate = self
             }
 
+            cell.fileSelectImage?.image = nil
+            cell.fileStatusImage?.image = nil
+            cell.fileLocalImage?.image = nil
+            cell.fileFavoriteImage?.image = nil
+            cell.fileSharedImage?.image = nil
+            cell.fileMoreImage?.image = nil
+
+            cell.imageItem.image = nil
+            cell.imageItem.backgroundColor = nil
             cell.fileObjectId = metadata.ocId
             cell.fileUser = metadata.ownerId
-            cell.title?.textColor = NCBrandColor.shared.label
-            cell.info?.textColor = NCBrandColor.shared.systemGray
+            cell.fileTitleLabel?.textColor = NCBrandColor.shared.label
+            cell.fileInfoLabel?.textColor = NCBrandColor.shared.systemGray
 
             if isSearching {
-                cell.title?.text = metadata.fileName
-                cell.title?.lineBreakMode = .byTruncatingTail
+                cell.fileTitleLabel?.text = metadata.fileName
+                cell.fileTitleLabel?.lineBreakMode = .byTruncatingTail
                 if metadata.name == NCGlobal.shared.appName {
-                    cell.info?.text = NSLocalizedString("_in_", comment: "") + " " + NCUtilityFileSystem.shared.getPath(metadata: metadata, withFileName: false)
+                    cell.fileInfoLabel?.text = NSLocalizedString("_in_", comment: "") + " " + NCUtilityFileSystem.shared.getPath(metadata: metadata, withFileName: false)
                 } else {
-                    cell.info?.text = metadata.subline
+                    cell.fileInfoLabel?.text = metadata.subline
                     if cell is NCListCell {
                         (cell as? NCListCell)?.titleInfoTrailingFull()
                     }
@@ -1524,14 +1533,16 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                     let longestWordRange = (metadata.fileName.lowercased() as NSString).range(of: literalSearch)
                     let attributedString = NSMutableAttributedString(string: metadata.fileName, attributes: [NSAttributedString.Key.font : UIFont.systemFont(ofSize: 15)])
                     attributedString.setAttributes([NSAttributedString.Key.font : UIFont.boldSystemFont(ofSize: 15)], range: longestWordRange)
-                    cell.title?.attributedText = attributedString
+                    cell.fileTitleLabel?.attributedText = attributedString
                 }
             } else {
-                cell.title?.text = metadata.fileNameView
-                cell.title?.lineBreakMode = .byTruncatingMiddle
-                cell.info?.text = CCUtility.dateDiff(metadata.date as Date) + " · " + CCUtility.transformedSize(metadata.size)
+                cell.fileTitleLabel?.text = metadata.fileNameView
+                cell.fileTitleLabel?.lineBreakMode = .byTruncatingMiddle
+                cell.fileInfoLabel?.text = CCUtility.dateDiff(metadata.date as Date) + " · " + CCUtility.transformedSize(metadata.size)
             }
 
+
+
         }
 
 

iOSClient/Main/Collection Common/NCGridCell.swift

@@ -43,54 +43,54 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     var namedButtonMore = ""
 
     var fileAvatarImageView: UIImageView? {
-        get {
-            return nil
-        }
+        get { return nil }
     }
     var fileObjectId: String? {
-        get {
-            return objectId
-        }
-        set {
-            objectId = newValue ?? ""
-        }
+        get { return objectId }
+        set { objectId = newValue ?? "" }
     }
     var filePreviewImageView: UIImageView? {
-        get {
-            return imageItem
-        }
+        get { return imageItem }
     }
     var fileUser: String? {
-        get {
-            return user
-        }
-        set {
-            user = newValue ?? ""
-        }
+        get { return user }
+        set { user = newValue ?? "" }
     }
-    var title: UILabel? {
-        get {
-            return labelTitle
-        }
-        set {
-            labelTitle = newValue
-        }
+    var fileTitleLabel: UILabel? {
+        get { return labelTitle }
+        set { labelTitle = newValue }
     }
-    var info: UILabel? {
-        get {
-            return labelInfo
-        }
-        set {
-            labelInfo = newValue
-        }
+    var fileInfoLabel: UILabel? {
+        get { return labelInfo }
+        set { labelInfo = newValue }
     }
-    var progress: UIProgressView? {
-        get {
-            return progressView
-        }
-        set {
-            progressView = newValue
-        }
+    var fileProgressView: UIProgressView? {
+        get { return progressView }
+        set { progressView = newValue }
+    }
+    var fileSelectImage: UIImageView? {
+        get { return imageSelect }
+        set { imageSelect = newValue }
+    }
+    var fileStatusImage: UIImageView? {
+        get { return imageStatus }
+        set { imageStatus = newValue }
+    }
+    var fileLocalImage: UIImageView? {
+        get { return imageLocal }
+        set { imageLocal = newValue }
+    }
+    var fileFavoriteImage: UIImageView? {
+        get { return imageFavorite }
+        set { imageFavorite = newValue }
+    }
+    var fileSharedImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileMoreImage: UIImageView? {
+        get { return nil }
+        set {}
     }
     
     override func awakeFromNib() {

iOSClient/Main/Collection Common/NCListCell.swift

@@ -76,31 +76,43 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
             user = newValue ?? ""
         }
     }
-    var title: UILabel? {
-        get {
-            return labelTitle
-        }
-        set {
-            labelTitle = newValue
-        }
+    var fileTitleLabel: UILabel? {
+        get { return labelTitle }
+        set { labelTitle = newValue }
     }
-    var info: UILabel? {
-        get {
-            return labelInfo
-        }
-        set {
-            labelInfo = newValue
-        }
+    var fileInfoLabel: UILabel? {
+        get { return labelInfo }
+        set { labelInfo = newValue }
     }
-    var progress: UIProgressView? {
-        get {
-            return progressView
-        }
-        set {
-            progressView = newValue
-        }
+    var fileProgressView: UIProgressView? {
+        get { return progressView }
+        set { progressView = newValue }
     }
-
+    var fileSelectImage: UIImageView? {
+        get { return imageSelect }
+        set { imageSelect = newValue }
+    }
+    var fileStatusImage: UIImageView? {
+        get { return imageStatus }
+        set { imageStatus = newValue }
+    }
+    var fileLocalImage: UIImageView? {
+        get { return imageLocal }
+        set { imageLocal = newValue }
+    }
+    var fileFavoriteImage: UIImageView? {
+        get { return imageFavorite }
+        set { imageFavorite = newValue }
+    }
+    var fileSharedImage: UIImageView? {
+        get { return imageShared }
+        set { imageShared = newValue }
+    }
+    var fileMoreImage: UIImageView? {
+        get { return imageMore }
+        set { imageMore = newValue }
+    }
+    
     override func awakeFromNib() {
         super.awakeFromNib()
 

iOSClient/Main/NCCellProtocol.swift

@@ -28,9 +28,15 @@ protocol NCCellProtocol {
     var fileObjectId: String? { get set }
     var filePreviewImageView: UIImageView? { get }
     var fileUser: String? { get set }
-    var title: UILabel? { get set }
-    var info: UILabel? { get set }
-    var progress: UIProgressView? { get set }
+    var fileTitleLabel: UILabel? { get set }
+    var fileInfoLabel: UILabel? { get set }
+    var fileProgressView: UIProgressView? { get set }
+    var fileSelectImage: UIImageView? { get set }
+    var fileStatusImage: UIImageView? { get set }
+    var fileLocalImage: UIImageView? { get set }
+    var fileFavoriteImage: UIImageView? { get set }
+    var fileSharedImage: UIImageView? { get set }
+    var fileMoreImage: UIImageView? { get set }
 
     func writeInfoDateSize(date: NSDate, totalBytes: Int64)
     func setButtonMore(named: String, image: UIImage)

iOSClient/Media/Cell/NCGridMediaCell.swift

@@ -61,15 +61,39 @@ class NCGridMediaCell: UICollectionViewCell, NCCellProtocol {
             user = newValue ?? ""
         }
     }
-    var title: UILabel? {
+    var fileTitleLabel: UILabel? {
         get { return nil }
         set {}
     }
-    var info: UILabel? {
+    var fileInfoLabel: UILabel? {
         get { return nil }
         set {}
     }
-    var progress: UIProgressView? {
+    var fileProgressView: UIProgressView? {
+        get { return nil }
+        set {}
+    }
+    var fileSelectImage: UIImageView? {
+        get { return imageSelect }
+        set { imageSelect = newValue }
+    }
+    var fileStatusImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileLocalImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileFavoriteImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileSharedImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileMoreImage: UIImageView? {
         get { return nil }
         set {}
     }

iOSClient/Notification/NCNotification.swift

@@ -347,18 +347,42 @@ class NCNotificationCell: UITableViewCell, NCCellProtocol {
             user = newValue ?? ""
         }
     }
-    var title: UILabel? {
+    var fileTitleLabel: UILabel? {
         get { return nil }
         set {}
     }
-    var info: UILabel? {
+    var fileInfoLabel: UILabel? {
         get { return nil }
         set { }
     }
-    var progress: UIProgressView? {
+    var fileProgressView: UIProgressView? {
         get { return nil }
         set { }
     }
+    var fileSelectImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileStatusImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileLocalImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileFavoriteImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileSharedImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileMoreImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
     
     override func awakeFromNib() {
         super.awakeFromNib()

iOSClient/Share/NCShareCommentsCell.swift

@@ -53,19 +53,43 @@ class NCShareCommentsCell: UITableViewCell, NCCellProtocol {
         }
         set {}
     }
-    var title: UILabel? {
+    var fileTitleLabel: UILabel? {
         get { return nil }
         set {}
     }
-    var info: UILabel? {
+    var fileInfoLabel: UILabel? {
         get { return nil }
         set {}
     }
-    var progress: UIProgressView? {
+    var fileProgressView: UIProgressView? {
         get { return nil }
         set {}
     }
-
+    var fileSelectImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileStatusImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileLocalImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileFavoriteImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileSharedImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileMoreImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    
     override func awakeFromNib() {
         super.awakeFromNib()
 

iOSClient/Share/NCShareUserCell.swift

@@ -51,18 +51,42 @@ class NCShareUserCell: UITableViewCell, NCCellProtocol {
         get { return nil }
         set {}
     }
-    var title: UILabel? {
+    var fileTitleLabel: UILabel? {
         get { return nil }
         set {}
     }
-    var info: UILabel? {
+    var fileInfoLabel: UILabel? {
         get { return nil }
         set { }
     }
-    var progress: UIProgressView? {
+    var fileProgressView: UIProgressView? {
         get { return nil }
         set { }
     }
+    var fileSelectImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileStatusImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileLocalImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileFavoriteImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileSharedImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileMoreImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
 
     func setupCellUI(userId: String) {
         guard let tableShare = tableShare else {
@@ -171,19 +195,43 @@ class NCSearchUserDropDownCell: DropDownCell, NCCellProtocol {
             user = newValue ?? ""
         }
     }
-    var title: UILabel? {
+    var fileTitleLabel: UILabel? {
         get { return nil }
         set {}
     }
-    var info: UILabel? {
+    var fileInfoLabel: UILabel? {
         get { return nil }
         set { }
     }
-    var progress: UIProgressView? {
+    var fileProgressView: UIProgressView? {
         get { return nil }
         set { }
     }
-
+    var fileSelectImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileStatusImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileLocalImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileFavoriteImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileSharedImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileMoreImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    
     func setupCell(sharee: NCCommunicationSharee, baseUrl: NCUserBaseUrl) {
         imageItem.image = NCShareCommon.shared.getImageShareType(shareType: sharee.shareType)
         imageShareeType.image = NCShareCommon.shared.getImageShareType(shareType: sharee.shareType)

iOSClient/Transfers/NCTransferCell.swift

@@ -44,54 +44,54 @@ class NCTransferCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellP
     var namedButtonMore = ""
 
     var fileAvatarImageView: UIImageView? {
-        get {
-            return nil
-        }
+        get { return nil }
     }
     var fileObjectId: String? {
-        get {
-            return objectId
-        }
-        set {
-            objectId = newValue ?? ""
-        }
+        get { return objectId }
+        set { objectId = newValue ?? "" }
     }
     var filePreviewImageView: UIImageView? {
-        get {
-            return imageItem
-        }
+        get { return imageItem }
     }
     var fileUser: String? {
-        get {
-            return user
-        }
-        set {
-            user = newValue ?? ""
-        }
-    }
-    var title: UILabel? {
-        get {
-            return labelTitle
-        }
-        set {
-            labelTitle = newValue
-        }
-    }
-    var info: UILabel? {
-        get {
-            return labelInfo
-        }
-        set {
-            labelInfo = newValue
-        }
-    }
-    var progress: UIProgressView? {
-        get {
-            return progressView
-        }
-        set {
-            progressView = newValue
-        }
+        get { return user }
+        set { user = newValue ?? "" }
+    }
+    var fileTitleLabel: UILabel? {
+        get { return labelTitle }
+        set { labelTitle = newValue }
+    }
+    var fileInfoLabel: UILabel? {
+        get { return labelInfo }
+        set { labelInfo = newValue }
+    }
+    var fileProgressView: UIProgressView? {
+        get { return progressView }
+        set { progressView = newValue }
+    }
+    var fileSelectImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileStatusImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileLocalImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileFavoriteImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileSharedImage: UIImageView? {
+        get { return nil }
+        set {}
+    }
+    var fileMoreImage: UIImageView? {
+        get { return imageMore }
+        set { imageMore = newValue }
     }
     
     override func awakeFromNib() {