Browse Source

add: themingLogo -> svg, png

Marino Faggiana 6 years ago
parent
commit
e2d21cc17c
2 changed files with 16 additions and 5 deletions
  1. 5 1
      iOSClient/Networking/NCService.swift
  2. 11 4
      iOSClient/Utility/NCUtility.swift

+ 5 - 1
iOSClient/Networking/NCService.swift

@@ -142,6 +142,10 @@ class NCService: NSObject, OCNetworkingDelegate {
             
             // ------ THEMING -----------------------------------------------------------------------
             
+            // 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)
+            
             if (NCBrandOptions.sharedInstance.use_themingBackground && capabilities!.themingBackground != "") {
                 
                 // Download Theming Background & Change Theming color
@@ -380,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)
+                        NCUtility.sharedInstance.convertSVGtoPNGWriteToUserData(svgUrlString: icon, fileName: nil, rewrite: false)
                     }
                     new = new + String(describing: id)
                 }

+ 11 - 4
iOSClient/Utility/NCUtility.swift

@@ -166,7 +166,9 @@ class NCUtility: NSObject {
         return (k_layout_list, "fileName", true, "none", true)
     }
     
-    func convertSVGtoPNGWriteToUserData(svgUrlString: String) {
+    func convertSVGtoPNGWriteToUserData(svgUrlString: String, fileName: String?, rewrite: Bool) {
+        
+        var fileNamePNG = ""
         
         guard let svgUrlString = svgUrlString.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) else {
             return
@@ -175,10 +177,15 @@ class NCUtility: NSObject {
             return
         }
         
-        let fileName = iconURL.deletingPathExtension().lastPathComponent
-        let imageNamePath = CCUtility.getDirectoryUserData() + "/" + fileName + ".png"
+        if fileName == nil {
+            fileNamePNG = iconURL.deletingPathExtension().lastPathComponent + ".png"
+        } else {
+            fileNamePNG = fileName!
+        }
+        
+        let imageNamePath = CCUtility.getDirectoryUserData() + "/" + fileNamePNG
         
-        if !FileManager.default.fileExists(atPath: imageNamePath) {
+        if !FileManager.default.fileExists(atPath: imageNamePath) || rewrite == true {
             guard let svgkImage: SVGKImage = SVGKImage(contentsOf: iconURL) else {
                 return
             }