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

Removed unneeded parameter.

Browse Source
This commit is contained in:
Christiano, Kevin 2019-05-03 14:20:23 -04:00
parent 211d9f6c3b
commit 2f69b07bf5
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,6 @@ public typealias ActionBlock = () -> Void
// Used for tappable links in the text. // Used for tappable links in the text.
private struct ActionableClause { private struct ActionableClause {
var labelView: Label?
var location: Int? var location: Int?
var length: Int? var length: Int?
var actionText: String? var actionText: String?
@ -173,8 +172,7 @@ public typealias ActionBlock = () -> Void
let subStringRange = Range(range, in: text) let subStringRange = Range(range, in: text)
else { return } else { return }
clauses.append(ActionableClause(labelView: self, clauses.append(ActionableClause(location: range.location,
location: range.location,
length: range.length, length: range.length,
actionText: String(text[subStringRange]), actionText: String(text[subStringRange]),
actionBlock: actionBlock)) actionBlock: actionBlock))
@ -198,8 +196,7 @@ public typealias ActionBlock = () -> Void
let subStringRange = Range(range, in: text) let subStringRange = Range(range, in: text)
else { return } else { return }
clauses.append(ActionableClause(labelView: self, clauses.append(ActionableClause(location: range.location,
location: range.location,
length: range.length, length: range.length,
actionText: String(text[subStringRange]), actionText: String(text[subStringRange]),
actionBlock: { [weak self, weak delegate] in actionBlock: { [weak self, weak delegate] in
@ -233,8 +230,7 @@ public typealias ActionBlock = () -> Void
let string = text as NSString let string = text as NSString
let range = string.range(of: actionText) let range = string.range(of: actionText)
clauses.append(ActionableClause(labelView: self, clauses.append(ActionableClause(location: range.location,
location: range.location,
length: range.length, length: range.length,
actionText: actionText, actionText: actionText,
actionBlock: actionBlock)) actionBlock: actionBlock))
@ -258,7 +254,7 @@ public typealias ActionBlock = () -> Void
let string = text as NSString let string = text as NSString
let range = string.range(of: actionText) let range = string.range(of: actionText)
clauses.append(ActionableClause(labelView: self, location: range.location, length: range.length, actionText: actionText, clauses.append(ActionableClause(location: range.location, length: range.length, actionText: actionText,
actionBlock: { [weak self, weak delegate] in actionBlock: { [weak self, weak delegate] in
var willPerform = true var willPerform = true
@ -400,8 +396,7 @@ public typealias ActionBlock = () -> Void
let subStringRange = Range(NSRange(location: actionLocation, length: actionLength), in: text) let subStringRange = Range(NSRange(location: actionLocation, length: actionLength), in: text)
else { continue } else { continue }
label.clauses.append(ActionableClause(labelView: label, label.clauses.append(ActionableClause(location: actionLocation,
location: actionLocation,
length: actionLength, length: actionLength,
actionText: String(text[subStringRange]), actionText: String(text[subStringRange]),
actionBlock: { [weak delegate] in actionBlock: { [weak delegate] in
@ -563,7 +558,7 @@ extension Label {
return true return true
} }
} }
return false return false
} }
@ -603,7 +598,6 @@ extension Label {
// MARK: - UITapGestureRecognizer Override // MARK: - UITapGestureRecognizer Override
extension UITapGestureRecognizer { extension UITapGestureRecognizer {
func didTapAttributedTextInLabel(_ label: Label, inRange targetRange: NSRange) -> Bool { func didTapAttributedTextInLabel(_ label: Label, inRange targetRange: NSRange) -> Bool {
guard let attributedText = label.attributedText else { return false } guard let attributedText = label.attributedText else { return false }
@ -620,7 +614,7 @@ extension UITapGestureRecognizer {
textContainer.maximumNumberOfLines = label.numberOfLines textContainer.maximumNumberOfLines = label.numberOfLines
let labelSize = label.bounds.size let labelSize = label.bounds.size
textContainer.size = labelSize textContainer.size = labelSize
let j = layoutManager.boundingRect(forGlyphRange: targetRange, in: textContainer)
let indexOfCharacter = layoutManager.characterIndex(for: location(in: label), in: textContainer, fractionOfDistanceBetweenInsertionPoints: nil) let indexOfCharacter = layoutManager.characterIndex(for: location(in: label), in: textContainer, fractionOfDistanceBetweenInsertionPoints: nil)
return NSLocationInRange(indexOfCharacter, targetRange) return NSLocationInRange(indexOfCharacter, targetRange)

2
MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
View File

@ -210,7 +210,7 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
setAlternateActionTextAttributes([NSAttributedString.Key.underlineStyle: NSNumber(value: NSUnderlineStyle.single.rawValue)]) setAlternateActionTextAttributes([NSAttributedString.Key.underlineStyle: NSNumber(value: NSUnderlineStyle.single.rawValue)])
self.label?.attributedText = attributedText self.label?.attributedText = attributedText
self.label?.accessibilityTraits = .button self.label?.accessibilityTraits = actionText?.isEmpty ?? false ? .staticText : .button
} }
@objc public func setActionMap(_ actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) { @objc public func setActionMap(_ actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {