Browse Source

coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>
marinofaggiana 2 years ago
parent
commit
0d84708fc8

+ 5 - 11
iOSClient/Activity/NCActivityTableViewCell.swift

@@ -76,22 +76,16 @@ class NCActivityTableViewCell: UITableViewCell, NCCellProtocol {
             user = newValue ?? ""
         }
     }
-    var title: String? {
-        get {
-            return nil
-        }
+    var title: UILabel? {
+        get { return nil }
         set {}
     }
-    var info: String? {
-        get {
-            return nil
-        }
+    var info: UILabel? {
+        get { return nil }
         set {}
     }
     var progress: UIProgressView? {
-        get {
-            return nil
-        }
+        get { return nil }
         set {}
     }
 

+ 3 - 3
iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -602,16 +602,16 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                     if let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
                         cell.writeInfoDateSize(date: metadata.date, totalBytes: metadata.size)
                     } else {
-                        cell.info = ""
+                        cell.info?.text = ""
                     }
                 } else {
                     cell.progress?.isHidden = false
                     cell.progress?.progress = progressNumber.floatValue
                     cell.setButtonMore(named: NCGlobal.shared.buttonMoreStop, image: NCBrandColor.cacheImages.buttonStop)
                     if status == NCGlobal.shared.metadataStatusInDownload {
-                        cell.info = CCUtility.transformedSize(totalBytesExpected) + " - ↓ " + CCUtility.transformedSize(totalBytes)
+                        cell.info?.text = CCUtility.transformedSize(totalBytesExpected) + " - ↓ " + CCUtility.transformedSize(totalBytes)
                     } else if status == NCGlobal.shared.metadataStatusInUpload {
-                        cell.info = CCUtility.transformedSize(totalBytesExpected) + " - ↑ " + CCUtility.transformedSize(totalBytes)
+                        cell.info?.text = CCUtility.transformedSize(totalBytesExpected) + " - ↑ " + CCUtility.transformedSize(totalBytes)
                     }
                 }
             }

+ 6 - 6
iOSClient/Main/Collection Common/NCGridCell.swift

@@ -68,20 +68,20 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
             user = newValue ?? ""
         }
     }
