marinofaggiana 6 years ago
parent
commit
0ffa0c2e05

+ 1 - 1
iOSClient/Activity/NCActivity.swift

@@ -75,7 +75,7 @@ class NCActivity: UIViewController, UITableViewDataSource, UITableViewDelegate,
     }
     
     func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
-        return CCGraphics.changeThemingColorImage(UIImage.init(named: "activityNoRecord"), width: 300, height: 300, scale: 2, color: NCBrandColor.sharedInstance.graySoft)
+        return CCGraphics.changeThemingColorImage(UIImage.init(named: "activity"), width: 300, height: 300, scale: 2, color: NCBrandColor.sharedInstance.graySoft)
     }
     
     func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {

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

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

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


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


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


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


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

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

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


+ 1 - 1
iOSClient/Main/CCMore.swift

@@ -365,7 +365,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
             }
         }
         
-        cell.imageIcon?.image = CCGraphics.changeThemingColorImage(UIImage.init(named: item.icon), multiplier: 2, color: NCBrandColor.sharedInstance.icon)
+        cell.imageIcon?.image = CCGraphics.changeThemingColorImage(UIImage.init(named: item.icon), width: 50, height: 50, scale: 2, color: NCBrandColor.sharedInstance.icon)
         cell.labelText?.text = NSLocalizedString(item.name, comment: "")
         cell.labelText.textColor = NCBrandColor.sharedInstance.textView