Skip to content

Make pre and quote background colors optional #1229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SergioEstevao merged 2 commits into from
Nov 5, 2019
Merged

Make pre and quote background colors optional #1229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c220f8
Make colors for Quote and Pre elements optional.
SergioEstevao Nov 3, 2019
e490a22
Improve colors used in demo for pre and quote formats.
SergioEstevao Nov 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions Aztec/Classes/TextKit/LayoutManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ class LayoutManager: NSLayoutManager {

/// Blockquote's Left Border Color
///
var blockquoteBorderColor = UIColor(red: 0.52, green: 0.65, blue: 0.73, alpha: 1.0)
var blockquoteBorderColor: UIColor? = UIColor(red: 0.52, green: 0.65, blue: 0.73, alpha: 1.0)

/// Blockquote's Background Color
///
var blockquoteBackgroundColor = UIColor(red: 0.91, green: 0.94, blue: 0.95, alpha: 1.0)
var blockquoteBackgroundColor: UIColor? = UIColor(red: 0.91, green: 0.94, blue: 0.95, alpha: 1.0)

/// HTML Pre Background Color
///
var preBackgroundColor = UIColor(red: 243.0/255.0, green: 246.0/255.0, blue: 248.0/255.0, alpha: 1.0)
var preBackgroundColor: UIColor? = UIColor(red: 243.0/255.0, green: 246.0/255.0, blue: 248.0/255.0, alpha: 1.0)

/// Closure that is expected to return the TypingAttributes associated to the Extra Line Fragment
///
Expand Down Expand Up @@ -126,12 +126,17 @@ private extension LayoutManager {
/// Draws a single Blockquote Line Fragment, in the specified Rectangle, using a given Graphics Context.
///
private func drawBlockquote(in rect: CGRect, with context: CGContext) {
blockquoteBackgroundColor.setFill()
context.fill(rect)
if let blockquoteBackgroundColor = blockquoteBackgroundColor {
blockquoteBackgroundColor.setFill()
context.fill(rect)

}

let borderRect = CGRect(origin: rect.origin, size: CGSize(width: blockquoteBorderWidth, height: rect.height))
blockquoteBorderColor.setFill()
context.fill(borderRect)
if let blockquoteBorderColor = blockquoteBorderColor {
let borderRect = CGRect(origin: rect.origin, size: CGSize(width: blockquoteBorderWidth, height: rect.height))
blockquoteBorderColor.setFill()
context.fill(borderRect)
}
}
}

Expand Down Expand Up @@ -172,6 +177,9 @@ private extension LayoutManager {
/// Draws a single HTML Pre Line Fragment, in the specified Rectangle, using a given Graphics Context.
///
private func drawHTMLPre(in rect: CGRect, with context: CGContext) {
guard let preBackgroundColor = preBackgroundColor else {
return
}
preBackgroundColor.setFill()
context.fill(rect)
}
Expand Down
6 changes: 3 additions & 3 deletions Aztec/Classes/TextKit/TextView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ open class TextView: UITextView {

/// Blockquote Blocks Border Color.
///
@objc dynamic public var blockquoteBorderColor: UIColor {
@objc dynamic public var blockquoteBorderColor: UIColor? {
get {
return layout.blockquoteBorderColor
}
Expand All @@ -286,7 +286,7 @@ open class TextView: UITextView {

/// Blockquote Blocks Background Color.
///
@objc dynamic public var blockquoteBackgroundColor: UIColor {
@objc dynamic public var blockquoteBackgroundColor: UIColor? {
get {
return layout.blockquoteBackgroundColor
}
Expand All @@ -309,7 +309,7 @@ open class TextView: UITextView {

/// Pre Blocks Background Color.
///
@objc dynamic public var preBackgroundColor: UIColor {
@objc dynamic public var preBackgroundColor: UIColor? {
get {
return layout.preBackgroundColor
}
Expand Down
5 changes: 3 additions & 2 deletions Example/Example/EditorDemoController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,9 @@ class EditorDemoController: UIViewController {
titleTextView.textColor = UIColor.label
editorView.htmlTextView.textColor = UIColor.label
editorView.richTextView.textColor = UIColor.label
editorView.richTextView.blockquoteBackgroundColor = UIColor.tertiarySystemBackground
editorView.richTextView.preBackgroundColor = UIColor.tertiarySystemBackground
editorView.richTextView.blockquoteBackgroundColor = UIColor.secondarySystemBackground
editorView.richTextView.preBackgroundColor = UIColor.secondarySystemBackground
editorView.richTextView.blockquoteBorderColor = UIColor.secondarySystemFill
var attributes = editorView.richTextView.linkTextAttributes
attributes?[.foregroundColor] = UIColor.link
} else {
Expand Down