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

refactored radiobuttongroup

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-09-08 15:39:39 -05:00
parent 7b6a62eae7
commit ac2a77acf5
3 changed files with 15 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
VDS/Components/RadioBox/RadioBoxGroup.swift
View File

@ -8,10 +8,9 @@
import Foundation
import UIKit
public class RadioBoxGroup: Control<DefaultRadioBoxGroupModel>, SelectorGroupSelectedModelHandlerable, Changable {
public typealias ModelHandlerType = RadioBox
public class RadioBoxGroup: RadioBoxGroupBase<DefaultRadioBoxGroupModel, RadioBox> {
public func didSelect(_ selectedControl: ModelHandlerType) {
public override func didSelect(_ selectedControl: ModelHandlerType) {
//only changes local model in control,
//this is now disconnected from the parent model
for (index, control) in selectorViews.enumerated() {
@ -30,131 +29,12 @@ public class RadioBoxGroup: Control<DefaultRadioBoxGroupModel>, SelectorGroupSel
}
}
sendActions(for: .valueChanged)
}
//--------------------------------------------------
// MARK: - Public Properties
//--------------------------------------------------
public var selectorViews: [ModelHandlerType] = []
public var onChange: Blocks.ActionBlock?
//--------------------------------------------------
// MARK: - Private Properties
//--------------------------------------------------
private var mainStackView: UIStackView = {
return UIStackView().with {
$0.translatesAutoresizingMaskIntoConstraints = false
$0.spacing = 12
}
}()
//--------------------------------------------------
// MARK: - Overrides
//--------------------------------------------------
override public var disabled: Bool {
didSet {
updateSelectors()
}
}
override public var surface: Surface {
didSet {
updateSelectors()
}
}
private func ensureDevice() {
if UIDevice.isIPad {
mainStackView.axis = .horizontal
mainStackView.distribution = .fillEqually
} else {
if UIDevice.current.orientation.isPortrait || UIDevice.current.orientation == .unknown {
mainStackView.axis = .vertical
mainStackView.distribution = .fillProportionally
} else {
mainStackView.axis = .horizontal
mainStackView.distribution = .fillEqually
}
}
}
open override func setup() {
super.setup()
isAccessibilityElement = true
accessibilityTraits = .button
addSubview(mainStackView)
ensureDevice()
mainStackView.topAnchor.constraint(equalTo: topAnchor).isActive = true
mainStackView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
mainStackView.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
mainStackView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
NotificationCenter.default
.publisher(for: UIDevice.orientationDidChangeNotification)
.sink() { [weak self] _ in
UIView.animate(withDuration: 1.0) {
self?.ensureDevice()
}
}.store(in: &subscribers)
}
open override func shouldUpdateView(viewModel: ModelType) -> Bool {
let update = viewModel.selectedModel?.inputId != model.selectedModel?.inputId
|| viewModel.selectors.count != model.selectors.count
|| viewModel.hasError != model.hasError
|| viewModel.surface != model.surface
|| viewModel.disabled != model.disabled
return update
}
open override func updateView(viewModel: ModelType) {
for selectorModel in viewModel.selectors {
//see if view is there for the model
if let foundSelectorView = findSelectorView(inputId: selectorModel.inputId) {
foundSelectorView.set(with: selectorModel)
} else {
//create view
let newSelectorView = createModelHandler(selector: selectorModel)
self.selectorViews.append(newSelectorView)
mainStackView.addArrangedSubview(newSelectorView)
}
}
}
}
public class RadioBoxGroupBase<GroupModelType: RadioBoxGroupModel, ModelHandlerType: ModelHandlerable & UIControl>: Control<GroupModelType>, SelectorGroupSelectedModelHandlerable, Changable where GroupModelType.SelectorModelType == ModelHandlerType.ModelType {
public func didSelect(_ selectedControl: ModelHandlerType) {
//only changes local model in control,
//this is now disconnected from the parent model
for (index, control) in selectorViews.enumerated() {
//only change the old and new
if control == selectedControl {
let updated = model.selectors[index].copyWith {
$0.selected = true
}
model.selectors[index] = updated
} else if control.isSelected {
let updated = model.selectors[index].copyWith {
$0.selected = false
}
model.selectors[index] = updated
}
}
sendActions(for: .valueChanged)
}
//--------------------------------------------------
// MARK: - Public Properties
//--------------------------------------------------
@ -246,4 +126,8 @@ public class RadioBoxGroupBase<GroupModelType: RadioBoxGroupModel, ModelHandlerT
}
}
}
public func didSelect(_ selectedControl: ModelHandlerType) {
fatalError("Must override didSelect")
}
}

11
VDS/Components/RadioButton/RadioButtonGroup.swift
View File

@ -8,10 +8,9 @@
import Foundation
import UIKit
public class RadioButtonGroup: Control<DefaultRadioButtonGroupModel>, SelectorGroupSelectedModelHandlerable, Changable {
public typealias ModelHandlerType = RadioButton
public class RadioButtonGroup: RadioButtonGroupBase<DefaultRadioButtonGroupModel, RadioButton> {
public func didSelect(_ selectedControl: ModelHandlerType) {
public override func didSelect(_ selectedControl: ModelHandlerType) {
//only changes local model in control,
//this is now disconnected from the parent model
for (index, control) in selectorViews.enumerated() {
@ -37,7 +36,9 @@ public class RadioButtonGroup: Control<DefaultRadioButtonGroupModel>, SelectorGr
sendActions(for: .valueChanged)
}
}
public class RadioButtonGroupBase<GroupModelType: RadioButtonGroupModel, ModelHandlerType: ModelHandlerable & UIControl>: Control<GroupModelType>, SelectorGroupSelectedModelHandlerable, Changable where GroupModelType.SelectorModelType == ModelHandlerType.ModelType {
//--------------------------------------------------
// MARK: - Public Properties
@ -129,4 +130,8 @@ public class RadioButtonGroup: Control<DefaultRadioButtonGroupModel>, SelectorGr
}
}
}
public func didSelect(_ selectedControl: ModelHandlerType) {
fatalError("Must override didSelect")
}
}

2
VDS/Components/RadioButton/RadioButtonGroupModel.swift
View File

@ -7,7 +7,7 @@
import Foundation
public protocol RadioButtonGroupModel: SelectorGroupSelectedModelable where SelectorModelType: RadioButtonModel { }
public protocol RadioButtonGroupModel: SelectorGroupSelectedModelable, Errorable where SelectorModelType: RadioButtonModel { }
extension RadioButtonGroupModel {
public var errorText: String? { return nil }