-    var title: String? {
+    var title: UILabel? {
         get {
-            return labelTitle.text
+            return labelTitle
         }
         set {
-            labelTitle.text = newValue ?? ""
+            labelTitle = newValue
         }
     }
-    var info: String? {
+    var info: UILabel? {
         get {
-            return labelInfo.text
+            return labelInfo
         }
         set {
-            labelInfo.text = newValue ?? ""
+            labelInfo = newValue
         }
     }
     var progress: UIProgressView? {

+ 6 - 6
iOSClient/Main/Collection Common/NCListCell.swift

@@ -76,20 +76,20 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
             user = newValue ?? ""
         }
     }
-    var title: String? {
+    var title: UILabel? {
         get {
-            return labelTitle.text
+            return labelTitle
         }
         set {
-            labelTitle.text = newValue ?? ""
+            labelTitle = newValue
         }
     }
-    var info: String? {
+    var info: UILabel? {
         get {
-            return labelInfo.text
+            return labelInfo
         }
         set {
-            labelInfo.text = newValue ?? ""
+            labelInfo = newValue
         }
     }
     var progress: UIProgressView? {

+ 2 - 2
iOSClient/Main/NCCellProtocol.swift

@@ -28,8 +28,8 @@ protocol NCCellProtocol {
     var fileObjectId: String? { get set }
     var filePreviewImageView: UIImageView? { get }
     var fileUser: String? { get set }
-    var title: String? { get set }
-    var info: String? { get set }
+    var title: UILabel? { get set }
+    var info: UILabel? { get set }
     var progress: UIProgressView? { get set }
 
     func writeInfoDateSize(date: NSDate, totalBytes: Int64)

+ 8 - 14
iOSClient/Media/Cell/NCGridMediaCell.swift

@@ -61,23 +61,17 @@ class NCGridMediaCell: UICollectionViewCell, NCCellProtocol {
             user = newValue ?? ""
         }
     }
-    var title: String? {
-        get {
-            return nil
-        }
-        set { }
+    var title: UILabel? {
+        get { return nil }
+        set {}
     }
-    var info: String? {
-        get {
-            return nil
-        }
-        set { }
+    var info: UILabel? {
+        get { return nil }
+        set {}
     }
     var progress: UIProgressView? {
-        get {
-            nil
-        }
-        set { }
+        get { return nil }
+        set {}
     }
     
     override func awakeFromNib() {

+ 6 - 12
iOSClient/Notification/NCNotification.swift

@@ -347,22 +347,16 @@ class NCNotificationCell: UITableViewCell, NCCellProtocol {
             user = newValue ?? ""
         }
     }
-    var title: String? {
-        get {
-            return nil
-        }
-        set { }
+    var title: UILabel? {
+        get { return nil }
+        set {}
     }
-    var info: String? {
-        get {
-            return nil
-        }
+    var info: UILabel? {
+        get { return nil }
         set { }
     }
     var progress: UIProgressView? {
-        get {
-            return nil
-        }
+        get { return nil }
         set { }
     }
     

+ 9 - 17
iOSClient/Share/NCShareCommentsCell.swift

@@ -44,9 +44,7 @@ class NCShareCommentsCell: UITableViewCell, NCCellProtocol {
         return imageItem
     }
     var fileObjectId: String? {
-        get {
-            return nil
-        }
+        get { return nil }
         set {}
     }
     var fileUser: String? {
@@ -55,23 +53,17 @@ class NCShareCommentsCell: UITableViewCell, NCCellProtocol {
         }
         set {}
     }
-    var title: String? {
-        get {
-            return nil
-        }
-        set { }
+    var title: UILabel? {
+        get { return nil }
+        set {}
     }
-    var info: String? {
-        get {
-            return nil
-        }
-        set { }
+    var info: UILabel? {
+        get { return nil }
+        set {}
     }
     var progress: UIProgressView? {
-        get {
-            return nil
-        }
-        set { }
+        get { return nil }
+        set {}
     }
 
     override func awakeFromNib() {

+ 15 - 35
iOSClient/Share/NCShareUserCell.swift

@@ -48,31 +48,19 @@ class NCShareUserCell: UITableViewCell, NCCellProtocol {
     }
 
     var fileObjectId: String? {
-        get {
-            return nil
-        }
+        get { return nil }
         set {}
     }
-    var title: String? {
-        get {
-            return labelTitle.text
-        }
-        set {
-            labelTitle.text = newValue ?? ""
-        }
+    var title: UILabel? {
+        get { return nil }
+        set {}
     }
-    var info: String? {
-        get {
-            return status.text
-        }
-        set {
-            status.text = newValue ?? ""
-        }
+    var info: UILabel? {
+        get { return nil }
+        set { }
     }
     var progress: UIProgressView? {
-        get {
-            return nil
-        }
+        get { return nil }
         set { }
     }
 
@@ -170,9 +158,7 @@ class NCSearchUserDropDownCell: DropDownCell, NCCellProtocol {
     var filePreviewImageView: UIImageView? { return nil }
 
     var fileObjectId: String? {
-        get {
-            return nil
-        }
+        get { return nil }
         set {}
     }
     var fileUser: String? {
@@ -183,22 +169,16 @@ class NCSearchUserDropDownCell: DropDownCell, NCCellProtocol {
             user = newValue ?? ""
         }
     }
-    var title: String? {
-        get {
-            return nil
-        }
-        set { }
+    var title: UILabel? {
+        get { return nil }
+        set {}
     }
-    var info: String? {
-        get {
-            return nil
-        }
+    var info: UILabel? {
+        get { return nil }
         set { }
     }
     var progress: UIProgressView? {
-        get {
-            return nil
-        }
+        get { return nil }
         set { }
     }
 

+ 6 - 6
iOSClient/Transfers/NCTransferCell.swift

@@ -69,20 +69,20 @@ class NCTransferCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellP
             user = newValue ?? ""
         }
     }
-    var title: String? {
+    var title: UILabel? {
         get {
-            return labelTitle.text
+            return labelTitle
         }
         set {
-            labelTitle.text = newValue ?? ""
+            labelTitle = newValue
         }
     }
-    var info: String? {
+    var info: UILabel? {
         get {
-            return labelInfo.text
+            return labelInfo
         }
         set {
-            labelInfo.text = newValue ?? ""
+            labelInfo = newValue
         }
     }
     var progress: UIProgressView? {