coding

iOSClient/Activity/NCActivity.swift

@@ -113,30 +113,34 @@ class activityTableViewCell: UITableViewCell, NCCellProtocol {
     private let appDelegate = UIApplication.shared.delegate as! AppDelegate
 
     @IBOutlet weak var collectionView: UICollectionView!
-    
     @IBOutlet weak var icon: UIImageView!
     @IBOutlet weak var avatar: UIImageView!
     @IBOutlet weak var subject: UILabel!
     @IBOutlet weak var subjectTrailingConstraint: NSLayoutConstraint!
     @IBOutlet weak var collectionViewHeightConstraint: NSLayoutConstraint!
 
-    var filePreviewImageView: UIImageView? {
+    var idActivity: Int = 0
+    var account: String = ""
+    var activityPreviews: [tableActivityPreview] = []
+    var didSelectItemEnable: Bool = true
+    var viewController: UIViewController? = nil
+    
+    var fileAvatarImageView: UIImageView? {
+        get {
+            return avatar
+        }
+    }
+    var fileObjectId: String? {
         get {
             return nil
         }
     }
-    var fileAvatarImageView: UIImageView? {
-        get{
-            return avatar
+    var filePreviewImageView: UIImageView? {
+        get {
+            return nil
         }
     }
     
-    var idActivity: Int = 0
-    var account: String = ""
-    var activityPreviews: [tableActivityPreview] = []
-    var didSelectItemEnable: Bool = true
-    var viewController: UIViewController? = nil
-    
     override func awakeFromNib() {
         super.awakeFromNib()
         

iOSClient/Main/Collection Common/NCGridCell.swift

@@ -26,32 +26,34 @@ import UIKit
 class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProtocol {
     
     @IBOutlet weak var imageItem: UIImageView!
-    
     @IBOutlet weak var imageSelect: UIImageView!
     @IBOutlet weak var imageStatus: UIImageView!
     @IBOutlet weak var imageFavorite: UIImageView!
     @IBOutlet weak var imageLocal: UIImageView!
-
     @IBOutlet weak var labelTitle: UILabel!
     @IBOutlet weak var buttonMore: UIButton!
-
     @IBOutlet weak var imageVisualEffect: UIVisualEffectView!
     @IBOutlet weak var progressView: UIProgressView!
 
-    var filePreviewImageView: UIImageView? {
+    var delegate: NCGridCellDelegate?
+    var objectId = ""
+    var namedButtonMore = ""
+    
+    var fileAvatarImageView: UIImageView? {
         get{
-            return imageItem
+            return nil
         }
     }
-    var fileAvatarImageView: UIImageView? {
+    var fileObjectId: String? {
         get{
-            return nil
+            return objectId
+        }
+    }
+    var filePreviewImageView: UIImageView? {
+        get{
+            return imageItem
         }
     }
-    
-    var delegate: NCGridCellDelegate?
-    var objectId = ""
-    var namedButtonMore = ""
     
     override func awakeFromNib() {
         super.awakeFromNib()

iOSClient/Main/Collection Common/NCListCell.swift

@@ -27,42 +27,40 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     
     @IBOutlet weak var imageItem: UIImageView!
     @IBOutlet weak var imageItemLeftConstraint: NSLayoutConstraint!
-    
     @IBOutlet weak var imageSelect: UIImageView!
     @IBOutlet weak var imageStatus: UIImageView!
     @IBOutlet weak var imageFavorite: UIImageView!
     @IBOutlet weak var imageLocal: UIImageView!
-
     @IBOutlet weak var labelTitle: UILabel!
-
     @IBOutlet weak var labelInfo: UILabel!
-
     @IBOutlet weak var imageShared: UIImageView!
     @IBOutlet weak var buttonShared: UIButton!
-
     @IBOutlet weak var imageMore: UIImageView!
     @IBOutlet weak var buttonMore: UIButton!
-    
     @IBOutlet weak var progressView: UIProgressView!
-    
     @IBOutlet weak var separator: UIView!
     @IBOutlet weak var separatorHeightConstraint: NSLayoutConstraint!
 
-    var filePreviewImageView : UIImageView? {
+    var delegate: NCListCellDelegate?
+    var objectId = ""
+    var namedButtonMore = ""
+    
+    var fileAvatarImageView: UIImageView? {
         get{
-            return imageItem
+            return imageShared
         }
     }
-    var fileAvatarImageView: UIImageView? {
+    var fileObjectId: String? {
         get{
-            return imageShared
+            return objectId
+        }
+    }
+    var filePreviewImageView : UIImageView? {
+        get{
+            return imageItem
         }
     }
     
-    var delegate: NCListCellDelegate?
-    var objectId = ""
-    var namedButtonMore = ""
-
     override func awakeFromNib() {
         super.awakeFromNib()
                

iOSClient/Main/NCCellProtocol.swift

@@ -24,7 +24,8 @@
 import UIKit
 
 protocol NCCellProtocol {
-    var filePreviewImageView: UIImageView? { get }
     var fileAvatarImageView: UIImageView? { get }
+    var fileObjectId: String? { get }
+    var filePreviewImageView: UIImageView? { get }
 }
 

iOSClient/Media/Cell/NCGridMediaCell.swift

@@ -26,14 +26,13 @@ import UIKit
 class NCGridMediaCell: UICollectionViewCell, NCCellProtocol {
 
     @IBOutlet weak var imageItem: UIImageView!
-
     @IBOutlet weak var imageVisualEffect: UIVisualEffectView!
-
     @IBOutlet weak var imageSelect: UIImageView!
     @IBOutlet weak var imageStatus: UIImageView!
     
     var date: Date?
-
+    var objectId: String = ""
+    
     var filePreviewImageView: UIImageView? {
         get {
             return imageItem
@@ -44,6 +43,11 @@ class NCGridMediaCell: UICollectionViewCell, NCCellProtocol {
             return nil
         }
     }
+    var fileObjectId: String? {
+        get{
+            return objectId
+        }
+    }
     
     override func awakeFromNib() {
         super.awakeFromNib()

iOSClient/Media/NCMedia.swift

@@ -419,6 +419,7 @@ extension NCMedia: UICollectionViewDataSource {
             self.cellHeigth = cell.frame.size.height
 
             cell.date = metadata.date as Date
+            cell.objectId = metadata.ocId
 
             if metadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue || metadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue {
                 cell.imageStatus.image = cacheImages.cellPlayImage

iOSClient/Notification/NCNotification.swift

@@ -317,9 +317,6 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
 
 class NCNotificationCell: UITableViewCell, NCCellProtocol {
     
-    var delegate: NCNotificationCellDelegate?
-    var notification: NCCommunicationNotifications?
-
     @IBOutlet weak var icon : UIImageView!
     @IBOutlet weak var avatar : UIImageView!
     @IBOutlet weak var date: UILabel!
@@ -328,22 +325,29 @@ class NCNotificationCell: UITableViewCell, NCCellProtocol {
     @IBOutlet weak var remove: UIButton!
     @IBOutlet weak var primary: UIButton!
     @IBOutlet weak var secondary: UIButton!
-
     @IBOutlet weak var avatarLeadingMargin: NSLayoutConstraint!
     @IBOutlet weak var messageBottomMargin: NSLayoutConstraint!
     @IBOutlet weak var primaryWidth: NSLayoutConstraint!
     @IBOutlet weak var secondaryWidth: NSLayoutConstraint!
     
+    var delegate: NCNotificationCellDelegate?
+    var notification: NCCommunicationNotifications?
+
     var filePreviewImageView : UIImageView? {
-        get{
+        get {
             return nil
         }
     }
     var fileAvatarImageView: UIImageView? {
-        get{
+        get {
             return avatar
         }
     }
+    var fileObjectId: String? {
+        get {
+            return nil
+        }
+    }
     
     override func awakeFromNib() {
         super.awakeFromNib()

iOSClient/Share/NCShare.swift

@@ -476,14 +476,19 @@ class NCShareUserCell: UITableViewCell, NCCellProtocol {
     @IBOutlet weak var imageStatus: UIImageView!
     @IBOutlet weak var status: UILabel!
     
-    var filePreviewImageView : UIImageView? {
+    var fileAvatarImageView: UIImageView? {
         get{
+            return imageItem
+        }
+    }
+    var fileObjectId: String? {
+        get {
             return nil
         }
     }
-    var fileAvatarImageView: UIImageView? {
+    var filePreviewImageView : UIImageView? {
         get{
-            return imageItem
+            return nil
         }
     }
     
@@ -522,14 +527,19 @@ class NCShareUserDropDownCell: DropDownCell, NCCellProtocol {
     @IBOutlet weak var imageShareeType: UIImageView!
     @IBOutlet weak var centerTitle: NSLayoutConstraint!
     
-    var filePreviewImageView : UIImageView? {
-        get{
+    var fileAvatarImageView: UIImageView? {
+        get {
+            return imageItem
+        }
+    }
+    var fileObjectId: String? {
+        get {
             return nil
         }
     }
-    var fileAvatarImageView: UIImageView? {
-        get{
-            return imageItem
+    var filePreviewImageView : UIImageView? {
+        get {
+            return nil
         }
     }
 }

iOSClient/Share/NCShareComments.swift

@@ -215,6 +215,9 @@ class NCShareCommentsCell: UITableViewCell, NCCellProtocol {
     @IBOutlet weak var labelDate: UILabel!
     @IBOutlet weak var labelMessage: UILabel!
     
+    var tableComments: tableComments?
+    var delegate: NCShareCommentsCellDelegate?
+    
     var filePreviewImageView : UIImageView? {
         get{
             return nil
@@ -225,9 +228,11 @@ class NCShareCommentsCell: UITableViewCell, NCCellProtocol {
             return imageItem
         }
     }
-    
-    var tableComments: tableComments?
-    var delegate: NCShareCommentsCellDelegate?
+    var fileObjectId: String? {
+        get {
+            return nil
+        }
+    }
     
     override func awakeFromNib() {
         super.awakeFromNib()

iOSClient/Transfers/NCTransferCell.swift

@@ -26,36 +26,37 @@ import UIKit
 class NCTransferCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProtocol {
     
     @IBOutlet weak var imageItem: UIImageView!
-    
     @IBOutlet weak var labelTitle: UILabel!
     @IBOutlet weak var labelPath: UILabel!
     @IBOutlet weak var labelStatus: UILabel!
     @IBOutlet weak var labelInfo: UILabel!
-
     @IBOutlet weak var imageMore: UIImageView!
     @IBOutlet weak var buttonMore: UIButton!
-    
     @IBOutlet weak var progressView: UIProgressView!
-    
     @IBOutlet weak var separator: UIView!
     @IBOutlet weak var separatorHeightConstraint: NSLayoutConstraint!
     
-    var filePreviewImageView : UIImageView? {
-        get{
-            return imageItem
-        }
-    }
-    var fileAvatarImageView: UIImageView? {
-        get{
-            return nil
-        }
-    }
-
     var delegate: NCTransferCellDelegate?
     var objectId = ""
     var indexPath = IndexPath()
     var namedButtonMore = ""
-
+    
+    var fileAvatarImageView: UIImageView? {
+        get {
+            return nil
+        }
+    }
+    var fileObjectId: String? {
+        get {
+            return objectId
+        }
+    }
+    var filePreviewImageView : UIImageView? {
+        get {
+            return imageItem
+        }
+    }
+    
     override func awakeFromNib() {
         super.awakeFromNib()