fix imagePreview

iOSClient/Main/NCMainCommon.swift

@@ -211,25 +211,26 @@ class NCMainCommon: NSObject, PhotoEditorDelegate {
     func collectionViewCellForItemAt(_ indexPath: IndexPath, collectionView: UICollectionView, cell: UICollectionViewCell, metadata: tableMetadata, metadataFolder: tableMetadata?, serverUrl: String, isEditMode: Bool, selectFileID: [String], autoUploadFileName: String, autoUploadDirectory: String, hideButtonMore: Bool, downloadThumbnail: Bool,source: UIViewController) {
         
         var image: UIImage?
-        var imagePreview = false
+        var isImagePreviewLoaded = false
         
-        if metadata.iconName.count > 0 {
-            if cell is NCGridMediaCell {
-                if metadata.typeFile == k_metadataTypeFile_video {
-                    image = UIImage.init(named: "file_video_big")
+        // Image Preview
+        if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconFileID(metadata.fileID, fileNameView: metadata.fileName)) {
+            image = UIImage.init(contentsOfFile: CCUtility.getDirectoryProviderStorageIconFileID(metadata.fileID, fileNameView: metadata.fileName))
+            isImagePreviewLoaded = true
+        } else {
+            if metadata.iconName.count > 0 {
+                if cell is NCGridMediaCell {
+                    if metadata.typeFile == k_metadataTypeFile_video {
+                        image = UIImage.init(named: "file_video_big")
+                    } else {
+                        image = UIImage.init(named: "file_photo_big")
+                    }
                 } else {
-                    image = UIImage.init(named: "file_photo_big")
+                    image = UIImage.init(named: metadata.iconName)
                 }
             } else {
-                image = UIImage.init(named: metadata.iconName)
+                image = UIImage.init(named: "file")
             }
-        } else {
-            image = UIImage.init(named: "file")
-        }
-        
-        if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconFileID(metadata.fileID, fileNameView: metadata.fileName)) {
-            image = UIImage.init(contentsOfFile: CCUtility.getDirectoryProviderStorageIconFileID(metadata.fileID, fileNameView: metadata.fileName))
-            imagePreview = true
         }
         
         // Download preview
@@ -406,7 +407,7 @@ class NCMainCommon: NSObject, PhotoEditorDelegate {
             } else {
                 
                 cell.imageItem.image = image
-                if imagePreview == false {
+                if isImagePreviewLoaded == false {
                     let width = cell.imageItem.image!.size.width * 2
                     //let scale = UIScreen.main.scale
                     cell.imageItem.image = NCUtility.sharedInstance.resizeImage(image: image!, newWidth: width)
@@ -464,9 +465,13 @@ class NCMainCommon: NSObject, PhotoEditorDelegate {
             cell.imageFavorite.image = nil
             
             cell.imageItem.image = image
-            if imagePreview == false {
-                let width = cell.imageItem.image!.size.width * 2
-                cell.imageItem.image = NCUtility.sharedInstance.resizeImage(image: image!, newWidth: width)
+          
+            if isImagePreviewLoaded {
+                // Preview
+                cell.imageItem.contentMode = .scaleAspectFill
+            } else {
+                // Default xcassets
+                cell.imageItem.contentMode = .scaleAspectFit
             }
             
             // image Local
@@ -1295,6 +1300,7 @@ class NCNetworkingMain: NSObject, CCNetworkingDelegate {
                                     (cell as! NCGridCell).imageItem.image = image
                                 } else if cell is NCGridMediaCell {
                                     (cell as! NCGridMediaCell).imageItem.image = image
+                                    (cell as! NCGridMediaCell).imageItem.contentMode = .scaleAspectFill
                                 }
                             }
                         }

iOSClient/Media/NCGridMediaCell.xib

@@ -19,7 +19,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="220" height="220"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView autoresizesSubviews="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5Ci-V1-hf5" userLabel="imageItem">
+                    <imageView autoresizesSubviews="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5Ci-V1-hf5" userLabel="imageItem">
                         <rect key="frame" x="0.0" y="0.0" width="220" height="220"/>
                     </imageView>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DHy-Up-3Bh" userLabel="imageSelect">