marinofaggiana 4 vuotta sitten
vanhempi
commit
28fe92091b

+ 20 - 0
iOSClient/Media/Cell/NCGridMediaCell.swift

@@ -64,5 +64,25 @@ class NCGridMediaCell: UICollectionViewCell, NCImageCellProtocol {
         imageVisualEffect.layer.cornerRadius = 6
         imageVisualEffect.clipsToBounds = true
     }
+    
+    func selectMode(_ status: Bool) {
+        if status {
+            imageSelect.isHidden = false
+        } else {
+            imageSelect.isHidden = true
+            imageVisualEffect.isHidden = true
+        }
+    }
+    
+    func selected(_ status: Bool) {
+        if status {
+            imageSelect.image = NCCollectionCommon.images.cellCheckedYes
+            imageVisualEffect.isHidden = false
+            imageVisualEffect.alpha = 0.4
+        } else {
+            imageSelect.isHidden = true
+            imageVisualEffect.isHidden = true
+        }
+    }
 }
 

+ 4 - 8
iOSClient/Media/NCMedia.swift

@@ -616,18 +616,14 @@ extension NCMedia: UICollectionViewDataSource {
         }
         
         if isEditMode {
-            cell.imageSelect.isHidden = false
+            cell.selectMode(true)
             if selectOcId.contains(metadata.ocId) {
-                cell.imageSelect.image = NCCollectionCommon.images.cellCheckedYes
-                cell.imageVisualEffect.isHidden = false
-                cell.imageVisualEffect.alpha = 0.4
+                cell.selected(true)
             } else {
-                cell.imageSelect.isHidden = true
-                cell.imageVisualEffect.isHidden = true
+                cell.selected(false)
             }
         } else {
-            cell.imageSelect.isHidden = true
-            cell.imageVisualEffect.isHidden = true
+            cell.selectMode(false)
         }
        
         return cell

+ 10 - 0
iOSClient/Trash/Cell/NCTrashListCell.swift

@@ -76,6 +76,16 @@ class NCTrashListCell: UICollectionViewCell {
             backgroundView = nil
         }
     }
+    
+    func selected(_ status: Bool) {
+        if status {
+            imageSelect.image = NCCollectionCommon.images.cellCheckedYes
+            backgroundView = NCUtility.shared.cellBlurEffect(with: self.bounds)
+        } else {
+            imageSelect.image = NCCollectionCommon.images.cellCheckedNo
+            backgroundView = nil
+        }
+    }
 }
 
 protocol NCTrashListCellDelegate {

+ 4 - 8
iOSClient/Trash/NCTrash.swift

@@ -498,11 +498,9 @@ extension NCTrash: UICollectionViewDataSource {
             if isEditMode {
                 cell.selectMode(true)
                 if selectOcId.contains(tableTrash.fileId) {
-                    cell.imageSelect.image = CCGraphics.scale(UIImage.init(named: "checkedYes"), to: CGSize(width: 50, height: 50), isAspectRation: true)
-                    cell.backgroundView = NCUtility.shared.cellBlurEffect(with: cell.bounds)
+                    cell.selected(true)
                 } else {
-                    cell.imageSelect.image = CCGraphics.scale(UIImage.init(named: "checkedNo"), to: CGSize(width: 50, height: 50), isAspectRation: true)
-                    cell.backgroundView = nil
+                    cell.selected(false)
                 }
             } else {
                 cell.selectMode(false)
@@ -530,11 +528,9 @@ extension NCTrash: UICollectionViewDataSource {
             if isEditMode {
                 cell.imageSelect.isHidden = false
                 if selectOcId.contains(tableTrash.fileId) {
-                    cell.imageSelect.image = CCGraphics.scale(UIImage.init(named: "checkedYes"), to: CGSize(width: 50, height: 50), isAspectRation: true)
-                    cell.backgroundView = NCUtility.shared.cellBlurEffect(with: cell.bounds)
+                    cell.selected(true)
                 } else {
-                    cell.imageSelect.isHidden = true
-                    cell.backgroundView = nil
+                    cell.selected(false)
                 }
             } else {
                 cell.imageSelect.isHidden = true