marinofaggiana 6 years ago
parent
commit
0c6d539184

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

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

+ 53 - 0
iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folderAutomaticUpload.pdf

@@ -0,0 +1,53 @@
+%PDF-1.4
+%Óëéá
+1 0 obj
+<</Creator (Chromium)
+/Producer (Skia/PDF m66)
+/CreationDate (D:20190306155436+00'00')
+/ModDate (D:20190306155436+00'00')>>
+endobj
+2 0 obj
+<</Filter /FlateDecode
+/Length 518>> stream
+xœmTAŽÛ0¼û:(KJ¤D½`Ïí¥Úí!)Ðíÿ�Rr66FbzÌI;RÇWÁOc.—Ûñïà}ß·_ÇÏ/å/Pq–ÙÒ¹�I¡á^~¼”‡«·×ãÛ—×ÿ‡�•Zn8פÔâdårH‘†àº‚Ñ$QÕˆ¨–PÀ	ɺ¢kD÷\$X’Í眾¯RÜŠ.ñ¢ª†w-)Š^B­Ã×u½£*R:¡B*ÞŽNµK–´eÍ.ȘÅhr8n@'q¯ê‰À,ÒF²çf“'°H¶XHfj	£A““>kMÆSiPIŸ— [Úk+£~ˆËÉô9Ö¤PÊG*K�žW|Å\?愉ðÒ
+˜e· èÀN8ÙPÕ§Rn©¯O¾ ¨�þ™ï‚&çœgF
T¯m�ɲFÌûyCØ$1¯ýêÖÓÔíÄÚv•nkCØ¥�TqÒ6îX/“”×x/±qÛ­1µ>s�KB.E¶^T¾·&»tšÝÏ1ˆ9Ôǃ"žÃ�°
+Ï=ê@=cØÓš-AkØvÐÍËgÍîlfKå‰8™û6Úlä}<¢¶úpד˜¥f¸ñtÂi¸™~ŽÌÜ¢µ¾­1ß»ÒôÒÀ¤ÕÖ¤Ö½¿¹£ÔsÏÛj”ÕMtlÓžÿѺVÏ&4ߎÏÚ½àíý}|Çñððn
+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 
+0000000742 00000 n 
+0000000789 00000 n 
+0000000844 00000 n 
+0000001016 00000 n 
+trailer
+<</Size 7
+/Root 3 0 R
+/Info 1 0 R>>
+startxref
+1053
+%%EOF

BIN
iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folderAutomaticUpload.png


BIN
iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folderAutomaticUpload@2x.png


BIN
iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folderAutomaticUpload@3x.png


+ 1 - 1
iOSClient/Images.xcassets/networkInProgress.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "networkInProgress@2x.png"
+      "filename" : "networkInProgress.pdf"
     }
   ],
   "info" : {

BIN
iOSClient/Images.xcassets/networkInProgress.imageset/networkInProgress.pdf


BIN
iOSClient/Images.xcassets/networkInProgress.imageset/networkInProgress@2x.png


+ 1 - 1
iOSClient/Images.xcassets/qrcode.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "qrcode-scan.png"
+      "filename" : "qrcode.pdf"
     }
   ],
   "info" : {

BIN
iOSClient/Images.xcassets/qrcode.imageset/qrcode-scan.png


BIN
iOSClient/Images.xcassets/qrcode.imageset/qrcode.pdf


+ 0 - 12
iOSClient/Images.xcassets/selectFolderMedia.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "selectFolderMedia.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

BIN
iOSClient/Images.xcassets/selectFolderMedia.imageset/selectFolderMedia.png


+ 1 - 1
iOSClient/Media/NCMedia.swift

@@ -223,7 +223,7 @@ 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 item1 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "selectFolderMedia"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_select_media_folder_", comment: ""))
+            let item1 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "folderAutomaticUpload"), width: 50, height: 50, scale: 2, 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: ""))