mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

name change

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2019-06-24 10:55:07 -04:00
parent fe09ce04dc
commit ab33ceebde
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MVMCoreUI/Atoms/Views/Label.swift
View File

@ -247,7 +247,7 @@ public typealias ActionBlock = () -> Void
case "action": case "action":
guard let actionLabel = label as? Label else { continue } guard let actionLabel = label as? Label else { continue }
actionLabel.addDefaultAttributes(range: range, string: attributedString) actionLabel.addActionAttributes(range: range, string: attributedString)
actionLabel.clauses.append(ActionableClause(range: range, actionLabel.clauses.append(ActionableClause(range: range,
actionBlock: actionLabel.createActionBlockFrom(actionMap: json, actionBlock: actionLabel.createActionBlockFrom(actionMap: json,
additionalData: additionalData, additionalData: additionalData,
@ -398,18 +398,18 @@ extension Label {
} }
} }
func addDefaultAttributes(range: NSRange, string: NSMutableAttributedString?) { func addActionAttributes(range: NSRange, string: NSMutableAttributedString?) {
guard let string = string else { return } guard let string = string else { return }
string.addAttributes([NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue], range: range) string.addAttributes([NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue], range: range)
} }
fileprivate func setDefaultAttributes(range: NSRange) { fileprivate func setActionAttributes(range: NSRange) {
guard let attributedText = attributedText else { return } guard let attributedText = attributedText else { return }
let mutableAttributedString = NSMutableAttributedString(attributedString: attributedText) let mutableAttributedString = NSMutableAttributedString(attributedString: attributedText)
addDefaultAttributes(range: range, string: mutableAttributedString) addActionAttributes(range: range, string: mutableAttributedString)
self.attributedText = mutableAttributedString self.attributedText = mutableAttributedString
} }
@ -423,7 +423,7 @@ extension Label {
*/ */
@objc public func addTappableLinkAttribute(range: NSRange, actionBlock: @escaping ActionBlock) { @objc public func addTappableLinkAttribute(range: NSRange, actionBlock: @escaping ActionBlock) {
setDefaultAttributes(range: range) setActionAttributes(range: range)
clauses.append(ActionableClause(range: range, actionBlock: actionBlock)) clauses.append(ActionableClause(range: range, actionBlock: actionBlock))
} }
@ -439,7 +439,7 @@ extension Label {
*/ */
@objc public func addTappableLinkAttribute(range: NSRange, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) { @objc public func addTappableLinkAttribute(range: NSRange, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
setDefaultAttributes(range: range) setActionAttributes(range: range)
clauses.append(ActionableClause(range: range, clauses.append(ActionableClause(range: range,
actionBlock: createActionBlockFrom(actionMap: actionMap, actionBlock: createActionBlockFrom(actionMap: actionMap,
additionalData: additionalData, additionalData: additionalData,