Marino Faggiana 6 years ago
parent
commit
1529b277ae
2 changed files with 9 additions and 3 deletions
  1. 2 2
      iOSClient/Networking/NCService.swift
  2. 7 1
      iOSClient/Utility/NCUtility.swift

+ 2 - 2
iOSClient/Networking/NCService.swift

@@ -144,7 +144,7 @@ class NCService: NSObject, OCNetworkingDelegate {
             
             // theming logo
             let fileNameThemingLogo = CCUtility.getStringUser(self.appDelegate.activeUser, activeUrl: self.appDelegate.activeUrl) + "-themingLogo.png"
-            NCUtility.sharedInstance.convertSVGtoPNGWriteToUserData(svgUrlString: capabilities!.themingLogo, fileName: fileNameThemingLogo, rewrite: true)
+            NCUtility.sharedInstance.convertSVGtoPNGWriteToUserData(svgUrlString: capabilities!.themingLogo, fileName: fileNameThemingLogo, width: 40, rewrite: true)
             
             if (NCBrandOptions.sharedInstance.use_themingBackground && capabilities!.themingBackground != "") {
                 
@@ -384,7 +384,7 @@ class NCService: NSObject, OCNetworkingDelegate {
                 for notification in listOfNotifications! {
                     let id = (notification as! OCNotifications).idNotification
                     if let icon = (notification as! OCNotifications).icon {
-                        NCUtility.sharedInstance.convertSVGtoPNGWriteToUserData(svgUrlString: icon, fileName: nil, rewrite: false)
+                        NCUtility.sharedInstance.convertSVGtoPNGWriteToUserData(svgUrlString: icon, fileName: nil, width: 25, rewrite: false)
                     }
                     new = new + String(describing: id)
                 }

+ 7 - 1
iOSClient/Utility/NCUtility.swift

@@ -166,7 +166,7 @@ class NCUtility: NSObject {
         return (k_layout_list, "fileName", true, "none", true)
     }
     
-    func convertSVGtoPNGWriteToUserData(svgUrlString: String, fileName: String?, rewrite: Bool) {
+    func convertSVGtoPNGWriteToUserData(svgUrlString: String, fileName: String?, width: CGFloat?, rewrite: Bool) {
         
         var fileNamePNG = ""
         
@@ -189,6 +189,12 @@ class NCUtility: NSObject {
             guard let svgkImage: SVGKImage = SVGKImage(contentsOf: iconURL) else {
                 return
             }
+            
+            if width != nil {
+                let scale = svgkImage.size.height / svgkImage.size.width
+                svgkImage.size = CGSize(width: width!, height: width! * scale)
+            }
+            
             guard let image: UIImage = svgkImage.uiImage else {
                 return
             }