coding

iOSClient/Account Request/NCAccountRequest.swift

@@ -159,7 +159,7 @@ extension NCAccountRequest: UITableViewDataSource {
         let urlLabel = cell.viewWithTag(30) as? UILabel
         let activeImage = cell.viewWithTag(40) as? UIImageView
         
-        avatarImage?.image = UIImage(named: "avatarCredentials")
+        avatarImage?.image = NCCollectionCommon.shared.loadImage(named: "person.crop.circle")
     
         let fileNamePath = String(CCUtility.getDirectoryUserData()) + "/" + String(CCUtility.getStringUser(account.user, urlBase: account.urlBase)) + "-" + account.user + ".png"
         
@@ -172,7 +172,7 @@ extension NCAccountRequest: UITableViewDataSource {
         urlLabel?.text = (URL(string: account.urlBase)?.host ?? "")
 
         if account.active {
-            activeImage?.image = UIImage(named: "check")!.imageColor(NCBrandColor.shared.textView)
+            activeImage?.image = NCCollectionCommon.shared.loadImage(named: "checkmark")
         } else {
             activeImage?.image = nil
         }

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

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

iOSClient/Images.xcassets/avatar.imageset/account-circle-outline.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="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M7.07,18.28C7.5,17.38 10.12,16.5 12,16.5C13.88,16.5 16.5,17.38 16.93,18.28C15.57,19.36 13.86,20 12,20C10.14,20 8.43,19.36 7.07,18.28M18.36,16.83C16.93,15.09 13.46,14.5 12,14.5C10.54,14.5 7.07,15.09 5.64,16.83C4.62,15.5 4,13.82 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,13.82 19.38,15.5 18.36,16.83M12,6C10.06,6 8.5,7.56 8.5,9.5C8.5,11.44 10.06,13 12,13C13.94,13 15.5,11.44 15.5,9.5C15.5,7.56 13.94,6 12,6M12,11A1.5,1.5 0 0,1 10.5,9.5A1.5,1.5 0 0,1 12,8A1.5,1.5 0 0,1 13.5,9.5A1.5,1.5 0 0,1 12,11Z" /></svg>

iOSClient/Main/Colleaction Common/NCCollectionCommon.swift

@@ -98,7 +98,8 @@ class NCCollectionCommon: NSObject, NCSelectDelegate {
         var image: UIImage?
         
         if #available(iOS 13.0, *) {
-            image = UIImage(systemName: named)?.imageColor(color)
+            let configuration = UIImage.SymbolConfiguration(pointSize: size)
+            image = UIImage(systemName: named, withConfiguration: configuration)?.imageColor(color)
             if image == nil {
                 image = UIImage(named: named)?.image(color: color, size: size)
             }

iOSClient/Menu/NCLoginWeb+Menu.swift

@@ -31,7 +31,7 @@ extension NCLoginWeb {
         var actions = [NCMenuAction]()
         
         let accounts = NCManageDatabase.shared.getAllAccount()
-        var avatar = UIImage(named: "avatarCredentials")!.image(color: NCBrandColor.shared.icon, size: 50)
+        var avatar = NCCollectionCommon.shared.loadImage(named: "person.crop.circle")
         
         for account in accounts {
             

iOSClient/More/NCMore.storyboard

@@ -35,10 +35,10 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ybA-XY-jKA">
-                                                    <rect key="frame" x="20" y="10" width="30" height="30"/>
+                                                    <rect key="frame" x="20" y="12.5" width="25" height="25"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="30" id="97R-Fz-3Om"/>
-                                                        <constraint firstAttribute="width" constant="30" id="ldi-oV-Yce"/>
+                                                        <constraint firstAttribute="height" constant="25" id="97R-Fz-3Om"/>
+                                                        <constraint firstAttribute="width" constant="25" id="ldi-oV-Yce"/>
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E8e-56-e81">

iOSClient/Settings/CCManageAccount.m

@@ -72,8 +72,7 @@
             
         } else {
             
-            UIImage *image = [UIImage imageNamed:@"avatarCredentials"];
-            avatar = [image imageWithColor:NCBrandColor.shared.icon size:35];
+            avatar = [[NCCollectionCommon shared] loadImageWithNamed:@"avatar" color:NCBrandColor.shared.icon size:35];
         }
         
         row.cellConfigAtConfigure[@"backgroundColor"] = NCBrandColor.shared.backgroundView;