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

Crash fixes in Label

Browse Source 
update molecule name from progressBar to progressbar as per oneconfluence mapping name and Android mapping name.
This commit is contained in:
Khan, Arshad 2019-10-25 01:17:54 +05:30
parent cd40ebfccd
commit c1adbe2f2e
2 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,7 +252,7 @@ public typealias ActionBlock = () -> ()
let length = attribute["length"] as? Int let length = attribute["length"] as? Int
else { continue } else { continue }
let range = NSRange(location: location, length: length) var range = NSRange(location: location, length: length)
switch attributeType { switch attributeType {
case "underline": case "underline":
@ -264,7 +264,17 @@ public typealias ActionBlock = () -> ()
case "color": case "color":
if let colorHex = attribute.optionalStringForKey(KeyTextColor), !colorHex.isEmpty { if let colorHex = attribute.optionalStringForKey(KeyTextColor), !colorHex.isEmpty {
attributedString.removeAttribute(.foregroundColor, range: range) // crash fix: removing attribute, even though it does not exists
let foregroundColorAttributesArray = attributedString.attributes(at: location, effectiveRange: &range).filter { (attribute) -> Bool in
if attribute.key == .foregroundColor {
return true
} else {
return false
}
}
if foregroundColorAttributesArray.isEmpty == false {
attributedString.removeAttribute(.foregroundColor, range: range)
}
attributedString.addAttribute(.foregroundColor, value: UIColor.mfGet(forHex: colorHex), range: range) attributedString.addAttribute(.foregroundColor, value: UIColor.mfGet(forHex: colorHex), range: range)
} }
case "image": case "image":
@ -286,8 +296,28 @@ public typealias ActionBlock = () -> ()
case "font": case "font":
if let fontStyle = attribute.optionalStringForKey("style") { if let fontStyle = attribute.optionalStringForKey("style") {
let styles = MFStyler.styleGetAttributedString("0", withStyle: fontStyle) let styles = MFStyler.styleGetAttributedString("0", withStyle: fontStyle)
attributedString.removeAttribute(.font, range: range) // crash fix: removing font attribute, even though it does not exists
attributedString.removeAttribute(.foregroundColor, range: range) let fontAttributesArray = attributedString.attributes(at: location, effectiveRange: &range).filter { (attribute) -> Bool in
if attribute.key == .font {
return true
} else {
return false
}
}
if fontAttributesArray.isEmpty == false {
attributedString.removeAttribute(.font, range: range)
}
// crash fix: removing attribute, even though it does not exists
let foregroundColorAttributesArray = attributedString.attributes(at: location, effectiveRange: &range).filter { (attribute) -> Bool in
if attribute.key == .foregroundColor {
return true
} else {
return false
}
}
if foregroundColorAttributesArray.isEmpty == false {
attributedString.removeAttribute(.foregroundColor, range: range)
}
attributedString.addAttributes(styles.attributes(at: 0, effectiveRange: nil), range: range) attributedString.addAttributes(styles.attributes(at: 0, effectiveRange: nil), range: range)
} else { } else {
let fontSize = attribute["size"] as? CGFloat let fontSize = attribute["size"] as? CGFloat
@ -300,7 +330,17 @@ public typealias ActionBlock = () -> ()
} }
if let font = font { if let font = font {
attributedString.removeAttribute(.font, range: range) // crash fix: removing font attribute, even though it does not exists
let fontAttributesArray = attributedString.attributes(at: location, effectiveRange: &range).filter { (attribute) -> Bool in
if attribute.key == .font {
return true
} else {
return false
}
}
if fontAttributesArray.isEmpty == false {
attributedString.removeAttribute(.font, range: range)
}
attributedString.addAttribute(.font, value: font, range: range) attributedString.addAttribute(.font, value: font, range: range)
} }
} }

2
MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
View File

@ -41,7 +41,7 @@
@"checkbox" : Checkbox.class, @"checkbox" : Checkbox.class,
@"checkboxWithLabelView" : CheckboxWithLabelView.class, @"checkboxWithLabelView" : CheckboxWithLabelView.class,
@"cornerLabels" : CornerLabels.class, @"cornerLabels" : CornerLabels.class,
@"progressBar": ProgressBar.class, @"progressbar": ProgressBar.class,
@"multiProgressBar": MultiProgress.class, @"multiProgressBar": MultiProgress.class,
@"listItem": MoleculeTableViewCell.class, @"listItem": MoleculeTableViewCell.class,
@"accordionListItem": AccordionMoleculeTableViewCell.class, @"accordionListItem": AccordionMoleculeTableViewCell.class,