slight cleanup

This commit is contained in:
Pfeil, Scott Robert 2020-03-04 09:15:57 -05:00
parent c8183103f7
commit 1e03009142
3 changed files with 38 additions and 27 deletions

View File

@ -13,14 +13,13 @@ import UIKit
//----------------------------------------------------- //-----------------------------------------------------
// MARK: - Outlets // MARK: - Outlets
//----------------------------------------------------- //-----------------------------------------------------
let progressBar = MultiProgress(frame: .zero) let progressBar = MultiProgress(frame: .zero)
let leftLabel = Label.commonLabelB1(true) let leftLabel = Label.createLabelBoldBodySmall(true)
let rightLabel = Label.commonLabelB1(true) let rightLabel = Label.createLabelBoldBodySmall(true)
let view = View() let view = MVMCoreUICommonViewsUtility.commonView()
//----------------------------------------------------- //-----------------------------------------------------
// MARK: - View Lifecycle // MARK: - MFViewProtocol
//----------------------------------------------------- //-----------------------------------------------------
override open func setupView() { override open func setupView() {
super.setupView() super.setupView()
@ -29,34 +28,46 @@ import UIKit
view.addSubview(progressBar) view.addSubview(progressBar)
view.addSubview(leftLabel) view.addSubview(leftLabel)
view.addSubview(rightLabel) view.addSubview(rightLabel)
addMolecule(view) contentView.addSubview(view)
NSLayoutConstraint.pinViews(leftView: leftLabel, rightView: rightLabel, alignTop: false) containerHelper.constrainView(view)
NSLayoutConstraint.pinViews(leftView: leftLabel, rightView: rightLabel, alignTop: true, bottomAnchor: progressBar.topAnchor, constant: 8)
progressBar.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true progressBar.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
progressBar.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true progressBar.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
progressBar.topAnchor.constraint(equalTo: leftLabel.bottomAnchor, constant: 8).isActive = true
view.bottomAnchor.constraint(equalTo: progressBar.bottomAnchor).isActive = true view.bottomAnchor.constraint(equalTo: progressBar.bottomAnchor).isActive = true
} }
// MARK: - MVMCoreUIMoleculeViewProtocol public override func updateView(_ size: CGFloat) {
open override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) { super.updateView(size)
super.setWithModel(model, delegateObject, additionalData) progressBar.updateView(size)
guard let model = model as? ListProgressBarDataModel else { return} leftLabel.updateView(size)
progressBar.setWithModel(model.progressBar, delegateObject, additionalData) rightLabel.updateView(size)
leftLabel.setWithModel(model.leftLabel, delegateObject, additionalData)
rightLabel.setWithModel(model.rightLabel, delegateObject, additionalData)
} }
//-----------------------------------------------------
// MARK: - ModelMoleculeViewProtocol
//-----------------------------------------------------
open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
super.set(with: model, delegateObject, additionalData)
guard let model = model as? ListProgressBarDataModel else { return}
progressBar.set(with: model.progressBar, delegateObject, additionalData)
leftLabel.set(with: model.leftLabel, delegateObject, additionalData)
rightLabel.set(with: model.rightLabel, delegateObject, additionalData)
}
open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
return 90
}
//-----------------------------------------------------
// MARK: - MVMCoreUIMoleculeViewProtocol
//-----------------------------------------------------
override open func reset() { override open func reset() {
super.reset() super.reset()
progressBar.reset() progressBar.reset()
leftLabel.reset() leftLabel.reset()
rightLabel.reset() rightLabel.reset()
leftLabel.styleB1(true) leftLabel.styleBoldBodySmall(true)
rightLabel.styleB1(true) rightLabel.styleBoldBodySmall(true)
}
open override class func estimatedHeight(forRow molecule: MoleculeModelProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
return 90
} }
} }

View File

@ -38,7 +38,7 @@ import Foundation
stack.restack() stack.restack()
} }
// MARK: - MVMCoreUIMoleculeViewProtocol // MARK: - ModelMoleculeViewProtocol
open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) { open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
super.set(with: model, delegateObject, additionalData) super.set(with: model, delegateObject, additionalData)
guard let model = model as? ListFourColumnDataUsageDividerModel else { return } guard let model = model as? ListFourColumnDataUsageDividerModel else { return }
@ -48,6 +48,10 @@ import Foundation
label4.set(with: model.label4, delegateObject, additionalData) label4.set(with: model.label4, delegateObject, additionalData)
} }
open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
return 121
}
// MARK: - MVMCoreUIMoleculeViewProtocol // MARK: - MVMCoreUIMoleculeViewProtocol
open override func reset() { open override func reset() {
super.reset() super.reset()
@ -56,8 +60,4 @@ import Foundation
label3.styleBoldBodySmall(true) label3.styleBoldBodySmall(true)
label4.styleBoldBodySmall(true) label4.styleBoldBodySmall(true)
} }
open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
return 121
}
} }

View File

@ -35,7 +35,7 @@ import Foundation
stack.restack() stack.restack()
} }
// MARK: - MVMCoreUIMoleculeViewProtocol // MARK: - ModelMoleculeViewProtocol
open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) { open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
super.set(with: model, delegateObject, additionalData) super.set(with: model, delegateObject, additionalData)
guard let model = model as? ListThreeColumnPlanDataDividerModel else { return } guard let model = model as? ListThreeColumnPlanDataDividerModel else { return }