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

changes from merging

Browse Source
This commit is contained in:
Kevin G Christiano 2020-06-08 15:58:46 -04:00
parent f449b8aafd
commit d7b745b56f
6 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MVMCoreUI/Atomic/Atoms/FormFields/Tags/Tag.swift
View File

@ -8,11 +8,17 @@
import Foundation import Foundation
@objcMembers open class Tag: View { @objcMembers open class Tag: View {
//--------------------------------------------------
// MARK: - Outlets
//--------------------------------------------------
public let label = Label.createLabelRegularBodySmall(true) public let label = Label(fontStyle: .RegularBodySmall)
//--------------------------------------------------
// MARK: - MVMCoreViewProtocol // MARK: - MVMCoreViewProtocol
//--------------------------------------------------
open override func setupView() { open override func setupView() {
super.setupView() super.setupView()
layer.borderColor = UIColor.mvmCoolGray6.cgColor layer.borderColor = UIColor.mvmCoolGray6.cgColor
@ -22,9 +28,10 @@ import Foundation
NSLayoutConstraint.constraintPinSubview(label, pinTop: true, topConstant: 13, pinBottom: true, bottomConstant: 13, pinLeft: true, leftConstant: 15, pinRight: true, rightConstant: 15) NSLayoutConstraint.constraintPinSubview(label, pinTop: true, topConstant: 13, pinBottom: true, bottomConstant: 13, pinLeft: true, leftConstant: 15, pinRight: true, rightConstant: 15)
} }
// MARK: - MoleculeViewProtocol
open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
guard let model = model as? TagModel else { return } guard let model = model as? TagModel else { return }
label.set(with: model.label, delegateObject, additionalData) label.set(with: model.label, delegateObject, additionalData)
} }
@ -36,6 +43,6 @@ import Foundation
open override func reset() { open override func reset() {
super.reset() super.reset()
label.reset() label.reset()
label.styleRegularBodySmall(true) label.setFontStyle(.RegularBodySmall)
} }
} }

6
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift
View File

@ -15,10 +15,10 @@ import Foundation
//-------------------------------------------------- //--------------------------------------------------
public let progressBar = ProgressBar() public let progressBar = ProgressBar()
public let leftHeadline = Label.createLabelBoldBodySmall(true) public let leftHeadline = Label(fontStyle: .BoldBodySmall)
public let leftBody = Label.createLabelBoldBodySmall(true) public let leftBody = Label(fontStyle: .BoldBodySmall)
public let rightBar = Line() public let rightBar = Line()
public let rightLabel = Label.createLabelBoldBodySmall(true) public let rightLabel = Label(fontStyle: .BoldBodySmall)
private let barStackItem: StackItem private let barStackItem: StackItem
private let rightLabelStackItem: StackItem private let rightLabelStackItem: StackItem
public var labelStack: Stack<StackModel> public var labelStack: Stack<StackModel>

2
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift
View File

@ -13,7 +13,7 @@ import Foundation
//----------------------------------------------------- //-----------------------------------------------------
// MARK: - Outlets // MARK: - Outlets
//----------------------------------------------------- //-----------------------------------------------------
private let stack: Stack<StackModel>
public let headlineBody = HeadlineBody() public let headlineBody = HeadlineBody()
public let arrow = Arrow() public let arrow = Arrow()
public let rightLabel = Label(fontStyle: .RegularBodySmall) public let rightLabel = Label(fontStyle: .RegularBodySmall)

2
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift
View File

@ -13,7 +13,7 @@ import Foundation
//----------------------------------------------------- //-----------------------------------------------------
// MARK: - Outlets // MARK: - Outlets
//----------------------------------------------------- //-----------------------------------------------------
public var stack: Stack<StackModel>
public let leftLabel = Label(fontStyle: .BoldBodySmall) public let leftLabel = Label(fontStyle: .BoldBodySmall)
public let rightLabel = Label(fontStyle: .RegularBodySmall) public let rightLabel = Label(fontStyle: .RegularBodySmall)
public let bar = Line() public let bar = Line()

16
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnCompareChanges.swift
View File

@ -83,14 +83,14 @@ import Foundation
open override func reset() { open override func reset() {
super.reset() super.reset()
leftHeadline1.setFontStyle(.BoldBodySmall) leftHeadlineBodyLink.headline1.setFontStyle(.BoldBodySmall)
leftHeadline2.setFontStyle(.BoldBodySmall) leftHeadlineBodyLink.headline2.setFontStyle(.BoldBodySmall)
leftHeadline3.setFontStyle(.BoldBodySmall) leftHeadlineBodyLink.headline3.setFontStyle(.BoldBodySmall)
leftBody.setFontStyle(.RegularBodySmall) leftHeadlineBodyLink.body.setFontStyle(.RegularBodySmall)
rightHeadline1.setFontStyle(.BoldBodySmall) rightHeadlineBodyLink.headline1.setFontStyle(.BoldBodySmall)
rightHeadline2.setFontStyle(.BoldBodySmall) rightHeadlineBodyLink.headline2.setFontStyle(.BoldBodySmall)
rightHeadline3.setFontStyle(.BoldBodySmall) rightHeadlineBodyLink.headline3.setFontStyle(.BoldBodySmall)
rightBody.setFontStyle(.RegularBodySmall) rightHeadlineBodyLink.body.setFontStyle(.RegularBodySmall)
} }
public override class func estimatedHeight(with molecule: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat { public override class func estimatedHeight(with molecule: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {

8
MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLink.swift
View File

@ -14,10 +14,10 @@ open class ThreeHeadlineBodyLink: View {
// MARK: - Outlets // MARK: - Outlets
//------------------------------------------------------- //-------------------------------------------------------
public let headline1 = Label.createLabelBoldBodySmall(true) public let headline1 = Label(fontStyle: .BoldBodySmall)
public let headline2 = Label.createLabelBoldBodySmall(true) public let headline2 = Label(fontStyle: .BoldBodySmall)
public let headline3 = Label.createLabelBoldBodySmall(true) public let headline3 = Label(fontStyle: .BoldBodySmall)
public let body = Label.createLabelRegularBodySmall(true) public let body = Label(fontStyle: .RegularBodySmall)
public let link = Link() public let link = Link()
//------------------------------------------------------ //------------------------------------------------------