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

fix error from merging

Browse Source
This commit is contained in:
panxi 2020-01-13 17:07:16 -05:00
parent 53e00a7654
commit a6dc16889c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Models/Molecules/NumberedListModel.swift
View File

@ -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]
}

2
MVMCoreUI/Models/Molecules/UnOrderedListModel.swift
View File

@ -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]

8
MVMCoreUI/Molecules/LabelRightMoleculesStack.swift
View File

@ -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()