From 2e6b2d6b55837b218efb8eb74788fb6e6147b671 Mon Sep 17 00:00:00 2001 From: vasavk Date: Wed, 24 Apr 2024 18:04:57 +0530 Subject: [PATCH 1/8] 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 2/8] =?UTF-8?q?Digital=20ACT-191=20ONEAPP-7016=20story:=20?= =?UTF-8?q?Setup=20form=20to=20pass=20values=20=E2=80=8B=E2=80=8Bto=20cale?= =?UTF-8?q?ndar=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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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 } }