From 2bf7d2e1ab6d0a9783894370f0e20ed47bb56a1b Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 8 Apr 2024 10:51:28 -0500 Subject: [PATCH] refactored for naming updates Signed-off-by: Matt Bruce --- .../DropdownSelectViewController.swift | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/VDSSample/ViewControllers/DropdownSelectViewController.swift b/VDSSample/ViewControllers/DropdownSelectViewController.swift index 87c96aa..a152f1f 100644 --- a/VDSSample/ViewControllers/DropdownSelectViewController.swift +++ b/VDSSample/ViewControllers/DropdownSelectViewController.swift @@ -95,16 +95,16 @@ class DropdownSelectViewController: BaseViewController { .publisher(for: .valueChanged) .sink { [weak self] sender in guard let self else { return } - component.error = sender.isOn - if component.error != sender.isOn { - self.errorSwitch.isOn = self.component.error + component.showError = sender.isOn + if component.showError != sender.isOn { + self.errorSwitch.isOn = self.component.showError } }.store(in: &subscribers) labelTextField .textPublisher .sink { [weak self] text in - self?.component.label = text + self?.component.labelText = text }.store(in: &subscribers) helperTextField @@ -135,12 +135,12 @@ class DropdownSelectViewController: BaseViewController { .publisher(for: .valueChanged) .sink { [weak self] sender in guard let self else { return } - self.component.inlineLabel = sender.isOn + self.component.showInlineLabel = sender.isOn }.store(in: &subscribers) } func setupModel() { - component.label = "Street Address" + component.labelText = "Street Address" component.helperText = "For example: 123 Verizon St" component.errorText = "Enter a valid address." component.tooltipModel = .init(title: "Check the formatting of your address", content:"House/Building number then street name") @@ -156,11 +156,11 @@ class DropdownSelectViewController: BaseViewController { disabledSwitch.isOn = !component.isEnabled requiredSwitch.isOn = component.required surfacePickerSelectorView.text = component.surface.rawValue - labelTextField.text = component.label + labelTextField.text = component.labelText helperTextField.text = component.helperText readonlySwitch.isOn = false transparentBgSwitch.isOn = false - errorSwitch.isOn = component.error + errorSwitch.isOn = component.showError errorTextField.text = component.errorText tooltipTitleTextField.text = component.tooltipModel?.title tooltipContentTextField.text = component.tooltipModel?.content @@ -175,7 +175,10 @@ class DropdownSelectViewController: BaseViewController { } func updateTooltip() { - component.tooltipModel = .init(title: tooltipTitleTextField.text, - content: tooltipContentTextField.text) + let title = tooltipTitleTextField.text ?? "" + let content = tooltipContentTextField.text ?? "" + + component.tooltipModel = !title.isEmpty || !content.isEmpty ? .init(title: title, + content: content) : nil } }