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

fixing wire ups

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-09-23 16:39:24 -05:00
parent fba9567de7
commit 974219912b
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VDSSample.xcodeproj/project.pbxproj
View File

@ -249,6 +249,7 @@
EA3C3BB228996775000CA526 /* MenuViewController.swift */, EA3C3BB228996775000CA526 /* MenuViewController.swift */,
EAB1D2C828AAAA1D00DAE764 /* ModelScrollViewController.swift */, EAB1D2C828AAAA1D00DAE764 /* ModelScrollViewController.swift */,
EA4DB30328DCD25B00103EE3 /* BadgeViewController.swift */, EA4DB30328DCD25B00103EE3 /* BadgeViewController.swift */,
5FC35BE828D5235A004EBEAC /* ButtonViewController.swift */,
EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */, EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */,
EAF7F09B2899B92400B287F5 /* CheckboxViewController.swift */, EAF7F09B2899B92400B287F5 /* CheckboxViewController.swift */,
EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */, EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */,
@ -256,7 +257,6 @@
EAF7F11928A14A0E00B287F5 /* RadioButtonViewController.swift */, EAF7F11928A14A0E00B287F5 /* RadioButtonViewController.swift */,
EA84F76128BE4AE500D67ABC /* RadioSwatchGroupViewController.swift */, EA84F76128BE4AE500D67ABC /* RadioSwatchGroupViewController.swift */,
EA3C3BB328996775000CA526 /* ToggleViewController.swift */, EA3C3BB328996775000CA526 /* ToggleViewController.swift */,
5FC35BE828D5235A004EBEAC /* ButtonViewController.swift */,
); );
path = ViewControllers; path = ViewControllers;
sourceTree = "<group>"; sourceTree = "<group>";

6
VDSSample/Protocols/PickerBase.swift
View File

@ -102,10 +102,4 @@ class UsePicker: PickerBase<Use> {
} }
} }
class ButtonSizePicker: PickerBase<Use.Size> {
init(){
super.init(items: [.large, .small])
}
}

12
VDSSample/ViewControllers/ButtonViewController.swift
View File

@ -70,14 +70,14 @@ class ButtonViewController: ModelScrollViewController<DefaultButtonModel> {
textField textField
.textPublisher .textPublisher
.sink { [weak self] text in .sink { [weak self] text in
self?.button.setTitle(text, for: .normal) self?.button.text = text
}.store(in: &subscribers) }.store(in: &subscribers)
widthTextField widthTextField
.textPublisher .textPublisher
.sink { [weak self] text in .sink { [weak self] text in
if let n = NumberFormatter().number(from: text) { if let n = NumberFormatter().number(from: text) {
self?.button.buttonWidth = CGFloat(truncating: n) self?.button.width = CGFloat(truncating: n)
} }
}.store(in: &subscribers) }.store(in: &subscribers)
@ -105,8 +105,8 @@ class ButtonViewController: ModelScrollViewController<DefaultButtonModel> {
disabledSwitch.isOn = model.disabled disabledSwitch.isOn = model.disabled
textField.text = model.text textField.text = model.text
usePickerSelectorView.text = model.use.rawValue usePickerSelectorView.text = model.use.rawValue
widthTextField.text = "200" widthTextField.text = ""
buttonSizePickerSelectorView.text = Use.Size.large.rawValue buttonSizePickerSelectorView.text = ButtonSize.large.rawValue
} }
override func updateView(viewModel: DefaultButtonModel) { override func updateView(viewModel: DefaultButtonModel) {
@ -116,7 +116,7 @@ class ButtonViewController: ModelScrollViewController<DefaultButtonModel> {
//Picker //Picker
var surfacePicker = SurfacePicker() var surfacePicker = SurfacePicker()
var usePicker = UsePicker() var usePicker = UsePicker()
var buttonSizePicker = ButtonSizePicker() var buttonSizePicker = PickerBase<ButtonSize>.init(items: ButtonSize.allCases)
var pickerType: PickerType = .surface { var pickerType: PickerType = .surface {
didSet { didSet {
@ -153,7 +153,7 @@ class ButtonViewController: ModelScrollViewController<DefaultButtonModel> {
} }
buttonSizePicker.onPickerDidSelect = { [weak self] item in buttonSizePicker.onPickerDidSelect = { [weak self] item in
self?.button.buttonSize = item self?.button.size = item
self?.buttonSizePickerSelectorView.text = item.rawValue self?.buttonSizePickerSelectorView.text = item.rawValue
} }
} }

5
VDSSample/ViewControllers/MenuViewController.swift
View File

@ -20,15 +20,14 @@ protocol Initable {
class MenuViewController: UITableViewController { class MenuViewController: UITableViewController {
let items: [MenuComponent] = [ let items: [MenuComponent] = [
MenuComponent(title: "Badge", viewController: BadgeViewController.self), MenuComponent(title: "Badge", viewController: BadgeViewController.self),
MenuComponent(title: "Button", viewController: ButtonViewController.self),
MenuComponent(title: "Checkbox", viewController: CheckboxViewController.self), MenuComponent(title: "Checkbox", viewController: CheckboxViewController.self),
MenuComponent(title: "CheckboxGroup", viewController: CheckboxGroupViewController.self), MenuComponent(title: "CheckboxGroup", viewController: CheckboxGroupViewController.self),
MenuComponent(title: "Label", viewController: LabelViewController.self), MenuComponent(title: "Label", viewController: LabelViewController.self),
MenuComponent(title: "RadioButtonGroup", viewController: RadioButtonViewController.self), MenuComponent(title: "RadioButtonGroup", viewController: RadioButtonViewController.self),
MenuComponent(title: "RadioBoxGroup", viewController: RadioBoxGroupViewController.self), MenuComponent(title: "RadioBoxGroup", viewController: RadioBoxGroupViewController.self),
MenuComponent(title: "RadioSwatchGroup", viewController: RadioSwatchGroupViewController.self), MenuComponent(title: "RadioSwatchGroup", viewController: RadioSwatchGroupViewController.self),
MenuComponent(title: "Toggle", viewController: ToggleViewController.self), MenuComponent(title: "Toggle", viewController: ToggleViewController.self)
MenuComponent(title: "Button", viewController: ButtonViewController.self)
] ]
override func numberOfSections(in tableView: UITableView) -> Int { override func numberOfSections(in tableView: UITableView) -> Int {