Skip to content

Improve Mark formatting #1352

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
geriux merged 14 commits into from
Mar 21, 2024
Merged

Improve Mark formatting #1352

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d655451
Mark Formatting - Fix autocorrected strings and changing the caret po…
Mar 14, 2022
af4c463
Mark formatter - Fix autocorrected formatting
Mar 14, 2022
61c04b7
Merge branch 'develop' into feature/mark-formatting-improvements
Jan 8, 2024
dd8a325
Remove setting the color to the placeholder attributes
Jan 8, 2024
87b3cd8
Update preprocessMarkForInsertion
Jan 8, 2024
fadc312
Fix whitespace issues
Jan 8, 2024
4711da4
Update MarkFormatter to support incoming color changes
Jan 12, 2024
590b646
Update how toggleMark works to support color customization and resett…
Jan 12, 2024
42485a7
Update TextStorage to process the mark formatting within replaceChara…
Jan 12, 2024
2970e7f
Fix Hound lint issues
Jan 19, 2024
8712387
Fix lint issue
Jan 19, 2024
a41d881
Update MarkConverter to remove extra spaces within the style attribute
Jan 23, 2024
28e62ab
Use if let to unwrap textColor value
Mar 18, 2024
7b9cc63
Fix defaultTextColor typo
Mar 18, 2024
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
Prev Previous commit
Next Next commit
Update MarkFormatter to support incoming color changes
  • Loading branch information
Gerardo committed Jan 12, 2024
commit 4711da4fe44e0932ea13e0204d16890ec15cfaef
22 changes: 19 additions & 3 deletions Aztec/Classes/Formatters/Implementations/MarkFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,41 @@ import UIKit
class MarkFormatter: AttributeFormatter {

var placeholderAttributes: [NSAttributedString.Key: Any]?

var textColor: String?
var defaulTextColor: UIColor?

func applicationRange(for range: NSRange, in text: NSAttributedString) -> NSRange {
return range
}

func apply(to attributes: [NSAttributedString.Key: Any], andStore representation: HTMLRepresentation?) -> [NSAttributedString.Key: Any] {
var resultingAttributes = attributes
var resultingAttributes = attributes
let colorStyle = CSSAttribute(name: "color", value: textColor)
let backgroundColorStyle = CSSAttribute(name: "background-color", value: "rgba(0, 0, 0, 0)")

let styleAttribute = Attribute(type: .style, value: .inlineCss([backgroundColorStyle, colorStyle]))
let classAttribute = Attribute(type: .class, value: .string("has-inline-color"))

var representationToUse = HTMLRepresentation(for: .element(HTMLElementRepresentation.init(name: "mark", attributes: [])))
// Setting the HTML representation
var representationToUse = HTMLRepresentation(for: .element(HTMLElementRepresentation.init(name: "mark", attributes: [styleAttribute, classAttribute])))
if let requestedRepresentation = representation {
representationToUse = requestedRepresentation
}
resultingAttributes[.markHtmlRepresentation] = representationToUse

if (textColor != nil) {
resultingAttributes[.foregroundColor] = UIColor(hexString: textColor!)
}

return resultingAttributes
}

func remove(from attributes: [NSAttributedString.Key: Any]) -> [NSAttributedString.Key: Any] {
var resultingAttributes = attributes

if (defaulTextColor != nil) {
resultingAttributes[.foregroundColor] = defaulTextColor
}

resultingAttributes.removeValue(forKey: .markHtmlRepresentation)
return resultingAttributes
Expand Down