Merge pull request #46 from RakuyoKit/feature/color-for-sf-symbols

feat: Add `color` for `FastImageContentProviding.sfSymbols` method
RakuyoKit · Jun 17, 2024 · ab2931d · ab2931d
2 parents 714b1df + 653311c
commit ab2931d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Sources/Epoxy/Row/ButtonRow/AnyButtonImageContent.swift b/Sources/Epoxy/Row/ButtonRow/AnyButtonImageContent.swift
@@ -54,8 +54,10 @@ extension AnyButtonImageContent: FastImageContentProviding {
         .init(UIImage(contentsOfFile: path))
     }
 
-    public static func sfSymbols(name: String, configuration: UIImage.SymbolConfiguration? = nil) -> Self {
-        .init(UIImage(systemName: name, withConfiguration: configuration))
+    public static func sfSymbols(name: String, color: UIColor? = nil, configuration: UIImage.SymbolConfiguration? = nil) -> Self {
+        let image = UIImage(systemName: name, withConfiguration: configuration)
+        let finalImage = color.flatMap { image?.withTintColor($0, renderingMode: .alwaysOriginal) } ?? image
+        return .init(finalImage)
     }
 }
 #endif
diff --git a/Sources/Epoxy/Row/ImageRow/AnyImageContent.swift b/Sources/Epoxy/Row/ImageRow/AnyImageContent.swift
@@ -54,8 +54,10 @@ extension AnyImageContent: FastImageContentProviding {
         .init(UIImage(contentsOfFile: path))
     }
 
-    public static func sfSymbols(name: String, configuration: UIImage.SymbolConfiguration? = nil) -> Self {
-        .init(UIImage(systemName: name, withConfiguration: configuration))
+    public static func sfSymbols(name: String, color: UIColor? = nil, configuration: UIImage.SymbolConfiguration? = nil) -> Self {
+        let image = UIImage(systemName: name, withConfiguration: configuration)
+        let finalImage = color.flatMap { image?.withTintColor($0, renderingMode: .alwaysOriginal) } ?? image
+        return .init(finalImage)
     }
 }
 #endif
diff --git a/Sources/Epoxy/Row/ImageRow/FastImageContentProviding.swift b/Sources/Epoxy/Row/ImageRow/FastImageContentProviding.swift
@@ -12,5 +12,5 @@ public protocol FastImageContentProviding {
     static func asset(name: String, bundle: Bundle, with configuration: UIImage.Configuration?) -> Self
     static func data(_ data: Data) -> Self
     static func file(path: String) -> Self
-    static func sfSymbols(name: String, configuration: UIImage.SymbolConfiguration?) -> Self
+    static func sfSymbols(name: String, color: UIColor?, configuration: UIImage.SymbolConfiguration?) -> Self
 }