Merge branch 'master' into develop

Author: malcommac

ExampleiOS/ViewController.swift

@@ -94,8 +94,8 @@ class ViewController: UIViewController {
 
 public class MyXMLDynamicAttributesResolver: StandardXMLAttributesResolver {
 
-    public override func styleForUnknownXMLTag(_ tag: String, to attributedString: inout AttributedString, attributes: [String : String]?) {
-        super.styleForUnknownXMLTag(tag, to: &attributedString, attributes: attributes)
+    public override func styleForUnknownXMLTag(_ tag: String, to attributedString: inout AttributedString, attributes: [String : String]?, fromStyle forStyle: StyleXML) {
+        super.styleForUnknownXMLTag(tag, to: &attributedString, attributes: attributes, fromStyle: forStyle)
 
         if tag == "rainbow" {
             let colors = UIColor.randomColors(attributedString.length)

Sources/SwiftRichString/Style/StyleGroup.swift

@@ -56,7 +56,7 @@ public class StyleXML: StyleProtocol {
 
     /// Image provider is called to provide custom image when `StyleXML` encounter a `img` tag image.
     /// If not implemented the image is automatically searched inside any bundled `xcassets`.
-    public var imageProvider: ((String) -> UIImage?)? = nil
+    public var imageProvider: ((String) -> Image?)? = nil
 
     /// Dynamic attributes resolver.
     /// By default the `StandardXMLAttributesResolver` instance is used.

Sources/SwiftRichString/Support/XMLDynamicAttributesResolver.swift

@@ -47,7 +47,7 @@ public protocol XMLDynamicAttributesResolver {
     /// - Parameters:
     ///   - name: name of the image to get.
     ///   - fromStyle: caller instance of `StyleXML.
-    func imageWithName(_ name: String, fromStyle style: StyleXML) -> UIImage?
+    func imageWithName(_ name: String, fromStyle style: StyleXML) -> Image?
 
     /// You are receiving this event when SwiftRichString correctly render an existing tag but the tag
     /// contains extra attributes you may want to handle.
@@ -75,9 +75,9 @@ public protocol XMLDynamicAttributesResolver {
 
 extension XMLDynamicAttributesResolver {
 
-    public func imageWithName(_ name: String, fromStyle style: StyleXML) -> UIImage? {
+    public func imageWithName(_ name: String, fromStyle style: StyleXML) -> Image? {
         guard let mappedImage = style.imageProvider?(name) else {
-            return UIImage(named: name) // xcassets fallback
+            return Image(named: name) // xcassets fallback
         }
 
         // origin xml style contains mapped image.