Browse Source

New more coherent icons

Signed-off-by: Philippe Weidmann <philippe.weidmann@infomaniak.com>
Philippe Weidmann 4 years ago
parent
commit
3c0223d4d7
30 changed files with 66 additions and 56 deletions
  1. 5 5
      iOSClient/Images.xcassets/activity.imageset/Contents.json
  2. BIN
      iOSClient/Images.xcassets/activity.imageset/activity.pdf
  3. BIN
      iOSClient/Images.xcassets/activity.imageset/bolt.pdf
  4. 5 5
      iOSClient/Images.xcassets/load.imageset/Contents.json
  5. BIN
      iOSClient/Images.xcassets/load.imageset/load.pdf
  6. BIN
      iOSClient/Images.xcassets/load.imageset/transfer.pdf
  7. 1 1
      iOSClient/Images.xcassets/notification.imageset/Contents.json
  8. BIN
      iOSClient/Images.xcassets/notification.imageset/bell.pdf
  9. BIN
      iOSClient/Images.xcassets/notification.imageset/notification.pdf
  10. 8 16
      iOSClient/Images.xcassets/offline.imageset/Contents.json
  11. BIN
      iOSClient/Images.xcassets/offline.imageset/offline.pdf
  12. BIN
      iOSClient/Images.xcassets/offline.imageset/onDevice.png
  13. BIN
      iOSClient/Images.xcassets/offline.imageset/onDevice@2x.png
  14. BIN
      iOSClient/Images.xcassets/offline.imageset/onDevice@3x.png
  15. 5 5
      iOSClient/Images.xcassets/scan.imageset/Contents.json
  16. BIN
      iOSClient/Images.xcassets/scan.imageset/scan.pdf
  17. 5 5
      iOSClient/Images.xcassets/settings.imageset/Contents.json
  18. BIN
      iOSClient/Images.xcassets/settings.imageset/gear.pdf
  19. BIN
      iOSClient/Images.xcassets/settings.imageset/settings.pdf
  20. 8 5
      iOSClient/Images.xcassets/share.imageset/Contents.json
  21. BIN
      iOSClient/Images.xcassets/share.imageset/share.pdf
  22. 15 0
      iOSClient/Images.xcassets/shareFill.imageset/Contents.json
  23. BIN
      iOSClient/Images.xcassets/shareFill.imageset/share.pdf
  24. 5 5
      iOSClient/Images.xcassets/sharebylink.imageset/Contents.json
  25. BIN
      iOSClient/Images.xcassets/sharebylink.imageset/sharebylink.pdf
  26. 5 5
      iOSClient/Images.xcassets/trash.imageset/Contents.json
  27. BIN
      iOSClient/Images.xcassets/trash.imageset/trash.pdf
  28. 1 1
      iOSClient/Main/CCMore.swift
  29. 2 2
      iOSClient/Main/NCMainCommon.swift
  30. 1 1
      iOSClient/Utility/NCUtility.swift

+ 5 - 5
iOSClient/Images.xcassets/activity.imageset/Contents.json

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

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


BIN
iOSClient/Images.xcassets/activity.imageset/bolt.pdf


+ 5 - 5
iOSClient/Images.xcassets/load.imageset/Contents.json

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

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


BIN
iOSClient/Images.xcassets/load.imageset/transfer.pdf


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

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "notification.pdf",
+      "filename" : "bell.pdf",
       "idiom" : "universal"
     }
   ],

BIN
iOSClient/Images.xcassets/notification.imageset/bell.pdf


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


+ 8 - 16
iOSClient/Images.xcassets/offline.imageset/Contents.json

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

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


BIN
iOSClient/Images.xcassets/offline.imageset/onDevice.png


BIN
iOSClient/Images.xcassets/offline.imageset/onDevice@2x.png


BIN
iOSClient/Images.xcassets/offline.imageset/onDevice@3x.png


+ 5 - 5
iOSClient/Images.xcassets/scan.imageset/Contents.json

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

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


+ 5 - 5
iOSClient/Images.xcassets/settings.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/settings.imageset/gear.pdf


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


+ 8 - 5
iOSClient/Images.xcassets/share.imageset/Contents.json

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

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


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

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

BIN
iOSClient/Images.xcassets/shareFill.imageset/share.pdf


+ 5 - 5
iOSClient/Images.xcassets/sharebylink.imageset/Contents.json

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

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


+ 5 - 5
iOSClient/Images.xcassets/trash.imageset/Contents.json

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

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


+ 1 - 1
iOSClient/Main/CCMore.swift

@@ -114,7 +114,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         // ITEM : Shares
         item = OCExternalSites.init()
         item.name = "_list_shares_"
-        item.icon = "share"
+        item.icon = "shareFill"
         item.url = "segueShares"
         functionMenu.append(item)
 

+ 2 - 2
iOSClient/Main/NCMainCommon.swift

@@ -70,8 +70,8 @@ class NCMainCommon: NSObject, NCAudioRecorderViewControllerDelegate, UIDocumentI
     
     @objc func createImagesThemingColor() {
         NCMainCommonImages.cellSharedImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 100, height: 100, color: NCBrandColor.sharedInstance.textView)
-        NCMainCommonImages.cellCanShareImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 100, height: 100, color: NCBrandColor.sharedInstance.graySoft)
-        NCMainCommonImages.cellShareByLinkImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "sharebylink"), width: 100, height: 100, color: NCBrandColor.sharedInstance.textView)
+        NCMainCommonImages.cellCanShareImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 100, height: 100, color: NCBrandColor.sharedInstance.optionItem)
+        NCMainCommonImages.cellShareByLinkImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "sharebylink"), width: 100, height: 100, color: NCBrandColor.sharedInstance.optionItem)
         NCMainCommonImages.cellFavouriteImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "favorite"), width: 100, height: 100, color: NCBrandColor.sharedInstance.yellowFavorite)
         NCMainCommonImages.cellMoreImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "more"), width: 50, height: 50, color: NCBrandColor.sharedInstance.optionItem)
         NCMainCommonImages.cellCommentImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "comment"), width: 30, height: 30, color: NCBrandColor.sharedInstance.graySoft)

+ 1 - 1
iOSClient/Utility/NCUtility.swift

@@ -403,7 +403,7 @@ class NCUtility: NSObject {
         UIGraphicsEndImageContext()
 
         UIGraphicsBeginImageContextWithOptions(CGSize(width: size, height: size), false, 0)
-        let avatarImageView = CCAvatar.init(image: image, borderColor: .lightGray, borderWidth: 0.5)
+        let avatarImageView = CCAvatar.init(image: image, borderColor: .clear, borderWidth: 0)
         //avatarImageView?.alpha = alpha
         guard let context = UIGraphicsGetCurrentContext() else { return nil }
         avatarImageView?.layer.render(in: context)