replace icon

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

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

iOSClient/Images.xcassets/videono.imageset/Contents.json → iOSClient/Images.xcassets/photo.imageset/Contents.json

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

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

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

iOSClient/Images.xcassets/video.imageset/video.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M15,8V16H5V8H15M16,6H4A1,1 0 0,0 3,7V17A1,1 0 0,0 4,18H16A1,1 0 0,0 17,17V13.5L21,17.5V6.5L17,10.5V7A1,1 0 0,0 16,6Z" /></svg>

iOSClient/Images.xcassets/videono.imageset/5.pdf

@@ -1,53 +0,0 @@
-%PDF-1.4
-%Óëéá
-1 0 obj
-<</Creator (Chromium)
-/Producer (Skia/PDF m66)
-/CreationDate (D:20190307142530+00'00')
-/ModDate (D:20190307142530+00'00')>>
-endobj
-2 0 obj
-<</Filter /FlateDecode
-/Length 378>> stream
-xœMRKN,1ÜçY#Ñø“ØÎ	Þú­8ÀˆÏb@î/árš�nM�S©òŸ;å{ÏùQ¢~yk�Î~ŸOíñ®¿'ÊrÌ"ߌ$?ü£þòÕôïÒßšô2¯m®Ý`ÔW�é–'=FÏ™7-7eˆ–ÄRIh[£_Rt^ÛM‘>OO°¤Îˆ‡¿ƒUŒ"½‘Lu�Àa+Ì�…0
±ÐŠÀi™—zÒä&¯Å2˜±ªÆŸüsrÎ(Pk˜%h…O·F�3\¹ª3NË
-[™½oµë
-¥R/&P#™ÅVžè™1èÀ"åìá	œó¤
Þؾ
Ì�ëU	”³Nq~ö©Ì¤æȲ}Li]aùŽp†¶3†Û3E«´eÍÂv1¶œZyVÙ²05´‚‹YíÁôªedÀª‘Ó~fž’’WÏ
ð„VQNqkbv–ž6!†›ìí`�õÝöÀÎÝÀ62–ðÒÖŒ2½�ÉŠßÎ\Ûk{nÿóýW
œ
-endstream
-endobj
-3 0 obj
-<</Type /Catalog
-/Pages 4 0 R>>
-endobj
-4 0 obj
-<</Type /Pages
-/Count 1
-/Kids [5 0 R]>>
-endobj
-5 0 obj
-<</Type /Page
-/Resources <</ProcSets [/PDF /Text /ImageB /ImageC /ImageI]
-/ExtGState <</G0 6 0 R>>>>
-/MediaBox [0 0 300 300]
-/Contents 2 0 R
-/Parent 4 0 R>>
-endobj
-6 0 obj
-<</ca 1
-/BM /Normal>>
-endobj
-xref
-0 7
-0000000000 65535 f 
-0000000015 00000 n 
-0000000154 00000 n 
-0000000602 00000 n 
-0000000649 00000 n 
-0000000704 00000 n 
-0000000876 00000 n 
-trailer
-<</Size 7
-/Root 3 0 R
-/Info 1 0 R>>
-startxref
-913
-%%EOF

iOSClient/Images.xcassets/videoyes.imageset/6.pdf

@@ -1,52 +0,0 @@
-%PDF-1.4
-%Óëéá
-1 0 obj
-<</Creator (Chromium)
-/Producer (Skia/PDF m66)
-/CreationDate (D:20190307142551+00'00')
-/ModDate (D:20190307142551+00'00')>>
-endobj
-2 0 obj
-<</Filter /FlateDecode
-/Length 402>> stream
-xœUSÁ®Ô0¼ç+rF¢Øqb;_À™°zÀaðÿ7éöµjã��Il�Ë•âþÌñ¢úx/
-­xþ¾•ïŸêï@¹#ÉWä/_©þüWØ*S ïˆ¬>ë1qyÕÃÕd2W`Öµ�Àñ6GbMÜÀS6á!õ
µGÜf }v'N¦˜¸ª’32¦¡
¶Ù|†$åÊ"¢€yNn]À4x&—›ÆP<bÂIdÊÁ>7hJ¬Î€Û“L€%`ï'ÇëQ>‹5&Gwç1:”ÓT8 LMÚNRzHeÿ­—¥�;!6�*£›XÖá±Û•�­,�Eî�:°,Hò„,ÓR�µƒyöÃ�e“ü–_`ÙOOuv™S��(n´d¡¬.}ÓÄ–—PÃa¡T/×eM‚&vNGdìÙp¬96»Ç/ÎÍ�×fÛ¹æν¹üJñ6»¹ÏÎ.[×è-ÂjÐ9zç8îFökpõj9Ÿê�ß2'‡t²L4¸Êð«Äwó,-‹[‘f°?ªgùU~”oqÿƒz·
-endstream
-endobj
-3 0 obj
-<</Type /Catalog
-/Pages 4 0 R>>
-endobj
-4 0 obj
-<</Type /Pages
-/Count 1
-/Kids [5 0 R]>>
-endobj
-5 0 obj
-<</Type /Page
-/Resources <</ProcSets [/PDF /Text /ImageB /ImageC /ImageI]
-/ExtGState <</G0 6 0 R>>>>
-/MediaBox [0 0 300 300]
-/Contents 2 0 R
-/Parent 4 0 R>>
-endobj
-6 0 obj
-<</ca 1
-/BM /Normal>>
-endobj
-xref
-0 7
-0000000000 65535 f 
-0000000015 00000 n 
-0000000154 00000 n 
-0000000626 00000 n 
-0000000673 00000 n 
-0000000728 00000 n 
-0000000900 00000 n 
-trailer
-<</Size 7
-/Root 3 0 R
-/Info 1 0 R>>
-startxref
-937
-%%EOF

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

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

