marinofaggiana 4 жил өмнө
parent
commit
b77f0fdada
20 өөрчлөгдсөн 5 нэмэгдсэн , 145 устгасан
  1. 0 12
      iOSClient/Images.xcassets/checkedYes.imageset/Contents.json
  2. BIN
      iOSClient/Images.xcassets/checkedYes.imageset/selectFull.pdf
  3. 1 1
      iOSClient/Images.xcassets/circle.fill.imageset/Contents.json
  4. 0 0
      iOSClient/Images.xcassets/circle.fill.imageset/circle.pdf
  5. 1 1
      iOSClient/Images.xcassets/circle.imageset/Contents.json
  6. 0 0
      iOSClient/Images.xcassets/circle.imageset/checkedNo.pdf
  7. 0 12
      iOSClient/Images.xcassets/cursor.imageset/Contents.json
  8. BIN
      iOSClient/Images.xcassets/cursor.imageset/cursor.png
  9. 0 23
      iOSClient/Images.xcassets/deletePhotoBrowser.imageset/Contents.json
  10. BIN
      iOSClient/Images.xcassets/deletePhotoBrowser.imageset/delete.png
  11. BIN
      iOSClient/Images.xcassets/deletePhotoBrowser.imageset/delete@2x.png
  12. BIN
      iOSClient/Images.xcassets/deletePhotoBrowser.imageset/delete@3x.png
  13. 0 23
      iOSClient/Images.xcassets/downloadSelectedFiles.imageset/Contents.json
  14. BIN
      iOSClient/Images.xcassets/downloadSelectedFiles.imageset/downloadSelectedFiles.png
  15. BIN
      iOSClient/Images.xcassets/downloadSelectedFiles.imageset/downloadSelectedFiles@2x.png
  16. BIN
      iOSClient/Images.xcassets/downloadSelectedFiles.imageset/downloadSelectedFiles@3x.png
  17. 0 15
      iOSClient/Images.xcassets/dragHorizontal.imageset/Contents.json
  18. 0 55
      iOSClient/Images.xcassets/dragHorizontal.imageset/dragHorizontal.pdf
  19. 2 2
      iOSClient/Main/Colleaction Common/NCCollectionCommon.swift
  20. 1 1
      iOSClient/Share/NCShareCommon.swift

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

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

BIN
iOSClient/Images.xcassets/checkedYes.imageset/selectFull.pdf


+ 1 - 1
iOSClient/Images.xcassets/checkedNo.imageset/Contents.json → iOSClient/Images.xcassets/circle.fill.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "checkedNo.pdf"
+      "filename" : "circle.pdf"
     }
   ],
   "info" : {

+ 0 - 0
iOSClient/Images.xcassets/circle.imageset/circle.pdf → iOSClient/Images.xcassets/circle.fill.imageset/circle.pdf


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

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "circle.pdf"
+      "filename" : "checkedNo.pdf"
     }
   ],
   "info" : {

+ 0 - 0
iOSClient/Images.xcassets/checkedNo.imageset/checkedNo.pdf → iOSClient/Images.xcassets/circle.imageset/checkedNo.pdf


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

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

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


+ 0 - 23
iOSClient/Images.xcassets/deletePhotoBrowser.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "delete.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "delete@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "delete@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

BIN
iOSClient/Images.xcassets/deletePhotoBrowser.imageset/delete.png


BIN
iOSClient/Images.xcassets/deletePhotoBrowser.imageset/delete@2x.png


BIN
iOSClient/Images.xcassets/deletePhotoBrowser.imageset/delete@3x.png


+ 0 - 23
iOSClient/Images.xcassets/downloadSelectedFiles.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "downloadSelectedFiles.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "downloadSelectedFiles@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "downloadSelectedFiles@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

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


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


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


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

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

+ 0 - 55
iOSClient/Images.xcassets/dragHorizontal.imageset/dragHorizontal.pdf

@@ -1,55 +0,0 @@
-%PDF-1.4
-%Óëéá
-1 0 obj
-<</Creator (Mozilla/5.0 \(Macintosh; Intel Mac OS X 10_15_2\) AppleWebKit/537.36 \(KHTML, like Gecko\) BoxySVG/3.33.1 Chrome/73.0.3683.121 Electron/5.0.13 Safari/537.36)
-/Producer (Skia/PDF m73)
-/CreationDate (D:20200109144732+00'00')
-/ModDate (D:20200109144732+00'00')>>
-endobj
-3 0 obj
-<</ca 1
-/BM /Normal>>
-endobj
-4 0 obj
-<</Filter /FlateDecode
-/Length 109>> stream
-xœÓ32¶ ÔÕCâ)$çrr�d�
 DQ*W¸–BPÜÔDÏÐ,ÀzQy@�úîÆ
-éÅ\F†
-††
-¹\Æ *HYI  ”‚hcˆc°CS¨¨)\6‡+ƒ+�+™-#3
-endstream
-endobj
-2 0 obj
-<</Type /Page
-/Resources <</ProcSets [/PDF /Text /ImageB /ImageC /ImageI]
-/ExtGState <</G3 3 0 R>>>>
-/MediaBox [0 0 312 312]
-/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 
-0000000518 00000 n 
-0000000302 00000 n 
-0000000339 00000 n 
-0000000707 00000 n 
-0000000762 00000 n 
-trailer
-<</Size 7
-/Root 6 0 R
-/Info 1 0 R>>
-startxref
-809
-%%EOF

+ 2 - 2
iOSClient/Main/Colleaction Common/NCCollectionCommon.swift

@@ -86,8 +86,8 @@ class NCCollectionCommon: NSObject, NCSelectDelegate {
         images.folderAutomaticUpload = UIImage(named: "folderAutomaticUpload")!.image(color: NCBrandColor.shared.brandElement, size: folderWidth)
         images.folder =  UIImage(named: "folder")!.image(color: NCBrandColor.shared.brandElement, size: folderWidth)
         
-        images.checkedYes = UIImage(named: "checkedYes")!.image(color: .darkGray, size: 50)
-        images.checkedNo = UIImage(named: "checkedNo")!.image(color: NCBrandColor.shared.graySoft, size: 50)
+        images.checkedYes = NCUtility.shared.loadImage(named: "checkmark.circle.fill", color: .darkGray) //UIImage(named: "checkedYes")!.image(color: .darkGray, size: 50)
+        images.checkedNo = NCUtility.shared.loadImage(named: "circle", color: NCBrandColor.shared.graySoft) //UIImage(named: "checkedNo")!.image(color: NCBrandColor.shared.graySoft, size: 50)
         
         images.buttonMore = UIImage(named: "more")!.image(color: NCBrandColor.shared.graySoft, size: 50)
         images.buttonStop = UIImage(named: "stop")!.image(color: NCBrandColor.shared.graySoft, size: 50)

+ 1 - 1
iOSClient/Share/NCShareCommon.swift

@@ -45,7 +45,7 @@ class NCShareCommon: NSObject {
         
         let size: CGFloat = 200
         
-        let bottomImage = UIImage.init(named: "circle")!.image(color: colorCircle, size: size/2)
+        let bottomImage = UIImage.init(named: "circle.fill")!.image(color: colorCircle, size: size/2)
         let topImage = UIImage.init(named: imageName)!.image(color: .white, size: size/2)
         UIGraphicsBeginImageContextWithOptions(CGSize(width: size, height: size), false, UIScreen.main.scale)
         bottomImage.draw(in: CGRect(origin: CGPoint.zero, size: CGSize(width: size, height: size)))