diff --git a/MVMCoreUI/Models/Molecules/NumberedListModel.swift b/MVMCoreUI/Models/Molecules/NumberedListModel.swift index 2a440b27..496db1b1 100644 --- a/MVMCoreUI/Models/Molecules/NumberedListModel.swift +++ b/MVMCoreUI/Models/Molecules/NumberedListModel.swift @@ -9,7 +9,7 @@ import Foundation @objcMembers public class NumberedListModel: OrderListProtocol { - public var backgroundColor: String? + public var backgroundColor: Color? public static var identifier: String = "numberedList" public var list: [LabelModel] } diff --git a/MVMCoreUI/Models/Molecules/UnOrderedListModel.swift b/MVMCoreUI/Models/Molecules/UnOrderedListModel.swift index a795e903..2c80dc6f 100644 --- a/MVMCoreUI/Models/Molecules/UnOrderedListModel.swift +++ b/MVMCoreUI/Models/Molecules/UnOrderedListModel.swift @@ -9,7 +9,7 @@ import Foundation @objcMembers public class UnOrderedListModel: OrderListProtocol { - public var backgroundColor: String? + public var backgroundColor: Color? public static var identifier: String = "unOrderedList" public var bulletChar: String? public var list: [LabelModel] diff --git a/MVMCoreUI/Molecules/LabelRightMoleculesStack.swift b/MVMCoreUI/Molecules/LabelRightMoleculesStack.swift index 58a5ba7b..312927fd 100644 --- a/MVMCoreUI/Molecules/LabelRightMoleculesStack.swift +++ b/MVMCoreUI/Molecules/LabelRightMoleculesStack.swift @@ -12,7 +12,7 @@ open class LabelRightMoleculesStack: MoleculeStackView { var orderedListModel: OrderListProtocol? - public override func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) { + public override func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) { let previousModel = self.orderedListModel //Remove previously drawn views removeAllItemViews() @@ -64,8 +64,8 @@ class LeftLabelRightMoleculeContainer: View { } // MARK: - Inits - public override init() { - super.init() + public convenience init() { + self.init(frame:.zero) } public override init(frame: CGRect) { @@ -131,7 +131,7 @@ class LeftLabelRightMoleculeContainer: View { rightMolecule?.reset() } - override func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) { + public override func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) { let previousMoleculeName = model?.moleculeName super.setWithModel(model, delegateObject, additionalData) removeSubviewsInRightContainer()