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

move to onChange for controls

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2023-04-03 10:16:06 -05:00
parent 645c7d5815
commit e6fa8a5930
16 changed files with 227 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
VDSSample/ViewControllers/ButtonGroupViewController.swift
View File

@ -113,14 +113,12 @@ class ButtonGroupViewController: BaseViewController {
addFormRow(label: "Row Quantity", view: rowQuantitySelectorView)
addFormRow(label: "Percentage (1-100)", view: percentageTextField)
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.largeLabel.disabled = sender.isOn
self?.smallLabel.disabled = sender.isOn
self?.largeButtonGroup.disabled = sender.isOn
self?.smallButtonGroup.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.largeLabel.disabled = sender.isOn
self?.smallLabel.disabled = sender.isOn
self?.largeButtonGroup.disabled = sender.isOn
self?.smallButtonGroup.disabled = sender.isOn
}
widthTextField
.textPublisher

8
VDSSample/ViewControllers/ButtonViewController.swift
View File

@ -53,11 +53,9 @@ class ButtonViewController: BaseViewController {
addFormRow(label: "Size", view: buttonSizePickerSelectorView)
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.button.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.button.disabled = sender.isOn
}
textField
.textPublisher

38
VDSSample/ViewControllers/CheckBoxGroupViewController.swift
View File

@ -38,17 +38,13 @@ class CheckboxGroupViewController: BaseViewController {
addFormRow(label: "Child Text", view: childTextField)
addFormRow(label: "Error", view: .makeWrapper(for: showErrorSwitch))
showErrorSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.checkboxGroup.showError = sender.isOn
}.store(in: &subscribers)
showErrorSwitch.onChange = { [weak self] sender in
self?.checkboxGroup.showError = sender.isOn
}
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.checkboxGroup.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.checkboxGroup.disabled = sender.isOn
}
labelTextField
.textPublisher
@ -78,19 +74,17 @@ class CheckboxGroupViewController: BaseViewController {
checkboxGroup.selectorViews = [checkbox1, checkbox2]
checkboxGroup
.publisher(for: .valueChanged)
.sink { [weak self] group in
let selected = group.selectedHandlers?
.compactMap{"\($0.labelText!)"}
.joined(separator: "\r") ?? "none selected"
checkboxGroup.onChange = { [weak self] group in
let selected = group.selectedHandlers?
.compactMap{"\($0.labelText!)"}
.joined(separator: "\r") ?? "none selected"
let alertController:UIAlertController = UIAlertController(title: "Alert",
message: "Selected Checkboxes:\r\(selected)",
preferredStyle: UIAlertController.Style.alert)
alertController.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler:nil))
self?.present(alertController, animated: true)
}.store(in: &subscribers)
let alertController:UIAlertController = UIAlertController(title: "Alert",
message: "Selected Checkboxes:\r\(selected)",
preferredStyle: UIAlertController.Style.alert)
alertController.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler:nil))
self?.present(alertController, animated: true)
}
//setup UI
surfacePickerSelectorView.text = checkboxGroup.surface.rawValue

44
VDSSample/ViewControllers/CheckboxViewController.swift
View File

