From e0abe4c8cd6ed62f6d6107f4de8dad5ca460758d Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Thu, 23 Jan 2020 10:40:17 -0500 Subject: [PATCH 1/2] More opening --- .../SwitchMolecules/LabelSwitch.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/LabelSwitch.swift b/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/LabelSwitch.swift index dcb8dd58..b2cb5069 100644 --- a/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/LabelSwitch.swift +++ b/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/LabelSwitch.swift @@ -8,9 +8,9 @@ import UIKit -@objcMembers public class LabelSwitch: View { - let label = Label.commonLabelB1(true) - let mvmSwitch = Toggle() +@objcMembers open class LabelSwitch: View { + public let label = Label.commonLabelB1(true) + public let mvmSwitch = Toggle() // MARK: - MVMCoreViewProtocol open override func updateView(_ size: CGFloat) { @@ -19,7 +19,7 @@ import UIKit mvmSwitch.updateView(size) } - public override func setupView() { + open override func setupView() { super.setupView() guard mvmSwitch.superview == nil else { return @@ -32,14 +32,14 @@ import UIKit } // MARK:- ModelMoleculeViewProtocol - public override class func estimatedHeight(forRow molecule: MoleculeModelProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { + open override class func estimatedHeight(forRow molecule: MoleculeModelProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { guard let model = molecule as? LabelToggleModel, let toggleHeight = Toggle.estimatedHeight(forRow: model.toggle, delegateObject: delegateObject), let labelHeight = Label.estimatedHeight(forRow: model.label, delegateObject: delegateObject) else { return nil } return max(toggleHeight, labelHeight) } - public override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { + open override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { guard let labelToggleModel = model as? LabelToggleModel else { return } @@ -48,7 +48,7 @@ import UIKit } // MARK: - MVMCoreUIMoleculeViewProtocol - public override func reset() { + open override func reset() { super.reset() label.reset() (mvmSwitch as MVMCoreUIMoleculeViewProtocol).reset?() From d3edf62a943af8c3448ef478c2ce2e93db64ae28 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Thu, 23 Jan 2020 10:42:39 -0500 Subject: [PATCH 2/2] toggle name change --- .../SwitchMolecules/LabelSwitch.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/LabelSwitch.swift b/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/LabelSwitch.swift index b2cb5069..a7688121 100644 --- a/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/LabelSwitch.swift +++ b/MVMCoreUI/Molecules/LeftRightViews/SwitchMolecules/LabelSwitch.swift @@ -10,25 +10,25 @@ import UIKit @objcMembers open class LabelSwitch: View { public let label = Label.commonLabelB1(true) - public let mvmSwitch = Toggle() + public let toggle = Toggle() // MARK: - MVMCoreViewProtocol open override func updateView(_ size: CGFloat) { super.updateView(size) label.updateView(size) - mvmSwitch.updateView(size) + toggle.updateView(size) } open override func setupView() { super.setupView() - guard mvmSwitch.superview == nil else { + guard toggle.superview == nil else { return } addSubview(label) - addSubview(mvmSwitch) + addSubview(toggle) label.setContentHuggingPriority(UILayoutPriority.required, for: NSLayoutConstraint.Axis.vertical) - NSLayoutConstraint.pinSubviewsCenter(leftView: label, rightView: mvmSwitch) + NSLayoutConstraint.pinSubviewsCenter(leftView: label, rightView: toggle) } // MARK:- ModelMoleculeViewProtocol @@ -44,14 +44,14 @@ import UIKit return } label.setWithModel(labelToggleModel.label, delegateObject, additionalData) - mvmSwitch.setWithModel(labelToggleModel.toggle, delegateObject, additionalData) + toggle.setWithModel(labelToggleModel.toggle, delegateObject, additionalData) } // MARK: - MVMCoreUIMoleculeViewProtocol open override func reset() { super.reset() label.reset() - (mvmSwitch as MVMCoreUIMoleculeViewProtocol).reset?() + toggle.reset() label.styleB1(true) } }