marinofaggiana před 6 roky
rodič
revize
2479c5b431
25 změnil soubory, kde provedl 158 přidání a 56 odebrání
  1. 15 0
      iOSClient/Images.xcassets/cancel.imageset/Contents.json
  2. binární
      iOSClient/Images.xcassets/cancel.imageset/cancel.pdf
  3. binární
      iOSClient/Images.xcassets/imageno.imageset/3.pdf
  4. 4 12
      iOSClient/Images.xcassets/imageno.imageset/Contents.json
  5. binární
      iOSClient/Images.xcassets/imageno.imageset/imageno.png
  6. binární
      iOSClient/Images.xcassets/imageno.imageset/imageno@2x.png
  7. binární
      iOSClient/Images.xcassets/imageno.imageset/imageno@3x.png
  8. binární
      iOSClient/Images.xcassets/imageyes.imageset/4.pdf
  9. 4 12
      iOSClient/Images.xcassets/imageyes.imageset/Contents.json
  10. binární
      iOSClient/Images.xcassets/imageyes.imageset/imageyes.png
  11. binární
      iOSClient/Images.xcassets/imageyes.imageset/imageyes@2x.png
  12. binární
      iOSClient/Images.xcassets/imageyes.imageset/imageyes@3x.png
  13. 15 0
      iOSClient/Images.xcassets/selectFull.imageset/Contents.json
  14. binární
      iOSClient/Images.xcassets/selectFull.imageset/selectFull.pdf
  15. 53 0
      iOSClient/Images.xcassets/videono.imageset/5.pdf
  16. 4 12
      iOSClient/Images.xcassets/videono.imageset/Contents.json
  17. binární
      iOSClient/Images.xcassets/videono.imageset/videono.png
  18. binární
      iOSClient/Images.xcassets/videono.imageset/videono@2x.png
  19. binární
      iOSClient/Images.xcassets/videono.imageset/videono@3x.png
  20. 52 0
      iOSClient/Images.xcassets/videoyes.imageset/6.pdf
  21. 4 12
      iOSClient/Images.xcassets/videoyes.imageset/Contents.json
  22. binární
      iOSClient/Images.xcassets/videoyes.imageset/videoyes.png
  23. binární
      iOSClient/Images.xcassets/videoyes.imageset/videoyes@2x.png
  24. binární
      iOSClient/Images.xcassets/videoyes.imageset/videoyes@3x.png
  25. 7 8
      iOSClient/Media/NCMedia.swift

+ 15 - 0
iOSClient/Images.xcassets/cancel.imageset/Contents.json

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

binární
iOSClient/Images.xcassets/cancel.imageset/cancel.pdf


binární
iOSClient/Images.xcassets/imageno.imageset/3.pdf


+ 4 - 12
iOSClient/Images.xcassets/imageno.imageset/Contents.json

@@ -2,22 +2,14 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "imageno.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "imageno@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "imageno@3x.png",
-      "scale" : "3x"
+      "filename" : "3.pdf"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

binární
iOSClient/Images.xcassets/imageno.imageset/imageno.png


binární
iOSClient/Images.xcassets/imageno.imageset/imageno@2x.png


binární
iOSClient/Images.xcassets/imageno.imageset/imageno@3x.png


binární
iOSClient/Images.xcassets/imageyes.imageset/4.pdf


+ 4 - 12
iOSClient/Images.xcassets/imageyes.imageset/Contents.json

@@ -2,22 +2,14 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "imageyes.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "imageyes@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "imageyes@3x.png",
-      "scale" : "3x"
+      "filename" : "4.pdf"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

binární
iOSClient/Images.xcassets/imageyes.imageset/imageyes.png


binární
iOSClient/Images.xcassets/imageyes.imageset/imageyes@2x.png


binární
iOSClient/Images.xcassets/imageyes.imageset/imageyes@3x.png


+ 15 - 0
iOSClient/Images.xcassets/selectFull.imageset/Contents.json

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

binární
iOSClient/Images.xcassets/selectFull.imageset/selectFull.pdf


+ 53 - 0
iOSClient/Images.xcassets/videono.imageset/5.pdf

@@ -0,0 +1,53 @@
+%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

+ 4 - 12
iOSClient/Images.xcassets/videono.imageset/Contents.json

@@ -2,22 +2,14 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "videono.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "videono@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "videono@3x.png",
-      "scale" : "3x"
+      "filename" : "5.pdf"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

binární
iOSClient/Images.xcassets/videono.imageset/videono.png


binární
iOSClient/Images.xcassets/videono.imageset/videono@2x.png


binární
iOSClient/Images.xcassets/videono.imageset/videono@3x.png


+ 52 - 0
iOSClient/Images.xcassets/videoyes.imageset/6.pdf

@@ -0,0 +1,52 @@
+%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

+ 4 - 12
iOSClient/Images.xcassets/videoyes.imageset/Contents.json

@@ -2,22 +2,14 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "videoyes.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "videoyes@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "videoyes@3x.png",
-      "scale" : "3x"
+      "filename" : "6.pdf"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

binární
iOSClient/Images.xcassets/videoyes.imageset/videoyes.png


binární
iOSClient/Images.xcassets/videoyes.imageset/videoyes@2x.png


binární
iOSClient/Images.xcassets/videoyes.imageset/videoyes@3x.png


+ 7 - 8
iOSClient/Media/NCMedia.swift

@@ -222,28 +222,27 @@ class NCMedia: UIViewController, DropdownMenuDelegate, DZNEmptyDataSetSource, DZ
 
         if !isEditMode {
             
-            let item0 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "select"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_select_", comment: ""))
+            let item0 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "selectFull"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_select_", comment: ""))
             let item1 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "folderAutomaticUpload"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_select_media_folder_", comment: ""))
             var item2: DropdownItem
             if filterTypeFileImage {
-                item2 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "imageno"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_media_viewimage_show_", comment: ""))
+                item2 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "imageno"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_media_viewimage_show_", comment: ""))
             } else {
-                item2 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "imageyes"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_media_viewimage_hide_", comment: ""))
+                item2 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "imageyes"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_media_viewimage_hide_", comment: ""))
             }
             var item3: DropdownItem
             if filterTypeFileVideo {
-                item3 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "videono"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_media_viewvideo_show_", comment: ""))
+                item3 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "videono"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_media_viewvideo_show_", comment: ""))
             } else {
-                item3 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "videoyes"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_media_viewvideo_hide_", comment: ""))
+                item3 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "videoyes"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_media_viewvideo_hide_", comment: ""))
             }
             menu = DropdownMenu(navigationController: self.navigationController!, items: [item0,item1,item2,item3], selectedRow: -1)
             menu?.token = "menuButtonMore"
             
         } else {
             
-            let item0 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "select"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_cancel_", comment: ""))
-            
-            let item1 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "trash"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_delete_", comment: ""))
+            let item0 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "cancel"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_cancel_", comment: ""))
+            let item1 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "trash"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_delete_", comment: ""))
             
             menu = DropdownMenu(navigationController: self.navigationController!, items: [item0, item1], selectedRow: -1)
             menu?.token = "menuButtonMoreSelect"