@ -40,21 +40,17 @@ class CheckboxViewController: BaseViewController {
addFormRow(label: "Error", view: .makeWrapper(for: showErrorSwitch))
addFormRow(label: "Error Text", view: errorTextField)
showErrorSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
guard let self else { return }
self.checkbox.showError = sender.isOn
if self.checkbox.showError != sender.isOn {
self.showErrorSwitch.isOn = self.checkbox.showError
}
}.store(in: &subscribers)
showErrorSwitch.onChange = { [weak self] sender in
guard let self else { return }
self.checkbox.showError = sender.isOn
if self.checkbox.showError != sender.isOn {
self.showErrorSwitch.isOn = self.checkbox.showError
}
}
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.checkbox.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.checkbox.disabled = sender.isOn
}
labelTextField
.textPublisher
@ -80,17 +76,15 @@ class CheckboxViewController: BaseViewController {
checkbox.childText = "I agree to Verizon's terms and conditions click here"
checkbox.errorText = "Error Text"
checkbox
.publisher(for: .valueChanged)
.sink { [weak self] checkbox in
let alertController:UIAlertController = UIAlertController(title: "Alert",
message: "\(checkbox.labelText!): \(checkbox.isSelected)",
preferredStyle: UIAlertController.Style.alert)
alertController.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler:nil))
self?.present(alertController, animated: true)
self?.showErrorSwitch.isOn = checkbox.showError
print("checkbox selected: \(checkbox.isSelected)")
}.store(in: &subscribers)
checkbox.onChange = { [weak self] checkbox in
let alertController:UIAlertController = UIAlertController(title: "Alert",
message: "\(checkbox.labelText!): \(checkbox.isSelected)",
preferredStyle: UIAlertController.Style.alert)
alertController.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler:nil))
self?.present(alertController, animated: true)
self?.showErrorSwitch.isOn = checkbox.showError
print("checkbox selected: \(checkbox.isSelected)")
}
//setup UI
surfacePickerSelectorView.text = checkbox.surface.rawValue

48
VDSSample/ViewControllers/InputFieldViewController.swift
View File

@ -58,37 +58,29 @@ class InputFieldViewController: BaseViewController {
addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
addFormRow(label: "ToolTip Content", view: tooltipContentTextField)
requiredSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.textEntryField.required = sender.isOn
}.store(in: &subscribers)
requiredSwitch.onChange = { [weak self] sender in
self?.textEntryField.required = sender.isOn
}
showErrorSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
guard let self else { return }
self.textEntryField.showError = sender.isOn
if self.textEntryField.showError != sender.isOn {
self.showErrorSwitch.isOn = self.textEntryField.showError
}
}.store(in: &subscribers)
showErrorSwitch.onChange = { [weak self] sender in
guard let self else { return }
self.textEntryField.showError = sender.isOn
if self.textEntryField.showError != sender.isOn {
self.showErrorSwitch.isOn = self.textEntryField.showError
}
}
showSuccessSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
guard let self else { return }
self.textEntryField.showSuccess = sender.isOn
if self.textEntryField.showSuccess != sender.isOn {
self.showSuccessSwitch.isOn = self.textEntryField.showSuccess
}
}.store(in: &subscribers)
showSuccessSwitch.onChange = { [weak self] sender in
guard let self else { return }
self.textEntryField.showSuccess = sender.isOn
if self.textEntryField.showSuccess != sender.isOn {
self.showSuccessSwitch.isOn = self.textEntryField.showSuccess
}
}
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.textEntryField.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.textEntryField.disabled = sender.isOn
}
labelTextField
.textPublisher

8
VDSSample/ViewControllers/LabelViewController.swift
View File

@ -48,11 +48,9 @@ class LabelViewController: BaseViewController {
addFormRow(label: "Text Size", view: textSizePickerSelectorView)
addFormRow(label: "Text", view: textField)
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.label.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.label.disabled = sender.isOn
}
boldSwitch
.publisher(for: .valueChanged)

5
VDSSample/ViewControllers/NotificationViewController.swift
View File

