coding

iOSClient/Select/NCSelect.swift

@@ -306,7 +306,6 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, NCListCellDelegat
                 })
             })
             layout = k_layout_list
-            NCUtility.shared.setLayoutForView(key: keyLayout, serverUrl: serverUrl, layout: layout)
         } else {
             // grid layout
             UIView.animate(withDuration: 0.0, animations: {
@@ -317,7 +316,6 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, NCListCellDelegat
                 })
             })
             layout = k_layout_grid
-            NCUtility.shared.setLayoutForView(key: keyLayout, serverUrl: serverUrl, layout: layout)
         }
     }
     
@@ -585,59 +583,12 @@ extension NCSelect: UICollectionViewDataSource {
             cell.imageItemLeftConstraint.constant = 10
             cell.imageSelect.isHidden = true
             cell.backgroundView = nil
-            
-            // Transfer
-            var progress: Float = 0.0
-            var totalBytes: Double = 0.0
-            let progressArray = appDelegate.listProgressMetadata.object(forKey: metadata.ocId) as? NSArray
-            if progressArray != nil && progressArray?.count == 3 {
-                progress = progressArray?.object(at: 0) as? Float ?? 0
-                totalBytes = progressArray?.object(at: 1) as? Double ?? 0
-            }
-            if metadata.status == k_metadataStatusInDownload || metadata.status == k_metadataStatusDownloading ||  metadata.status >= k_metadataStatusTypeUpload {
-                cell.progressView.isHidden = false
-                cell.setButtonMore(named: k_buttonMoreStop, image: NCCollectionCommon.images.cellButtonStop)
-            } else {
-                cell.progressView.isHidden = true
-                cell.progressView.progress = progress
-                cell.setButtonMore(named: k_buttonMoreMore, image: NCCollectionCommon.images.cellButtonMore)
-            }
-            // Write status on Label Info
-            switch metadata.status {
-            case Int(k_metadataStatusWaitDownload):
-                cell.labelInfo.text = CCUtility.transformedSize(metadata.size) + " - " + NSLocalizedString("_status_wait_download_", comment: "")
-                break
-            case Int(k_metadataStatusInDownload):
-                cell.labelInfo.text = CCUtility.transformedSize(metadata.size) + " - " + NSLocalizedString("_status_in_download_", comment: "")
-                break
-            case Int(k_metadataStatusDownloading):
-                cell.labelInfo.text = CCUtility.transformedSize(metadata.size) + " - ↓ " + CCUtility.transformedSize(totalBytes)
-                break
-            case Int(k_metadataStatusWaitUpload):
-                cell.labelInfo.text = CCUtility.transformedSize(metadata.size) + " - " + NSLocalizedString("_status_wait_upload_", comment: "")
-                break
-            case Int(k_metadataStatusInUpload):
-                cell.labelInfo.text = CCUtility.transformedSize(metadata.size) + " - " + NSLocalizedString("_status_in_upload_", comment: "")
-                break
-            case Int(k_metadataStatusUploading):
-                cell.labelInfo.text = CCUtility.transformedSize(metadata.size) + " - ↑ " + CCUtility.transformedSize(totalBytes)
-                break
-            default:
-                break
-            }
-            
+    
             // Live Photo
             if metadata.livePhoto {
                 cell.imageStatus.image = NCCollectionCommon.images.cellLivePhotoImage
             }
             
-            // E2EE
-            if metadata.e2eEncrypted {
-                cell.hideButtonShare(true)
-            } else {
-                cell.hideButtonShare(false)
-            }
-            
             // Remove last separator
             if collectionView.numberOfItems(inSection: indexPath.section) == indexPath.row + 1 {
                 cell.separator.isHidden = true
@@ -729,17 +680,8 @@ extension NCSelect: UICollectionViewDataSource {
             
             cell.imageSelect.isHidden = true
             cell.backgroundView = nil
-            
-            // Transfer
-            if metadata.status == k_metadataStatusInDownload || metadata.status == k_metadataStatusDownloading ||  metadata.status >= k_metadataStatusTypeUpload {
-                cell.progressView.isHidden = false
-                cell.setButtonMore(named: k_buttonMoreStop, image: NCCollectionCommon.images.cellButtonStop)
-            } else {
-                cell.progressView.isHidden = true
-                cell.progressView.progress = 0.0
-                cell.setButtonMore(named: k_buttonMoreMore, image: NCCollectionCommon.images.cellButtonMore)
-            }
-            
+            cell.hideButtonMore()
+
             // Live Photo
             if metadata.livePhoto {
                 cell.imageStatus.image = NCCollectionCommon.images.cellLivePhotoImage