From e666a792e067d3422ef0d8aa1241fc80ef4c45bf Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 11 Apr 2024 16:50:54 -0500 Subject: [PATCH 01/16] initial commit for datePicker Signed-off-by: Matt Bruce --- VDSSample.xcodeproj/project.pbxproj | 4 + VDSSample/Extensions/IconName.swift | 1 - .../DatePickerViewController.swift | 141 ++++++++++++++++++ .../ViewControllers/MenuViewController.swift | 1 + 4 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 VDSSample/ViewControllers/DatePickerViewController.swift diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj index 128bc3d..e5cf453 100644 --- a/VDSSample.xcodeproj/project.pbxproj +++ b/VDSSample.xcodeproj/project.pbxproj @@ -43,6 +43,7 @@ EA0D1C312A673F3500E5C127 /* RadioButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C302A673F3500E5C127 /* RadioButtonViewController.swift */; }; EA0D1C332A673FD400E5C127 /* RadioButtonItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C322A673FD400E5C127 /* RadioButtonItemViewController.swift */; }; EA0FC2C12912DC5500DF80B4 /* TextLinkCaretViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */; }; + EA1758462BC8893700A5C0D9 /* DatePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1758452BC8893700A5C0D9 /* DatePickerViewController.swift */; }; EA297A682A02F5320031ED56 /* TableViewTestController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA297A672A02F5320031ED56 /* TableViewTestController.swift */; }; EA3C3B9D289966EF000CA526 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3B9C289966EF000CA526 /* AppDelegate.swift */; }; EA3C3B9F289966EF000CA526 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3B9E289966EF000CA526 /* SceneDelegate.swift */; }; @@ -142,6 +143,7 @@ EA0D1C302A673F3500E5C127 /* RadioButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioButtonViewController.swift; sourceTree = ""; }; EA0D1C322A673FD400E5C127 /* RadioButtonItemViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioButtonItemViewController.swift; sourceTree = ""; }; EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextLinkCaretViewController.swift; sourceTree = ""; }; + EA1758452BC8893700A5C0D9 /* DatePickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatePickerViewController.swift; sourceTree = ""; }; EA297A672A02F5320031ED56 /* TableViewTestController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewTestController.swift; sourceTree = ""; }; EA3C3B99289966EF000CA526 /* VDSSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VDSSample.app; sourceTree = BUILT_PRODUCTS_DIR; }; EA3C3B9C289966EF000CA526 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -330,6 +332,7 @@ EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */, EAF7F09B2899B92400B287F5 /* CheckboxItemViewController.swift */, EA0D1C2E2A66CFE900E5C127 /* CheckboxViewController.swift */, + EA1758452BC8893700A5C0D9 /* DatePickerViewController.swift */, 186D13CC2BBA990800986B53 /* DropdownSelectViewController.swift */, EA985C00296CC21C00F2FF2E /* IconViewController.swift */, EAA5EEAC28EB6924003B3210 /* InputFieldViewController.swift */, @@ -524,6 +527,7 @@ EA3C3BB428996775000CA526 /* PickerBase.swift in Sources */, EAB2376C29E9E74900AABE9A /* TrailingTooltipLabelViewController.swift in Sources */, EAB1D2C928AAAA1D00DAE764 /* BaseViewController.swift in Sources */, + EA1758462BC8893700A5C0D9 /* DatePickerViewController.swift in Sources */, EAD062AD2A3B86950015965D /* BadgeIndicatorViewController.swift in Sources */, EA5E305C295111050082B959 /* TileletViewController.swift in Sources */, EAD062A32A3913920015965D /* DropShawdowViewController.swift in Sources */, diff --git a/VDSSample/Extensions/IconName.swift b/VDSSample/Extensions/IconName.swift index 8dc6b69..7e96269 100644 --- a/VDSSample/Extensions/IconName.swift +++ b/VDSSample/Extensions/IconName.swift @@ -62,7 +62,6 @@ extension Icon.Name { public static let bucketTruck = Icon.Name(name: "bucket-truck") public static let bug = Icon.Name(name: "bug") public static let businessContinuity = Icon.Name(name: "business-continuity") - public static let calendar = Icon.Name(name: "calendar") public static let calibrate = Icon.Name(name: "calibrate") public static let callDisconnected = Icon.Name(name: "call-disconnected") public static let callerId = Icon.Name(name: "caller-id") diff --git a/VDSSample/ViewControllers/DatePickerViewController.swift b/VDSSample/ViewControllers/DatePickerViewController.swift new file mode 100644 index 0000000..70b2bdf --- /dev/null +++ b/VDSSample/ViewControllers/DatePickerViewController.swift @@ -0,0 +1,141 @@ +// +// DatePickerViewController.swift +// VDSSample +// +// Created by Matt Bruce on 4/11/24. +// + +import Foundation +import VDS + +class DatePickerViewController: BaseViewController { + + var disabledSwitch = Toggle() + var requiredSwitch = Toggle() + var labelTextField = TextField() + var errorTextField = TextField() + var helperTextField = TextField() + var inlineLabelSwitch = Toggle() + var readonlySwitch = Toggle() + var transparentBgSwitch = Toggle() + var errorSwitch = Toggle() + var tooltipTitleTextField = TextField() + var tooltipContentTextField = TextField() + + override func viewDidLoad() { + super.viewDidLoad() + addContentTopView(view: component) + setupModel() + setupPicker() + } + + override func setupForm(){ + addFormRow(label: "Surface", view: surfacePickerSelectorView) + addFormRow(label: "Disabled", view: disabledSwitch) + addFormRow(label: "Required", view: requiredSwitch) + 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) + addFormRow(label: "ToolTip Title", view: tooltipTitleTextField) + addFormRow(label: "ToolTip Content", view: tooltipContentTextField) + + disabledSwitch.onChange = { [weak self] sender in + self?.component.isEnabled = !sender.isOn + } + + requiredSwitch.onChange = { [weak self] sender in + self?.component.required = sender.isOn + } + + readonlySwitch.onChange = { [weak self] sender in + self?.component.readOnly = sender.isOn + } + + transparentBgSwitch.onChange = { [weak self] sender in + self?.component.transparentBackground = sender.isOn + } + + errorSwitch + .publisher(for: .valueChanged) + .sink { [weak self] sender in + guard let self else { return } + 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.labelText = text + }.store(in: &subscribers) + + helperTextField + .textPublisher + .sink { [weak self] text in + self?.component.helperText = text + }.store(in: &subscribers) + + errorTextField + .textPublisher + .sink { [weak self] text in + self?.component.errorText = text + }.store(in: &subscribers) + + tooltipTitleTextField + .textPublisher + .sink { [weak self] text in + self?.updateTooltip() + }.store(in: &subscribers) + + tooltipContentTextField + .textPublisher + .sink { [weak self] text in + self?.updateTooltip() + }.store(in: &subscribers) + + } + + func setupModel() { + component.labelText = "Date" + component.helperText = "Pick a date for your needs." + component.errorText = "Enter a date." + component.tooltipModel = .init(title: "Check your date.", content:"Here is the content for your date component") + + component.onChange = { c in + print("selected value: \(c.value ?? "no date selected")") + } + + //setup UI + disabledSwitch.isOn = !component.isEnabled + requiredSwitch.isOn = component.required + surfacePickerSelectorView.text = component.surface.rawValue + labelTextField.text = component.labelText + helperTextField.text = component.helperText + readonlySwitch.isOn = false + transparentBgSwitch.isOn = false + errorSwitch.isOn = component.showError + errorTextField.text = component.errorText + tooltipTitleTextField.text = component.tooltipModel?.title + tooltipContentTextField.text = component.tooltipModel?.content + } + + func setupPicker() { + surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in + self?.component.surface = item + self?.contentTopView.backgroundColor = item.color + } + } + + func updateTooltip() { + let title = tooltipTitleTextField.text ?? "" + let content = tooltipContentTextField.text ?? "" + + component.tooltipModel = !title.isEmpty || !content.isEmpty ? .init(title: title, + content: content) : nil + } +} diff --git a/VDSSample/ViewControllers/MenuViewController.swift b/VDSSample/ViewControllers/MenuViewController.swift index 86484c6..2916b7d 100644 --- a/VDSSample/ViewControllers/MenuViewController.swift +++ b/VDSSample/ViewControllers/MenuViewController.swift @@ -78,6 +78,7 @@ class MenuViewController: UITableViewController, TooltipLaunchable { MenuComponent(title: "Checkbox", completed: true, viewController: CheckboxViewController.self), MenuComponent(title: "CheckboxItem", completed: true, viewController: CheckboxItemViewController.self), MenuComponent(title: "CheckboxGroup", completed: true, viewController: CheckboxGroupViewController.self), + MenuComponent(title: "DatePicker", completed: false, viewController: DatePickerViewController.self), MenuComponent(title: "DropdownSelect", completed: true, viewController: DropdownSelectViewController.self), MenuComponent(title: "Icon", completed: true, viewController: IconViewController.self), MenuComponent(title: "InputField", completed: false, viewController: InputFieldViewController.self), From 6e1bab1b175f87306c46473ab063e5f42362c7e2 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 11 Apr 2024 17:28:06 -0500 Subject: [PATCH 02/16] added formatter Signed-off-by: Matt Bruce --- .../ViewControllers/DatePickerViewController.swift | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/VDSSample/ViewControllers/DatePickerViewController.swift b/VDSSample/ViewControllers/DatePickerViewController.swift index 70b2bdf..69690ca 100644 --- a/VDSSample/ViewControllers/DatePickerViewController.swift +++ b/VDSSample/ViewControllers/DatePickerViewController.swift @@ -21,7 +21,12 @@ class DatePickerViewController: BaseViewController { var errorSwitch = Toggle() var tooltipTitleTextField = TextField() var tooltipContentTextField = TextField() - + lazy var dateFormatPickerSelectorView = { + PickerSelectorView(title: "shortNumeric", + picker: self.picker, + items: DatePicker.DateFormat.allCases) + }() + override func viewDidLoad() { super.viewDidLoad() addContentTopView(view: component) @@ -33,6 +38,7 @@ class DatePickerViewController: BaseViewController { addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Disabled", view: disabledSwitch) 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) @@ -101,6 +107,7 @@ class DatePickerViewController: BaseViewController { } func setupModel() { + component.selectedDate = Calendar.current.date(byAdding: .day, value: -5, to: Date()) component.labelText = "Date" component.helperText = "Pick a date for your needs." component.errorText = "Enter a date." @@ -129,6 +136,11 @@ class DatePickerViewController: BaseViewController { self?.component.surface = item self?.contentTopView.backgroundColor = item.color } + + dateFormatPickerSelectorView.onPickerDidSelect = { [weak self] item in + self?.component.dateFormat = item + } + } func updateTooltip() { From 2e6b2d6b55837b218efb8eb74788fb6e6147b671 Mon Sep 17 00:00:00 2001 From: vasavk Date: Wed, 24 Apr 2024 18:04:57 +0530 Subject: [PATCH 03/16] Digital ACT-191 ONEAPP-7016 story: added new controller for calendar --- VDSSample.xcodeproj/project.pbxproj | 4 ++++ .../CalendarViewController.swift | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 VDSSample/ViewControllers/CalendarViewController.swift diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj index fc9f459..6cb427f 100644 --- a/VDSSample.xcodeproj/project.pbxproj +++ b/VDSSample.xcodeproj/project.pbxproj @@ -35,6 +35,7 @@ 1808BEBE2BA4479500129230 /* CarouselScrollbarViewConttroller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1808BEBD2BA4479500129230 /* CarouselScrollbarViewConttroller.swift */; }; 1832AC5B2BA1347B008AE476 /* BreadcrumbsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1832AC5A2BA1347B008AE476 /* BreadcrumbsViewController.swift */; }; 186D13CD2BBA990800986B53 /* DropdownSelectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 186D13CC2BBA990800986B53 /* DropdownSelectViewController.swift */; }; + 18A3F1302BD9332500498E4A /* CalendarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18A3F12F2BD9332500498E4A /* CalendarViewController.swift */; }; 445BA07A29C088470036A7C5 /* NotificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 445BA07929C088470036A7C5 /* NotificationViewController.swift */; }; 44604AD929CE1CF900E62B51 /* LineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44604AD829CE1CF900E62B51 /* LineViewController.swift */; }; 5FC35BE928D5235A004EBEAC /* ButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FC35BE828D5235A004EBEAC /* ButtonViewController.swift */; }; @@ -129,6 +130,7 @@ 1808BEBD2BA4479500129230 /* CarouselScrollbarViewConttroller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselScrollbarViewConttroller.swift; sourceTree = ""; }; 1832AC5A2BA1347B008AE476 /* BreadcrumbsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BreadcrumbsViewController.swift; sourceTree = ""; }; 186D13CC2BBA990800986B53 /* DropdownSelectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropdownSelectViewController.swift; sourceTree = ""; }; + 18A3F12F2BD9332500498E4A /* CalendarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarViewController.swift; sourceTree = ""; }; 445BA07929C088470036A7C5 /* NotificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationViewController.swift; sourceTree = ""; }; 44604AD829CE1CF900E62B51 /* LineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineViewController.swift; sourceTree = ""; }; 5FC35BE828D5235A004EBEAC /* ButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonViewController.swift; sourceTree = ""; }; @@ -317,6 +319,7 @@ EAB5FEEE2927E28400998C17 /* ButtonGroupViewController.swift */, EA81410D2A0ED8DC004F60D2 /* ButtonIconViewController.swift */, 5FC35BE828D5235A004EBEAC /* ButtonViewController.swift */, + 18A3F12F2BD9332500498E4A /* CalendarViewController.swift */, 1808BEBD2BA4479500129230 /* CarouselScrollbarViewConttroller.swift */, EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */, EAF7F09B2899B92400B287F5 /* CheckboxItemViewController.swift */, @@ -529,6 +532,7 @@ 71B23C312B921D740027F7D9 /* PaginationViewController.swift in Sources */, EAF7F09C2899B92400B287F5 /* CheckboxItemViewController.swift in Sources */, EA0D1C2F2A66CFE900E5C127 /* CheckboxViewController.swift in Sources */, + 18A3F1302BD9332500498E4A /* CalendarViewController.swift in Sources */, EA596ABA2A16B2ED00300C4B /* TabsViewController.swift in Sources */, EA89204E28B67332006B9984 /* CheckBoxGroupViewController.swift in Sources */, EAA5EEAD28EB6924003B3210 /* InputFieldViewController.swift in Sources */, diff --git a/VDSSample/ViewControllers/CalendarViewController.swift b/VDSSample/ViewControllers/CalendarViewController.swift new file mode 100644 index 0000000..2fb4259 --- /dev/null +++ b/VDSSample/ViewControllers/CalendarViewController.swift @@ -0,0 +1,19 @@ +// +// CalendarViewController.swift +// VDSSample +// +// Created by Kanamarlapudi, Vasavi on 19/04/24. +// + +import Foundation +import UIKit +import VDS +import Combine +import VDSTokens + +class CalendarViewController: BaseViewController { + + override func viewDidLoad() { + super.viewDidLoad() + } +} From 2f259686d110ce786750688d2b0fcd3a4e889a1d Mon Sep 17 00:00:00 2001 From: vasavk Date: Mon, 29 Apr 2024 10:06:20 +0530 Subject: [PATCH 04/16] =?UTF-8?q?Digital=20ACT-191=20ONEAPP-7016=20story:?= =?UTF-8?q?=20Setup=20form=20to=20pass=20values=20=E2=80=8B=E2=80=8Bto=20c?= =?UTF-8?q?alendar=20properties.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CalendarViewController.swift | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/VDSSample/ViewControllers/CalendarViewController.swift b/VDSSample/ViewControllers/CalendarViewController.swift index 2fb4259..f43f7dc 100644 --- a/VDSSample/ViewControllers/CalendarViewController.swift +++ b/VDSSample/ViewControllers/CalendarViewController.swift @@ -13,7 +13,134 @@ import VDSTokens class CalendarViewController: BaseViewController { + var borderSwitch = Toggle() + var dateIndicatorSwitch = Toggle() + var transparentSwitch = Toggle() + var indicatorOneSwitch = Toggle() + var indicatorTwoSwitch = Toggle() + var indicatorThreeSwitch = Toggle() + var legendOneField = TextField() + var legendTwoField = TextField() + var legendThreeField = TextField() + private var minDateField: UIDatePicker = UIDatePicker() + private var maxDateField: UIDatePicker = UIDatePicker() + private var datePickerOne: UIDatePicker = UIDatePicker() + private var datePickerTwo: UIDatePicker = UIDatePicker() + private var datePickerThree: UIDatePicker = UIDatePicker() + var indicators: [CalendarBase.CalendarIndicatorModel] = [] + override func viewDidLoad() { super.viewDidLoad() + addContentTopView(view: component) + + setupPicker() + setupModel() + } + + override func setupForm() { + super.setupForm() + configurePicker(datePickerOne) + datePickerOne.tag = 1 + configurePicker(datePickerTwo) + datePickerTwo.tag = 2 + configurePicker(datePickerThree) + datePickerThree.tag = 3 + configurePicker(minDateField) + minDateField.tag = 4 + configurePicker(maxDateField) + maxDateField.tag = 5 + indicators = [ + .init(label: "Due Date", date: datePickerOne.date), + .init(label: "Auto Pay", date: datePickerTwo.date), + .init(label: "Scheduled", date: datePickerTwo.date), + ] + + //add form rows + addFormRow(label: "Surface", view: surfacePickerSelectorView) + addFormRow(label: "Hide Container Border", view: borderSwitch) + addFormRow(label: "Hide Current Date Indicator", view: dateIndicatorSwitch) + addFormRow(label: "Min Date", view: minDateField) + addFormRow(label: "Max Date", view: maxDateField) + addFormRow(label: "Transparent Background", view: transparentSwitch) + addFormRow(label: "Indicator One", view: indicatorOneSwitch) + addFormRow(label: "Indicator Two", view: indicatorTwoSwitch) + addFormRow(label: "Indicator Three", view: indicatorThreeSwitch) + addFormRow(label: "Legend One", view: legendOneField) + addFormRow(label: "Legend Two", view: legendTwoField) + addFormRow(label: "Legend Three", view: legendThreeField) + addFormRow(label: "Indicator One Date", view: datePickerOne) + addFormRow(label: "Indicator Two Date", view: datePickerTwo) + addFormRow(label: "Indicator Three Date", view: datePickerThree) + + legendOneField + .textPublisher + .sink { + [weak self] text in + self?.updateIndicatorData(label: text, index: 0) + }.store(in: &subscribers) + + legendTwoField + .textPublisher + .sink { + [weak self] text in + self?.updateIndicatorData(label: text, index: 1) + }.store(in: &subscribers) + + legendThreeField + .textPublisher + .sink { + [weak self] text in + self?.updateIndicatorData(label: text, index: 2) + }.store(in: &subscribers) + } + + func setupPicker(){ + surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in + self?.component.surface = item + self?.contentTopView.backgroundColor = item.color + } + } + + func setupModel() { + legendOneField.text = "Due Date" + legendTwoField.text = "Auto Pay" + legendThreeField.text = "Scheduled" + } + + func updateIndicatorData(label: String = "", date: Date = Date(), index:Int) { + + print("Indicator data here >>> ") + } + + func configurePicker(_ sender:UIDatePicker) { + // Set some of UIDatePicker properties + sender.timeZone = NSTimeZone.local + sender.backgroundColor = UIColor.white + + // Add an event to call onDidChangeDate function when value is changed. + sender.addTarget(self, action: #selector(self.datePickerValueChanged(_:)), for: .valueChanged) + } + + @objc func datePickerValueChanged(_ sender: UIDatePicker){ + + // Create date formatter + let dateFormatter: DateFormatter = DateFormatter() + + // Set date format + dateFormatter.dateFormat = "MM/dd/yyyy hh:mm a" + + // Apply date format + let selectedDate: String = dateFormatter.string(from: sender.date) + + let date: Date = dateFormatter.date(from: selectedDate) ?? sender.date //TO DO: check is this required? + + switch sender.tag { + case 1: updateIndicatorData(date: sender.date, index: 0) + case 2: updateIndicatorData(date: sender.date, index: 1) + case 3: updateIndicatorData(date: sender.date, index: 2) + default: break + } + + print("Selected value \(selectedDate)") } } From 75310e1c4dc737e1bef990a0ed7160404e6a08d5 Mon Sep 17 00:00:00 2001 From: vasavk Date: Tue, 30 Apr 2024 11:26:14 +0530 Subject: [PATCH 05/16] Digital ACT-191 ONEAPP-7016 story: passing updated text for indicators --- .../CalendarViewController.swift | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/VDSSample/ViewControllers/CalendarViewController.swift b/VDSSample/ViewControllers/CalendarViewController.swift index f43f7dc..31fa5e8 100644 --- a/VDSSample/ViewControllers/CalendarViewController.swift +++ b/VDSSample/ViewControllers/CalendarViewController.swift @@ -27,7 +27,7 @@ class CalendarViewController: BaseViewController { private var datePickerOne: UIDatePicker = UIDatePicker() private var datePickerTwo: UIDatePicker = UIDatePicker() private var datePickerThree: UIDatePicker = UIDatePicker() - var indicators: [CalendarBase.CalendarIndicatorModel] = [] + var indicators: [CalendarIndicatorModel] = [] override func viewDidLoad() { super.viewDidLoad() @@ -76,21 +76,21 @@ class CalendarViewController: BaseViewController { .textPublisher .sink { [weak self] text in - self?.updateIndicatorData(label: text, index: 0) + self?.updateIndicatorData(label: text, date: self?.datePickerOne.date, index: 0) }.store(in: &subscribers) legendTwoField .textPublisher .sink { [weak self] text in - self?.updateIndicatorData(label: text, index: 1) + self?.updateIndicatorData(label: text, date: self?.datePickerTwo.date, index: 1) }.store(in: &subscribers) legendThreeField .textPublisher .sink { [weak self] text in - self?.updateIndicatorData(label: text, index: 2) + self?.updateIndicatorData(label: text, date: self?.datePickerThree.date, index: 2) }.store(in: &subscribers) } @@ -102,14 +102,16 @@ class CalendarViewController: BaseViewController { } func setupModel() { + component.indicators = indicators legendOneField.text = "Due Date" legendTwoField.text = "Auto Pay" legendThreeField.text = "Scheduled" } - func updateIndicatorData(label: String = "", date: Date = Date(), index:Int) { - - print("Indicator data here >>> ") + func updateIndicatorData(label: String = "", date: Date?, index:Int) { + indicators[index].label = label + indicators[index].date = date ?? Date() + component.indicators = indicators } func configurePicker(_ sender:UIDatePicker) { @@ -131,16 +133,13 @@ class CalendarViewController: BaseViewController { // Apply date format let selectedDate: String = dateFormatter.string(from: sender.date) - - let date: Date = dateFormatter.date(from: selectedDate) ?? sender.date //TO DO: check is this required? switch sender.tag { - case 1: updateIndicatorData(date: sender.date, index: 0) - case 2: updateIndicatorData(date: sender.date, index: 1) - case 3: updateIndicatorData(date: sender.date, index: 2) + case 1: updateIndicatorData(label: legendOneField.text ?? "", date: sender.date, index: 0) + case 2: updateIndicatorData(label: legendTwoField.text ?? "", date: sender.date, index: 1) + case 3: updateIndicatorData(label: legendThreeField.text ?? "", date: sender.date, index: 2) default: break } - - print("Selected value \(selectedDate)") +// print("Selected value \(selectedDate)") } } From a6b06f507686e66ed15f6c5a52fd2ebba341c20e Mon Sep 17 00:00:00 2001 From: vasavk Date: Tue, 30 Apr 2024 19:23:40 +0530 Subject: [PATCH 06/16] Digital ACT-191 ONEAPP-7016 story: added calendar to menu --- VDSSample/ViewControllers/CalendarViewController.swift | 4 ++-- VDSSample/ViewControllers/MenuViewController.swift | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/VDSSample/ViewControllers/CalendarViewController.swift b/VDSSample/ViewControllers/CalendarViewController.swift index 31fa5e8..2c40971 100644 --- a/VDSSample/ViewControllers/CalendarViewController.swift +++ b/VDSSample/ViewControllers/CalendarViewController.swift @@ -27,7 +27,7 @@ class CalendarViewController: BaseViewController { private var datePickerOne: UIDatePicker = UIDatePicker() private var datePickerTwo: UIDatePicker = UIDatePicker() private var datePickerThree: UIDatePicker = UIDatePicker() - var indicators: [CalendarIndicatorModel] = [] + var indicators: [CalendarBase.CalendarIndicatorModel] = [] override func viewDidLoad() { super.viewDidLoad() @@ -132,7 +132,7 @@ class CalendarViewController: BaseViewController { dateFormatter.dateFormat = "MM/dd/yyyy hh:mm a" // Apply date format - let selectedDate: String = dateFormatter.string(from: sender.date) +// let selectedDate: String = dateFormatter.string(from: sender.date) switch sender.tag { case 1: updateIndicatorData(label: legendOneField.text ?? "", date: sender.date, index: 0) diff --git a/VDSSample/ViewControllers/MenuViewController.swift b/VDSSample/ViewControllers/MenuViewController.swift index c300171..b929fa5 100644 --- a/VDSSample/ViewControllers/MenuViewController.swift +++ b/VDSSample/ViewControllers/MenuViewController.swift @@ -74,6 +74,7 @@ class MenuViewController: UITableViewController, TooltipLaunchable { MenuComponent(title: "Button", completed: true, viewController: ButtonViewController.self), MenuComponent(title: "ButtonGroup", completed: true, viewController: ButtonGroupViewController.self), MenuComponent(title: "ButtonIcon", completed: true, viewController: ButtonIconViewController.self), + MenuComponent(title: "Calendar", completed: false, viewController: CalendarViewController.self), MenuComponent(title: "Carousel Scrollbar", completed: true, viewController: CarouselScrollbarViewConttroller.self), MenuComponent(title: "Checkbox", completed: true, viewController: CheckboxViewController.self), MenuComponent(title: "CheckboxItem", completed: true, viewController: CheckboxItemViewController.self), From c45775759af404ba6bafdef1da88fb61641199ee Mon Sep 17 00:00:00 2001 From: vasavk Date: Sat, 4 May 2024 15:03:23 +0530 Subject: [PATCH 07/16] Digital ACT-191 ONEAPP-7016 story: Hide/Show indicators by toggling on/off --- .../CalendarViewController.swift | 71 +++++++++++++++++-- 1 file changed, 64 insertions(+), 7 deletions(-) diff --git a/VDSSample/ViewControllers/CalendarViewController.swift b/VDSSample/ViewControllers/CalendarViewController.swift index 2c40971..680f9f2 100644 --- a/VDSSample/ViewControllers/CalendarViewController.swift +++ b/VDSSample/ViewControllers/CalendarViewController.swift @@ -31,12 +31,11 @@ class CalendarViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - addContentTopView(view: component) - + addContentTopView(view: component) setupPicker() setupModel() } - + override func setupForm() { super.setupForm() configurePicker(datePickerOne) @@ -52,7 +51,7 @@ class CalendarViewController: BaseViewController { indicators = [ .init(label: "Due Date", date: datePickerOne.date), .init(label: "Auto Pay", date: datePickerTwo.date), - .init(label: "Scheduled", date: datePickerTwo.date), + .init(label: "Scheduled", date: datePickerTwo.date) ] //add form rows @@ -92,6 +91,41 @@ class CalendarViewController: BaseViewController { [weak self] text in self?.updateIndicatorData(label: text, date: self?.datePickerThree.date, index: 2) }.store(in: &subscribers) + + indicatorOneSwitch.onChange = { [weak self] sender in + guard let self else { return } + if !sender.isOn { + component.indicators.removeAll() + } else { + self.setIndicatorsData() + } + } + + indicatorTwoSwitch.onChange = { [weak self] sender in + guard let self else { return } + if !sender.isOn { + if component.indicators.count > 2 { + component.indicators.removeLast() + component.indicators.removeLast() + } else if component.indicators.count == 2 { + component.indicators.removeLast() + } + } else { + self.setIndicatorsData() + } + + } + + indicatorThreeSwitch.onChange = { [weak self] sender in + guard let self else { return } + if !sender.isOn { + if component.indicators.count > 2 { + component.indicators.removeLast() + } + } else { + self.setIndicatorsData() + } + } } func setupPicker(){ @@ -106,6 +140,9 @@ class CalendarViewController: BaseViewController { legendOneField.text = "Due Date" legendTwoField.text = "Auto Pay" legendThreeField.text = "Scheduled" + indicatorOneSwitch.isOn = true + indicatorTwoSwitch.isOn = true + indicatorThreeSwitch.isOn = true } func updateIndicatorData(label: String = "", date: Date?, index:Int) { @@ -113,7 +150,27 @@ class CalendarViewController: BaseViewController { indicators[index].date = date ?? Date() component.indicators = indicators } - + + func setIndicatorsData() { + if indicatorOneSwitch.isOn && indicatorTwoSwitch.isOn && indicatorThreeSwitch.isOn { + component.indicators = [ + .init(label: self.legendOneField.text ?? "", date: datePickerOne.date), + .init(label: self.legendTwoField.text ?? "", date: datePickerTwo.date), + .init(label: self.legendThreeField.text ?? "", date: datePickerTwo.date) + ] + } else if indicatorOneSwitch.isOn && indicatorTwoSwitch.isOn && !indicatorThreeSwitch.isOn { + component.indicators = [ + .init(label: self.legendOneField.text ?? "", date: datePickerOne.date), + .init(label: self.legendTwoField.text ?? "", date: datePickerTwo.date), + ] + + } else if indicatorOneSwitch.isOn && !indicatorTwoSwitch.isOn { + component.indicators = [ + .init(label: self.legendOneField.text ?? "", date: datePickerOne.date), + ] + } + } + func configurePicker(_ sender:UIDatePicker) { // Set some of UIDatePicker properties sender.timeZone = NSTimeZone.local @@ -132,7 +189,7 @@ class CalendarViewController: BaseViewController { dateFormatter.dateFormat = "MM/dd/yyyy hh:mm a" // Apply date format -// let selectedDate: String = dateFormatter.string(from: sender.date) + // let selectedDate: String = dateFormatter.string(from: sender.date) switch sender.tag { case 1: updateIndicatorData(label: legendOneField.text ?? "", date: sender.date, index: 0) @@ -140,6 +197,6 @@ class CalendarViewController: BaseViewController { case 3: updateIndicatorData(label: legendThreeField.text ?? "", date: sender.date, index: 2) default: break } -// print("Selected value \(selectedDate)") + // print("Selected value \(selectedDate)") } } From b408be250ad9a4b41e8d34305ad99524e40f9d3d Mon Sep 17 00:00:00 2001 From: vasavk Date: Mon, 6 May 2024 09:51:07 +0530 Subject: [PATCH 08/16] Digital ACT-191 ONEAPP-7016 story: hide/show container border --- .../ViewControllers/CalendarViewController.swift | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/VDSSample/ViewControllers/CalendarViewController.swift b/VDSSample/ViewControllers/CalendarViewController.swift index 680f9f2..a2ae7a7 100644 --- a/VDSSample/ViewControllers/CalendarViewController.swift +++ b/VDSSample/ViewControllers/CalendarViewController.swift @@ -13,7 +13,7 @@ import VDSTokens class CalendarViewController: BaseViewController { - var borderSwitch = Toggle() + var containerBorderSwitch = Toggle() var dateIndicatorSwitch = Toggle() var transparentSwitch = Toggle() var indicatorOneSwitch = Toggle() @@ -31,7 +31,7 @@ class CalendarViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - addContentTopView(view: component) + addContentTopView(view: component) setupPicker() setupModel() } @@ -56,7 +56,7 @@ class CalendarViewController: BaseViewController { //add form rows addFormRow(label: "Surface", view: surfacePickerSelectorView) - addFormRow(label: "Hide Container Border", view: borderSwitch) + addFormRow(label: "Hide Container Border", view: containerBorderSwitch) addFormRow(label: "Hide Current Date Indicator", view: dateIndicatorSwitch) addFormRow(label: "Min Date", view: minDateField) addFormRow(label: "Max Date", view: maxDateField) @@ -71,6 +71,11 @@ class CalendarViewController: BaseViewController { addFormRow(label: "Indicator Two Date", view: datePickerTwo) addFormRow(label: "Indicator Three Date", view: datePickerThree) + containerBorderSwitch.onChange = { [weak self] sender in + guard let self else { return } + component.hideContainerBorder = sender.isOn + } + legendOneField .textPublisher .sink { From 68f7450255809d7f78540a02239f14992bd2a7ac Mon Sep 17 00:00:00 2001 From: vasavk Date: Mon, 6 May 2024 16:11:54 +0530 Subject: [PATCH 09/16] Digital ACT-191 ONEAPP-7016 story: hide/show current date indicator --- .../CalendarViewController.swift | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/VDSSample/ViewControllers/CalendarViewController.swift b/VDSSample/ViewControllers/CalendarViewController.swift index a2ae7a7..4506ffd 100644 --- a/VDSSample/ViewControllers/CalendarViewController.swift +++ b/VDSSample/ViewControllers/CalendarViewController.swift @@ -14,8 +14,8 @@ import VDSTokens class CalendarViewController: BaseViewController { var containerBorderSwitch = Toggle() - var dateIndicatorSwitch = Toggle() - var transparentSwitch = Toggle() + var hideCurrentDateIndicatorSwitch = Toggle() + var transparentBgSwitch = Toggle() var indicatorOneSwitch = Toggle() var indicatorTwoSwitch = Toggle() var indicatorThreeSwitch = Toggle() @@ -57,10 +57,10 @@ class CalendarViewController: BaseViewController { //add form rows addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Hide Container Border", view: containerBorderSwitch) - addFormRow(label: "Hide Current Date Indicator", view: dateIndicatorSwitch) + addFormRow(label: "Hide Current Date Indicator", view: hideCurrentDateIndicatorSwitch) addFormRow(label: "Min Date", view: minDateField) addFormRow(label: "Max Date", view: maxDateField) - addFormRow(label: "Transparent Background", view: transparentSwitch) + addFormRow(label: "Transparent Background", view: transparentBgSwitch) addFormRow(label: "Indicator One", view: indicatorOneSwitch) addFormRow(label: "Indicator Two", view: indicatorTwoSwitch) addFormRow(label: "Indicator Three", view: indicatorThreeSwitch) @@ -76,6 +76,16 @@ class CalendarViewController: BaseViewController { component.hideContainerBorder = sender.isOn } + hideCurrentDateIndicatorSwitch.onChange = { [weak self] sender in + guard let self else { return } + component.hideCurrentDateIndicator = sender.isOn + } + + transparentBgSwitch.onChange = { [weak self] sender in + guard let self else { return } + component.transparentBackground = sender.isOn + } + legendOneField .textPublisher .sink { @@ -148,6 +158,7 @@ class CalendarViewController: BaseViewController { indicatorOneSwitch.isOn = true indicatorTwoSwitch.isOn = true indicatorThreeSwitch.isOn = true + hideCurrentDateIndicatorSwitch.isOn = false } func updateIndicatorData(label: String = "", date: Date?, index:Int) { From d85003e66b2f4774bb2fcfb75905d665835fc807 Mon Sep 17 00:00:00 2001 From: vasavk Date: Tue, 7 May 2024 11:21:26 +0530 Subject: [PATCH 10/16] Digital ACT-191 ONEAPP-7016 story: added active dates, inactive dates options to form. --- .../CalendarViewController.swift | 159 ++++++++++++++---- 1 file changed, 123 insertions(+), 36 deletions(-) diff --git a/VDSSample/ViewControllers/CalendarViewController.swift b/VDSSample/ViewControllers/CalendarViewController.swift index 4506ffd..6b7b107 100644 --- a/VDSSample/ViewControllers/CalendarViewController.swift +++ b/VDSSample/ViewControllers/CalendarViewController.swift @@ -19,15 +19,30 @@ class CalendarViewController: BaseViewController { var indicatorOneSwitch = Toggle() var indicatorTwoSwitch = Toggle() var indicatorThreeSwitch = Toggle() + var clearActiveDatesSwitch = Toggle() + var clearInactiveDatesSwitch = Toggle() + var activeDatesField = TextField() + var inactiveDatesField = TextField() var legendOneField = TextField() var legendTwoField = TextField() var legendThreeField = TextField() - private var minDateField: UIDatePicker = UIDatePicker() - private var maxDateField: UIDatePicker = UIDatePicker() - private var datePickerOne: UIDatePicker = UIDatePicker() - private var datePickerTwo: UIDatePicker = UIDatePicker() - private var datePickerThree: UIDatePicker = UIDatePicker() + + private var minDatePicker: UIDatePicker = UIDatePicker() + private var maxDatePicker: UIDatePicker = UIDatePicker() + private var indicatorOnePicker: UIDatePicker = UIDatePicker() + private var indicatorTwoPicker: UIDatePicker = UIDatePicker() + private var indicatorThreePicker: UIDatePicker = UIDatePicker() + private var activeDatePicker: UIDatePicker = UIDatePicker() + private var inactiveDatePicker: UIDatePicker = UIDatePicker() + var indicators: [CalendarBase.CalendarIndicatorModel] = [] + let indicatorOnePickerTag = 1 + let indicatorTwoPickerTag = 2 + let indicatorThreePickerTag = 3 + let minDatePickerTag = 4 + let maxDatePickerTag = 5 + let activeDatePickerTag = 6 + let inactiveDatePickerTag = 7 override func viewDidLoad() { super.viewDidLoad() @@ -38,38 +53,52 @@ class CalendarViewController: BaseViewController { override func setupForm() { super.setupForm() - configurePicker(datePickerOne) - datePickerOne.tag = 1 - configurePicker(datePickerTwo) - datePickerTwo.tag = 2 - configurePicker(datePickerThree) - datePickerThree.tag = 3 - configurePicker(minDateField) - minDateField.tag = 4 - configurePicker(maxDateField) - maxDateField.tag = 5 + configurePicker(indicatorOnePicker) + indicatorOnePicker.tag = indicatorOnePickerTag + configurePicker(indicatorTwoPicker) + indicatorTwoPicker.tag = indicatorTwoPickerTag + configurePicker(indicatorThreePicker) + indicatorThreePicker.tag = indicatorThreePickerTag + configurePicker(minDatePicker) + minDatePicker.tag = minDatePickerTag + configurePicker(maxDatePicker) + maxDatePicker.tag = maxDatePickerTag + configurePicker(activeDatePicker) + activeDatePicker.tag = activeDatePickerTag + configurePicker(inactiveDatePicker) + inactiveDatePicker.tag = inactiveDatePickerTag indicators = [ - .init(label: "Due Date", date: datePickerOne.date), - .init(label: "Auto Pay", date: datePickerTwo.date), - .init(label: "Scheduled", date: datePickerTwo.date) + .init(label: "Due Date", date: indicatorOnePicker.date), + .init(label: "Auto Pay", date: indicatorTwoPicker.date), + .init(label: "Scheduled", date: indicatorThreePicker.date) ] //add form rows addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Hide Container Border", view: containerBorderSwitch) addFormRow(label: "Hide Current Date Indicator", view: hideCurrentDateIndicatorSwitch) - addFormRow(label: "Min Date", view: minDateField) - addFormRow(label: "Max Date", view: maxDateField) + addFormRow(label: "Min Date", view: minDatePicker) + addFormRow(label: "Max Date", view: maxDatePicker) addFormRow(label: "Transparent Background", view: transparentBgSwitch) + addFormRow(label: "Active Dates", view: activeDatesField) + addFormRow(label: "Select ActiveDate", view: activeDatePicker) + addFormRow(label: "Clear Active Dates", view: clearActiveDatesSwitch) + addFormRow(label: "Inactive Dates", view: inactiveDatesField) + addFormRow(label: "Select InActiveDate", view: inactiveDatePicker) + addFormRow(label: "Clear Inactive Dates", view: clearInactiveDatesSwitch) addFormRow(label: "Indicator One", view: indicatorOneSwitch) addFormRow(label: "Indicator Two", view: indicatorTwoSwitch) addFormRow(label: "Indicator Three", view: indicatorThreeSwitch) addFormRow(label: "Legend One", view: legendOneField) addFormRow(label: "Legend Two", view: legendTwoField) addFormRow(label: "Legend Three", view: legendThreeField) - addFormRow(label: "Indicator One Date", view: datePickerOne) - addFormRow(label: "Indicator Two Date", view: datePickerTwo) - addFormRow(label: "Indicator Three Date", view: datePickerThree) + addFormRow(label: "Indicator One Date", view: indicatorOnePicker) + addFormRow(label: "Indicator Two Date", view: indicatorTwoPicker) + addFormRow(label: "Indicator Three Date", view: indicatorThreePicker) + activeDatesField.isUserInteractionEnabled = false + inactiveDatesField.isUserInteractionEnabled = false + activeDatesField.isEnabled = false + inactiveDatesField.isEnabled = false containerBorderSwitch.onChange = { [weak self] sender in guard let self else { return } @@ -86,25 +115,41 @@ class CalendarViewController: BaseViewController { component.transparentBackground = sender.isOn } + clearActiveDatesSwitch.onChange = { [weak self] sender in + guard let self else { return } + if sender.isOn { + activeDatesField.text = "" + component.activeDates = [] + } + } + + clearInactiveDatesSwitch.onChange = { [weak self] sender in + guard let self else { return } + if sender.isOn { + inactiveDatesField.text = "" + component.inactiveDates = [] + } + } + legendOneField .textPublisher .sink { [weak self] text in - self?.updateIndicatorData(label: text, date: self?.datePickerOne.date, index: 0) + self?.updateIndicatorData(label: text, date: self?.indicatorOnePicker.date, index: 0) }.store(in: &subscribers) legendTwoField .textPublisher .sink { [weak self] text in - self?.updateIndicatorData(label: text, date: self?.datePickerTwo.date, index: 1) + self?.updateIndicatorData(label: text, date: self?.indicatorTwoPicker.date, index: 1) }.store(in: &subscribers) legendThreeField .textPublisher .sink { [weak self] text in - self?.updateIndicatorData(label: text, date: self?.datePickerThree.date, index: 2) + self?.updateIndicatorData(label: text, date: self?.indicatorThreePicker.date, index: 2) }.store(in: &subscribers) indicatorOneSwitch.onChange = { [weak self] sender in @@ -159,6 +204,12 @@ class CalendarViewController: BaseViewController { indicatorTwoSwitch.isOn = true indicatorThreeSwitch.isOn = true hideCurrentDateIndicatorSwitch.isOn = false + indicatorOnePicker.date = Calendar.current.date(byAdding: .day, value: 1, to: Date())! + indicatorTwoPicker.date = Calendar.current.date(byAdding: .day, value: 1, to: Date())! + indicatorThreePicker.date = Calendar.current.date(byAdding: .day, value: 1, to: Date())! + updateIndicatorData(label: legendOneField.text ?? "", date: indicatorOnePicker.date, index: 0) + updateIndicatorData(label: legendTwoField.text ?? "", date: indicatorTwoPicker.date, index: 1) + updateIndicatorData(label: legendThreeField.text ?? "", date: indicatorThreePicker.date, index: 2) } func updateIndicatorData(label: String = "", date: Date?, index:Int) { @@ -170,19 +221,19 @@ class CalendarViewController: BaseViewController { func setIndicatorsData() { if indicatorOneSwitch.isOn && indicatorTwoSwitch.isOn && indicatorThreeSwitch.isOn { component.indicators = [ - .init(label: self.legendOneField.text ?? "", date: datePickerOne.date), - .init(label: self.legendTwoField.text ?? "", date: datePickerTwo.date), - .init(label: self.legendThreeField.text ?? "", date: datePickerTwo.date) + .init(label: self.legendOneField.text ?? "", date: indicatorOnePicker.date), + .init(label: self.legendTwoField.text ?? "", date: indicatorTwoPicker.date), + .init(label: self.legendThreeField.text ?? "", date: indicatorThreePicker.date) ] } else if indicatorOneSwitch.isOn && indicatorTwoSwitch.isOn && !indicatorThreeSwitch.isOn { component.indicators = [ - .init(label: self.legendOneField.text ?? "", date: datePickerOne.date), - .init(label: self.legendTwoField.text ?? "", date: datePickerTwo.date), + .init(label: self.legendOneField.text ?? "", date: indicatorOnePicker.date), + .init(label: self.legendTwoField.text ?? "", date: indicatorTwoPicker.date), ] } else if indicatorOneSwitch.isOn && !indicatorTwoSwitch.isOn { component.indicators = [ - .init(label: self.legendOneField.text ?? "", date: datePickerOne.date), + .init(label: self.legendOneField.text ?? "", date: indicatorOnePicker.date), ] } } @@ -206,13 +257,49 @@ class CalendarViewController: BaseViewController { // Apply date format // let selectedDate: String = dateFormatter.string(from: sender.date) + // print("Selected value \(selectedDate)") switch sender.tag { - case 1: updateIndicatorData(label: legendOneField.text ?? "", date: sender.date, index: 0) - case 2: updateIndicatorData(label: legendTwoField.text ?? "", date: sender.date, index: 1) - case 3: updateIndicatorData(label: legendThreeField.text ?? "", date: sender.date, index: 2) + case indicatorOnePickerTag: + updateIndicatorData(label: legendOneField.text ?? "", date: sender.date, index: 0) + case indicatorTwoPickerTag: + updateIndicatorData(label: legendTwoField.text ?? "", date: sender.date, index: 1) + case indicatorThreePickerTag: + updateIndicatorData(label: legendThreeField.text ?? "", date: sender.date, index: 2) + case minDatePickerTag: + component.minDate = sender.date + case maxDatePickerTag: + component.maxDate = sender.date + case activeDatePickerTag: + component.activeDates.append(sender.date) + var text = activeDatesField.text + if let textEmpty = text?.isEmpty, textEmpty == true { + text?.append("") + } else { + text?.append(", ") + } + text?.append("\(self.getSelectedDate(with: sender.date))") + clearActiveDatesSwitch.isOn = false + activeDatesField.text = text + case inactiveDatePickerTag: + component.inactiveDates.append(sender.date) + var text = inactiveDatesField.text + if let textEmpty = text?.isEmpty, textEmpty == true { + text?.append("") + } else { + text?.append(", ") + } + text?.append("\(self.getSelectedDate(with: sender.date))") + clearInactiveDatesSwitch.isOn = false + inactiveDatesField.text = text default: break } - // print("Selected value \(selectedDate)") + } + + func getSelectedDate(with date:Date) -> String { + let dateFormatter: DateFormatter = DateFormatter() + dateFormatter.dateFormat = "MM/dd/yyyy" + let day: String = dateFormatter.string(from: date) + return day } } From 7d263c62cb0c21555d09a60d7d6f9037aec89ace Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 13 May 2024 14:55:15 -0500 Subject: [PATCH 11/16] updated for isRequired Signed-off-by: Matt Bruce --- VDSSample/ViewControllers/DatePickerViewController.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VDSSample/ViewControllers/DatePickerViewController.swift b/VDSSample/ViewControllers/DatePickerViewController.swift index 69690ca..4e6be9f 100644 --- a/VDSSample/ViewControllers/DatePickerViewController.swift +++ b/VDSSample/ViewControllers/DatePickerViewController.swift @@ -53,11 +53,11 @@ class DatePickerViewController: BaseViewController { } requiredSwitch.onChange = { [weak self] sender in - self?.component.required = sender.isOn + self?.component.isRequired = sender.isOn } readonlySwitch.onChange = { [weak self] sender in - self?.component.readOnly = sender.isOn + self?.component.isReadOnly = sender.isOn } transparentBgSwitch.onChange = { [weak self] sender in @@ -119,7 +119,7 @@ class DatePickerViewController: BaseViewController { //setup UI disabledSwitch.isOn = !component.isEnabled - requiredSwitch.isOn = component.required + requiredSwitch.isOn = component.isRequired surfacePickerSelectorView.text = component.surface.rawValue labelTextField.text = component.labelText helperTextField.text = component.helperText From a7ccec0f989022e68d494e20cf2b93df2a85c10b Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 13 May 2024 15:13:45 -0500 Subject: [PATCH 12/16] 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() { From 4be27a1442282820eb372e6c363472fd9d8b85df Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 14 May 2024 11:24:23 -0500 Subject: [PATCH 13/16] merged Signed-off-by: Matt Bruce --- VDSSample/Extensions/IconName.swift | 3 +-- .../external-link.imageset/Contents.json | 15 --------------- .../external-link.imageset/external-link.svg | 1 - 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 VDSSample/Supporting Files/Resources/SVG.xcassets/external-link.imageset/Contents.json delete mode 100644 VDSSample/Supporting Files/Resources/SVG.xcassets/external-link.imageset/external-link.svg diff --git a/VDSSample/Extensions/IconName.swift b/VDSSample/Extensions/IconName.swift index 7e96269..f9b71dd 100644 --- a/VDSSample/Extensions/IconName.swift +++ b/VDSSample/Extensions/IconName.swift @@ -151,7 +151,6 @@ extension Icon.Name { public static let error = Icon.Name(name: "error") public static let euro = Icon.Name(name: "euro") public static let expense = Icon.Name(name: "expense") - public static let externalLink = Icon.Name(name: "external-link") public static let faceCovering = Icon.Name(name: "face-covering") public static let facebook = Icon.Name(name: "facebook") public static let fallDetected = Icon.Name(name: "fall-detected") @@ -516,5 +515,5 @@ extension Icon.Name { public static let zoomIn = Icon.Name(name: "zoom-in") public static let zoomOut = Icon.Name(name: "zoom-out") static let all: [Icon.Name] = [ - threedAd, accessibility, accessories, adTechStack, adaptiveSpeaker, addFolder, addToFavorite, addUser, addedToFavorite, advancedSettings, agentChat, agricultureLeaves, agricultureTractor, agricultureVineyard, aiDashcam, airConditioner, airport, alertNotification, ambulance, americanSignLanguage, analytics, announcement, ar, archive, artboard, assetTracking, assistedListeningSystems, at, attach, audienceTargetedSearch, audioDescription, award, awareness, babyMonitor, barcode, battery, bestPractices, bid, billDown, billUp, blind, bluetooth, bonusData, bookmark, bot, boxOpen, braille, brightness, bringYourOwnDevice, bucketTruckBoom, bucketTruck, bug, businessContinuity, calendar, calibrate, callDisconnected, callerId, camera, carBattery, carryoverData, cellPhone, cellTower, chat, checkmark, cleanSurface, clock, closeAlternate, close, closedCaptioning, cloudDocument, cloud, coffee, cognitiveDisability, coin, comparison, compass, complianceDocument, compose, conditionBasedMaintenance, conditionBasedWrench, connectParts, connect, constructionHammer, constructionTruck, consultativeTransfer, convergence, conversion, countDown, creditCard, crop, crossDeviceTargeting, crossDevice, cta, ctr, customAudience, customize, dataBoost, data, deaf, decrease, deviceActivity, deviceProtection, devicesAddons, dfcVideoSideBySide, diagnostic, digitalContent, digitalSignageCar, digitalSignage, dining, directCarrierBilling, directory, displayUtilities, display, distribution, domainTargeting, doorbell, downArrow, downCaret, download, dragAndDrop, driver, droneCamera, dropShipment, duplicate, edit, educationCurriculum, education, electricCar, electricPower, electricUtility, electricVan, emailSignature, email, embeddedSound, emergencyContact, emoji, employeeTermination, energyScience, energyUtilities, enterprise, error, euro, expense, externalLink, faceCovering, facebook, fallDetected, favorite, fax, federalDefense, feedback, filterOff, filter, financial, findMyRemote, fineArt, fingerprintSensor, fire, fitToZone, flag, fleetTracking, fleet, flexibilityRectangles, flexibility, flipCamera, flurry, forwardedCall, fridge, fullscreen, gaming, gas, gateway, geofence, getHelp, gift, giftedData, government, gridView, groupFamily, growthOpportunities, growth, hackers, handshake, healthcareCorporate, healthcareGeneral, healthcareWorker, history, homeInternet, home, humidity, ideasSolutions, identityGraph, impressionVideo, inStorePickup, inclusivity, incomingCall, increase, industry, inferredIdentity, info, instagram, insurance, intelligentTracking, internationalLongDistance, internationalSymbolOfAccess, international, internetDevices, internetOfThings, inventory, invitationAccepted, invitationExpired, invitationRejected, irobot, ironingBoard, joinCall, k12Education, kidsStroller, landscape, laptopAntivirus, laptopControls, laptopGpsTracking, laptopSettings, laptopTrends, laptopWireless, largePlan, law, leftArrow, leftCaret, levers, light, link, list, liveCaption, lmr, loanerEquipment, locationPin, location, lockClosed, lockOpen, logout, loyaltyRetention, manufacturing, mapView, masonryView, maximize, medal, mediaEntertainment, mediumBusiness, mediumPlan, menu, mergeCalls, microphone, minus, missedCall, mobileApps, mobileCommandCenter, mobileHotspot, mobileKioskInfo, mobileKioskWireless, mobilePlusTv, mobileRetail, mobileRetargeting, mobileSearch, mobileWorkforceManagement, moreHorizontal, motionDetector, moveTo, multicast, multipleDeviceProtection, multipleDevices, multipleDocuments, music, mute, myAccount, nationwide, nativeVideo, native, networkAttachedStorage, networkConnection, network, news, next, nfcTag, night, noFee, noOff, noSmoking, noVideo, no, notification, notificationsOff, notifyMe, officePhoneSystem, oilIndustry, onDemand, onGoCar, oneYear, openCaptioning, operationalTransformation, orders, outOfStock, outgoingCall, packBackpack, packLuggage, packPurse, paperFreeBilling, passenger, pauseInternet, pause, peelSticker, petsCollar, pharmaceutical, phoneAllGood, phoneFavorite, phoneMedical, phonePublicSafety, phoneVolume, phone, photo, platform, playWith, play, plus, policeFleet, portrait, pressure, previous, print, professionalServicesCase, professionalServicesChart, publicSafety, publicTransportation, purchaseData, pushNotification, pushToTalk, question, realTimeTracking, realTime, recycle, remindMe, reminder, removeItem, reoccurringPayment, replaceAPhoto, reply, reportsAndAlerts, research, reservations, responsibleBusiness, retailStore, retargeting, returns, rewards, rightArrow, rightCaret, ringing, ringtone, riskMonitor, router, rss, satelliteOff, satellite, save, scaleAlt, scale, schoolNotebook, search, securityAlert, securityCheck, securityKeyhole, securityWireless, sendMessage, serverClock, serverSearch, serverStack, setFallbackImage, setGalleryImage, settings, share, shipping, shock, shoppingBag, shopping, signalBroadcast, simCard, singleDocument, smallBusiness, smallPlan, smartAssistant, smartBoiler, smartCommunities, smartFamilyChildAddressBook, smartLighting, smartMeter, smartScooter, smartSocket, smartSwitch, smokeDetector, snooze, socialDistancing, solarPanel, sort, sound, speakerMute, speakerPhone, speedMonitoring, speed, sportsBike, sportsSkis, sportsSoccer, sportsTennis, stadiumFlag, stakeholder, star, steps, stethoscope, stockTogether, stopAlt, stop, supportDrawer, support, survey, swipeLeft, swipeRight, swipe, `switch`, sync, tabletData, tabletWireless, tablet, tag, talking, targetGoal, taxes, teamLeader, techLaptop, technology, telematicsCar, teletype, temperature, template, textToSpeech, theme, thermostatTech, thumbsDown, thumbsUp, ticket, tiles, tilt, timer, tireBlowout, tools, topBox, totalMobileProtection, towTruck, tradingDeck, trafficLight, traffic, trailers, training, transportation, trash, travelKeys, travelPass, tripPlanner, trumpet, turnOnOff, tvContent, tv, twitter, undo, unification, unlimitedPlan, upArrow, upCaret, uplink, upload, urlTransparency, userGuides1, userGuides2, userRegistration, userSettings, utilityGridManagement, vibration, videoOnTablet, video, virtualReality, visibility, voiceHd, voiceMail, volume, volunteer, warning, waterResistant, waterUtility, wearable, weather, webinar, weights, whiteboard, winchService, wirelessVending, wirelessVideoSurveillance, yield, youtube, zoomIn, zoomOut ] + threedAd, accessibility, accessories, adTechStack, adaptiveSpeaker, addFolder, addToFavorite, addUser, addedToFavorite, advancedSettings, agentChat, agricultureLeaves, agricultureTractor, agricultureVineyard, aiDashcam, airConditioner, airport, alertNotification, ambulance, americanSignLanguage, analytics, announcement, ar, archive, artboard, assetTracking, assistedListeningSystems, at, attach, audienceTargetedSearch, audioDescription, award, awareness, babyMonitor, barcode, battery, bestPractices, bid, billDown, billUp, blind, bluetooth, bonusData, bookmark, bot, boxOpen, braille, brightness, bringYourOwnDevice, bucketTruckBoom, bucketTruck, bug, businessContinuity, calendar, calibrate, callDisconnected, callerId, camera, carBattery, carryoverData, cellPhone, cellTower, chat, checkmark, cleanSurface, clock, closeAlternate, close, closedCaptioning, cloudDocument, cloud, coffee, cognitiveDisability, coin, comparison, compass, complianceDocument, compose, conditionBasedMaintenance, conditionBasedWrench, connectParts, connect, constructionHammer, constructionTruck, consultativeTransfer, convergence, conversion, countDown, creditCard, crop, crossDeviceTargeting, crossDevice, cta, ctr, customAudience, customize, dataBoost, data, deaf, decrease, deviceActivity, deviceProtection, devicesAddons, dfcVideoSideBySide, diagnostic, digitalContent, digitalSignageCar, digitalSignage, dining, directCarrierBilling, directory, displayUtilities, display, distribution, domainTargeting, doorbell, downArrow, downCaret, download, dragAndDrop, driver, droneCamera, dropShipment, duplicate, edit, educationCurriculum, education, electricCar, electricPower, electricUtility, electricVan, emailSignature, email, embeddedSound, emergencyContact, emoji, employeeTermination, energyScience, energyUtilities, enterprise, error, euro, expense, externalLink, faceCovering, facebook, fallDetected, favorite, fax, federalDefense, feedback, filterOff, filter, financial, findMyRemote, fineArt, fingerprintSensor, fire, fitToZone, flag, fleetTracking, fleet, flexibilityRectangles, flexibility, flipCamera, flurry, forwardedCall, fridge, fullscreen, gaming, gas, gateway, geofence, getHelp, gift, giftedData, government, gridView, groupFamily, growthOpportunities, growth, hackers, handshake, healthcareCorporate, healthcareGeneral, healthcareWorker, history, homeInternet, home, humidity, ideasSolutions, identityGraph, impressionVideo, inStorePickup, inclusivity, incomingCall, increase, industry, inferredIdentity, info, instagram, insurance, intelligentTracking, internationalLongDistance, internationalSymbolOfAccess, international, internetDevices, internetOfThings, inventory, invitationAccepted, invitationExpired, invitationRejected, irobot, ironingBoard, joinCall, k12Education, kidsStroller, landscape, laptopAntivirus, laptopControls, laptopGpsTracking, laptopSettings, laptopTrends, laptopWireless, largePlan, law, leftArrow, leftCaret, levers, light, link, list, liveCaption, lmr, loanerEquipment, locationPin, location, lockClosed, lockOpen, logout, loyaltyRetention, manufacturing, mapView, masonryView, maximize, medal, mediaEntertainment, mediumBusiness, mediumPlan, menu, mergeCalls, microphone, minus, missedCall, mobileApps, mobileCommandCenter, mobileHotspot, mobileKioskInfo, mobileKioskWireless, mobilePlusTv, mobileRetail, mobileRetargeting, mobileSearch, mobileWorkforceManagement, moreHorizontal, motionDetector, moveTo, multicast, multipleDeviceProtection, multipleDevices, multipleDocuments, music, mute, myAccount, nationwide, nativeVideo, native, networkAttachedStorage, networkConnection, network, news, next, nfcTag, night, noFee, noOff, noSmoking, noVideo, no, notification, notificationsOff, notifyMe, officePhoneSystem, oilIndustry, onDemand, onGoCar, oneYear, openCaptioning, operationalTransformation, orders, outOfStock, outgoingCall, packBackpack, packLuggage, packPurse, paperFreeBilling, passenger, pauseInternet, pause, peelSticker, petsCollar, pharmaceutical, phoneAllGood, phoneFavorite, phoneMedical, phonePublicSafety, phoneVolume, phone, photo, platform, playWith, play, plus, policeFleet, portrait, pressure, previous, print, professionalServicesCase, professionalServicesChart, publicSafety, publicTransportation, purchaseData, pushNotification, pushToTalk, question, realTimeTracking, realTime, recycle, remindMe, reminder, removeItem, reoccurringPayment, replaceAPhoto, reply, reportsAndAlerts, research, reservations, responsibleBusiness, retailStore, retargeting, returns, rewards, rightArrow, rightCaret, ringing, ringtone, riskMonitor, router, rss, satelliteOff, satellite, save, scaleAlt, scale, schoolNotebook, search, securityAlert, securityCheck, securityKeyhole, securityWireless, sendMessage, serverClock, serverSearch, serverStack, setFallbackImage, setGalleryImage, settings, share, shipping, shock, shoppingBag, shopping, signalBroadcast, simCard, singleDocument, smallBusiness, smallPlan, smartAssistant, smartBoiler, smartCommunities, smartFamilyChildAddressBook, smartLighting, smartMeter, smartScooter, smartSocket, smartSwitch, smokeDetector, snooze, socialDistancing, solarPanel, sort, sound, speakerMute, speakerPhone, speedMonitoring, speed, sportsBike, sportsSkis, sportsSoccer, sportsTennis, stadiumFlag, stakeholder, star, steps, stethoscope, stockTogether, stopAlt, stop, supportDrawer, support, survey, swipeLeft, swipeRight, swipe, `switch`, sync, tabletData, tabletWireless, tablet, tag, talking, targetGoal, taxes, teamLeader, techLaptop, technology, telematicsCar, teletype, temperature, template, textToSpeech, theme, thermostatTech, thumbsDown, thumbsUp, ticket, tiles, tilt, timer, tireBlowout, tools, topBox, totalMobileProtection, towTruck, tradingDeck, trafficLight, traffic, trailers, training, transportation, trash, travelKeys, travelPass, tripPlanner, trumpet, turnOnOff, tvContent, tv, twitter, undo, unification, unlimitedPlan, upArrow, upCaret, uplink, upload, urlTransparency, userGuides1, userGuides2, userRegistration, userSettings, utilityGridManagement, vibration, videoOnTablet, video, virtualReality, visibility, voiceHd, voiceMail, volume, volunteer, warning, waterResistant, waterUtility, wearable, weather, webinar, weights, whiteboard, winchService, wirelessVending, wirelessVideoSurveillance, yield, youtube, zoomIn, zoomOut] } diff --git a/VDSSample/Supporting Files/Resources/SVG.xcassets/external-link.imageset/Contents.json b/VDSSample/Supporting Files/Resources/SVG.xcassets/external-link.imageset/Contents.json deleted file mode 100644 index 1e10c5e..0000000 --- a/VDSSample/Supporting Files/Resources/SVG.xcassets/external-link.imageset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "images" : [ - { - "filename" : "external-link.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true - } -} diff --git a/VDSSample/Supporting Files/Resources/SVG.xcassets/external-link.imageset/external-link.svg b/VDSSample/Supporting Files/Resources/SVG.xcassets/external-link.imageset/external-link.svg deleted file mode 100644 index 5c545b6..0000000 --- a/VDSSample/Supporting Files/Resources/SVG.xcassets/external-link.imageset/external-link.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 613288d86d2ee3023d8dda362196a8fd01e6499d Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 14 May 2024 16:36:16 -0500 Subject: [PATCH 14/16] updated samples Signed-off-by: Matt Bruce --- .../CalendarViewController.swift | 34 +++++++++---------- .../DatePickerViewController.swift | 6 ++-- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/VDSSample/ViewControllers/CalendarViewController.swift b/VDSSample/ViewControllers/CalendarViewController.swift index 6b7b107..9d6ca4a 100644 --- a/VDSSample/ViewControllers/CalendarViewController.swift +++ b/VDSSample/ViewControllers/CalendarViewController.swift @@ -12,7 +12,7 @@ import Combine import VDSTokens class CalendarViewController: BaseViewController { - + let label = Label() var containerBorderSwitch = Toggle() var hideCurrentDateIndicatorSwitch = Toggle() var transparentBgSwitch = Toggle() @@ -32,8 +32,8 @@ class CalendarViewController: BaseViewController { private var indicatorOnePicker: UIDatePicker = UIDatePicker() private var indicatorTwoPicker: UIDatePicker = UIDatePicker() private var indicatorThreePicker: UIDatePicker = UIDatePicker() - private var activeDatePicker: UIDatePicker = UIDatePicker() - private var inactiveDatePicker: UIDatePicker = UIDatePicker() + private var activeDatePicker: UIDatePicker = UIDatePicker().with { $0.datePickerMode = .date } + private var inactiveDatePicker: UIDatePicker = UIDatePicker().with { $0.datePickerMode = .date } var indicators: [CalendarBase.CalendarIndicatorModel] = [] let indicatorOnePickerTag = 1 @@ -47,6 +47,13 @@ class CalendarViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() addContentTopView(view: component) + component.minDate = Date().startOfMonth + component.maxDate = Date().endOfMonth + component.onChange = { [weak self] control in + self?.label.text = DateFormatter.localizedString(from: control.selectedDate, dateStyle: .short, timeStyle: .none) + } + minDatePicker.date = component.minDate + maxDatePicker.date = component.maxDate setupPicker() setupModel() } @@ -74,6 +81,7 @@ class CalendarViewController: BaseViewController { ] //add form rows + addFormRow(label: "onChange", view: label) addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Hide Container Border", view: containerBorderSwitch) addFormRow(label: "Hide Current Date Indicator", view: hideCurrentDateIndicatorSwitch) @@ -196,6 +204,8 @@ class CalendarViewController: BaseViewController { } func setupModel() { + let calendar = Calendar.current + let indicatorDate = calendar.startOfDay(for: calendar.date(byAdding: .day, value: 1, to: Date())!) component.indicators = indicators legendOneField.text = "Due Date" legendTwoField.text = "Auto Pay" @@ -204,9 +214,9 @@ class CalendarViewController: BaseViewController { indicatorTwoSwitch.isOn = true indicatorThreeSwitch.isOn = true hideCurrentDateIndicatorSwitch.isOn = false - indicatorOnePicker.date = Calendar.current.date(byAdding: .day, value: 1, to: Date())! - indicatorTwoPicker.date = Calendar.current.date(byAdding: .day, value: 1, to: Date())! - indicatorThreePicker.date = Calendar.current.date(byAdding: .day, value: 1, to: Date())! + indicatorOnePicker.date = indicatorDate + indicatorTwoPicker.date = indicatorDate + indicatorThreePicker.date = indicatorDate updateIndicatorData(label: legendOneField.text ?? "", date: indicatorOnePicker.date, index: 0) updateIndicatorData(label: legendTwoField.text ?? "", date: indicatorTwoPicker.date, index: 1) updateIndicatorData(label: legendThreeField.text ?? "", date: indicatorThreePicker.date, index: 2) @@ -248,17 +258,7 @@ class CalendarViewController: BaseViewController { } @objc func datePickerValueChanged(_ sender: UIDatePicker){ - - // Create date formatter - let dateFormatter: DateFormatter = DateFormatter() - - // Set date format - dateFormatter.dateFormat = "MM/dd/yyyy hh:mm a" - - // Apply date format - // let selectedDate: String = dateFormatter.string(from: sender.date) - // print("Selected value \(selectedDate)") - + switch sender.tag { case indicatorOnePickerTag: updateIndicatorData(label: legendOneField.text ?? "", date: sender.date, index: 0) diff --git a/VDSSample/ViewControllers/DatePickerViewController.swift b/VDSSample/ViewControllers/DatePickerViewController.swift index 654f2f3..7590e02 100644 --- a/VDSSample/ViewControllers/DatePickerViewController.swift +++ b/VDSSample/ViewControllers/DatePickerViewController.swift @@ -10,6 +10,7 @@ import VDS class DatePickerViewController: BaseViewController { + var label = Label() var disabledSwitch = Toggle() var requiredSwitch = Toggle() var labelTextField = TextField() @@ -35,6 +36,7 @@ class DatePickerViewController: BaseViewController { } override func setupForm(){ + addFormRow(label: "onChange", view: label) addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Disabled", view: disabledSwitch) addFormRow(label: "Required", view: requiredSwitch) @@ -113,8 +115,8 @@ class DatePickerViewController: BaseViewController { component.errorText = "Enter a date." component.tooltipModel = .init(title: "Check your date.", content:"Here is the content for your date component") - component.onChange = { c in - print("selected value: \(c.value ?? "no date selected")") + component.onChange = { [weak self] control in + self?.label.text = DateFormatter.localizedString(from: control.selectedDate!, dateStyle: .short, timeStyle: .none) } //setup UI From 3027275c9126013c05cba336c24472a6b8fc354d Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 14 May 2024 17:14:11 -0500 Subject: [PATCH 15/16] updated date picker Signed-off-by: Matt Bruce --- .../DatePickerViewController.swift | 288 +++++++++++++++++- .../ViewControllers/MenuViewController.swift | 4 +- 2 files changed, 289 insertions(+), 3 deletions(-) diff --git a/VDSSample/ViewControllers/DatePickerViewController.swift b/VDSSample/ViewControllers/DatePickerViewController.swift index 7590e02..72a5a8e 100644 --- a/VDSSample/ViewControllers/DatePickerViewController.swift +++ b/VDSSample/ViewControllers/DatePickerViewController.swift @@ -7,9 +7,11 @@ import Foundation import VDS +import UIKit class DatePickerViewController: BaseViewController { + // Datepicker var label = Label() var disabledSwitch = Toggle() var requiredSwitch = Toggle() @@ -28,11 +30,50 @@ class DatePickerViewController: BaseViewController { items: DatePicker.DateFormat.allCases ) }() + // Calendar + //props + var indicators: [CalendarBase.CalendarIndicatorModel] = [] + var activeDates: [Date] = [] + var inactiveDates: [Date] = [] + var minDate: Date = Date().startOfMonth + var maxDate: Date = Date().endOfMonth + + //form + var containerBorderSwitch = Toggle() + var hideCurrentDateIndicatorSwitch = Toggle() + var indicatorOneSwitch = Toggle() + var indicatorTwoSwitch = Toggle() + var indicatorThreeSwitch = Toggle() + var clearActiveDatesSwitch = Toggle() + var clearInactiveDatesSwitch = Toggle() + var activeDatesField = TextField() + var inactiveDatesField = TextField() + var legendOneField = TextField() + var legendTwoField = TextField() + var legendThreeField = TextField() + + private var minDatePicker: UIDatePicker = UIDatePicker() + private var maxDatePicker: UIDatePicker = UIDatePicker() + private var indicatorOnePicker: UIDatePicker = UIDatePicker() + private var indicatorTwoPicker: UIDatePicker = UIDatePicker() + private var indicatorThreePicker: UIDatePicker = UIDatePicker() + private var activeDatePicker: UIDatePicker = UIDatePicker().with { $0.datePickerMode = .date } + private var inactiveDatePicker: UIDatePicker = UIDatePicker().with { $0.datePickerMode = .date } + + let indicatorOnePickerTag = 1 + let indicatorTwoPickerTag = 2 + let indicatorThreePickerTag = 3 + let minDatePickerTag = 4 + let maxDatePickerTag = 5 + let activeDatePickerTag = 6 + let inactiveDatePickerTag = 7 + override func viewDidLoad() { super.viewDidLoad() addContentTopView(view: component) setupModel() setupPicker() + setupCalendar() } override func setupForm(){ @@ -49,7 +90,7 @@ class DatePickerViewController: BaseViewController { addFormRow(label: "Error Text", view: errorTextField) addFormRow(label: "ToolTip Title", view: tooltipTitleTextField) addFormRow(label: "ToolTip Content", view: tooltipContentTextField) - + append(section: getCalendarSection()) disabledSwitch.onChange = { [weak self] sender in self?.component.isEnabled = !sender.isOn } @@ -153,3 +194,248 @@ class DatePickerViewController: BaseViewController { content: content) : nil } } + +extension DatePickerViewController { + + func getCalendarSection() -> FormSection { + let section = FormSection() + section.title = "Calendar Options" + section.addFormRow(label: "Hide Container Border", view: containerBorderSwitch) + section.addFormRow(label: "Hide Current Date Indicator", view: hideCurrentDateIndicatorSwitch) + section.addFormRow(label: "Min Date", view: minDatePicker) + section.addFormRow(label: "Max Date", view: maxDatePicker) + section.addFormRow(label: "Active Dates", view: activeDatesField) + section.addFormRow(label: "Select ActiveDate", view: activeDatePicker) + section.addFormRow(label: "Clear Active Dates", view: clearActiveDatesSwitch) + section.addFormRow(label: "Inactive Dates", view: inactiveDatesField) + section.addFormRow(label: "Select InActiveDate", view: inactiveDatePicker) + section.addFormRow(label: "Clear Inactive Dates", view: clearInactiveDatesSwitch) + section.addFormRow(label: "Indicator One", view: indicatorOneSwitch) + section.addFormRow(label: "Indicator Two", view: indicatorTwoSwitch) + section.addFormRow(label: "Indicator Three", view: indicatorThreeSwitch) + section.addFormRow(label: "Legend One", view: legendOneField) + section.addFormRow(label: "Legend Two", view: legendTwoField) + section.addFormRow(label: "Legend Three", view: legendThreeField) + section.addFormRow(label: "Indicator One Date", view: indicatorOnePicker) + section.addFormRow(label: "Indicator Two Date", view: indicatorTwoPicker) + section.addFormRow(label: "Indicator Three Date", view: indicatorThreePicker) + + + containerBorderSwitch.onChange = { [weak self] sender in + self?.updateCalendarModel() + } + + hideCurrentDateIndicatorSwitch.onChange = { [weak self] sender in + self?.updateCalendarModel() + } + + clearActiveDatesSwitch.onChange = { [weak self] sender in + self?.updateCalendarModel() + } + + clearInactiveDatesSwitch.onChange = { [weak self] sender in + self?.updateCalendarModel() + } + + legendOneField + .textPublisher + .sink { + [weak self] text in + self?.updateIndicatorData(label: text, date: self?.indicatorOnePicker.date, index: 0) + }.store(in: &subscribers) + + legendTwoField + .textPublisher + .sink { + [weak self] text in + self?.updateIndicatorData(label: text, date: self?.indicatorTwoPicker.date, index: 1) + }.store(in: &subscribers) + + legendThreeField + .textPublisher + .sink { + [weak self] text in + self?.updateIndicatorData(label: text, date: self?.indicatorThreePicker.date, index: 2) + }.store(in: &subscribers) + + indicatorOneSwitch.onChange = { [weak self] sender in + guard let self else { return } + if !sender.isOn { + self.indicators.removeAll() + } else { + self.setIndicatorsData() + } + self.updateCalendarModel() + } + + indicatorTwoSwitch.onChange = { [weak self] sender in + guard let self else { return } + if !sender.isOn { + if self.indicators.count > 2 { + self.indicators.removeLast() + self.indicators.removeLast() + } else if self.indicators.count == 2 { + self.indicators.removeLast() + } + } else { + self.setIndicatorsData() + } + self.updateCalendarModel() + } + + indicatorThreeSwitch.onChange = { [weak self] sender in + guard let self else { return } + if !sender.isOn { + if self.indicators.count > 2 { + self.indicators.removeLast() + } + } else { + self.setIndicatorsData() + } + self.updateCalendarModel() + } + + return section + } + + func updateCalendarModel() { + component.calendarModel = .init(surface: component.surface, + hideContainerBorder: containerBorderSwitch.isOn, + hideCurrentDateIndicator: hideCurrentDateIndicatorSwitch.isOn, + activeDates: activeDates, + inactiveDates: inactiveDates, + minDate: minDate, + maxDate: maxDate, + indicators: indicators) + } + + func setupCalendar() { + configurePicker(indicatorOnePicker) + indicatorOnePicker.tag = indicatorOnePickerTag + configurePicker(indicatorTwoPicker) + indicatorTwoPicker.tag = indicatorTwoPickerTag + configurePicker(indicatorThreePicker) + indicatorThreePicker.tag = indicatorThreePickerTag + configurePicker(minDatePicker) + minDatePicker.tag = minDatePickerTag + configurePicker(maxDatePicker) + maxDatePicker.tag = maxDatePickerTag + configurePicker(activeDatePicker) + activeDatePicker.tag = activeDatePickerTag + configurePicker(inactiveDatePicker) + inactiveDatePicker.tag = inactiveDatePickerTag + indicators = [ + .init(label: "Due Date", date: indicatorOnePicker.date), + .init(label: "Auto Pay", date: indicatorTwoPicker.date), + .init(label: "Scheduled", date: indicatorThreePicker.date) + ] + + let calendar = Calendar.current + let indicatorDate = calendar.startOfDay(for: calendar.date(byAdding: .day, value: 1, to: Date())!) + legendOneField.text = "Due Date" + legendTwoField.text = "Auto Pay" + legendThreeField.text = "Scheduled" + indicatorOneSwitch.isOn = true + indicatorTwoSwitch.isOn = true + indicatorThreeSwitch.isOn = true + hideCurrentDateIndicatorSwitch.isOn = false + indicatorOnePicker.date = indicatorDate + indicatorTwoPicker.date = indicatorDate + indicatorThreePicker.date = indicatorDate + updateIndicatorData(label: legendOneField.text ?? "", date: indicatorOnePicker.date, index: 0) + updateIndicatorData(label: legendTwoField.text ?? "", date: indicatorTwoPicker.date, index: 1) + updateIndicatorData(label: legendThreeField.text ?? "", date: indicatorThreePicker.date, index: 2) + + activeDatesField.isUserInteractionEnabled = false + inactiveDatesField.isUserInteractionEnabled = false + activeDatesField.isEnabled = false + inactiveDatesField.isEnabled = false + + minDatePicker.date = minDate + maxDatePicker.date = maxDate + + updateCalendarModel() + } + + func updateIndicatorData(label: String = "", date: Date?, index:Int) { + indicators[index].label = label + indicators[index].date = date ?? Date() + updateCalendarModel() + } + + func setIndicatorsData() { + if indicatorOneSwitch.isOn && indicatorTwoSwitch.isOn && indicatorThreeSwitch.isOn { + indicators = [ + .init(label: self.legendOneField.text ?? "", date: indicatorOnePicker.date), + .init(label: self.legendTwoField.text ?? "", date: indicatorTwoPicker.date), + .init(label: self.legendThreeField.text ?? "", date: indicatorThreePicker.date) + ] + } else if indicatorOneSwitch.isOn && indicatorTwoSwitch.isOn && !indicatorThreeSwitch.isOn { + indicators = [ + .init(label: self.legendOneField.text ?? "", date: indicatorOnePicker.date), + .init(label: self.legendTwoField.text ?? "", date: indicatorTwoPicker.date), + ] + + } else if indicatorOneSwitch.isOn && !indicatorTwoSwitch.isOn { + indicators = [ + .init(label: self.legendOneField.text ?? "", date: indicatorOnePicker.date), + ] + } + } + + func configurePicker(_ sender:UIDatePicker) { + // Set some of UIDatePicker properties + sender.timeZone = NSTimeZone.local + sender.backgroundColor = UIColor.white + + // Add an event to call onDidChangeDate function when value is changed. + sender.addTarget(self, action: #selector(self.datePickerValueChanged(_:)), for: .valueChanged) + } + + @objc func datePickerValueChanged(_ sender: UIDatePicker){ + + switch sender.tag { + case indicatorOnePickerTag: + updateIndicatorData(label: legendOneField.text ?? "", date: sender.date, index: 0) + case indicatorTwoPickerTag: + updateIndicatorData(label: legendTwoField.text ?? "", date: sender.date, index: 1) + case indicatorThreePickerTag: + updateIndicatorData(label: legendThreeField.text ?? "", date: sender.date, index: 2) + case minDatePickerTag: + minDate = sender.date + case maxDatePickerTag: + maxDate = sender.date + case activeDatePickerTag: + activeDates.append(sender.date) + var text = activeDatesField.text + if let textEmpty = text?.isEmpty, textEmpty == true { + text?.append("") + } else { + text?.append(", ") + } + text?.append("\(self.getSelectedDate(with: sender.date))") + clearActiveDatesSwitch.isOn = false + activeDatesField.text = text + case inactiveDatePickerTag: + inactiveDates.append(sender.date) + var text = inactiveDatesField.text + if let textEmpty = text?.isEmpty, textEmpty == true { + text?.append("") + } else { + text?.append(", ") + } + text?.append("\(self.getSelectedDate(with: sender.date))") + clearInactiveDatesSwitch.isOn = false + inactiveDatesField.text = text + default: break + } + } + + func getSelectedDate(with date:Date) -> String { + let dateFormatter: DateFormatter = DateFormatter() + dateFormatter.dateFormat = "MM/dd/yyyy" + let day: String = dateFormatter.string(from: date) + return day + } + +} diff --git a/VDSSample/ViewControllers/MenuViewController.swift b/VDSSample/ViewControllers/MenuViewController.swift index 197db25..9ec0747 100644 --- a/VDSSample/ViewControllers/MenuViewController.swift +++ b/VDSSample/ViewControllers/MenuViewController.swift @@ -74,12 +74,12 @@ class MenuViewController: UITableViewController, TooltipLaunchable { MenuComponent(title: "Button", completed: true, viewController: ButtonViewController.self), MenuComponent(title: "ButtonGroup", completed: true, viewController: ButtonGroupViewController.self), MenuComponent(title: "ButtonIcon", completed: true, viewController: ButtonIconViewController.self), - MenuComponent(title: "Calendar", completed: false, viewController: CalendarViewController.self), + MenuComponent(title: "Calendar", completed: true, viewController: CalendarViewController.self), MenuComponent(title: "Carousel Scrollbar", completed: true, viewController: CarouselScrollbarViewConttroller.self), MenuComponent(title: "Checkbox", completed: true, viewController: CheckboxViewController.self), MenuComponent(title: "CheckboxItem", completed: true, viewController: CheckboxItemViewController.self), MenuComponent(title: "CheckboxGroup", completed: true, viewController: CheckboxGroupViewController.self), - MenuComponent(title: "DatePicker", completed: false, viewController: DatePickerViewController.self), + MenuComponent(title: "DatePicker", completed: true, viewController: DatePickerViewController.self), MenuComponent(title: "DropdownSelect", completed: true, viewController: DropdownSelectViewController.self), MenuComponent(title: "Icon", completed: true, viewController: IconViewController.self), MenuComponent(title: "InputField", completed: true, viewController: InputFieldViewController.self), From 8fbce11dd949d0fff21b048d27f91ff772fde063 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 14 May 2024 17:45:48 -0500 Subject: [PATCH 16/16] updated version Signed-off-by: Matt Bruce --- VDSSample.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj index 2a48f22..bb308b5 100644 --- a/VDSSample.xcodeproj/project.pbxproj +++ b/VDSSample.xcodeproj/project.pbxproj @@ -44,9 +44,9 @@ EA0D1C312A673F3500E5C127 /* RadioButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C302A673F3500E5C127 /* RadioButtonViewController.swift */; }; EA0D1C332A673FD400E5C127 /* RadioButtonItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C322A673FD400E5C127 /* RadioButtonItemViewController.swift */; }; EA0FC2C12912DC5500DF80B4 /* TextLinkCaretViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */; }; + EA1758462BC8893700A5C0D9 /* DatePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1758452BC8893700A5C0D9 /* DatePickerViewController.swift */; }; EA21C5D82B600E4200CFC139 /* VDSTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA21C5D72B600E4200CFC139 /* VDSTokens.xcframework */; }; EA21C5D92B600E4200CFC139 /* VDSTokens.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA21C5D72B600E4200CFC139 /* VDSTokens.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - EA1758462BC8893700A5C0D9 /* DatePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1758452BC8893700A5C0D9 /* DatePickerViewController.swift */; }; EA297A682A02F5320031ED56 /* TableViewTestController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA297A672A02F5320031ED56 /* TableViewTestController.swift */; }; EA3C3B9D289966EF000CA526 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3B9C289966EF000CA526 /* AppDelegate.swift */; }; EA3C3B9F289966EF000CA526 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3B9E289966EF000CA526 /* SceneDelegate.swift */; }; @@ -140,8 +140,8 @@ EA0D1C302A673F3500E5C127 /* RadioButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioButtonViewController.swift; sourceTree = ""; }; EA0D1C322A673FD400E5C127 /* RadioButtonItemViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioButtonItemViewController.swift; sourceTree = ""; }; EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextLinkCaretViewController.swift; sourceTree = ""; }; - EA21C5D72B600E4200CFC139 /* VDSTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSTokens.xcframework; path = SharedFrameworks/VDSTokens.xcframework; sourceTree = ""; }; EA1758452BC8893700A5C0D9 /* DatePickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatePickerViewController.swift; sourceTree = ""; }; + EA21C5D72B600E4200CFC139 /* VDSTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSTokens.xcframework; path = SharedFrameworks/VDSTokens.xcframework; sourceTree = ""; }; EA297A672A02F5320031ED56 /* TableViewTestController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewTestController.swift; sourceTree = ""; }; EA3C3B99289966EF000CA526 /* VDSSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VDSSample.app; sourceTree = BUILT_PRODUCTS_DIR; }; EA3C3B9C289966EF000CA526 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -700,7 +700,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 62; + CURRENT_PROJECT_VERSION = 63; 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 = 62; + CURRENT_PROJECT_VERSION = 63; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77; GENERATE_INFOPLIST_FILE = YES;