@ -69,7 +69,7 @@ class NotificationViewController: BaseViewController {
self.notificationView.subTitleText = newString
}.store(in: &subscribers)
buttonGroupToggle.publisher(for: .valueChanged).sink { [weak self] toggle in
buttonGroupToggle.onChange = { [weak self] toggle in
if toggle.isOn {
self?.notificationView.primaryButtonModel = nil
self?.notificationView.secondaryButtonModel = nil
@ -77,8 +77,7 @@ class NotificationViewController: BaseViewController {
} else {
self?.setupButtons(with: self?.firstButtonDefaultText, secondButtonText: self?.secondButtonDefaultText)
}
}.store(in: &subscribers)
}
firstButtonTextField.textPublisher.sink { newString in

16
VDSSample/ViewControllers/RadioBoxGroupViewController.swift
View File

@ -41,17 +41,13 @@ class RadioBoxGroupViewController: BaseViewController {
addFormRow(label: "Sub Text", view: subTextField)
addFormRow(label: "Sub Text Right", view: subTextRightField)
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.radioBoxGroup.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.radioBoxGroup.disabled = sender.isOn
}
strikeThroughSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.radioBox?.strikethrough = sender.isOn
}.store(in: &subscribers)
strikeThroughSwitch.onChange = { [weak self] sender in
self?.radioBox?.strikethrough = sender.isOn
}
textField
.textPublisher

34
VDSSample/ViewControllers/RadioButtonViewController.swift
View File

@ -38,17 +38,13 @@ class RadioButtonViewController: BaseViewController {
addFormRow(label: "Child Text", view: childTextField)
addFormRow(label: "Error", view: .makeWrapper(for: showErrorSwitch))
showErrorSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.radioButtonGroup.showError = sender.isOn
}.store(in: &subscribers)
showErrorSwitch.onChange = { [weak self] sender in
self?.radioButtonGroup.showError = sender.isOn
}
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.radioButtonGroup.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.radioButtonGroup.disabled = sender.isOn
}
labelTextField
.textPublisher
@ -85,17 +81,15 @@ class RadioButtonViewController: BaseViewController {
radioButtonGroup.selectorViews = [radioButton1, radioButton2, radioButton3]
radioButtonGroup
.publisher(for: .valueChanged)
.sink { [weak self] group in
let alertController:UIAlertController = UIAlertController(title: "Alert",
message: "Selected:\r\(group.selectedHandler?.labelText ?? "none")",
preferredStyle: UIAlertController.Style.alert)
alertController.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler:nil))
self?.present(alertController, animated: true)
radioButtonGroup.onChange = { [weak self] group in
let alertController:UIAlertController = UIAlertController(title: "Alert",
message: "Selected:\r\(group.selectedHandler?.labelText ?? "none")",
preferredStyle: UIAlertController.Style.alert)
alertController.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler:nil))
self?.present(alertController, animated: true)
print("Selected: \(group.selectedHandler?.labelText ?? "none")")
}.store(in: &subscribers)
print("Selected: \(group.selectedHandler?.labelText ?? "none")")
}
//set UI values
surfacePickerSelectorView.text = radioButtonGroup.surface.rawValue

26
VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
View File

@ -30,18 +30,14 @@ class RadioSwatchGroupViewController: BaseViewController {
addFormRow(label: "Surface", view: surfacePickerSelectorView)
addFormRow(label: "Strikethrough", view: .makeWrapper(for: strikeThroughSwitch))
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.radioSwatchGroup.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.radioSwatchGroup.disabled = sender.isOn
}
strikeThroughSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.radioSwatchGroup.selectorViews.first?.strikethrough = sender.isOn
self?.radioSwatchGroup.reload()
}.store(in: &subscribers)
strikeThroughSwitch.onChange = { [weak self] sender in
self?.radioSwatchGroup.selectorViews.first?.strikethrough = sender.isOn
self?.radioSwatchGroup.reload()
}
}
func setupModel(){
@ -89,11 +85,9 @@ class RadioSwatchGroupViewController: BaseViewController {
radioSwatchGroup.selectorViews = [radioSwatch1, radioSwatch2, radioSwatch3, radioSwatch4, radioSwatch5, radioSwatch6, radioSwatch7, radioSwatch8]
radioSwatchGroup
.publisher(for: .valueChanged)
.sink { group in
print("Selected: \(group.selectedHandler?.text ?? "none")")
}.store(in: &subscribers)
radioSwatchGroup.onChange = { group in
print("Selected: \(group.selectedHandler?.text ?? "none")")
}
//set UI values
surfacePickerSelectorView.text = radioSwatchGroup.surface.rawValue

32
VDSSample/ViewControllers/TextAreaViewController.swift
View File

@ -48,27 +48,21 @@ class TextAreaViewController: BaseViewController {
addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
addFormRow(label: "ToolTip Content", view: tooltipContentTextField)
requiredSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.textArea.required = sender.isOn
}.store(in: &subscribers)
requiredSwitch.onChange = { [weak self] sender in
self?.textArea.required = sender.isOn
}
showErrorSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
guard let self else { return }
self.textArea.showError = sender.isOn
if self.textArea.showError != sender.isOn {
self.showErrorSwitch.isOn = self.textArea.showError
}
}.store(in: &subscribers)
showErrorSwitch.onChange = { [weak self] sender in
guard let self else { return }
self.textArea.showError = sender.isOn
if self.textArea.showError != sender.isOn {
self.showErrorSwitch.isOn = self.textArea.showError
}
}
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.textArea.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.textArea.disabled = sender.isOn
}
labelTextField
.textPublisher

