From 9f547669f6b7a9f8aa4f76bfdb597e01210c585f Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Mon, 8 Jun 2020 14:43:38 -0400 Subject: [PATCH 1/2] Minor cleaning --- MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift | 5 ++++- MVMCoreUI/Atomic/Atoms/Views/LineModel.swift | 6 ++++++ MVMCoreUI/BaseControllers/ViewController.swift | 2 +- MVMCoreUI/FormUIHelpers/FormValidator.swift | 12 ++++++------ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift b/MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift index d5ba0a14..637b074d 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift @@ -21,8 +21,11 @@ import Foundation public var contentMode: UIView.ContentMode? public var localBundle: Bundle? - public init(image: String) { + public init(image: String, imageFormat: String? = nil, width: CGFloat? = nil, height: CGFloat? = nil) { self.image = image + self.imageFormat = imageFormat + self.width = width + self.height = height } private enum CodingKeys: String, CodingKey { diff --git a/MVMCoreUI/Atomic/Atoms/Views/LineModel.swift b/MVMCoreUI/Atomic/Atoms/Views/LineModel.swift index 3189deab..0f67b3f0 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/LineModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/LineModel.swift @@ -71,6 +71,12 @@ import UIKit self.useVerticalLine = false } + public init(verticalLineOf type: Style, backgroundColor: Color? = nil) { + self.type = type + self.backgroundColor = backgroundColor + self.useVerticalLine = true + } + //-------------------------------------------------- // MARK: - Keys //-------------------------------------------------- diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift index 717a5761..395587ec 100644 --- a/MVMCoreUI/BaseControllers/ViewController.swift +++ b/MVMCoreUI/BaseControllers/ViewController.swift @@ -263,7 +263,7 @@ import UIKit // MARK: - TabBar open func updateTabBar() { guard MVMCoreUISplitViewController.main()?.getCurrentDetailViewController() == self, - var tabModel = pageModel as? TabPageModelProtocol else { return } + let tabModel = pageModel as? TabPageModelProtocol else { return } if let index = tabModel.tabBarIndex { MVMCoreUISplitViewController.main()?.tabBar?.highlightTab(at: index) } diff --git a/MVMCoreUI/FormUIHelpers/FormValidator.swift b/MVMCoreUI/FormUIHelpers/FormValidator.swift index 744304ba..0ece4b4b 100644 --- a/MVMCoreUI/FormUIHelpers/FormValidator.swift +++ b/MVMCoreUI/FormUIHelpers/FormValidator.swift @@ -15,12 +15,12 @@ import MVMCore // MARK: - Properties //-------------------------------------------------- - static var defaultGroupName: String = "default" - var formRules: [FormGroupRule]? - weak var delegate: FormHolderProtocol? - var fields: [String: FormFieldProtocol] = [:] - var groupWatchers: [FormGroupWatcherFieldProtocol] = [] - var radioButtonsModelByGroup: [String: RadioButtonSelectionHelper] = [:] + public static var defaultGroupName: String = "default" + public var formRules: [FormGroupRule]? + public weak var delegate: FormHolderProtocol? + public var fields: [String: FormFieldProtocol] = [:] + public var groupWatchers: [FormGroupWatcherFieldProtocol] = [] + public var radioButtonsModelByGroup: [String: RadioButtonSelectionHelper] = [:] //-------------------------------------------------- // MARK: - Initializer From ee029aa103902af3d0626427f0d95fe0d99839b4 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Mon, 8 Jun 2020 17:10:54 -0400 Subject: [PATCH 2/2] matching change in label --- MVMCoreUI/Atomic/Atoms/FormFields/Tags/Tag.swift | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/Tags/Tag.swift b/MVMCoreUI/Atomic/Atoms/FormFields/Tags/Tag.swift index c962f8c9..bc905a79 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/Tags/Tag.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/Tags/Tag.swift @@ -8,11 +8,18 @@ import Foundation + @objcMembers open class Tag: View { + //-------------------------------------------------- + // MARK: - Outlets + //-------------------------------------------------- - public let label = Label.createLabelRegularBodySmall(true) + public let label = Label(fontStyle: .RegularBodySmall) + //-------------------------------------------------- // MARK: - MVMCoreViewProtocol + //-------------------------------------------------- + open override func setupView() { super.setupView() layer.borderColor = UIColor.mvmCoolGray6.cgColor @@ -22,9 +29,10 @@ import Foundation NSLayoutConstraint.constraintPinSubview(label, pinTop: true, topConstant: 13, pinBottom: true, bottomConstant: 13, pinLeft: true, leftConstant: 15, pinRight: true, rightConstant: 15) } - // MARK: - MoleculeViewProtocol open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { + guard let model = model as? TagModel else { return } + label.set(with: model.label, delegateObject, additionalData) } @@ -36,6 +44,6 @@ import Foundation open override func reset() { super.reset() label.reset() - label.styleRegularBodySmall(true) + label.setFontStyle(.RegularBodySmall) } }