From a7ccec0f989022e68d494e20cf2b93df2a85c10b Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 13 May 2024 15:13:45 -0500 Subject: [PATCH] updated picker code Signed-off-by: Matt Bruce --- VDSSample/Protocols/PickerBase.swift | 11 +++++++++-- .../ViewControllers/DatePickerViewController.swift | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/VDSSample/Protocols/PickerBase.swift b/VDSSample/Protocols/PickerBase.swift index e0be6d6..3c38693 100644 --- a/VDSSample/Protocols/PickerBase.swift +++ b/VDSSample/Protocols/PickerBase.swift @@ -134,8 +134,15 @@ public class PickerSelectorView: UIStackView, Picker } private func title(for row: Int) -> String { - guard let item = items[row].rawValue as? String else { return "" } - return item + let item = items[row] + + if let item = item as? CustomStringConvertible { + return item.description + } else if let raw = item.rawValue as? String { + return raw + } else { + return "" + } } } diff --git a/VDSSample/ViewControllers/DatePickerViewController.swift b/VDSSample/ViewControllers/DatePickerViewController.swift index 4e6be9f..654f2f3 100644 --- a/VDSSample/ViewControllers/DatePickerViewController.swift +++ b/VDSSample/ViewControllers/DatePickerViewController.swift @@ -24,7 +24,7 @@ class DatePickerViewController: BaseViewController { lazy var dateFormatPickerSelectorView = { PickerSelectorView(title: "shortNumeric", picker: self.picker, - items: DatePicker.DateFormat.allCases) + items: DatePicker.DateFormat.allCases ) }() override func viewDidLoad() {