marinofaggiana 4 年之前
父節點
當前提交
6228b9a15e
共有 2 個文件被更改,包括 26 次插入22 次删除
  1. 2 0
      iOSClient/Main/Cell/NCListCell.swift
  2. 24 22
      iOSClient/Main/NCCollectionViewCommon.swift

+ 2 - 0
iOSClient/Main/Cell/NCListCell.swift

@@ -135,9 +135,11 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCImageCell
         if status {
             imageSelect.image = NCCollectionCommon.images.cellCheckedYes
             backgroundView = NCUtility.shared.cellBlurEffect(with: self.bounds)
+            separator.isHidden = true
         } else {
             imageSelect.image = NCCollectionCommon.images.cellCheckedNo
             backgroundView = nil
+            separator.isHidden = false
         }
     }
 }

+ 24 - 22
iOSClient/Main/NCCollectionViewCommon.swift

@@ -1424,17 +1424,6 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                 }
             }
             
-            if isEditMode {
-                cell.selectMode(true)
-                if selectOcId.contains(metadata.ocId) {
-                    cell.selected(true)
-                } else {
-                    cell.selected(false)
-                }
-            } else {
-                cell.selectMode(false)
-            }
-            
             // Transfer
             var progress: Float = 0.0
             var totalBytes: Double = 0.0
@@ -1494,6 +1483,18 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                 cell.separator.isHidden = false
             }
             
+            // Edit mode
+            if isEditMode {
+                cell.selectMode(true)
+                if selectOcId.contains(metadata.ocId) {
+                    cell.selected(true)
+                } else {
+                    cell.selected(false)
+                }
+            } else {
+                cell.selectMode(false)
+            }
+            
             return cell
         }
         
@@ -1576,17 +1577,6 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                 cell.imageFavorite.image = NCCollectionCommon.images.cellFavouriteImage
             }
             
-            if isEditMode {
-                cell.selectMode(true)
-                if selectOcId.contains(metadata.ocId) {
-                    cell.selected(true)
-                } else {
-                    cell.selected(false)
-                }
-            } else {
-                cell.selectMode(false)
-            }
-            
             // Transfer
             if metadata.status == k_metadataStatusInDownload || metadata.status == k_metadataStatusDownloading ||  metadata.status >= k_metadataStatusTypeUpload {
                 cell.progressView.isHidden = false
@@ -1602,6 +1592,18 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                 cell.imageStatus.image = NCCollectionCommon.images.cellLivePhotoImage
             }
             
+            // Edit mode
+            if isEditMode {
+                cell.selectMode(true)
+                if selectOcId.contains(metadata.ocId) {
+                    cell.selected(true)
+                } else {
+                    cell.selected(false)
+                }
+            } else {
+                cell.selectMode(false)
+            }
+            
             return cell
         }