8
VDSSample/ViewControllers/TextLinkCaretViewController.swift
View File

@ -43,11 +43,9 @@ class TextLinkCaretViewController: BaseViewController {
addFormRow(label: "Label", view: textField)
addFormRow(label: "Caret Position", view: caretPositionPickerSelectorView)
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.textLinkCaret.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.textLinkCaret.disabled = sender.isOn
}
textField
.textPublisher

8
VDSSample/ViewControllers/TextLinkViewController.swift
View File

@ -44,11 +44,9 @@ class TextLinkViewController: BaseViewController {
addFormRow(label: "Label", view: textField)
addFormRow(label: "Size", view: buttonSizePickerSelectorView)
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.textLink.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.textLink.disabled = sender.isOn
}
textField
.textPublisher

50
VDSSample/ViewControllers/TileContainerViewController.swift
View File

@ -74,40 +74,32 @@ class TileContainerViewController: BaseViewController {
addFormRow(label: "Background Image", view: .makeWrapper(for: showBackgroundImageSwitch))
addFormRow(label: "Image Fallback Color", view: imageFallbackColorPickerSelectorView)
clickableSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
guard let self else { return }
if sender.isOn {
self.tileContainer.onClick = { _ in
print("you click on me!")
}
} else {
self.tileContainer.onClick = nil
clickableSwitch.onChange = { [weak self] sender in
guard let self else { return }
if sender.isOn {
self.tileContainer.onClick = { _ in
print("you click on me!")
}
}.store(in: &subscribers)
} else {
self.tileContainer.onClick = nil
}
}
showBackgroundImageSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
if let image = self?.backgroundImage, sender.isOn {
self?.tileContainer.backgroundImage = image
} else {
self?.tileContainer.backgroundImage = nil
}
}.store(in: &subscribers)
showBackgroundImageSwitch.onChange = { [weak self] sender in
if let image = self?.backgroundImage, sender.isOn {
self?.tileContainer.backgroundImage = image
} else {
self?.tileContainer.backgroundImage = nil
}
}
showBorderSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
showBorderSwitch.onChange = { [weak self] sender in
self?.tileContainer.showBorder = sender.isOn
}.store(in: &subscribers)
}
showDropShadowSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.tileContainer.showDropShadows = sender.isOn
}.store(in: &subscribers)
showDropShadowSwitch.onChange = { [weak self] sender in
self?.tileContainer.showDropShadows = sender.isOn
}
heightTextField
.textPublisher

61
VDSSample/ViewControllers/TileletViewController.swift
View File

