dev

iOSClient/Images.xcassets/video.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Untitled.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

iOSClient/Main/NCDetailViewController.swift

@@ -563,7 +563,7 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
                     completion(index, image, metadata, ZoomScale.default, nil)
                 }
             } else {
-                completion(index, self.getImageOffOutline(), metadata, ZoomScale.default, nil)
+                completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
             }
                 
         // Preview
@@ -572,7 +572,7 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
             if let image = NCViewerImageCommon.shared.getThumbnailImage(metadata: metadata) {
                 completion(index, image, metadata, ZoomScale.default, nil)
             } else {
-                completion(index, self.getImageOffOutline(), metadata, ZoomScale.default, nil)
+                completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
             }
     
         } else {
@@ -587,10 +587,10 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
                         try data!.write(to: url, options: .atomic)
                         completion(index, UIImage.init(data: data!), metadata, ZoomScale.default, nil)
                     } catch {
-                        completion(index, self.getImageOffOutline(), metadata, ZoomScale.default, nil)
+                        completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
                     }
                 } else {
-                    completion(index, self.getImageOffOutline(), metadata, ZoomScale.default, nil)
+                    completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
                 }
             }
         }
@@ -626,13 +626,6 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
         viewUnload()
     }
     
-    func getImageOffOutline() -> UIImage {
-        
-        let image = CCGraphics.changeThemingColorImage(UIImage.init(named: "imageOffOutline"), width: self.view.frame.width, height: self.view.frame.width, color: NCBrandColor.sharedInstance.brand)
-
-        return image!
-    }
-    
     @objc func downloadImage() {
         
         guard let metadata = self.metadata else {return }

iOSClient/Viewer/NCViewerImage/NCViewerImageCommon.swift

@@ -106,4 +106,16 @@ class NCViewerImageCommon: NSObject {
         }
     }
 
+    func getImageOffOutline(frame: CGRect, type: String) -> UIImage {
+        
+        if type == k_metadataTypeFile_video {
+            let image = CCGraphics.changeThemingColorImage(UIImage.init(named: "video"), width: frame.width, height: frame.width, color: NCBrandColor.sharedInstance.brand)
+            
+            return image!
+        }
+        
+        let image = CCGraphics.changeThemingColorImage(UIImage.init(named: "imageOffOutline"), width: frame.width, height: frame.width, color: NCBrandColor.sharedInstance.brand)
+
+        return image!
+    }
 }