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

refactored controls

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-08-10 14:43:00 -05:00
parent 26642e2d55
commit c368f275cb
9 changed files with 58 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
VDS/Classes/Control.swift
View File

@ -15,10 +15,6 @@ open class Control<ModelType: Modelable>: UIControl, ModelHandlerable, ViewProto
@Published public var model: ModelType
private var cancellable: AnyCancellable?
open func set(with model: ModelType) {
self.model = model
}
open func shouldUpdateView(viewModel: ModelType) -> Bool {
fatalError("Implement shouldUpdateView")
}
@ -41,12 +37,22 @@ open class Control<ModelType: Modelable>: UIControl, ModelHandlerable, ViewProto
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
required public init() {
self.model = ModelType()
super.init(frame: .zero)
initialSetup()
}
required public init(with model: ModelType) {
public required init(with model: ModelType) {
self.model = model
super.init(frame: .zero)
initialSetup()
set(with: model)
}
public override init(frame: CGRect) {
self.model = ModelType()
super.init(frame: .zero)
initialSetup()
}
public required init?(coder: NSCoder) {

19
VDS/Classes/View.swift
View File

@ -15,10 +15,6 @@ open class View<ModelType: Modelable>: UIView, ModelHandlerable, ViewProtocol, R
@Published public var model: ModelType
private var cancellable: AnyCancellable?
open func set(with model: ModelType) {
self.model = model
}
open func shouldUpdateView(viewModel: ModelType) -> Bool {
fatalError("Implement shouldUpdateView")
}
@ -37,15 +33,26 @@ open class View<ModelType: Modelable>: UIView, ModelHandlerable, ViewProtocol, R
@Proxy(\.model.disabled)
open var disabled: Bool
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
required public init() {
self.model = ModelType()
super.init(frame: .zero)
initialSetup()
}
required public init(with model: ModelType) {
public required init(with model: ModelType) {
self.model = model
super.init(frame: .zero)
initialSetup()
set(with: model)
}
public override init(frame: CGRect) {
self.model = ModelType()
super.init(frame: .zero)
initialSetup()
}
public required init?(coder: NSCoder) {

15
VDS/Components/Checkbox/Checkbox.swift
View File

@ -58,21 +58,6 @@ open class CheckboxBase<ModelType: CheckboxModel>: SelectorBase<ModelType> {
return config
}()
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
public convenience init() {
self.init(with: ModelType())
}
required public init(with model: ModelType) {
super.init(with: model)
}
required public init?(coder: NSCoder) {
super.init(with: ModelType())
}
//--------------------------------------------------
// MARK: - Checkbox View
//--------------------------------------------------

39
VDS/Components/Label/Label.swift
View File

@ -12,7 +12,7 @@ import Combine
public class Label:LabelBase<DefaultLabelModel>{}
open class LabelBase<ModelType: LabelModel>: UILabel, ModelHandlerable, Initable, Resettable {
open class LabelBase<ModelType: LabelModel>: UILabel, ModelHandlerable, Initable, Resettable, ViewProtocol {
//--------------------------------------------------
// MARK: - Combine Properties
@ -62,32 +62,34 @@ open class LabelBase<ModelType: LabelModel>: UILabel, ModelHandlerable, Initable
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
required public convenience init() {
self.init(frame: .zero)
required public init() {
self.model = ModelType()
super.init(frame: .zero)
initialSetup()
}
public required convenience init(with model: ModelType) {
self.init()
public required init(with model: ModelType) {
self.model = model
super.init(frame: .zero)
initialSetup()
}
public override init(frame: CGRect) {
self.model = ModelType()
super.init(frame: frame)
setup()
super.init(frame: .zero)
initialSetup()
}
required public init?(coder: NSCoder) {
self.model = ModelType()
public required init?(coder: NSCoder) {
self.model = ModelType.init()
super.init(coder: coder)
setup()
initialSetup()
}
//--------------------------------------------------
// MARK: - Public Functions
//--------------------------------------------------
open func setup() {
open func initialSetup() {
backgroundColor = .clear
numberOfLines = 0
lineBreakMode = .byWordWrapping
@ -104,9 +106,13 @@ open class LabelBase<ModelType: LabelModel>: UILabel, ModelHandlerable, Initable
self.updateView(viewModel: viewModel)
}
setup()
}
public func reset() {
open func setup() {}
open func reset() {
text = nil
attributedText = nil
textColor = .black
@ -116,12 +122,7 @@ open class LabelBase<ModelType: LabelModel>: UILabel, ModelHandlerable, Initable
accessibilityTraits = .staticText
numberOfLines = 0
}
//Modelable
open func set(with model: ModelType) {
self.model = model
}
//--------------------------------------------------
// MARK: - State
//--------------------------------------------------

18
VDS/Components/RadioButton/RadioButton.swift
View File

@ -100,23 +100,7 @@ open class RadioButtonBase<ModelType: RadioButtonModel>: SelectorBase<ModelType>
config.forTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark
return config
}()
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
public convenience init() {
self.init(with: ModelType())
}
required public init(with model: ModelType) {
super.init(with: model)
}
required public init?(coder: NSCoder) {
super.init(with: ModelType())
}
//--------------------------------------------------
// MARK: - RadioButton View
//--------------------------------------------------

15
VDS/Components/SelectorBase/SelectorBase.swift
View File

@ -139,21 +139,6 @@ open class SelectorBase<ModelType: SelectorModel>: Control<ModelType>, Changable
}
}
}
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
public convenience init() {
self.init(with: ModelType())
}
required public init(with model: ModelType) {
super.init(with: model)
}
required public init?(coder: NSCoder) {
super.init(with: ModelType())
}
//--------------------------------------------------
// MARK: - Constraints

15
VDS/Components/SelectorBase/SelectorGroup.swift
View File

@ -115,19 +115,4 @@ open class SelectorGroup<SelectorType, SelectorGroupType: SelectorGroupModel<Sel
}
open func didSelect(selector: SelectorHandlerType) { }
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
public convenience init() {
self.init(with: ModelType())
}
required public init(with model: ModelType) {
super.init(with: model)
}
required public init?(coder: NSCoder) {
super.init(with: ModelType())
}
}

17
VDS/Components/Toggle/Toggle.swift
View File

@ -170,22 +170,7 @@ open class ToggleBase<ModelType: ToggleModel>: Control<ModelType>, Changable {
}
}
}
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
public convenience init() {
self.init(with: ModelType())
}
required public init(with model: ModelType) {
super.init(with: model)
}
required public init?(coder: NSCoder) {
super.init(with: ModelType())
}
//--------------------------------------------------
// MARK: - Constraints
//--------------------------------------------------

12
VDS/Protocols/ModelHandlerable.swift
View File

@ -7,7 +7,7 @@
import Foundation
public protocol ModelHandlerable {
public protocol ModelHandlerable: AnyObject {
associatedtype ModelType: Modelable
var model: ModelType { get set }
@ -16,3 +16,13 @@ public protocol ModelHandlerable {
func shouldUpdateView(viewModel: ModelType) -> Bool
func updateView(viewModel: ModelType)
}
extension ModelHandlerable {
public func set(with model: ModelType) {
if shouldUpdateView(viewModel: model){
updateView(viewModel: model)
self.model = model
}
}
}