iOSClient/Menu/NCMedia+Menu.swift

@@ -46,7 +46,9 @@ extension NCMedia {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString(filterTypeFileImage ? "_media_viewimage_show_" : "_media_viewimage_hide_", comment: ""),
-                    icon: UIImage(named: filterTypeFileImage ? "imageno" : "imageyes")!.image(color: NCBrandColor.shared.icon, size: 50),
+                    icon: NCUtility.shared.loadImage(named: "photo"),
+                    selected: filterTypeFileImage,
+                    on: true,
                     action: { menuAction in
                         self.filterTypeFileImage = !self.filterTypeFileImage
                         self.filterTypeFileVideo = false
@@ -58,7 +60,9 @@ extension NCMedia {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString(filterTypeFileVideo ? "_media_viewvideo_show_" : "_media_viewvideo_hide_", comment: ""),
-                    icon: UIImage(named: filterTypeFileVideo ? "videono" : "videoyes")!.image(color: NCBrandColor.shared.icon, size: 50),
+                    icon: NCUtility.shared.loadImage(named: "video"),
+                    selected: filterTypeFileVideo,
+                    on: true,
                     action: { menuAction in
                         self.filterTypeFileVideo = !self.filterTypeFileVideo
                         self.filterTypeFileImage = false
@@ -70,7 +74,7 @@ extension NCMedia {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_select_media_folder_", comment: ""),
-                    icon: UIImage(named: "folderAutomaticUpload")!.image(color: NCBrandColor.shared.icon, size: 50),
+                    icon: NCUtility.shared.loadImage(named: "folder-search-outline"),
                     action: { menuAction in
                         let navigationController = UIStoryboard(name: "NCSelect", bundle: nil).instantiateInitialViewController() as! UINavigationController
                         let viewController = navigationController.topViewController as! NCSelect
@@ -92,7 +96,7 @@ extension NCMedia {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_media_by_modified_date_", comment: ""),
-                    icon: UIImage(named: "sortModifiedDate")!.image(color: NCBrandColor.shared.icon, size: 50),
+                    icon: NCUtility.shared.loadImage(named: "circle.grid.cross.up.fill"),
                     selected: CCUtility.getMediaSortDate() == "date",
                     on: true,
                     action: { menuAction in
@@ -105,7 +109,7 @@ extension NCMedia {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_media_by_created_date_", comment: ""),
-                    icon: UIImage(named: "sortCreatedDate")!.image(color: NCBrandColor.shared.icon, size: 50),
+                    icon: NCUtility.shared.loadImage(named: "circle.grid.cross.down.fill"),
                     selected: CCUtility.getMediaSortDate() == "creationDate",
                     on: true,
                     action: { menuAction in
@@ -118,7 +122,7 @@ extension NCMedia {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_media_by_upload_date_", comment: ""),
-                    icon: UIImage(named: "sortUploadDate")!.image(color: NCBrandColor.shared.icon, size: 50),
+                    icon: NCUtility.shared.loadImage(named: "circle.grid.cross.right.fill"),
                     selected: CCUtility.getMediaSortDate() == "uploadDate",
                     on: true,
                     action: { menuAction in