From b24f90dab7536130640ba23abb98b802d21797bd Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 3 Oct 2022 15:29:02 -0500 Subject: [PATCH] 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 } }