From 8b05b20f515870afe93142d4e69a786b5c4aa255 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Tue, 5 May 2020 09:00:47 -0400 Subject: [PATCH] latest state --- MVMCoreUI/Atomic/Atoms/Views/Arrow.swift | 10 +++---- .../NumericIndicatorView.swift | 4 +-- .../Protocols/MoleculeViewProtocol.swift | 2 +- MVMCoreUI/BaseClasses/View.swift | 26 ++++++++++++------- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/Arrow.swift b/MVMCoreUI/Atomic/Atoms/Views/Arrow.swift index b618d43d..ae5182e5 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/Arrow.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/Arrow.swift @@ -78,11 +78,11 @@ open class Arrow: View { super.init(frame: frame) } - public convenience init(model: ArrowModel, degrees: Float = 0) { - self.init(frame: .zero) - self.model = model - arrowModel?.degrees = degrees - } +// public convenience init(degrees: Float = 0) { +// self.init(frame: .zero) +// self.model = ArrowModel() +// arrowModel?.degrees = degrees +// } public required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift index d93d7709..634038c1 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift @@ -24,14 +24,14 @@ open class NumericIndicatorView: CarouselIndicator { }() let leftArrow: Arrow = { - let arrow = Arrow(model: ArrowModel(), degrees: 180) + let arrow = Arrow(model: ArrowModel(), nil, nil) arrow.isAccessibilityElement = false arrow.pinHeightAndWidth() return arrow }() let rightArrow: Arrow = { - let arrow = Arrow(model: ArrowModel()) + let arrow = Arrow() arrow.pinHeightAndWidth() return arrow }() diff --git a/MVMCoreUI/Atomic/Protocols/MoleculeViewProtocol.swift b/MVMCoreUI/Atomic/Protocols/MoleculeViewProtocol.swift index 1654a34b..db0de647 100644 --- a/MVMCoreUI/Atomic/Protocols/MoleculeViewProtocol.swift +++ b/MVMCoreUI/Atomic/Protocols/MoleculeViewProtocol.swift @@ -45,7 +45,7 @@ extension MoleculeViewProtocol { } // Do nothing, optionals. - public func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {} + public func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {} public func reset() {} public static func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { diff --git a/MVMCoreUI/BaseClasses/View.swift b/MVMCoreUI/BaseClasses/View.swift index b5fdc5e7..c0ca8ee1 100644 --- a/MVMCoreUI/BaseClasses/View.swift +++ b/MVMCoreUI/BaseClasses/View.swift @@ -8,11 +8,16 @@ import UIKit + @objcMembers open class View: UIView, MoleculeViewProtocol { + //-------------------------------------------------- + // MARK: - Properties + //-------------------------------------------------- + open var model: MoleculeModelProtocol? - + private var initialSetupPerformed = false - + //-------------------------------------------------- // MARK: - Initialization //-------------------------------------------------- @@ -21,7 +26,7 @@ import UIKit super.init(frame: .zero) initialSetup() } - + public convenience init() { self.init(frame: .zero) } @@ -38,12 +43,15 @@ import UIKit } } - // MARK:- MoleculeViewProtocol + //-------------------------------------------------- + // MARK: - MoleculeViewProtocol + //-------------------------------------------------- + open func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { - self.model = model - if let backgroundColor = model.backgroundColor { + self.model = model + if let backgroundColor = model.backgroundColor { self.backgroundColor = backgroundColor.uiColor - } + } } open class func nameForReuse(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> String? { @@ -66,8 +74,8 @@ import UIKit // MARK:- MVMCoreViewProtocol extension View: MVMCoreViewProtocol { - open func updateView(_ size: CGFloat) {} - + open func updateView(_ size: CGFloat) { } + /// Will be called only once. open func setupView() { translatesAutoresizingMaskIntoConstraints = false