Merge branch 'release/3.5.0'

Author: malcommac

ExampleiOS/Assets.xcassets/rocket.imageset/816c77975b4ccce940d41933081b19d7.png renamed to ExampleiOS/Assets.xcassets/therocket.imageset/816c77975b4ccce940d41933081b19d7.png

@@ -2,11 +2,11 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "816c77975b4ccce940d41933081b19d7.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "816c77975b4ccce940d41933081b19d7.png",
       "scale" : "2x"
     },
     {

ExampleiOS/Assets.xcassets/rocket.imageset/Contents.json renamed to ExampleiOS/Assets.xcassets/therocket.imageset/Contents.json

@@ -1,6 +1,6 @@
 <strong>Parler du don d'organe n'est plus tabou. Je me renseigne, j'en discute avec mes proches,... <rainbow>et je décide!</rainbow></strong>
 
-<img named="rocket" rect="0,-50,30,30"/>
+<img named="therocket" rect="0,-50,30,30"/>
 
 <img url="https://www.macitynet.it/wp-content/uploads/2018/05/video_ApplePark_magg18.jpg"/>
 

ExampleiOS/file.txt

@@ -706,8 +706,8 @@ The following properties are available:
 ## Requirements
 
 * Swift 5.1+
-* iOS 8.0+
-* macOS 10.10+
+* iOS 9.0+
+* macOS 11.0+
 * watchOS 2.0+
 * tvOS 11.0+
 

README.md

@@ -45,22 +45,34 @@ public enum TextTransform {
     var transformer: TransformFunction {
         switch self {
             case .lowercase:
-                return { string in string.localizedLowercase }
+                return { string in
+                    string.localizedLowercase
+                }
 
             case .uppercase:
-                return { string in string.localizedUppercase }
+                return { string in
+                    string.localizedUppercase
+                }
 
             case .capitalized:
-                return { string in string.localizedCapitalized }
+                return { string in
+                    string.localizedCapitalized
+                }
 
             case .lowercaseWithLocale(let locale):
-                return { string in string.lowercased(with: locale) }
+                return { string in
+                    string.lowercased(with: locale)
+                }
 
             case .uppercaseWithLocale(let locale):
-                return { string in string.uppercased(with: locale) }
+                return { string in
+                    string.uppercased(with: locale)
+                }
 
             case .capitalizedWithLocale(let locale):
-                return { string in string.capitalized(with: locale) }
+                return { string in
+                    string.capitalized(with: locale)
+                }
 
             case .custom(let transform):
                 return transform

Sources/SwiftRichString/Attributes/TextTransform.swift

@@ -36,10 +36,10 @@ import AppKit
 import UIKit
 #endif
 
-#if os(OSX) || os(iOS)
-
 public extension AttributedString {
 
+    #if os(iOS)
+
     /// Initialize a new text attachment with a remote image resource.
     /// Image will be loaded asynchronously after the text appear inside the control.
     ///
@@ -61,6 +61,10 @@ public extension AttributedString {
         self.init(attachment: attachment)
     }
 
+    #endif
+    
+    #if os(iOS) || os(OSX)
+
     /// Initialize a new text attachment with local image contained into the assets.
     ///
     /// - Parameters:
@@ -71,8 +75,9 @@ public extension AttributedString {
             return nil
         }
 
+        let image = Image(named: imageNamed)
         let boundsRect = CGRect(string: bounds)
-        self.init(image: Image(named: imageNamed), bounds: boundsRect)
+        self.init(image: image, bounds: boundsRect)
     }
 
     /// Initialize a new attributed string from an image.
@@ -85,20 +90,24 @@ public extension AttributedString {
             return nil
         }
 
+        #if os(OSX)
+        let attachment = NSTextAttachment(data: image.pngData()!, ofType: "png")
+        #else
         var attachment: NSTextAttachment!
         if #available(iOS 13.0, *) {
             attachment = NSTextAttachment(image: image)
         } else {
             attachment = NSTextAttachment(data: image.pngData()!, ofType: "png")
         }
+        #endif
 
         if let bounds = bounds {
             attachment.bounds = bounds
         }
 
         self.init(attachment: attachment)
     }
+    
+    #endif
 
 }
-
-#endif

Sources/SwiftRichString/Extensions/AttributedString+Attachments.swift

@@ -35,7 +35,7 @@ import UIKit
 import MobileCoreServices
 #endif
 
-#if os(iOS) || os(OSX)
+#if os(iOS)
 
 @objc public protocol AsyncTextAttachmentDelegate
 {

Sources/SwiftRichString/Support/AsyncTextAttachment.swift

@@ -113,3 +113,20 @@ extension CGRect {
     }
 
 }
+
+#if os(OSX)
+
+public extension NSImage {
+    
+    /// PNG data of the image.
+    func pngData() -> Data? {
+        self.lockFocus()
+        let bitmap = NSBitmapImageRep(focusedViewRect: NSRect(x: 0, y: 0, width: size.width, height: size.height))
+        let pngData = bitmap!.representation(using: .png, properties: [:])
+        self.unlockFocus()
+        return pngData
+    }
+    
+}
+
+#endif

Sources/SwiftRichString/Support/Extensions.swift

@@ -86,18 +86,24 @@ open class StandardXMLAttributesResolver: XMLDynamicAttributesResolver {
             case "a": // href support
                 finalStyleToApply.linkURL = URL(string: attributes?["href"])
 
-            #if os(OSX) || os(iOS)
             case "img":
+                #if os(iOS)
+                // Remote Image URL support
                 if let url = attributes?["url"] {
                     if let image = AttributedString(imageURL: url, bounds: attributes?["rect"]) {
                         attributedString.append(image)
                     }
-                } else {
-                    if let image = AttributedString(imageNamed: attributes?["named"], bounds: attributes?["rect"]) {
+                }
+                #endif
+                
+                #if os(iOS) || os(OSX)
+                // Local Image support
+                if let imageName = attributes?["named"] {
+                    if let image = AttributedString(imageNamed: imageName, bounds: attributes?["rect"]) {
                         attributedString.append(image)
                     }
                 }
-            #endif
+                #endif
 
             default:
                 break

Sources/SwiftRichString/Support/XMLDynamicAttributesResolver.swift

@@ -9,8 +9,8 @@ Pod::Spec.new do |s|
   s.license      = { :type => "MIT", :file => "LICENSE" }
   s.author             = { "Daniele Margutti" => "[email protected]" }
   s.social_media_url   = "https://twitter.com/danielemargutti"
-  s.ios.deployment_target = "8.0"
-  s.osx.deployment_target = "10.10"
+  s.ios.deployment_target = "9.0"
+  s.osx.deployment_target = "11.0"
   s.watchos.deployment_target = "2.0"
   s.tvos.deployment_target = "9.2"
   s.source       = { :git => "https://github.com/malcommac/SwiftRichString.git", :tag => s.version.to_s }