From 0a26abe3911ec2eff400b012d47a65ad957f437c Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 3 Oct 2022 15:29:02 -0500 Subject: [PATCH 1/4] refactored picker base Signed-off-by: Matt Bruce --- VDSSample/Protocols/PickerBase.swift | 5 ++++- VDSSample/ViewControllers/BadgeViewController.swift | 3 --- .../ViewControllers/ButtonViewController.swift | 3 --- .../CheckBoxGroupViewController.swift | 1 - .../ViewControllers/CheckboxViewController.swift | 1 - VDSSample/ViewControllers/LabelViewController.swift | 1 - VDSSample/ViewControllers/MenuViewController.swift | 1 + .../ViewControllers/ModelScrollViewController.swift | 13 ++++++++++++- .../RadioBoxGroupViewController.swift | 1 - .../ViewControllers/RadioButtonViewController.swift | 1 - .../RadioSwatchGroupViewController.swift | 1 - .../ViewControllers/ToggleViewController.swift | 3 --- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/VDSSample/Protocols/PickerBase.swift b/VDSSample/Protocols/PickerBase.swift index 09b71dd..fb7bf6f 100644 --- a/VDSSample/Protocols/PickerBase.swift +++ b/VDSSample/Protocols/PickerBase.swift @@ -29,6 +29,7 @@ public protocol PickerViewable: UIPickerViewDataSource, UIPickerViewDelegate, Ha associatedtype EnumType: RawRepresentable var items: [EnumType] { get set } var onPickerDidSelect: ((EnumType) -> Void)? { get set } + var scrollToBottom: (()->Void)? { get set } } public class PickerSelectorView: UIStackView, PickerViewable { @@ -50,7 +51,7 @@ public class PickerSelectorView: UIStackView, Picker didSet { selectedIndex = 0 } } public var onPickerDidSelect: ((EnumType) -> Void)? - + public var scrollToBottom: (()->Void)? public init(title: String, picker: UIPickerView? = nil, items: [EnumType]) { self.picker = picker self.items = items @@ -70,6 +71,7 @@ public class PickerSelectorView: UIStackView, Picker self?.picker?.reloadAllComponents() self?.picker?.selectRow(self?.selectedIndex ?? 0, inComponent: 0, animated: false) self?.picker?.isHidden = false + self?.scrollToBottom?() }.store(in: &subscribers) } @@ -94,6 +96,7 @@ public class PickerSelectorView: UIStackView, Picker guard row - 1 >= 0 else { return } selectedIndex = row onPickerDidSelect?(items[row-1]) + text = "\(items[row-1].rawValue)" pickerView.isHidden = true } } diff --git a/VDSSample/ViewControllers/BadgeViewController.swift b/VDSSample/ViewControllers/BadgeViewController.swift index 89c5449..718b323 100644 --- a/VDSSample/ViewControllers/BadgeViewController.swift +++ b/VDSSample/ViewControllers/BadgeViewController.swift @@ -122,17 +122,14 @@ class BadgeViewController: ModelScrollViewController { surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in self?.badge.surface = item self?.contentTopView.backgroundColor = item.color - self?.surfacePickerSelectorView.text = item.rawValue } fillColorPickerSelectorView.onPickerDidSelect = { [weak self] item in self?.badge.fillColor = item - self?.fillColorPickerSelectorView.text = item.rawValue } numberOfLinesPickerSelectorView.onPickerDidSelect = { [weak self] item in self?.badge.numberOfLines = item.intValue - self?.numberOfLinesPickerSelectorView.text = item.rawValue } } } diff --git a/VDSSample/ViewControllers/ButtonViewController.swift b/VDSSample/ViewControllers/ButtonViewController.swift index e14ed3e..913e390 100644 --- a/VDSSample/ViewControllers/ButtonViewController.swift +++ b/VDSSample/ViewControllers/ButtonViewController.swift @@ -112,18 +112,15 @@ class ButtonViewController: ModelScrollViewController { surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in self?.button.surface = item self?.contentTopView.backgroundColor = item.color - self?.surfacePickerSelectorView.text = item.rawValue } usePickerSelectorView.onPickerDidSelect = { [weak self] item in self?.button.use = item self?.button.backgroundColor = item.color - self?.usePickerSelectorView.text = item.rawValue } buttonSizePickerSelectorView.onPickerDidSelect = { [weak self] item in self?.button.size = item - self?.buttonSizePickerSelectorView.text = item.rawValue } } } diff --git a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift index a516152..e9ae872 100644 --- a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift +++ b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift @@ -119,7 +119,6 @@ class CheckboxGroupViewController: ModelScrollViewController { surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in self?.checkbox.surface = item self?.contentTopView.backgroundColor = item.color - self?.surfacePickerSelectorView.text = item.rawValue } } } diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift index ef9e85a..400c7b1 100644 --- a/VDSSample/ViewControllers/LabelViewController.swift +++ b/VDSSample/ViewControllers/LabelViewController.swift @@ -127,7 +127,6 @@ class LabelViewController: ModelScrollViewController { surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in self?.label.surface = item self?.contentTopView.backgroundColor = item.color - self?.surfacePickerSelectorView.text = item.rawValue } textSizePickerSelectorView.onPickerDidSelect = { [weak self] item in diff --git a/VDSSample/ViewControllers/MenuViewController.swift b/VDSSample/ViewControllers/MenuViewController.swift index c898bcb..fe6333e 100644 --- a/VDSSample/ViewControllers/MenuViewController.swift +++ b/VDSSample/ViewControllers/MenuViewController.swift @@ -27,6 +27,7 @@ class MenuViewController: UITableViewController { MenuComponent(title: "RadioButtonGroup", viewController: RadioButtonViewController.self), MenuComponent(title: "RadioBoxGroup", viewController: RadioBoxGroupViewController.self), MenuComponent(title: "RadioSwatchGroup", viewController: RadioSwatchGroupViewController.self), + MenuComponent(title: "TextEntryField", viewController: TextEntryFieldViewController.self), MenuComponent(title: "Toggle", viewController: ToggleViewController.self) ] diff --git a/VDSSample/ViewControllers/ModelScrollViewController.swift b/VDSSample/ViewControllers/ModelScrollViewController.swift index 376b885..abb9f67 100644 --- a/VDSSample/ViewControllers/ModelScrollViewController.swift +++ b/VDSSample/ViewControllers/ModelScrollViewController.swift @@ -71,6 +71,7 @@ public class ModelScrollViewController: UIViewController, initialSetupPerformed = true setupUpdateView() setup() + surfacePickerSelectorView.scrollToBottom = { [weak self] in self?.scrollToBottom()} } } @@ -80,6 +81,7 @@ public class ModelScrollViewController: UIViewController, public var picker: UIPickerView = { return UIPickerView().with { + $0.backgroundColor = .white $0.translatesAutoresizingMaskIntoConstraints = false } }() @@ -138,7 +140,7 @@ public class ModelScrollViewController: UIViewController, formStackView.topAnchor.constraint(equalTo: contentBottomView.topAnchor, constant: edgeSpacing).isActive = true formStackView.leadingAnchor.constraint(equalTo: contentBottomView.leadingAnchor, constant: edgeSpacing).isActive = true formStackView.trailingAnchor.constraint(equalTo: contentBottomView.trailingAnchor, constant: -edgeSpacing).isActive = true - formStackView.bottomAnchor.constraint(equalTo: contentBottomView.bottomAnchor, constant: -150).isActive = true + formStackView.bottomAnchor.constraint(equalTo: contentBottomView.bottomAnchor, constant: -100).isActive = true view.addSubview(picker) picker.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor).isActive = true @@ -149,6 +151,11 @@ public class ModelScrollViewController: UIViewController, private let scrollViewController = ScrollViewController() + public func scrollToBottom() { + let bottomOffset = CGPoint(x: 0, y: scrollViewController.scrollView.contentSize.height - scrollViewController.scrollView.bounds.height + scrollViewController.scrollView.contentInset.bottom) + scrollViewController.scrollView.setContentOffset(bottomOffset, animated: true) + } + private func embed(_ viewController: UIViewController) { addChild(viewController) view.addSubview(viewController.view) @@ -190,6 +197,10 @@ public class ModelScrollViewController: UIViewController, } else { formStackView.addArrangedSubview(formRow) } + + if let pickerViewable = view as? any PickerViewable { + pickerViewable.scrollToBottom = { [weak self] in self?.scrollToBottom() } + } } open func setup() {} diff --git a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift index 813db61..0bb56d0 100644 --- a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift +++ b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift @@ -130,7 +130,6 @@ class RadioBoxGroupViewController: ModelScrollViewController { surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in self?.toggle.surface = item self?.contentTopView.backgroundColor = item.color - self?.surfacePickerSelectorView.text = item.rawValue } textSizePickerSelectorView.onPickerDidSelect = { [weak self] item in self?.toggle.fontSize = item - self?.textSizePickerSelectorView.text = item.rawValue } textPositionPickerSelectorView.onPickerDidSelect = { [weak self] item in self?.toggle.textPosition = item - self?.textPositionPickerSelectorView.text = item.rawValue } } From bde65dcd13ad314051a2ce0ad84fae18a8d02f2b Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 3 Oct 2022 15:29:08 -0500 Subject: [PATCH 2/4] added entry field Signed-off-by: Matt Bruce --- VDSSample.xcodeproj/project.pbxproj | 4 + .../TextEntryFieldViewController.swift | 167 ++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 VDSSample/ViewControllers/TextEntryFieldViewController.swift diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj index 14cebf8..b90000e 100644 --- a/VDSSample.xcodeproj/project.pbxproj +++ b/VDSSample.xcodeproj/project.pbxproj @@ -53,6 +53,7 @@ EA89204C28B66CE2006B9984 /* ScrollWrapperView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89204528B66CE2006B9984 /* ScrollWrapperView.swift */; }; EA89204E28B67332006B9984 /* CheckBoxGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */; }; EA89205128B68307006B9984 /* TextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89205028B68307006B9984 /* TextField.swift */; }; + EAA5EEAD28EB6924003B3210 /* TextEntryFieldViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA5EEAC28EB6924003B3210 /* TextEntryFieldViewController.swift */; }; EAB1D2C928AAAA1D00DAE764 /* ModelScrollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2C828AAAA1D00DAE764 /* ModelScrollViewController.swift */; }; EAB1D2D428AC409F00DAE764 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */; }; EAF7F07D2899698800B287F5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F07B2899698800B287F5 /* Assets.xcassets */; }; @@ -116,6 +117,7 @@ EA89204528B66CE2006B9984 /* ScrollWrapperView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrollWrapperView.swift; sourceTree = ""; }; EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckBoxGroupViewController.swift; sourceTree = ""; }; EA89205028B68307006B9984 /* TextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextField.swift; sourceTree = ""; }; + EAA5EEAC28EB6924003B3210 /* TextEntryFieldViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextEntryFieldViewController.swift; sourceTree = ""; }; EAB1D2C828AAAA1D00DAE764 /* ModelScrollViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelScrollViewController.swift; sourceTree = ""; }; EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = ""; }; EAF7F07B2899698800B287F5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -256,6 +258,7 @@ EA89201828B56DF5006B9984 /* RadioBoxGroupViewController.swift */, EAF7F11928A14A0E00B287F5 /* RadioButtonViewController.swift */, EA84F76128BE4AE500D67ABC /* RadioSwatchGroupViewController.swift */, + EAA5EEAC28EB6924003B3210 /* TextEntryFieldViewController.swift */, EA3C3BB328996775000CA526 /* ToggleViewController.swift */, ); path = ViewControllers; @@ -419,6 +422,7 @@ EA89204828B66CE2006B9984 /* ScrollViewKeyboardAvoiding.swift in Sources */, EAF7F09C2899B92400B287F5 /* CheckboxViewController.swift in Sources */, EA89204E28B67332006B9984 /* CheckBoxGroupViewController.swift in Sources */, + EAA5EEAD28EB6924003B3210 /* TextEntryFieldViewController.swift in Sources */, EA89204928B66CE2006B9984 /* KeyboardFrameChangeListening.swift in Sources */, EAB1D2D428AC409F00DAE764 /* LabelViewController.swift in Sources */, EA89204B28B66CE2006B9984 /* ScrollViewKeyboardAvoider.swift in Sources */, diff --git a/VDSSample/ViewControllers/TextEntryFieldViewController.swift b/VDSSample/ViewControllers/TextEntryFieldViewController.swift new file mode 100644 index 0000000..d4227b0 --- /dev/null +++ b/VDSSample/ViewControllers/TextEntryFieldViewController.swift @@ -0,0 +1,167 @@ +// +// TextEntryFieldViewController.swift +// VDSSample +// +// Created by Matt Bruce on 10/3/22. +// + +import Foundation +import UIKit +import VDS +import VDSColorTokens +import Combine + +class TextEntryFieldViewController: ModelScrollViewController { + + lazy var helperTextPlacementPickerSelectorView = { + PickerSelectorView(title: "", + picker: self.picker, + items: HelperTextPlacement.allCases) + }() + + var disabledSwitch = UISwitch() + var labelTextField = TextField() + var errorTextField = TextField() + var successTextField = TextField() + var helperTextField = TextField() + var widthTextField = TextField() + var showErrorSwitch = UISwitch() + var showSuccessSwitch = UISwitch() + + var textEntryField = TextEntryField() + + override func viewDidLoad() { + super.viewDidLoad() + addContentTopView(view: textEntryField) + setupForm() + setupPicker() + setupModel(model: getModel()) + } + + func getModel() -> DefaultTextEntryField { + var defaultModel = DefaultTextEntryField() + defaultModel.type = .text + defaultModel.width = 328 + defaultModel.labelText = "Street Address" + defaultModel.helperText = "For example: 123 Verizon St" + defaultModel.errorText = "Enter a valid address." + defaultModel.successText = "Good job entering a valid address!" + return defaultModel + } + + func setupForm(){ + addFormRow(label: "Disabled", view: disabledSwitch) + addFormRow(label: "Surface", view: surfacePickerSelectorView) + addFormRow(label: "Label Text", view: labelTextField) + addFormRow(label: "Helper Text Placement", view: helperTextPlacementPickerSelectorView) + addFormRow(label: "Helper Text", view: helperTextField) + addFormRow(label: "Error", view: showErrorSwitch) + addFormRow(label: "Error Text", view: errorTextField) + addFormRow(label: "Success", view: showSuccessSwitch) + addFormRow(label: "Success Text", view: successTextField) + addFormRow(label: "Width", view: widthTextField) + + textEntryField + .handlerPublisher() + .sink { [weak self] viewModel in + self?.model = viewModel + }.store(in: &subscribers) + + showErrorSwitch + .publisher(for: .valueChanged) + .sink { [weak self] sender in + self?.textEntryField.showError = sender.isOn + }.store(in: &subscribers) + + showSuccessSwitch + .publisher(for: .valueChanged) + .sink { [weak self] sender in + self?.textEntryField.showSuccess = sender.isOn + }.store(in: &subscribers) + + disabledSwitch + .publisher(for: .valueChanged) + .sink { [weak self] sender in + self?.textEntryField.disabled = sender.isOn + }.store(in: &subscribers) + + labelTextField + .textPublisher + .sink { [weak self] text in + self?.textEntryField.labelText = text + }.store(in: &subscribers) + + helperTextField + .textPublisher + .sink { [weak self] text in + self?.textEntryField.helperText = text + }.store(in: &subscribers) + + errorTextField + .textPublisher + .sink { [weak self] text in + self?.textEntryField.errorText = text + }.store(in: &subscribers) + + widthTextField + .textPublisher + .sink { [weak self] width in + guard let width = Float(width) else { return } + self?.textEntryField.width = CGFloat(width) + }.store(in: &subscribers) + + } + + func setupModel(model: DefaultTextEntryField) { + set(with: model) + + textEntryField + .handlerPublisher() + .sink { [weak self] viewModel in + self?.model = viewModel + }.store(in: &subscribers) + + textEntryField + .publisher(for: .valueChanged) + .sink { textEntryField in + if let text = textEntryField.value { + print("text entry: \(text)") + } else { + print("text entry: null") + } + }.store(in: &subscribers) + + //setup UI + surfacePickerSelectorView.text = model.surface.rawValue + disabledSwitch.isOn = model.disabled + labelTextField.text = model.labelText + helperTextField.text = model.helperText + showErrorSwitch.isOn = model.showError + errorTextField.text = model.errorText + showSuccessSwitch.isOn = model.showSuccess + successTextField.text = model.successText + if let width = model.width { + widthTextField.text = String(describing: width) + } + } + + override func updateView(viewModel: ModelType) { + print("\(Self.self) updateView(viewModel)") + showErrorSwitch.isOn = viewModel.showError + disabledSwitch.isOn = viewModel.disabled + textEntryField.set(with: viewModel) + } + + //Picker + func setupPicker(){ + surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in + self?.textEntryField.surface = item + self?.contentTopView.backgroundColor = item.color + } + + helperTextPlacementPickerSelectorView.onPickerDidSelect = { [weak self] item in + self?.textEntryField.helperTextPlacement = item + } + } +} + From eb9a239f6775eddce74afb00ba1f1fa33e173040 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 4 Oct 2022 11:37:52 -0500 Subject: [PATCH 3/4] added tooltip Signed-off-by: Matt Bruce --- .../ModelScrollViewController.swift | 1 + .../TextEntryFieldViewController.swift | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/VDSSample/ViewControllers/ModelScrollViewController.swift b/VDSSample/ViewControllers/ModelScrollViewController.swift index abb9f67..7b605c1 100644 --- a/VDSSample/ViewControllers/ModelScrollViewController.swift +++ b/VDSSample/ViewControllers/ModelScrollViewController.swift @@ -71,6 +71,7 @@ public class ModelScrollViewController: UIViewController, initialSetupPerformed = true setupUpdateView() setup() + contentTopView.backgroundColor = Surface.light.color surfacePickerSelectorView.scrollToBottom = { [weak self] in self?.scrollToBottom()} } } diff --git a/VDSSample/ViewControllers/TextEntryFieldViewController.swift b/VDSSample/ViewControllers/TextEntryFieldViewController.swift index d4227b0..61cc984 100644 --- a/VDSSample/ViewControllers/TextEntryFieldViewController.swift +++ b/VDSSample/ViewControllers/TextEntryFieldViewController.swift @@ -20,6 +20,7 @@ class TextEntryFieldViewController: ModelScrollViewController Date: Wed, 2 Nov 2022 11:07:15 -0500 Subject: [PATCH 4/4] refactored viewcontroller Signed-off-by: Matt Bruce --- .../TextEntryFieldViewController.swift | 71 ++++++------------- 1 file changed, 23 insertions(+), 48 deletions(-) diff --git a/VDSSample/ViewControllers/TextEntryFieldViewController.swift b/VDSSample/ViewControllers/TextEntryFieldViewController.swift index 61cc984..d854e0a 100644 --- a/VDSSample/ViewControllers/TextEntryFieldViewController.swift +++ b/VDSSample/ViewControllers/TextEntryFieldViewController.swift @@ -11,7 +11,7 @@ import VDS import VDSColorTokens import Combine -class TextEntryFieldViewController: ModelScrollViewController { +class TextEntryFieldViewController: BaseViewController { lazy var helperTextPlacementPickerSelectorView = { PickerSelectorView(title: "", @@ -38,20 +38,7 @@ class TextEntryFieldViewController: ModelScrollViewController DefaultTextEntryField { - var defaultModel = DefaultTextEntryField() - defaultModel.type = .text - defaultModel.width = 328 - defaultModel.labelText = "Street Address" - defaultModel.helperText = "For example: 123 Verizon St" - defaultModel.errorText = "Enter a valid address." - defaultModel.successText = "Good job entering a valid address!" - defaultModel.tooltipTitle = "Check the formatting of your address" - defaultModel.tooltipContent = "House/Building number then street name" - return defaultModel + setupModel() } func setupForm(){ @@ -69,12 +56,6 @@ class TextEntryFieldViewController: ModelScrollViewController