dev

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

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

iOSClient/Images.xcassets/audio.imageset/audio.pdf

@@ -0,0 +1,53 @@
+%PDF-1.4
+%Óëéá
+1 0 obj
+<</Creator (Mozilla/5.0 \(Macintosh; Intel Mac OS X 10_15_3\) AppleWebKit/537.36 \(KHTML, like Gecko\) BoxySVG/3.33.4 Chrome/73.0.3683.121 Electron/5.0.13 Safari/537.36)
+/Producer (Skia/PDF m73)
+/CreationDate (D:20200308130537+00'00')
+/ModDate (D:20200308130537+00'00')>>
+endobj
+3 0 obj
+<</ca 1
+/BM /Normal>>
+endobj
+4 0 obj
+<</Filter /FlateDecode
+/Length 110>> stream
+xœUL;
+€0ÝsŠÌ‚µijkNàìä
ÄÏ ‚z0V‡šyŸ„gK´ŠÒdÖ5ÎHýèaƒž;QC!Îå9B_à®?^#&ñœÚþNKª–q¾ ¢à¦›j\�èã€Î¾ìßX”bÚLÐ)nÊ°"g
+endstream
+endobj
+2 0 obj
+<</Type /Page
+/Resources <</ProcSets [/PDF /Text /ImageB /ImageC /ImageI]
+/ExtGState <</G3 3 0 R>>>>
+/MediaBox [0 0 282.95999 282.95999]
+/Contents 4 0 R
+/StructParents 0
+/Parent 5 0 R>>
+endobj
+5 0 obj
+<</Type /Pages
+/Count 1
+/Kids [2 0 R]>>
+endobj
+6 0 obj
+<</Type /Catalog
+/Pages 5 0 R>>
+endobj
+xref
+0 7
+0000000000 65535 f 
+0000000015 00000 n 
+0000000519 00000 n 
+0000000302 00000 n 
+0000000339 00000 n 
+0000000720 00000 n 
+0000000775 00000 n 
+trailer
+<</Size 7
+/Root 6 0 R
+/Info 1 0 R>>
+startxref
+822
+%%EOF

iOSClient/Viewer/NCViewerImage/NCViewerImageCommon.swift

@@ -32,7 +32,7 @@ class NCViewerImageCommon: NSObject {
     func getMetadatasDatasource(metadata: tableMetadata?, metadatas: [tableMetadata],favoriteDatasorce: Bool, mediaDatasorce: Bool, offLineDatasource: Bool) -> [tableMetadata]? {
         guard let metadata = metadata else { return nil }
         if favoriteDatasorce {
-            let metadatas = NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND favorite == 1 AND (typeFile == %@ || typeFile == %@)", metadata.account, k_metadataTypeFile_image, k_metadataTypeFile_video), sorted: CCUtility.getOrderSettings(), ascending: CCUtility.getAscendingSettings())
+            let metadatas = NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND favorite == 1 AND (typeFile == %@ || typeFile == %@ || typeFile == %@)", metadata.account, k_metadataTypeFile_image, k_metadataTypeFile_video, k_metadataTypeFile_audio), sorted: CCUtility.getOrderSettings(), ascending: CCUtility.getAscendingSettings())
             if metadatas == nil {
                 return [metadata]
             }
@@ -47,10 +47,10 @@ class NCViewerImageCommon: NSObject {
                 for file: tableLocalFile in files {
                     ocIds.append(file.ocId)
                 }
-                return NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND ocId IN %@ AND (typeFile == %@ || typeFile == %@)", metadata.account, ocIds, k_metadataTypeFile_image, k_metadataTypeFile_video), sorted: datasourceSorted, ascending: datasourceAscending)
+                return NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND ocId IN %@ AND (typeFile == %@ || typeFile == %@ || typeFile == %@)", metadata.account, ocIds, k_metadataTypeFile_image, k_metadataTypeFile_video, k_metadataTypeFile_audio), sorted: datasourceSorted, ascending: datasourceAscending)
             }
         } else {
-            return NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND (typeFile == %@ || typeFile == %@)", metadata.account, metadata.serverUrl, k_metadataTypeFile_image, k_metadataTypeFile_video), sorted: CCUtility.getOrderSettings(), ascending: CCUtility.getAscendingSettings())
+            return NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND (typeFile == %@ || typeFile == %@ || typeFile == %@)", metadata.account, metadata.serverUrl, k_metadataTypeFile_image, k_metadataTypeFile_video, k_metadataTypeFile_audio), sorted: CCUtility.getOrderSettings(), ascending: CCUtility.getAscendingSettings())
         }
         
         return nil
@@ -114,6 +114,12 @@ class NCViewerImageCommon: NSObject {
             return image!
         }
         
+        if type == k_metadataTypeFile_audio {
+            let image = CCGraphics.changeThemingColorImage(UIImage.init(named: "audio"), 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!