Merge branch 'issue/allow_change_of_default_font' into issue/update_xcode_ios_version

Author: SergioEstevao

Aztec.xcodeproj/project.pbxproj

@@ -231,6 +231,7 @@
 		FF24AC991F0146AF003CA91D /* Assets.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF24AC981F0146AF003CA91D /* Assets.swift */; };
 		FF437B6420D7CB2D000D9666 /* HTMLLi.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF437B6320D7CB2D000D9666 /* HTMLLi.swift */; };
 		FF437B6620D7CB83000D9666 /* LiFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF437B6520D7CB83000D9666 /* LiFormatter.swift */; };
+		FF48CAC8234DD5D3007FFC79 /* NSMutableAttributedString+ReplaceAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF48CAC7234DD5D3007FFC79 /* NSMutableAttributedString+ReplaceAttributes.swift */; };
 		FF4E26601EA8DF1E005E8E42 /* ImageAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF4E265F1EA8DF1E005E8E42 /* ImageAttachment.swift */; };
 		FF61909E202481F4004BCD0A /* CodeFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF61909D202481F4004BCD0A /* CodeFormatter.swift */; };
 		FF7A1C511E5651EA00C4C7C8 /* LineAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF7A1C501E5651EA00C4C7C8 /* LineAttachment.swift */; };
@@ -506,6 +507,7 @@
 		FF24AC981F0146AF003CA91D /* Assets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Assets.swift; sourceTree = "<group>"; };
 		FF437B6320D7CB2D000D9666 /* HTMLLi.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTMLLi.swift; sourceTree = "<group>"; };
 		FF437B6520D7CB83000D9666 /* LiFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LiFormatter.swift; sourceTree = "<group>"; };
+		FF48CAC7234DD5D3007FFC79 /* NSMutableAttributedString+ReplaceAttributes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSMutableAttributedString+ReplaceAttributes.swift"; sourceTree = "<group>"; };
 		FF4E265F1EA8DF1E005E8E42 /* ImageAttachment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageAttachment.swift; sourceTree = "<group>"; };
 		FF5B98E21DC29D0C00571CA4 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
 		FF5B98E41DC355B400571CA4 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = SOURCE_ROOT; };
@@ -748,6 +750,7 @@
 				FFD0FEB61DAE59A700430586 /* NSLayoutManager+Attachments.swift */,
 				F1584795203C9B4C00EE05A1 /* NSMutableAttributedString+ParagraphProperty.swift */,
 				F10BE6171EA7ADA6002E4625 /* NSMutableAttributedString+ReplaceOcurrences.swift */,
+				FF48CAC7234DD5D3007FFC79 /* NSMutableAttributedString+ReplaceAttributes.swift */,
 				F18733C41DA096EE005AEB80 /* NSRange+Helpers.swift */,
 				FF20D6431EDC395E00294B78 /* NSTextingResult+Helpers.swift */,
 				F1C05B9C1E37FA77007510EA /* String+CharacterName.swift */,
@@ -1643,6 +1646,7 @@
 				599F25381D8BC9A1002871D6 /* InAttributesConverter.swift in Sources */,
 				B551A4A01E770B3800EE3A7F /* UIFont+Emoji.swift in Sources */,
 				F13E8AD820B71BAA007C9F8A /* PluginManager.swift in Sources */,
+				FF48CAC8234DD5D3007FFC79 /* NSMutableAttributedString+ReplaceAttributes.swift in Sources */,
 				F12F586E1EF20394008AE298 /* LinkFormatter.swift in Sources */,
 				F1584796203C9B4C00EE05A1 /* NSMutableAttributedString+ParagraphProperty.swift in Sources */,
 				F15BA6092151501300424120 /* BoldStringAttributeConverter.swift in Sources */,

Aztec/Classes/Extensions/NSMutableAttributedString+ReplaceAttributes.swift

@@ -0,0 +1,25 @@
+import Foundation
+import UIKit
+
+public extension NSMutableAttributedString {
+
+    /// Replace all instances of the .font attribute that belong to the same family for the new font, trying to keep the same symbolic traits
+    /// - Parameter font: the original font to be replaced
+    /// - Parameter newFont: the new font to use.
+    func replace(font: UIFont, with newFont: UIFont) {
+        let fullRange = NSRange(location: 0, length: length)
+
+        beginEditing()
+        enumerateAttributes(in: fullRange, options: []) { (attributes, subrange, stop) in
+            guard let currentFont = attributes[.font] as? UIFont, currentFont.familyName == font.familyName else {
+                return
+            }
+            var replacementFont = newFont
+            if let fontDescriptor = newFont.fontDescriptor.withSymbolicTraits(currentFont.fontDescriptor.symbolicTraits) {
+                replacementFont = UIFont(descriptor: fontDescriptor, size: currentFont.pointSize)
+            }
+            addAttribute(.font, value: replacementFont, range: subrange)
+        }
+        endEditing()
+    }
+}

Aztec/Classes/TextKit/FontProvider.swift

@@ -7,7 +7,7 @@ public class FontProvider {
 
     }
 
-    static var shared = FontProvider()
+    public static var shared = FontProvider()
 
     public lazy var monospaceFont: UIFont = {
         let baseFont = UIFont(descriptor:UIFontDescriptor(name: "Menlo", size: 14), size:14)

Aztec/Classes/TextKit/LayoutManager.swift

@@ -317,7 +317,11 @@ private extension LayoutManager {
         traits.remove(.traitBold)
         traits.remove(.traitItalic)
 
-        let descriptor = font.fontDescriptor.withSymbolicTraits(traits)
-        return UIFont(descriptor: descriptor!, size: font.pointSize)
+        if let descriptor = font.fontDescriptor.withSymbolicTraits(traits) {
+            return UIFont(descriptor: descriptor, size: font.pointSize)
+        } else {
+            // Don't touch the font if we cannot remove the symbolic traits.
+            return font
+        }
     }
 }

Aztec/Classes/TextKit/TextView.swift

@@ -228,22 +228,10 @@ open class TextView: UITextView {
 
     public var defaultFont: UIFont {
         didSet {
-            refreshFont(oldFont: oldValue, newFont: defaultFont)
+            textStorage.replace(font: oldValue, with: defaultFont)
         }
     }
 
-    private func refreshFont(oldFont: UIFont, newFont: UIFont) {
-        let fullRange = NSRange(location: 0, length: textStorage.length)
-
-        textStorage.beginEditing()
-        textStorage.enumerateAttributes(in: fullRange, options: []) { (attributes, subrange, stop) in
-            if let currentFont = attributes[.font] as? UIFont, currentFont == oldFont {
-                textStorage.addAttribute(.font, value: newFont, range: subrange)
-            }
-        }
-        textStorage.endEditing()
-    }
-
     public let defaultParagraphStyle: ParagraphStyle
     var defaultMissingImage: UIImage