Browse Source

fix SVG

Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com>
Marino Faggiana 1 year ago
parent
commit
a8a52e7958

+ 9 - 8
iOSClient/Media/NCMedia.swift

@@ -63,6 +63,7 @@ class NCMedia: UIViewController, NCEmptyDataSetDelegate, NCSelectDelegate {
     struct cacheImages {
         static var cellLivePhotoImage = UIImage()
         static var cellPlayImage = UIImage()
+        static var cellImage = UIImage()
     }
 
     // MARK: - View Life Cycle
@@ -389,14 +390,6 @@ extension NCMedia: UICollectionViewDataSource {
             cell.indexPath = indexPath
             cell.fileUser = metadata.ownerId
 
-            if metadata.isAudioOrVideo {
-                cell.imageStatus.image = cacheImages.cellPlayImage
-            } else if metadata.livePhoto && NCImageCache.shared.livePhoto {
-                cell.imageStatus.image = cacheImages.cellLivePhotoImage
-            } else {
-                cell.imageStatus.image = nil
-            }
-
             if let cachedImage = NCImageCache.shared.getMediaImage(ocId: metadata.ocId), case let .actual(image) = cachedImage {
                 cell.imageItem.backgroundColor = nil
                 cell.imageItem.image = image
@@ -415,6 +408,14 @@ extension NCMedia: UICollectionViewDataSource {
                 cell.imageStatus.image = nil
             }
 
+            if metadata.isAudioOrVideo {
+                cell.imageStatus.image = cacheImages.cellPlayImage
+            } else if metadata.livePhoto && NCImageCache.shared.livePhoto {
+                cell.imageStatus.image = cacheImages.cellLivePhotoImage
+            } else {
+                cell.imageStatus.image = nil
+            }
+
             if isEditMode {
                 cell.selectMode(true)
                 if selectOcId.contains(metadata.ocId) {

+ 2 - 0
iOSClient/Utility/NCUtility+Image.swift

@@ -159,6 +159,7 @@ extension NCUtility {
         if utilityFileSystem.fileProviderStorageExists(metadata) && metadata.isImage {
 
             let previewPath = utilityFileSystem.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)
+            let iconPath = utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)
             let imagePath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)
 
             if ext == "GIF" {
@@ -173,6 +174,7 @@ extension NCUtility {
                         if !FileManager().fileExists(atPath: previewPath) {
                             do {
                                 try image.pngData()?.write(to: URL(fileURLWithPath: previewPath), options: .atomic)
+                                try image.pngData()?.write(to: URL(fileURLWithPath: iconPath), options: .atomic)
                             } catch { }
                         }
                         return image

+ 1 - 1
iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift

@@ -283,7 +283,7 @@ class NCViewerMedia: UIViewController {
             }
         }
 
-        if metadata.isImage, metadata.fileExtension.lowercased() == "gif", !utilityFileSystem.fileProviderStorageExists(metadata) {
+        if metadata.isImage, (metadata.fileExtension.lowercased() == "gif" || metadata.fileExtension.lowercased() == "svg"), !utilityFileSystem.fileProviderStorageExists(metadata) {
             downloadImage()
         }