diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/Tags/Tag.swift b/MVMCoreUI/Atomic/Atoms/FormFields/Tags/Tag.swift index c962f8c9..f4036fec 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/Tags/Tag.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/Tags/Tag.swift @@ -8,11 +8,17 @@ import Foundation + @objcMembers open class Tag: View { + //-------------------------------------------------- + // MARK: - Outlets + //-------------------------------------------------- - public let label = Label.createLabelRegularBodySmall(true) + public let label = Label(fontStyle: .RegularBodySmall) + //-------------------------------------------------- // MARK: - MVMCoreViewProtocol + //-------------------------------------------------- open override func setupView() { super.setupView() 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) } - // MARK: - MoleculeViewProtocol open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { + guard let model = model as? TagModel else { return } + label.set(with: model.label, delegateObject, additionalData) } @@ -36,6 +43,6 @@ import Foundation open override func reset() { super.reset() label.reset() - label.styleRegularBodySmall(true) + label.setFontStyle(.RegularBodySmall) } } diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift index 1e5875f1..08255db9 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift @@ -15,10 +15,10 @@ import Foundation //-------------------------------------------------- public let progressBar = ProgressBar() - public let leftHeadline = Label.createLabelBoldBodySmall(true) - public let leftBody = Label.createLabelBoldBodySmall(true) + public let leftHeadline = Label(fontStyle: .BoldBodySmall) + public let leftBody = Label(fontStyle: .BoldBodySmall) public let rightBar = Line() - public let rightLabel = Label.createLabelBoldBodySmall(true) + public let rightLabel = Label(fontStyle: .BoldBodySmall) private let barStackItem: StackItem private let rightLabelStackItem: StackItem public var labelStack: Stack diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift index ad18092b..a93d50f9 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift @@ -13,7 +13,7 @@ import Foundation //----------------------------------------------------- // MARK: - Outlets //----------------------------------------------------- - private let stack: Stack + public let headlineBody = HeadlineBody() public let arrow = Arrow() public let rightLabel = Label(fontStyle: .RegularBodySmall) diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift index 99a1885d..a42cd81d 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift @@ -13,7 +13,7 @@ import Foundation //----------------------------------------------------- // MARK: - Outlets //----------------------------------------------------- - public var stack: Stack + public let leftLabel = Label(fontStyle: .BoldBodySmall) public let rightLabel = Label(fontStyle: .RegularBodySmall) public let bar = Line() diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnCompareChanges.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnCompareChanges.swift index 3d563002..e0efa546 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnCompareChanges.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnCompareChanges.swift @@ -83,14 +83,14 @@ import Foundation open override func reset() { super.reset() - leftHeadline1.setFontStyle(.BoldBodySmall) - leftHeadline2.setFontStyle(.BoldBodySmall) - leftHeadline3.setFontStyle(.BoldBodySmall) - leftBody.setFontStyle(.RegularBodySmall) - rightHeadline1.setFontStyle(.BoldBodySmall) - rightHeadline2.setFontStyle(.BoldBodySmall) - rightHeadline3.setFontStyle(.BoldBodySmall) - rightBody.setFontStyle(.RegularBodySmall) + leftHeadlineBodyLink.headline1.setFontStyle(.BoldBodySmall) + leftHeadlineBodyLink.headline2.setFontStyle(.BoldBodySmall) + leftHeadlineBodyLink.headline3.setFontStyle(.BoldBodySmall) + leftHeadlineBodyLink.body.setFontStyle(.RegularBodySmall) + rightHeadlineBodyLink.headline1.setFontStyle(.BoldBodySmall) + rightHeadlineBodyLink.headline2.setFontStyle(.BoldBodySmall) + rightHeadlineBodyLink.headline3.setFontStyle(.BoldBodySmall) + rightHeadlineBodyLink.body.setFontStyle(.RegularBodySmall) } public override class func estimatedHeight(with molecule: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat { diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLink.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLink.swift index 2547a5e6..474907dd 100644 --- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLink.swift +++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLink.swift @@ -14,10 +14,10 @@ open class ThreeHeadlineBodyLink: View { // MARK: - Outlets //------------------------------------------------------- - public let headline1 = Label.createLabelBoldBodySmall(true) - public let headline2 = Label.createLabelBoldBodySmall(true) - public let headline3 = Label.createLabelBoldBodySmall(true) - public let body = Label.createLabelRegularBodySmall(true) + public let headline1 = Label(fontStyle: .BoldBodySmall) + public let headline2 = Label(fontStyle: .BoldBodySmall) + public let headline3 = Label(fontStyle: .BoldBodySmall) + public let body = Label(fontStyle: .RegularBodySmall) public let link = Link() //------------------------------------------------------