coding

Signed-off-by: marinofaggiana <marino.faggiana@nextcloud.com>

Widget/Nextcloud/NextcloudData.swift

@@ -210,7 +210,7 @@ func getDataEntry(isPreview: Bool, displaySize: CGSize, completion: @escaping (_
                 let urlString = "nextcloud://open-file?path=\(path)&user=\(user)&link=\(link)"
                 guard let url = URL(string: urlString) else { continue }
                 // Recent Data
-                let image:UIImage = NCUtilityGUI.shared.createFilePreviewImage(metadata: metadata, size: imageSize, createPreview: false) ?? UIImage(named: "file")!
+                let image:UIImage = NCUtilityGUI.shared.createFilePreviewImage(metadata: metadata, size: imageSize * 3, createPreview: false) ?? UIImage(named: "file")!
                 let recentData = RecentData.init(id: metadata.ocId, image: image, title: metadata.fileName, subTitle: subTitle, url: url)
                 recentDatas.append(recentData)
                 if recentDatas.count == 5 { break}

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1356,7 +1356,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
         // Thumbnail
         if !metadata.directory {
             if metadata.name == NCGlobal.shared.appName {
-                if let image = NCUtilityGUI.shared.createFilePreviewImage(metadata: metadata, createPreview: !metadata.hasPreview) {
+                if let image = NCUtilityGUI.shared.createFilePreviewImage(metadata: metadata, size: CGFloat(NCGlobal.shared.sizeIcon), createPreview: !metadata.hasPreview) {
                     (cell as! NCCellProtocol).filePreviewImageView?.image = image
                 } else {
                     NCOperationQueue.shared.downloadThumbnail(metadata: metadata, placeholder: true, cell: cell, view: collectionView)

iOSClient/Transfers/NCTransfers.swift

@@ -184,7 +184,7 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate {
         cell.labelPath.text = pathText
         cell.setButtonMore(named: NCGlobal.shared.buttonMoreStop, image: NCBrandColor.cacheImages.buttonStop)
         cell.progressView.progress = 0.0
-        cell.imageItem.image = NCUtilityGUI.shared.createFilePreviewImage(metadata: metadata, size: 40, createPreview: true) ?? UIImage(named: "file")
+        cell.imageItem.image = NCUtilityGUI.shared.createFilePreviewImage(metadata: metadata, size: 40 * 3, createPreview: true) ?? UIImage(named: "file")
         cell.labelInfo.text = CCUtility.dateDiff(metadata.date as Date) + " · " + CCUtility.transformedSize(metadata.size)
         if metadata.status == NCGlobal.shared.metadataStatusDownloading || metadata.status == NCGlobal.shared.metadataStatusUploading {
             cell.progressView.isHidden = false

iOSClient/Utility/NCUtilityGUI.swift

@@ -30,7 +30,7 @@ class NCUtilityGUI: NSObject {
         return instance
     }()
 
-    func createFilePreviewImage(metadata: tableMetadata, size: CGFloat? = nil, createPreview: Bool) -> UIImage? {
+    func createFilePreviewImage(metadata: tableMetadata, size: CGFloat, createPreview: Bool) -> UIImage? {
 
         autoreleasepool {
             var imagePreview: UIImage?
@@ -38,28 +38,29 @@ class NCUtilityGUI: NSObject {
             let iconImagePath = CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)!
 
             if FileManager().fileExists(atPath: iconImagePath) {
-                imagePreview = UIImage(contentsOfFile: iconImagePath)
+                if let image = UIImage(contentsOfFile: iconImagePath) {
+                    imagePreview = image.resizeImage(size: CGSize(width: size, height: size), isAspectRation: true)
+                }
             } else if metadata.status >= NCGlobal.shared.metadataStatusNormal && createPreview && metadata.classFile == NCCommunicationCommon.typeClassFile.image.rawValue && FileManager().fileExists(atPath: filePath) {
-                if let image = UIImage(contentsOfFile: filePath), let image = image.resizeImage(size: CGSize(width: NCGlobal.shared.sizeIcon, height: NCGlobal.shared.sizeIcon), isAspectRation: true), let data = image.jpegData(compressionQuality: 0.5) {
+                if let image = UIImage(contentsOfFile: filePath), let image = image.resizeImage(size: CGSize(width: size, height: size), isAspectRation: true), let data = image.jpegData(compressionQuality: 0.5) {
                     do {
                         try data.write(to: URL.init(fileURLWithPath: iconImagePath), options: .atomic)
                         imagePreview = image
                     } catch { }
                 }
             } else if metadata.status >= NCGlobal.shared.metadataStatusNormal && createPreview && metadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue && FileManager().fileExists(atPath: filePath) {
-                if let image = NCUtility.shared.imageFromVideo(url: URL(fileURLWithPath: filePath), at: 0), let image = image.resizeImage(size: CGSize(width: NCGlobal.shared.sizeIcon, height: NCGlobal.shared.sizeIcon), isAspectRation: true), let data = image.jpegData(compressionQuality: 0.5) {
+                if let image = NCUtility.shared.imageFromVideo(url: URL(fileURLWithPath: filePath), at: 0), let image = image.resizeImage(size: CGSize(width: size, height: size), isAspectRation: true), let data = image.jpegData(compressionQuality: 0.5) {
                     do {
                         try data.write(to: URL.init(fileURLWithPath: iconImagePath), options: .atomic)
                         imagePreview = image
                     } catch { }
                 }
             } else if !metadata.iconName.isEmpty {
-                imagePreview = UIImage(named: metadata.iconName)
+                if let image = UIImage(named: metadata.iconName) {
+                    imagePreview = image.resizeImage(size: CGSize(width: size, height: size), isAspectRation: true)
+                }
             }
 
-            if let image = imagePreview, let size = size  {
-                imagePreview = image.resizeImage(size: CGSize(width: size * 3, height: size * 3), isAspectRation: true)
-            }
             return imagePreview
         }
     }