Implement blockquotes with paragraph style #168
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…h_style # Conflicts: # Aztec/Classes/TextKit/ParagraphStyle.swift
|
|
||
| override init() { | ||
| textList = nil | ||
| blockquote = nil |
There was a problem hiding this comment.
Optionals are nil by default. You don't really need these two lines
| super.init() | ||
| } | ||
|
|
||
| public required init?(coder aDecoder: NSCoder) { | ||
| textList = nil | ||
| blockquote = nil |
There was a problem hiding this comment.
Same comment as above
| /// - 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) { |
There was a problem hiding this comment.
Missing // between the last doc's line and the method signature
| /// | ||
| /// - Parameters: | ||
| /// - text: the text being added | ||
| /// - range: the range of the insertion of the new text |
| /// - Parameters: | ||
| /// - text: the text being added | ||
| /// - range: the range of the insertion of the new text | ||
| private func refreshBlockquoteAfterInsertionOf(text:String, range:NSRange) { |
| 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 | ||
| } |
There was a problem hiding this comment.
Missing space between describing: and the class kind
| @@ -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)) | |||
|
|
||
| let isBegginingOfListItem = storage.isStartOfNewLine(atLocation: range.location) | ||
|
|
||
| if text == "\n" && beforeString == "\n" && afterString == "\n" && isBegginingOfListItem { |
There was a problem hiding this comment.
I wonder if this could be refactored (anyhow) using CharacterSet.newlines?
|
@SergioEstevao added a couple comments (100% of them are style / cosmetic ones, and please, by all means, feel free to disregard). This PR works beautifully, nice job sir!!
|
SergioEstevao
deleted the
issue/implement_blockquotes_with_paragraph_style
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #76 #145
This PR implements blockquotes using a custom paragraph style
How to test:
Notes: