Переглянути джерело

remove ios12

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 роки тому
батько
коміт
d230bcd150

+ 1 - 1
Widget/Dashboard/DashboardData.swift

@@ -147,7 +147,7 @@ func getDashboardDataEntry(intent: Applications, isPreview: Bool, displaySize: C
     if let fileName = tableDashboard?.iconClass {
         let fileNamePath: String = CCUtility.getDirectoryUserData() + "/" + fileName + ".png"
         if let image = UIImage(contentsOfFile: fileNamePath) {
-            titleImage = image.imageColor(.label)
+            titleImage = image.withTintColor(.label, renderingMode: .alwaysOriginal)
         }
     }
         

+ 2 - 16
iOSClient/Extensions/UIImage+Extensions.swift

@@ -138,20 +138,6 @@ extension UIImage {
         return newImage        
     }
 
-    func imageColor(_ color: UIColor) -> UIImage {
-        
-        //if #available(iOS 13.0, *) {
-        return self.withTintColor(color, renderingMode: .alwaysOriginal)
-        /*
-        } else {
-            return UIGraphicsImageRenderer(size: size, format: imageRendererFormat).image { _ in
-                color.set()
-                withRenderingMode(.alwaysTemplate).draw(at: .zero)
-            }
-        }
-        */
-    }
-
     func isEqualToImage(image: UIImage?) -> Bool {
         if image == nil { return false }
         let data1: NSData = self.pngData()! as NSData
@@ -235,10 +221,10 @@ extension UIImage {
         var image = self
         if let tableDirectory = tableDirectory {
             if let hex = tableDirectory.colorFolder, let color = UIColor(hex: hex) {
-                image = self.imageColor(color)
+                image = self.withTintColor(color, renderingMode: .alwaysOriginal)
             }
         } else if let tableDirectory = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, serverUrl)), let hex = tableDirectory.colorFolder, let color = UIColor(hex: hex) {
-            image = self.imageColor(color)
+            image = self.withTintColor(color, renderingMode: .alwaysOriginal)
         }
         return image
     }

+ 1 - 1
iOSClient/Menu/UIViewController+Menu.swift

@@ -81,7 +81,7 @@ extension UIViewController {
                 if let url = URL(string: action.icon),
                    let svgSource = SVGKSourceURL.source(from: url),
                    let svg = SVGKImage(source: svgSource) {
-                    image = svg.uiImage.imageColor(.label)
+                    image = svg.uiImage.withTintColor(.label, renderingMode: .alwaysOriginal)
                 }
                 return NCMenuAction(
                     title: action.title,

+ 1 - 1
iOSClient/Notification/NCNotification.swift

@@ -117,7 +117,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
         }
 
         if let image = image {
-            cell.icon.image = image.imageColor(NCBrandColor.shared.brandElement)
+            cell.icon.image = image.withTintColor(NCBrandColor.shared.brandElement, renderingMode: .alwaysOriginal)
         } else {
             cell.icon.image = NCUtility.shared.loadImage(named: "bell", color: NCBrandColor.shared.brandElement)
         }

+ 11 - 11
iOSClient/Share/NCShareCommon.swift

@@ -75,27 +75,27 @@ class NCShareCommon: NSObject {
 
         switch shareType {
         case SHARE_TYPE_USER:
-            return UIImage(named: "shareTypeUser")?.imageColor(.label)
+            return UIImage(named: "shareTypeUser")?.withTintColor(.label, renderingMode: .alwaysOriginal)
         case self.SHARE_TYPE_GROUP:
-            return UIImage(named: "shareTypeGroup")?.imageColor(.label)
+            return UIImage(named: "shareTypeGroup")?.withTintColor(.label, renderingMode: .alwaysOriginal)
         case self.SHARE_TYPE_LINK:
-            return UIImage(named: "shareTypeLink")?.imageColor(.label)
+            return UIImage(named: "shareTypeLink")?.withTintColor(.label, renderingMode: .alwaysOriginal)
         case self.SHARE_TYPE_EMAIL:
-            return UIImage(named: "shareTypeEmail")?.imageColor(.label)
+            return UIImage(named: "shareTypeEmail")?.withTintColor(.label, renderingMode: .alwaysOriginal)
         case self.SHARE_TYPE_CONTACT:
-            return UIImage(named: "shareTypeUser")?.imageColor(.label)
+            return UIImage(named: "shareTypeUser")?.withTintColor(.label, renderingMode: .alwaysOriginal)
         case self.SHARE_TYPE_REMOTE:
-            return UIImage(named: "shareTypeUser")?.imageColor(.label)
+            return UIImage(named: "shareTypeUser")?.withTintColor(.label, renderingMode: .alwaysOriginal)
         case self.SHARE_TYPE_CIRCLE:
-            return UIImage(named: "shareTypeCircles")?.imageColor(.label)
+            return UIImage(named: "shareTypeCircles")?.withTintColor(.label, renderingMode: .alwaysOriginal)
         case self.SHARE_TYPE_GUEST:
-            return UIImage(named: "shareTypeUser")?.imageColor(.label)
+            return UIImage(named: "shareTypeUser")?.withTintColor(.label, renderingMode: .alwaysOriginal)
         case self.SHARE_TYPE_REMOTE_GROUP:
-            return UIImage(named: "shareTypeGroup")?.imageColor(.label)
+            return UIImage(named: "shareTypeGroup")?.withTintColor(.label, renderingMode: .alwaysOriginal)
         case self.SHARE_TYPE_ROOM:
-            return UIImage(named: "shareTypeRoom")?.imageColor(.label)
+            return UIImage(named: "shareTypeRoom")?.withTintColor(.label, renderingMode: .alwaysOriginal)
         default:
-            return UIImage(named: "shareTypeUser")?.imageColor(.label)
+            return UIImage(named: "shareTypeUser")?.withTintColor(.label, renderingMode: .alwaysOriginal)
         }
     }
 }