Implement blockquotes with paragraph style

Aztec/Classes/Formatters/AttributeFormatter.swift

@@ -125,8 +125,7 @@ extension CharacterAttributeFormatter {
     func toggleAttribute(inTextView textView: UITextView, atRange range: NSRange) {
         let applicationRange = self.applicationRange(forRange: range, inString: textView.textStorage)
 
-        guard applicationRange.length > 0 else {
-            toggleTypingAttribute(inTextView: textView)
+        guard applicationRange.length > 0 || textView.textStorage.length > 0 else {
             return
         }
         toggleAttribute(inString: textView.textStorage, atRange: applicationRange)
@@ -144,11 +143,15 @@ extension ParagraphAttributeFormatter {
     func toggleAttribute(inTextView textView: UITextView, atRange range: NSRange) {
         let applicationRange = self.applicationRange(forRange: range, inString: textView.textStorage)
 
-        guard applicationRange.length > 0 else {
-            toggleTypingAttribute(inTextView: textView)
+        if applicationRange.length == 0 || textView.textStorage.length == 0 {
             insertEmptyAttribute(inString: textView.textStorage, at: applicationRange.location)
-            return
+            textView.selectedRange = NSRange(location: applicationRange.location, length: 1)
         }
         toggleAttribute(inString: textView.textStorage, atRange: applicationRange)
     }
+
+    func applyAttribute(inTextView textView: UITextView, atRange range: NSRange) {
+        let applicationRange = self.applicationRange(forRange: range, inString: textView.textStorage)
+        applyAttributes(toString: textView.textStorage, atRange: applicationRange)
+    }
 }

Aztec/Classes/Formatters/BlockquoteFormatter.swift

@@ -2,8 +2,6 @@ import Foundation
 import UIKit
 
 class Blockquote: NSObject, NSCoding {
-    static let attributeName = "AZBlockquote"
-
     public func encode(with aCoder: NSCoder) {
 
     }
@@ -15,25 +13,32 @@ class Blockquote: NSObject, NSCoding {
     required public init?(coder aDecoder: NSCoder){
 
     }
+
+    static func ==(lhs: Blockquote, rhs: Blockquote) -> Bool {
+        return true
+    }
 }
 
 struct BlockquoteFormatter: ParagraphAttributeFormatter {
     let attributes: [String: AnyObject] = {
-        let style = NSMutableParagraphStyle()
+        let style = ParagraphStyle()
         style.headIndent = Metrics.defaultIndentation
         style.firstLineHeadIndent = style.headIndent
         style.tailIndent = -Metrics.defaultIndentation
         style.paragraphSpacing = Metrics.defaultIndentation
         style.paragraphSpacingBefore = Metrics.defaultIndentation
+        style.blockquote = Blockquote()
 
         return [
-            NSParagraphStyleAttributeName: style,
-            Blockquote.attributeName: Blockquote()
+            NSParagraphStyleAttributeName: style            
         ]
     }()
 
     func present(inAttributes attributes: [String : AnyObject]) -> Bool {
-        return attributes[Blockquote.attributeName] is Blockquote
+        if let paragraphStyle = attributes[NSParagraphStyleAttributeName] as? ParagraphStyle {
+            return paragraphStyle.blockquote != nil
+        }
+        return false
     }
 }
 

Aztec/Classes/TextKit/LayoutManager.swift

@@ -15,9 +15,13 @@ class LayoutManager: NSLayoutManager {
         }
 
         let characterRange = self.characterRange(forGlyphRange: glyphsToShow, actualGlyphRange: nil)
-        textStorage.enumerateAttribute(Blockquote.attributeName, in: characterRange, options: []){ (object, range, stop) in
-            guard object is Blockquote else {
-                return
+
+        //draw blockquotes
+        textStorage.enumerateAttribute(NSParagraphStyleAttributeName, in: characterRange, options: []){ (object, range, stop) in
+            guard let paragraphStyle = object as? ParagraphStyle,
+                let _ = paragraphStyle.blockquote
+                else {
+                    return
             }
 
             let borderColor = UIColor(red: 0.5294117647, green: 0.650980392156863, blue: 0.737254902, alpha: 1.0)

Aztec/Classes/TextKit/ParagraphStyle.swift

@@ -4,20 +4,26 @@ import UIKit
 open class ParagraphStyle: NSMutableParagraphStyle {
 
     var textList: TextList?
+    var blockquote: Blockquote?
 
     override init() {
         textList = nil
+        blockquote = nil
         super.init()
     }
 
     public required init?(coder aDecoder: NSCoder) {
         textList = nil
+        blockquote = nil
         if aDecoder.containsValue(forKey: String(describing: TextList.self)) {
             let styleRaw = aDecoder.decodeInteger(forKey: String(describing: TextList.self))
             if let style = TextList.Style(rawValue:styleRaw) {
                 textList = TextList(style: style)
             }
         }
+        if aDecoder.containsValue(forKey: String(describing:Blockquote.self)) {
+            blockquote = aDecoder.decodeObject(forKey: String(describing:Blockquote.self)) as? Blockquote            
+        }
         super.init(coder: aDecoder)
     }
 
@@ -26,11 +32,16 @@ open class ParagraphStyle: NSMutableParagraphStyle {
         if let textListSet = textList {
             aCoder.encode(textListSet.style.rawValue, forKey: String(describing: TextList.self))
         }
+
+        if let blockquote = self.blockquote {
+            aCoder.encode(blockquote, forKey: String(describing:Blockquote.self))
+        }
     }
 
     override open func setParagraphStyle(_ obj: NSParagraphStyle) {
         if let paragrahStyle = obj as? ParagraphStyle {
             textList = paragrahStyle.textList
+            blockquote = paragrahStyle.blockquote
         }
         super.setParagraphStyle(obj)
     }
@@ -69,21 +80,14 @@ open class ParagraphStyle: NSMutableParagraphStyle {
             return false
         }
 
-        if textList == nil || otherParagraph.textList == nil {
-            return super.isEqual(object)
-        }
-
-        if textList == nil && otherParagraph.textList != nil {
+        if textList != otherParagraph.textList {
             return false
         }
 
-        if textList != nil && otherParagraph.textList == nil {
+        if blockquote != otherParagraph.blockquote {
             return false
         }
 
-        if textList! != otherParagraph.textList! {
-            return false
-        }
 
         return super.isEqual(object)
     }
@@ -97,7 +101,7 @@ open class ParagraphStyle: NSMutableParagraphStyle {
         let thisResult = ParagraphStyle()
         thisResult.setParagraphStyle(result as! NSParagraphStyle)
         thisResult.textList = textList
-
+        thisResult.blockquote = blockquote
         return thisResult
     }
 
@@ -106,7 +110,7 @@ open class ParagraphStyle: NSMutableParagraphStyle {
         let thisResult = ParagraphStyle()
         thisResult.setParagraphStyle(result as! NSParagraphStyle)
         thisResult.textList = textList
-
+        thisResult.blockquote = blockquote
         return thisResult
     }
 
@@ -115,6 +119,6 @@ open class ParagraphStyle: NSMutableParagraphStyle {
     }
 
     open override var description:String {
-        return super.description + "\nTextList:\(textList?.style)"
+        return super.description + "\nTextList:\(textList?.style)\nBlockquote:\(blockquote)"
     }
 }

Aztec/Classes/TextKit/TextView.swift

@@ -108,6 +108,7 @@ open class TextView: UITextView {
         super.insertText(text)
         insertionRange.length = 1
         refreshListAfterInsertionOf(text: text, range: insertionRange)
+        refreshBlockquoteAfterInsertionOf(text: text, range: insertionRange)
     }
 
     open override func deleteBackward() {
@@ -126,15 +127,9 @@ open class TextView: UITextView {
         if storage.string.isEmpty {
             return
         }
-        if deletedString.string == "\n" || deletionRange.location == 0 {
-            var isPreviousLocationList = false
-            if (selectedRange.location > 0) {
-                isPreviousLocationList = storage.textListAttribute(atIndex: selectedRange.location - 1) != nil
-            }
-            if !isPreviousLocationList {
-                removeList(aroundRange: selectedRange)
-            }
-        }
+
+        refreshListAfterDeletionOf(text: deletedString, atRange: deletionRange)
+        refreshBlockquoteAfterDeletionOf(text: deletedString, atRange: deletionRange)
     }
 
     // MARK: - UIView Overrides
@@ -454,6 +449,22 @@ open class TextView: UITextView {
         }
     }
 
+    /// Refresh Lists attributes when text is deleted in the specified range
+    ///
+    /// - Parameters:
+    ///   - text: the text being added
+    ///   - range: the range of the insertion of the new text
+    private func refreshListAfterDeletionOf(text deletedText: NSAttributedString, atRange range:NSRange) {
+        guard deletedText.textListAttribute(atIndex: 0) != nil,
+              deletedText.string == "\n" || range.location == 0 else {
+            return
+        }
+
+        if (range.location == 0) {
+            removeList(aroundRange: range)
+        }
+    }
+
     fileprivate func removeList(aroundRange range: NSRange) {
         let formatter = TextListFormatter()
         formatter.removeList(inString: storage, atRange: range)
@@ -495,6 +506,59 @@ open class TextView: UITextView {
         formatter.toggleAttribute(inTextView: self, atRange: range)
     }
 
+    /// Refresh Lists attributes when text is deleted in the specified range
+    ///
+    /// - Parameters:
+    ///   - text: the text being added
+    ///   - range: the range of the insertion of the new text
+    private func refreshBlockquoteAfterDeletionOf(text deletedText: NSAttributedString, atRange range:NSRange) {
+        let formatter = BlockquoteFormatter()
+        guard formatter.attribute(inTextView: self, at: range.location),
+            deletedText.string == "\n" || range.location == 0 else {
+                return
+        }
+
+        if (range.location == 0) {
+            formatter.toggleAttribute(inTextView: self, atRange: range)
+        }
+    }
+
+    /// Refresh blockquotes attributes when inserting new text in the specified range
+    ///
+    /// - Parameters:
+    ///   - text: the text being added
+    ///   - range: the range of the insertion of the new text
+    private func refreshBlockquoteAfterInsertionOf(text:String, range:NSRange) {
+        let formatter = BlockquoteFormatter()
+        guard formatter.attribute(inTextView: self, at: range.location) else {
+            return
+        }
+
+        let afterRange = NSRange(location: range.location + 1, length: 1)
+        let beforeRange = NSRange(location: range.location - 1, length: 1)
+
+        var afterString = "\n"
+        var beforeString = "\n"
+        if beforeRange.location >= 0 {
+            beforeString = storage.attributedSubstring(from: beforeRange).string
+        }
+        if afterRange.endLocation < storage.length {
+            afterString = storage.attributedSubstring(from: afterRange).string
+        }
+
+        let isBegginingOfListItem = storage.isStartOfNewLine(atLocation: range.location)
+
+        if text == "\n" && beforeString == "\n" && afterString == "\n" && isBegginingOfListItem {
+            formatter.toggleAttribute(inTextView: self, atRange: range)
+            if afterRange.endLocation < storage.length {
+                formatter.toggleAttribute(inTextView: self, atRange: afterRange)
+                deleteBackward()
+            } else {
+                selectedRange = NSRange(location: range.location, length: 0)
+            }
+        }
+    }
+
 
     // MARK: - Links