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

Changes as per review comments

Browse Source
This commit is contained in:
Sumanth Nadigadda 2021-06-09 23:12:45 +05:30
parent bba4cbfb66
commit 921df032b2
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
View File

@ -316,8 +316,8 @@ public typealias ActionBlock = () -> ()
textColor = color.uiColor
}
if let numberofLines = labelModel.numberOfLines {
numberOfLines = numberofLines
if let lines = labelModel.numberOfLines {
numberOfLines = lines
}
if let attributes = labelModel.attributes, let labelText = text {
@ -794,6 +794,7 @@ extension Label {
accessibilityCustomActions = []
clauses = []
accessibilityTraits = .staticText
numberOfLines = 0
}
public func needsToBeConstrained() -> Bool { true }

15
MVMCoreUI/Atomic/Atoms/Views/Label/LabelModel.swift
View File

@ -25,7 +25,7 @@
public var html: String?
public var hero: Int?
public var makeWholeViewClickable: Bool?
public var numberOfLines:Int?
public var numberOfLines: Int?
//--------------------------------------------------
// MARK: - Keys
@ -51,24 +51,13 @@
enum AttributeTypeKey: String, CodingKey {
case type
}
//-----------------------------------------------------
// MARK: - Methods
//-----------------------------------------------------
internal func setDefaults() {
if numberOfLines == nil {
numberOfLines = 1
}
}
//--------------------------------------------------
// MARK: - Initializer
//--------------------------------------------------
public init(text: String) {
self.text = text
setDefaults()
}
//--------------------------------------------------

4
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift
View File

@ -55,7 +55,6 @@
leftImage.contentMode = .scaleAspectFit
rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
rightLabel.setContentHuggingPriority(UILayoutPriority(rawValue: 900), for: .horizontal)
rightLabel.numberOfLines = 1
addMolecule(stack)
stack.restack()
}
@ -73,9 +72,6 @@
headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
rightLabel.set(with: model.rightLabel, delegateObject, additionalData)
updateAccessibilityLabel()
if let numberOfLines = model.rightLabel.numberOfLines{
rightLabel.numberOfLines = numberOfLines
}
}
open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {

3
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyTextModel.swift
View File

@ -29,6 +29,9 @@ public class ListLeftVariableIconWithRightCaretBodyTextModel: ListItemModel, Mol
}
headlineBody.style = .item
headlineBody.headline?.hero = 0
if rightLabel.numberOfLines == nil {
rightLabel.numberOfLines = 1
}
}
//-----------------------------------------------------