From 50c4ff62a4ace9fc82fd67ff8653499df7bbb5fc Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 23 May 2024 15:57:13 -0500 Subject: [PATCH 1/7] updated version Signed-off-by: Matt Bruce --- VDSSample.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj index bb308b5..52876ff 100644 --- a/VDSSample.xcodeproj/project.pbxproj +++ b/VDSSample.xcodeproj/project.pbxproj @@ -700,7 +700,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 63; + CURRENT_PROJECT_VERSION = 64; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77; GENERATE_INFOPLIST_FILE = YES; @@ -735,7 +735,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 63; + CURRENT_PROJECT_VERSION = 64; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77; GENERATE_INFOPLIST_FILE = YES; From 2ab6e402429f00c0ea12ef27681a6a342ac91dd6 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 24 May 2024 12:13:26 -0500 Subject: [PATCH 2/7] fixed calendar issue in date picker Signed-off-by: Matt Bruce --- VDSSample/ViewControllers/DatePickerViewController.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/VDSSample/ViewControllers/DatePickerViewController.swift b/VDSSample/ViewControllers/DatePickerViewController.swift index 3c5c460..bbe730b 100644 --- a/VDSSample/ViewControllers/DatePickerViewController.swift +++ b/VDSSample/ViewControllers/DatePickerViewController.swift @@ -411,8 +411,10 @@ extension DatePickerViewController { updateIndicatorData(label: legendThreeField.text ?? "", date: sender.date, index: 2) case minDatePickerTag: minDate = sender.date + updateCalendarModel() case maxDatePickerTag: maxDate = sender.date + updateCalendarModel() case activeDatePickerTag: activeDates.append(sender.date) var text = activeDatesField.text @@ -424,6 +426,7 @@ extension DatePickerViewController { text?.append("\(self.getSelectedDate(with: sender.date))") clearActiveDatesSwitch.isOn = false activeDatesField.text = text + updateCalendarModel() case inactiveDatePickerTag: inactiveDates.append(sender.date) var text = inactiveDatesField.text @@ -435,6 +438,7 @@ extension DatePickerViewController { text?.append("\(self.getSelectedDate(with: sender.date))") clearInactiveDatesSwitch.isOn = false inactiveDatesField.text = text + updateCalendarModel() default: break } } From 89d7fbd8ccae02848ba1e5843cfd857e7abf1a92 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 24 May 2024 12:13:37 -0500 Subject: [PATCH 3/7] Signed-off-by: Matt Bruce --- VDSSample/ViewControllers/DatePickerViewController.swift | 2 +- .../ViewControllers/DropdownSelectViewController.swift | 2 +- VDSSample/ViewControllers/InputFieldViewController.swift | 6 ++++++ VDSSample/ViewControllers/TextAreaViewController.swift | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/VDSSample/ViewControllers/DatePickerViewController.swift b/VDSSample/ViewControllers/DatePickerViewController.swift index bbe730b..ed72cc2 100644 --- a/VDSSample/ViewControllers/DatePickerViewController.swift +++ b/VDSSample/ViewControllers/DatePickerViewController.swift @@ -81,11 +81,11 @@ class DatePickerViewController: BaseViewController { addFormRow(label: "onChange", view: label) addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Disabled", view: disabledSwitch) + addFormRow(label: "Readonly", view: readonlySwitch) addFormRow(label: "Required", view: requiredSwitch) addFormRow(label: "Date Format", view: dateFormatPickerSelectorView) addFormRow(label: "Label Text", view: labelTextField) addFormRow(label: "Helper Text", view: helperTextField) - addFormRow(label: "Readonly", view: readonlySwitch) addFormRow(label: "Transparent Background", view: transparentBgSwitch) addFormRow(label: "Error", view: .makeWrapper(for: errorSwitch)) addFormRow(label: "Error Text", view: errorTextField) diff --git a/VDSSample/ViewControllers/DropdownSelectViewController.swift b/VDSSample/ViewControllers/DropdownSelectViewController.swift index 1d5002e..4a71b34 100644 --- a/VDSSample/ViewControllers/DropdownSelectViewController.swift +++ b/VDSSample/ViewControllers/DropdownSelectViewController.swift @@ -65,12 +65,12 @@ class DropdownSelectViewController: BaseViewController { override func setupForm(){ addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Disabled", view: disabledSwitch) + addFormRow(label: "Readonly", view: readonlySwitch) addFormRow(label: "Required", view: requiredSwitch) addFormRow(label: "Label Text", view: labelTextField) addFormRow(label: "Helper Text Placement", view: helperTextPlacementPickerSelectorView) addFormRow(label: "Helper Text", view: helperTextField) addFormRow(label: "Inline Label", view: .makeWrapper(for: inlineLabelSwitch)) - addFormRow(label: "Readonly", view: readonlySwitch) addFormRow(label: "Transparent Background", view: transparentBgSwitch) addFormRow(label: "Error", view: .makeWrapper(for: errorSwitch)) addFormRow(label: "Error Text", view: errorTextField) diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift index 9ca4875..0f600d4 100644 --- a/VDSSample/ViewControllers/InputFieldViewController.swift +++ b/VDSSample/ViewControllers/InputFieldViewController.swift @@ -27,6 +27,7 @@ class InputFieldViewController: BaseViewController { var disabledSwitch = Toggle() var requiredSwitch = Toggle() + var readonlySwitch = Toggle() var labelTextField = TextField() var errorTextField = TextField() var successTextField = TextField() @@ -104,6 +105,7 @@ class InputFieldViewController: BaseViewController { } general.addFormRow(label: "Disabled", view: disabledSwitch) + general.addFormRow(label: "Readonly", view: readonlySwitch) general.addFormRow(label: "Required", view: requiredSwitch) general.addFormRow(label: "Surface", view: surfacePickerSelectorView) general.addFormRow(label: "Label Text", view: labelTextField) @@ -147,6 +149,10 @@ class InputFieldViewController: BaseViewController { disabledSwitch.onChange = { [weak self] sender in self?.component.isEnabled = !sender.isOn } + + readonlySwitch.onChange = { [weak self] sender in + self?.component.isReadOnly = sender.isOn + } labelTextField .textPublisher diff --git a/VDSSample/ViewControllers/TextAreaViewController.swift b/VDSSample/ViewControllers/TextAreaViewController.swift index 3a7b17d..22859ee 100644 --- a/VDSSample/ViewControllers/TextAreaViewController.swift +++ b/VDSSample/ViewControllers/TextAreaViewController.swift @@ -41,11 +41,11 @@ class TextAreaViewController: BaseViewController