images

Signed-off-by: Marino Faggiana <[email protected]>
nextcloud · May 20, 2024 · 2c13172 · 2c13172
1 parent e458015
commit 2c13172
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 76 deletions.
diff --git a/iOSClient/Images.xcassets/noPreview.imageset/Contents.json b/iOSClient/Images.xcassets/noPreview.imageset/Contents.json
diff --git a/iOSClient/Images.xcassets/noPreview.imageset/noPreview.pdf b/iOSClient/Images.xcassets/noPreview.imageset/noPreview.pdf
diff --git a/iOSClient/Images.xcassets/noPreviewAudio.imageset/Contents.json b/iOSClient/Images.xcassets/noPreviewAudio.imageset/Contents.json
diff --git a/iOSClient/Images.xcassets/noPreviewAudio.imageset/noPreviewAudio.pdf b/iOSClient/Images.xcassets/noPreviewAudio.imageset/noPreviewAudio.pdf
diff --git a/iOSClient/Images.xcassets/noPreviewVideo.imageset/Contents.json b/iOSClient/Images.xcassets/noPreviewVideo.imageset/Contents.json
diff --git a/iOSClient/Images.xcassets/noPreviewVideo.imageset/noPreviewVideo.pdf b/iOSClient/Images.xcassets/noPreviewVideo.imageset/noPreviewVideo.pdf
diff --git a/iOSClient/Images.xcassets/notaMusic.imageset/Contents.json b/iOSClient/Images.xcassets/notaMusic.imageset/Contents.json
diff --git a/iOSClient/Images.xcassets/notaMusic.imageset/notaMusic.png b/iOSClient/Images.xcassets/notaMusic.imageset/notaMusic.png
diff --git a/iOSClient/Images.xcassets/notaMusic.imageset/[email protected] b/iOSClient/Images.xcassets/notaMusic.imageset/[email protected]
diff --git a/iOSClient/Images.xcassets/notaMusic.imageset/[email protected] b/iOSClient/Images.xcassets/notaMusic.imageset/[email protected]
diff --git a/iOSClient/Utility/NCUtility+Image.swift b/iOSClient/Utility/NCUtility+Image.swift
@@ -166,11 +166,11 @@ extension NCUtility {
         }
 
         if metadata.isVideo {
-            return UIImage(named: "noPreviewVideo")?.image(color: NCBrandColor.shared.iconImageColor2, size: size)
+            return loadImage(named: "video", colors: [NCBrandColor.shared.iconImageColor2])
         } else if metadata.isAudio {
-            return UIImage(named: "noPreviewAudio")?.image(color: NCBrandColor.shared.iconImageColor2, size: size)
+            return loadImage(named: "waveform", colors: [NCBrandColor.shared.iconImageColor2])
         } else {
-            return UIImage(named: "noPreview")?.image(color: NCBrandColor.shared.iconImageColor2, size: size)
+            return loadImage(named: "photo", colors: [NCBrandColor.shared.iconImageColor2])
         }
     }
 

diff --git a/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift b/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift
@@ -292,7 +292,7 @@ class NCViewerMedia: UIViewController {
         if metadata.isVideo && !metadata.hasPreview {
             utility.createImageFrom(fileNameView: metadata.fileNameView, ocId: metadata.ocId, etag: metadata.etag, classFile: metadata.classFile)
         } else if metadata.isAudio {
-            return completion(UIImage(named: "noPreviewAudio")!.image(color: NCBrandColor.shared.iconImageColor2, size: view.frame.width))
+            return completion(utility.loadImage(named: "waveform", colors: [NCBrandColor.shared.iconImageColor2]))
         } else if let image = utility.getImage(metadata: metadata) {
             return completion(image)
         }
@@ -317,7 +317,7 @@ class NCViewerMedia: UIViewController {
                     NCManageDatabase.shared.setMetadataEtagResource(ocId: self.metadata.ocId, etagResource: etag)
                     return completion(image)
                 } else {
-                    return completion(UIImage(named: "noPreview")!.image(color: NCBrandColor.shared.iconImageColor2, size: self.view.frame.width))
+                    return completion(self.utility.loadImage(named: "photo", colors: [NCBrandColor.shared.iconImageColor2]))
                 }
             }
         }