@ -27,8 +27,8 @@ class TileletViewController: BaseViewController {
lazy var subtitleColorPickerSelectorView = {
PickerSelectorView<Use>(title: "",
picker: self.picker,
items: [.primary, .secondary])
picker: self.picker,
items: [.primary, .secondary])
}()
var clickableSwitch = Toggle()
@ -74,18 +74,17 @@ class TileletViewController: BaseViewController {
addFormRow(label: "Description Icon", view: .makeWrapper(for: showDescriptionIconSwitch))
addFormRow(label: "Directional Icon", view: .makeWrapper(for: showDirectionalIconSwitch))
clickableSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
guard let tilelet = self?.tilelet else { return }
if sender.isOn {
tilelet.onClick = { t in
print("you click on me!")
}
} else {
tilelet.onClick = nil
clickableSwitch.onChange = { [weak self] sender in
guard let tilelet = self?.tilelet else { return }
if sender.isOn {
tilelet.onClick = { t in
print("you click on me!")
}
}.store(in: &subscribers)
} else {
tilelet.onClick = nil
}
}
widthTextField
.textPublisher
.sink { [weak self] text in
@ -145,27 +144,23 @@ class TileletViewController: BaseViewController {
self?.setBadgeModel()
}.store(in: &subscribers)
showDescriptionIconSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
if sender.isOn {
self?.showDirectionalIconSwitch.isOn = false
self?.tilelet.descriptiveIconModel = .init(size: .medium, surface: .dark)
} else {
self?.tilelet.descriptiveIconModel = nil
}
}.store(in: &subscribers)
showDescriptionIconSwitch.onChange = { [weak self] sender in
if sender.isOn {
self?.showDirectionalIconSwitch.isOn = false
self?.tilelet.descriptiveIconModel = .init(size: .medium, surface: .dark)
} else {
self?.tilelet.descriptiveIconModel = nil
}
}
showDirectionalIconSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
if sender.isOn {
self?.showDescriptionIconSwitch.isOn = false
self?.tilelet.directionalIconModel = .init(size: .medium, surface: .dark)
} else {
self?.tilelet.directionalIconModel = nil
}
}.store(in: &subscribers)
showDirectionalIconSwitch.onChange = { [weak self] sender in
if sender.isOn {
self?.showDescriptionIconSwitch.isOn = false
self?.tilelet.directionalIconModel = .init(size: .medium, surface: .dark)
} else {
self?.tilelet.directionalIconModel = nil
}
}
}

43
VDSSample/ViewControllers/ToggleViewController.swift
View File

@ -69,34 +69,27 @@ class ToggleViewController: BaseViewController {
//add textFormStackView to main form
formStackView.addArrangedSubview(textFormStackView)
toggle.publisher(for: .valueChanged)
.sink { [weak self] toggle in
let alertController:UIAlertController = UIAlertController(title: "Alert",
message: "Toggle Value: \(toggle.isOn)",
preferredStyle: UIAlertController.Style.alert)
alertController.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler:nil))
self?.present(alertController, animated: true)
print("toggle changed: \(toggle.isOn)")
}.store(in: &subscribers)
toggle.onChange = { [weak self] toggle in
let alertController:UIAlertController = UIAlertController(title: "Alert",
message: "Toggle Value: \(toggle.isOn)",
preferredStyle: UIAlertController.Style.alert)
alertController.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler:nil))
self?.present(alertController, animated: true)
print("toggle changed: \(toggle.isOn)")
}
showTextSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.toggle.showText = sender.isOn
self?.textFormStackView.isHidden = !sender.isOn
}.store(in: &subscribers)
showTextSwitch.onChange = { [weak self] sender in
self?.toggle.showText = sender.isOn
self?.textFormStackView.isHidden = !sender.isOn
}
disabledSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.toggle.disabled = sender.isOn
}.store(in: &subscribers)
disabledSwitch.onChange = { [weak self] sender in
self?.toggle.disabled = sender.isOn
}
boldSwitch
.publisher(for: .valueChanged)
.sink { [weak self] sender in
self?.toggle.textWeight = sender.isOn ? .bold : .regular
}.store(in: &subscribers)
boldSwitch.onChange = { [weak self] sender in
self?.toggle.textWeight = sender.isOn ? .bold : .regular
}
onTextField
.textPublisher