From 7c63ca1bbad8f76f9ae1a898c5f2174d73ab9875 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 14 Jul 2023 07:57:34 -0500 Subject: [PATCH] refactored for naming Signed-off-by: Matt Bruce --- .../BadgeIndicatorViewController.swift | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift index 6c6e72e..b148161 100644 --- a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift +++ b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift @@ -34,7 +34,7 @@ class BadgeIndicatorViewController: BaseViewController { lazy var maxDigitsPickerSelectorView = { PickerSelectorView(title: "", picker: self.picker, - items: BadgeIndicator.MaxDigits.allCases) + items: BadgeIndicator.MaximumDigits.allCases) }() lazy var borderColorLightPickerSelectorView = { @@ -51,6 +51,7 @@ class BadgeIndicatorViewController: BaseViewController { var textField = TextField() + var leadingCharacterTextField = TextField() var hideDotSwitch = Toggle() var hideBorderSwitch = Toggle() @@ -67,7 +68,7 @@ class BadgeIndicatorViewController: BaseViewController { var verticalPaddingTextField = NumericField() var dotSizeTextField = NumericField() - override func allTextFields() -> [TextField]? { [textField, heightTextField, widthTextField, horizontalPaddingTextField, verticalPaddingTextField, dotSizeTextField] } + override func allTextFields() -> [TextField]? { [textField, heightTextField, widthTextField, horizontalPaddingTextField, verticalPaddingTextField, dotSizeTextField, leadingCharacterTextField] } var numberedForm = FormSection().with { $0.title = "Numbered Kind"} @@ -89,6 +90,7 @@ class BadgeIndicatorViewController: BaseViewController { dotForm.addFormRow(label: "Hide Dot", view: .makeWrapper(for: hideDotSwitch)) dotForm.addFormRow(label: "Dot Size", view: dotSizeTextField) + numberedForm.addFormRow(label: "Leading Character", view: leadingCharacterTextField) numberedForm.addFormRow(label: "Text", view: textField) numberedForm.addFormRow(label: "Max Digits", view: maxDigitsPickerSelectorView) append(section: numberedForm) @@ -110,6 +112,16 @@ class BadgeIndicatorViewController: BaseViewController { } }.store(in: &subscribers) + leadingCharacterTextField + .textPublisher + .sink { [weak self] text in + if !text.isEmpty { + self?.component.leadingCharacter = text + } else { + self?.component.leadingCharacter = nil + } + }.store(in: &subscribers) + heightTextField .textPublisher .sink { [weak self] text in @@ -173,7 +185,7 @@ class BadgeIndicatorViewController: BaseViewController { kindPickerSelectorView.text = component.kind.rawValue fillColorPickerSelectorView.text = component.fillColor.rawValue textSizePickerSelectorView.text = component.size.rawValue - maxDigitsPickerSelectorView.text = component.maxDigits.rawValue + maxDigitsPickerSelectorView.text = component.maximumDigits.rawValue borderColorDarkPickerSelectorView.text = component.borderColorDark?.toVDSColor()?.rawValue ?? "" borderColorLightPickerSelectorView.text = component.borderColorLight?.toVDSColor()?.rawValue ?? "" textField.text = "\(component.number!)" @@ -206,7 +218,7 @@ class BadgeIndicatorViewController: BaseViewController { } maxDigitsPickerSelectorView.onPickerDidSelect = { [weak self] item in - self?.component.maxDigits = item + self?.component.maximumDigits = item } borderColorDarkPickerSelectorView.onPickerDidSelect = { [weak self] item in