Digital ACT-191 ONEAPP-7958 story: code refactored
This commit is contained in:
vasavk
parent
76022ab6eb
commit
6bb6d31b39
@ -10,7 +10,9 @@
|
||||
1808BEBC2BA41C3200129230 /* CarouselScrollbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1808BEBB2BA41C3200129230 /* CarouselScrollbar.swift */; };
|
||||
1808BEC02BA456B700129230 /* CarouselScrollbarChangeLog.txt in Resources */ = {isa = PBXBuildFile; fileRef = 1808BEBF2BA456B700129230 /* CarouselScrollbarChangeLog.txt */; };
|
||||
1832AC572BA0791D008AE476 /* BreadcrumbCellItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1832AC562BA0791D008AE476 /* BreadcrumbCellItem.swift */; };
|
||||
18408EDE2BE32C9900E8646B /* CalendarFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18408EDD2BE32C9900E8646B /* CalendarFooterView.swift */; };
|
||||
1842B1DF2BECE28B0021AFCA /* CalendarDateViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1842B1DE2BECE28B0021AFCA /* CalendarDateViewCell.swift */; };
|
||||
1842B1E12BECE7B70021AFCA /* CalendarHeaderReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1842B1E02BECE7B70021AFCA /* CalendarHeaderReusableView.swift */; };
|
||||
1842B1E32BECF0A20021AFCA /* CalendarFooterReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1842B1E22BECF0A10021AFCA /* CalendarFooterReusableView.swift */; };
|
||||
18450CF12BA1B19C009FDF2A /* BreadcrumbsChangeLog.txt in Resources */ = {isa = PBXBuildFile; fileRef = 18450CF02BA1B19C009FDF2A /* BreadcrumbsChangeLog.txt */; };
|
||||
1855EC662BAABF2A002ACAC2 /* BreadcrumbItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1855EC652BAABF2A002ACAC2 /* BreadcrumbItemModel.swift */; };
|
||||
186B2A8A2B88DA7F001AB71F /* TextAreaChangeLog.txt in Resources */ = {isa = PBXBuildFile; fileRef = 186B2A892B88DA7F001AB71F /* TextAreaChangeLog.txt */; };
|
||||
@ -18,15 +20,12 @@
|
||||
186D13CF2BBC36EF00986B53 /* DropdownSelectChangeLog.txt in Resources */ = {isa = PBXBuildFile; fileRef = 186D13CE2BBC36EE00986B53 /* DropdownSelectChangeLog.txt */; };
|
||||
18792A902B7431F2008C0D29 /* ButtonIconBadgeIndicatorModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18792A8F2B7431F2008C0D29 /* ButtonIconBadgeIndicatorModel.swift */; };
|
||||
18A3F12A2BD9298900498E4A /* Calendar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18A3F1292BD9298900498E4A /* Calendar.swift */; };
|
||||
18A3F1322BD944E800498E4A /* CalendarDateCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18A3F1312BD944E800498E4A /* CalendarDateCollectionViewCell.swift */; };
|
||||
18A65A022B96E848006602CC /* Breadcrumbs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18A65A012B96E848006602CC /* Breadcrumbs.swift */; };
|
||||
18A65A042B96F050006602CC /* BreadcrumbItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18A65A032B96F050006602CC /* BreadcrumbItem.swift */; };
|
||||
18B463A42BBD3C46005C4528 /* DropdownOptionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18B463A32BBD3C46005C4528 /* DropdownOptionModel.swift */; };
|
||||
18BDEE822B75316E00452358 /* ButtonIconChangeLog.txt in Resources */ = {isa = PBXBuildFile; fileRef = 18BDEE812B75316E00452358 /* ButtonIconChangeLog.txt */; };
|
||||
18FEA1AD2BDD137500A56439 /* CalendarIndicatorModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18FEA1AC2BDD137500A56439 /* CalendarIndicatorModel.swift */; };
|
||||
18FEA1B32BE0BC8700A56439 /* CalendarReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18FEA1B22BE0BC8700A56439 /* CalendarReusableView.swift */; };
|
||||
18FEA1B52BE0E63600A56439 /* Date+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18FEA1B42BE0E63600A56439 /* Date+Extension.swift */; };
|
||||
18FEA1B72BE0EBFE00A56439 /* CalendarHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18FEA1B62BE0EBFE00A56439 /* CalendarHeaderView.swift */; };
|
||||
18FEA1B92BE1301700A56439 /* CalendarChangeLog.txt in Resources */ = {isa = PBXBuildFile; fileRef = 18FEA1B82BE1301700A56439 /* CalendarChangeLog.txt */; };
|
||||
445BA07829C07B3D0036A7C5 /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 445BA07729C07B3D0036A7C5 /* Notification.swift */; };
|
||||
44604AD429CE186A00E62B51 /* NotificationButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44604AD329CE186A00E62B51 /* NotificationButtonModel.swift */; };
|
||||
@ -212,7 +211,9 @@
|
||||
1808BEBB2BA41C3200129230 /* CarouselScrollbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselScrollbar.swift; sourceTree = "<group>"; };
|
||||
1808BEBF2BA456B700129230 /* CarouselScrollbarChangeLog.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CarouselScrollbarChangeLog.txt; sourceTree = "<group>"; };
|
||||
1832AC562BA0791D008AE476 /* BreadcrumbCellItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BreadcrumbCellItem.swift; sourceTree = "<group>"; };
|
||||
18408EDD2BE32C9900E8646B /* CalendarFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarFooterView.swift; sourceTree = "<group>"; };
|
||||
1842B1DE2BECE28B0021AFCA /* CalendarDateViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarDateViewCell.swift; sourceTree = "<group>"; };
|
||||
1842B1E02BECE7B70021AFCA /* CalendarHeaderReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarHeaderReusableView.swift; sourceTree = "<group>"; };
|
||||
1842B1E22BECF0A10021AFCA /* CalendarFooterReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarFooterReusableView.swift; sourceTree = "<group>"; };
|
||||
18450CF02BA1B19C009FDF2A /* BreadcrumbsChangeLog.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = BreadcrumbsChangeLog.txt; sourceTree = "<group>"; };
|
||||
1855EC652BAABF2A002ACAC2 /* BreadcrumbItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BreadcrumbItemModel.swift; sourceTree = "<group>"; };
|
||||
186B2A892B88DA7F001AB71F /* TextAreaChangeLog.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = TextAreaChangeLog.txt; sourceTree = "<group>"; };
|
||||
@ -220,15 +221,12 @@
|
||||
186D13CE2BBC36EE00986B53 /* DropdownSelectChangeLog.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = DropdownSelectChangeLog.txt; sourceTree = "<group>"; };
|
||||
18792A8F2B7431F2008C0D29 /* ButtonIconBadgeIndicatorModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonIconBadgeIndicatorModel.swift; sourceTree = "<group>"; };
|
||||
18A3F1292BD9298900498E4A /* Calendar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Calendar.swift; sourceTree = "<group>"; };
|
||||
18A3F1312BD944E800498E4A /* CalendarDateCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarDateCollectionViewCell.swift; sourceTree = "<group>"; };
|
||||
18A65A012B96E848006602CC /* Breadcrumbs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Breadcrumbs.swift; sourceTree = "<group>"; };
|
||||
18A65A032B96F050006602CC /* BreadcrumbItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BreadcrumbItem.swift; sourceTree = "<group>"; };
|
||||
18B463A32BBD3C46005C4528 /* DropdownOptionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropdownOptionModel.swift; sourceTree = "<group>"; };
|
||||
18BDEE812B75316E00452358 /* ButtonIconChangeLog.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = ButtonIconChangeLog.txt; sourceTree = "<group>"; };
|
||||
18FEA1AC2BDD137500A56439 /* CalendarIndicatorModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarIndicatorModel.swift; sourceTree = "<group>"; };
|
||||
18FEA1B22BE0BC8700A56439 /* CalendarReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarReusableView.swift; sourceTree = "<group>"; };
|
||||
18FEA1B42BE0E63600A56439 /* Date+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Extension.swift"; sourceTree = "<group>"; };
|
||||
18FEA1B62BE0EBFE00A56439 /* CalendarHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarHeaderView.swift; sourceTree = "<group>"; };
|
||||
18FEA1B82BE1301700A56439 /* CalendarChangeLog.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CalendarChangeLog.txt; sourceTree = "<group>"; };
|
||||
445BA07729C07B3D0036A7C5 /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = "<group>"; };
|
||||
44604AD329CE186A00E62B51 /* NotificationButtonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationButtonModel.swift; sourceTree = "<group>"; };
|
||||
@ -445,11 +443,10 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
18A3F1292BD9298900498E4A /* Calendar.swift */,
|
||||
18A3F1312BD944E800498E4A /* CalendarDateCollectionViewCell.swift */,
|
||||
18408EDD2BE32C9900E8646B /* CalendarFooterView.swift */,
|
||||
18FEA1B62BE0EBFE00A56439 /* CalendarHeaderView.swift */,
|
||||
1842B1DE2BECE28B0021AFCA /* CalendarDateViewCell.swift */,
|
||||
1842B1E22BECF0A10021AFCA /* CalendarFooterReusableView.swift */,
|
||||
1842B1E02BECE7B70021AFCA /* CalendarHeaderReusableView.swift */,
|
||||
18FEA1AC2BDD137500A56439 /* CalendarIndicatorModel.swift */,
|
||||
18FEA1B22BE0BC8700A56439 /* CalendarReusableView.swift */,
|
||||
18FEA1B42BE0E63600A56439 /* Date+Extension.swift */,
|
||||
18FEA1B82BE1301700A56439 /* CalendarChangeLog.txt */,
|
||||
);
|
||||
@ -1149,6 +1146,7 @@
|
||||
EA985C2D296F03FE00F2FF2E /* TileletIconModels.swift in Sources */,
|
||||
EA89200428AECF4B006B9984 /* UITextField+Publisher.swift in Sources */,
|
||||
18A65A022B96E848006602CC /* Breadcrumbs.swift in Sources */,
|
||||
1842B1E12BECE7B70021AFCA /* CalendarHeaderReusableView.swift in Sources */,
|
||||
EA0D1C3F2A6AD5E200E5C127 /* Typography+ContentSizeCategory.swift in Sources */,
|
||||
EA5F86C82A1BD99100BC83E4 /* TabModel.swift in Sources */,
|
||||
EA297A5729FB0A360031ED56 /* AppleGuidelinesTouchable.swift in Sources */,
|
||||
@ -1190,7 +1188,6 @@
|
||||
71ACE89C2BA0451200FB6ADC /* PaginationContainer.swift in Sources */,
|
||||
EAC71A1F2A2E173D00E47A9F /* RadioButton.swift in Sources */,
|
||||
EA33622C2891E73B0071C351 /* FontProtocol.swift in Sources */,
|
||||
18A3F1322BD944E800498E4A /* CalendarDateCollectionViewCell.swift in Sources */,
|
||||
EA596ABD2A16B4EC00300C4B /* Tab.swift in Sources */,
|
||||
71ACE89E2BA1CC1700FB6ADC /* TiletEyebrowModel.swift in Sources */,
|
||||
EAF7F11728A1475A00B287F5 /* RadioButtonItem.swift in Sources */,
|
||||
@ -1206,7 +1203,6 @@
|
||||
EA297A5529FB07760031ED56 /* TooltipLabelAttribute.swift in Sources */,
|
||||
EA985BEA29689B6D00F2FF2E /* TileletSubTitleModel.swift in Sources */,
|
||||
EA2DC9B02BE175BA004F58C5 /* RequiredRule.swift in Sources */,
|
||||
18FEA1B72BE0EBFE00A56439 /* CalendarHeaderView.swift in Sources */,
|
||||
EA3361C9289054C50071C351 /* Surfaceable.swift in Sources */,
|
||||
EAB5FEED2927E1B200998C17 /* ButtonGroupPositionLayout.swift in Sources */,
|
||||
EA4DB30228DCBCA500103EE3 /* Badge.swift in Sources */,
|
||||
@ -1243,7 +1239,6 @@
|
||||
EA985C7D297DAED300F2FF2E /* Primitive.swift in Sources */,
|
||||
EAF1FE9929D4850E00101452 /* Clickable.swift in Sources */,
|
||||
EAD0688E2A55F819002E3A2D /* Loader.swift in Sources */,
|
||||
18408EDE2BE32C9900E8646B /* CalendarFooterView.swift in Sources */,
|
||||
EAB5FEF829393A7200998C17 /* ButtonGroupConstants.swift in Sources */,
|
||||
EAA7456C2AB23E2000C1841F /* TooltipModel.swift in Sources */,
|
||||
EA3361AF288B26310071C351 /* FormFieldable.swift in Sources */,
|
||||
@ -1258,7 +1253,6 @@
|
||||
EA985C1D296CD13600F2FF2E /* BundleManager.swift in Sources */,
|
||||
EA0B18052A9E2D2D00F2D0CD /* SelectorBase.swift in Sources */,
|
||||
EAC71A1D2A2E155A00E47A9F /* Checkbox.swift in Sources */,
|
||||
18FEA1B32BE0BC8700A56439 /* CalendarReusableView.swift in Sources */,
|
||||
EAF7F0AB289B13FD00B287F5 /* TextStyleLabelAttribute.swift in Sources */,
|
||||
EAB1D29C28A5618900DAE764 /* RadioButtonGroup.swift in Sources */,
|
||||
EA81410B2A0E8E3C004F60D2 /* ButtonIcon.swift in Sources */,
|
||||
@ -1272,10 +1266,12 @@
|
||||
EA0B18062A9E2D2D00F2D0CD /* SelectorItemBase.swift in Sources */,
|
||||
EAB5FF0129424ACB00998C17 /* UIControl.swift in Sources */,
|
||||
EA985BF5296C60C000F2FF2E /* Icon.swift in Sources */,
|
||||
1842B1E32BECF0A20021AFCA /* CalendarFooterReusableView.swift in Sources */,
|
||||
EA3361AA288B25E40071C351 /* Disabling.swift in Sources */,
|
||||
EA3361B6288B2A410071C351 /* Control.swift in Sources */,
|
||||
5F21D7BF28DCEB3D003E7CD6 /* Useable.swift in Sources */,
|
||||
EAF7F0B7289C12A600B287F5 /* UITapGestureRecognizer.swift in Sources */,
|
||||
1842B1DF2BECE28B0021AFCA /* CalendarDateViewCell.swift in Sources */,
|
||||
EA0D1C392A6AD4DF00E5C127 /* Typography+SpacingConfig.swift in Sources */,
|
||||
18FEA1B52BE0E63600A56439 /* Date+Extension.swift in Sources */,
|
||||
EAB2376629E9952D00AABE9A /* UIApplication.swift in Sources */,
|
||||
|
||||
@ -95,7 +95,7 @@ open class CalendarBase: View {
|
||||
collectionView.showsHorizontalScrollIndicator = false
|
||||
collectionView.showsVerticalScrollIndicator = false
|
||||
collectionView.backgroundColor = .clear
|
||||
collectionView.register(CalendarDateCollectionViewCell.self, forCellWithReuseIdentifier: CalendarDateCollectionViewCell.identifier)
|
||||
collectionView.register(CalendarDateViewCell.self, forCellWithReuseIdentifier: CalendarDateViewCell.identifier)
|
||||
collectionView.register(CalendarHeaderReusableView.self,
|
||||
forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader,
|
||||
withReuseIdentifier: CalendarHeaderReusableView.identifier)
|
||||
@ -175,6 +175,12 @@ open class CalendarBase: View {
|
||||
/// Resets to default settings.
|
||||
open override func reset() {
|
||||
super.reset()
|
||||
hideContainerBorder = false
|
||||
hideCurrentDateIndicator = false
|
||||
transparentBackground = false
|
||||
activeDates = []
|
||||
inactiveDates = []
|
||||
indicators = []
|
||||
}
|
||||
|
||||
//--------------------------------------------------
|
||||
@ -216,7 +222,7 @@ extension CalendarBase: UICollectionViewDelegate, UICollectionViewDataSource, UI
|
||||
}
|
||||
|
||||
public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
|
||||
guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: CalendarDateCollectionViewCell.identifier, for: indexPath) as? CalendarDateCollectionViewCell else { return UICollectionViewCell() }
|
||||
guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: CalendarDateViewCell.identifier, for: indexPath) as? CalendarDateViewCell else { return UICollectionViewCell() }
|
||||
var indicatorCount = 0
|
||||
if self.indicators.count > 0 {
|
||||
for x in (0...(self.indicators.count-1)) {
|
||||
@ -273,7 +279,7 @@ extension CalendarBase: UICollectionViewDelegate, UICollectionViewDataSource, UI
|
||||
guard let footer = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: CalendarFooterReusableView.identifier, for: indexPath) as? CalendarFooterReusableView else {
|
||||
return UICollectionReusableView()
|
||||
}
|
||||
footer.configure(with: surface, indicators: indicators)
|
||||
footer.update(with: surface, indicators: indicators)
|
||||
return footer
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,19 +1,17 @@
|
||||
//
|
||||
// CalendarDateCollectionViewCell.swift
|
||||
// CalendarDateViewCell.swift
|
||||
// VDS
|
||||
//
|
||||
// Created by Kanamarlapudi, Vasavi on 24/04/24.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import UIKit
|
||||
import VDSTokens
|
||||
|
||||
/// Calendar collection view cell for Date view
|
||||
final class CalendarDateCollectionViewCell: UICollectionViewCell {
|
||||
final class CalendarDateViewCell: UICollectionViewCell {
|
||||
|
||||
///Identifier for the Calendar Date Cell
|
||||
static let identifier: String = String(describing: CalendarDateCollectionViewCell.self)
|
||||
///Identifier for the Calendar Date Cell.
|
||||
static let identifier: String = String(describing: CalendarDateViewCell.self)
|
||||
|
||||
//--------------------------------------------------
|
||||
// MARK: - Private Properties
|
||||
@ -71,8 +69,7 @@ final class CalendarDateCollectionViewCell: UICollectionViewCell {
|
||||
//--------------------------------------------------
|
||||
// MARK: - Private Methods
|
||||
//--------------------------------------------------
|
||||
|
||||
/// Configuring the cell with default setup
|
||||
/// Configuring the cell with default setup.
|
||||
private func setUp() {
|
||||
isAccessibilityElement = false
|
||||
contentView.addSubview(containerView)
|
||||
@ -96,18 +93,18 @@ final class CalendarDateCollectionViewCell: UICollectionViewCell {
|
||||
stackView.centerXAnchor.constraint(equalTo: centerXAnchor).activate()
|
||||
}
|
||||
|
||||
/// Updating UI based on selected date, modified indicators data along with surface
|
||||
/// Enable/disable cell based on min date, max date, active dates, inactive dates
|
||||
/// Updating UI based on selected date, modified indicators data along with surface.
|
||||
/// Enable/disable cell based on min date, max date, active dates, inactive dates.
|
||||
func update(with surface: Surface, indicators: [CalendarBase.CalendarIndicatorModel], text: String, indicatorCount: Int, selectedDate: Date, displayDate: Date, hideDate: Bool, minDate: Date, maxDate: Date, activeDates: [Date], inactiveDates: [Date]) {
|
||||
|
||||
stackView.arrangedSubviews.forEach { $0.removeFromSuperview() }
|
||||
numberLabel.surface = surface
|
||||
numberLabel.text = text
|
||||
|
||||
// enable/disable cells based on min date, max date and active/inactive dates
|
||||
// enable/disable cells based on min date, max date and active/inactive dates.
|
||||
self.updateLabel(with:surface, displayDate: displayDate, minDate: minDate, maxDate: maxDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
|
||||
// handling inactive dates
|
||||
// handling inactive dates.
|
||||
if inactiveDates.count > 0 {
|
||||
for x in (0...(inactiveDates.count-1)) {
|
||||
if (inactiveDates[x].monthInt == displayDate.monthInt) && (inactiveDates[x].yearInt == displayDate.yearInt) {
|
||||
@ -118,7 +115,7 @@ final class CalendarDateCollectionViewCell: UICollectionViewCell {
|
||||
}
|
||||
}
|
||||
|
||||
// update text color, bg color, corner radius
|
||||
// update text color, bg color, corner radius.
|
||||
if (numberLabel.text == self.getDay(with: selectedDate)) && (selectedDate.monthInt == displayDate.monthInt) && (selectedDate.yearInt == displayDate.yearInt) && numberLabel.isEnabled {
|
||||
numberLabel.textColor = selectedTextColorConfiguration.getColor(surface)
|
||||
layer.backgroundColor = selectedBackgroundColor.getColor(surface).cgColor
|
||||
@ -129,20 +126,20 @@ final class CalendarDateCollectionViewCell: UICollectionViewCell {
|
||||
layer.cornerRadius = 0
|
||||
}
|
||||
|
||||
// add indicators
|
||||
// add indicators.
|
||||
if indicatorCount > 0 {
|
||||
for x in (0...(indicators.count-1)) {
|
||||
// irrespective of month and year, if it needs to show indicators on every month - comment below first if condition
|
||||
if (indicators[x].date.monthInt == displayDate.monthInt) && (indicators[x].date.yearInt == displayDate.yearInt) {
|
||||
// irrespective of month and year, if it needs to show indicators on every month - comment below first if condition, else uncomment it.
|
||||
// if (indicators[x].date.monthInt == displayDate.monthInt) && (indicators[x].date.yearInt == displayDate.yearInt) {
|
||||
if (self.numberLabel.text == self.getDay(with: indicators[x].date)) {
|
||||
let color = (numberLabel.text == self.getDay(with: selectedDate)) ? selectedCellIndicatorColorConfiguration.getColor(surface) : unselectedCellIndicatorColorConfiguration.getColor(surface)
|
||||
addIndicator(with: color, surface: surface, clearFullCircle: (x == 1), drawSemiCircle: (x == 2))
|
||||
}
|
||||
}
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
// update text style for current date
|
||||
// update text style for current date.
|
||||
if (numberLabel.text == self.getDay(with: currentDate)) && (currentDate.monthInt == displayDate.monthInt) && (currentDate.yearInt == displayDate.yearInt) {
|
||||
numberLabel.textStyle = hideDate ? .bodySmall : .boldBodySmall
|
||||
} else {
|
||||
@ -166,7 +163,7 @@ final class CalendarDateCollectionViewCell: UICollectionViewCell {
|
||||
}
|
||||
}
|
||||
|
||||
// handing active dates if exist, else enable numberLabel to display day
|
||||
// handing active dates if exist, else enable numberLabel to display day.
|
||||
func handleActiveDates(with displayDate: Date, activeDates: [Date], inactiveDates: [Date]) {
|
||||
if activeDates.count > 0 && inactiveDates.count == 0 {
|
||||
showActiveDates(with: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
@ -175,7 +172,7 @@ final class CalendarDateCollectionViewCell: UICollectionViewCell {
|
||||
}
|
||||
}
|
||||
|
||||
// enable all days if no active dates, handing active dates if exist
|
||||
// enable all days if no active dates, handing active dates if exist.
|
||||
func enableAllDaysAndCheckActiveDates(with surface:Surface, displayDate: Date, activeDates: [Date], inactiveDates: [Date]) {
|
||||
if activeDates.count > 0 && inactiveDates.count == 0 {
|
||||
disableLabel(with: surface)
|
||||
@ -184,49 +181,83 @@ final class CalendarDateCollectionViewCell: UICollectionViewCell {
|
||||
numberLabel.isEnabled = true
|
||||
}
|
||||
}
|
||||
|
||||
func minDateValidation(with surface:Surface, minDate: Date, displayDate: Date, activeDates: [Date], inactiveDates: [Date]) {
|
||||
// validate days to enable/disable with min date only.
|
||||
if let day:Int = Int(numberLabel.text), day < minDate.dayInt {
|
||||
disableLabel(with: surface)
|
||||
} else {
|
||||
numberLabel.isEnabled = false
|
||||
handleActiveDates(with: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
}
|
||||
}
|
||||
|
||||
func maxDateValidation(with surface:Surface, maxDate: Date, displayDate: Date, activeDates: [Date], inactiveDates: [Date]) {
|
||||
// validate days to enable/disable with max date only.
|
||||
if let day:Int = Int(numberLabel.text), day > maxDate.dayInt {
|
||||
disableLabel(with: surface)
|
||||
} else {
|
||||
numberLabel.isEnabled = false
|
||||
handleActiveDates(with: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
}
|
||||
}
|
||||
|
||||
func minAndMaxDateValidation(with surface:Surface, minDate: Date, maxDate: Date, displayDate: Date, activeDates: [Date], inactiveDates: [Date]) {
|
||||
// validate days to enable/disable with min and max date.
|
||||
if let day:Int = Int(numberLabel.text), day < minDate.dayInt || day > maxDate.dayInt {
|
||||
disableLabel(with: surface)
|
||||
} else {
|
||||
numberLabel.isEnabled = false
|
||||
handleActiveDates(with: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
}
|
||||
}
|
||||
|
||||
// enable/disable cells based on min date, max date and active/inactive dates
|
||||
// enable/disable cells based on min date, max date and active/inactive dates.
|
||||
func updateLabel(with surface: Surface, displayDate: Date, minDate: Date, maxDate: Date, activeDates: [Date], inactiveDates: [Date]) {
|
||||
if (minDate.yearInt == displayDate.yearInt) || (maxDate.yearInt == displayDate.yearInt) {
|
||||
|
||||
if (minDate.yearInt == displayDate.yearInt) && !(maxDate.yearInt == displayDate.yearInt) {
|
||||
// min year and max year are different, and matched to min year.
|
||||
if (minDate.monthInt == displayDate.monthInt) {
|
||||
// min year and max year are different, and matched to min year and min month.
|
||||
minDateValidation(with: surface, minDate: minDate, displayDate: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
} else {
|
||||
// handing active dates - enable all days if no active dates.
|
||||
enableAllDaysAndCheckActiveDates(with: surface, displayDate: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
}
|
||||
} else if (maxDate.yearInt == displayDate.yearInt) && !((minDate.yearInt == displayDate.yearInt)) {
|
||||
// min year and max year are different, and matched to max year.
|
||||
if (maxDate.monthInt == displayDate.monthInt) {
|
||||
// min year and max year are different, and matched to max year and max month.
|
||||
maxDateValidation(with: surface, maxDate: maxDate, displayDate: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
} else {
|
||||
// handing active dates - enable all days if no active dates.
|
||||
enableAllDaysAndCheckActiveDates(with: surface, displayDate: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
}
|
||||
} else if (minDate.yearInt == displayDate.yearInt) && (maxDate.yearInt == displayDate.yearInt) {
|
||||
// min year and max year same
|
||||
if (minDate.monthInt == displayDate.monthInt) && (maxDate.monthInt == displayDate.monthInt) {
|
||||
// validate days to enable/disable
|
||||
if let day:Int = Int(numberLabel.text), day < minDate.dayInt || day > maxDate.dayInt {
|
||||
disableLabel(with: surface)
|
||||
} else {
|
||||
numberLabel.isEnabled = false
|
||||
handleActiveDates(with: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
}
|
||||
// min year and max year same, when choose dates in same month.
|
||||
minAndMaxDateValidation(with: surface, minDate: minDate, maxDate: maxDate, displayDate: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
|
||||
} else if (minDate.monthInt == displayDate.monthInt) || (maxDate.monthInt == displayDate.monthInt) {
|
||||
// min year and max year same, and choose dates in different months.
|
||||
if (minDate.monthInt == displayDate.monthInt) {
|
||||
// validate days to enable/disable
|
||||
if let day:Int = Int(numberLabel.text), day < minDate.dayInt {
|
||||
disableLabel(with: surface)
|
||||
} else {
|
||||
numberLabel.isEnabled = false
|
||||
handleActiveDates(with: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
}
|
||||
|
||||
// min year and max year same, and matched to min month.
|
||||
minDateValidation(with: surface, minDate: minDate, displayDate: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
} else if (maxDate.monthInt == displayDate.monthInt) {
|
||||
// validate days to enable/disable
|
||||
if let day:Int = Int(numberLabel.text), day > maxDate.dayInt {
|
||||
disableLabel(with: surface)
|
||||
} else {
|
||||
numberLabel.isEnabled = false
|
||||
handleActiveDates(with: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
}
|
||||
|
||||
// min year and max year same, and matched to max month.
|
||||
maxDateValidation(with: surface, maxDate: maxDate, displayDate: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
}
|
||||
} else if ((minDate.monthInt < displayDate.monthInt) || (displayDate.monthInt < maxDate.monthInt)) {
|
||||
// enable all days if no active dates
|
||||
// handing active dates
|
||||
} else {
|
||||
// min year and max year same, and not matched to min or max month.
|
||||
// handing active dates - enable all days if no active dates.
|
||||
enableAllDaysAndCheckActiveDates(with: surface, displayDate: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
}
|
||||
} else {
|
||||
// enable all days if no active dates
|
||||
// handing active dates
|
||||
// min year and max year are different, and not matched to min or max year.
|
||||
// handing active dates - enable all days if no active dates.
|
||||
enableAllDaysAndCheckActiveDates(with: surface, displayDate: displayDate, activeDates: activeDates, inactiveDates: inactiveDates)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func addIndicator(with color: UIColor, surface: Surface, clearFullCircle: Bool, drawSemiCircle: Bool) {
|
||||
@ -1,40 +1,24 @@
|
||||
//
|
||||
// CalendarFooterView.swift
|
||||
// CalendarFooterReusableView.swift
|
||||
// VDS
|
||||
//
|
||||
// Created by Kanamarlapudi, Vasavi on 29/04/24.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import UIKit
|
||||
import VDSTokens
|
||||
import Combine
|
||||
|
||||
/// Footer view to show indicators data.
|
||||
open class CalendarFooterView: View {
|
||||
//--------------------------------------------------
|
||||
// MARK: - Initializers
|
||||
//--------------------------------------------------
|
||||
required public init() {
|
||||
super.init(frame: .zero)
|
||||
}
|
||||
class CalendarFooterReusableView: UICollectionReusableView {
|
||||
|
||||
public override init(frame: CGRect) {
|
||||
super.init(frame: .zero)
|
||||
}
|
||||
|
||||
public required init?(coder: NSCoder) {
|
||||
super.init(coder: coder)
|
||||
}
|
||||
|
||||
//--------------------------------------------------
|
||||
// MARK: - Public Properties
|
||||
//--------------------------------------------------
|
||||
open var items: [CalendarBase.CalendarIndicatorModel] = [] { didSet { setNeedsUpdate() } }
|
||||
|
||||
///Identifier for the Calendar Footer Reusable View.
|
||||
static let identifier: String = String(describing: CalendarFooterReusableView.self)
|
||||
|
||||
//--------------------------------------------------
|
||||
// MARK: - Private Properties
|
||||
//--------------------------------------------------
|
||||
private var surface: Surface = .light
|
||||
private var items: [CalendarBase.CalendarIndicatorModel] = []
|
||||
internal var containerSize: CGSize { CGSize(width: 304, height: 40) }
|
||||
|
||||
internal var containerView = View().with {
|
||||
@ -60,50 +44,51 @@ open class CalendarFooterView: View {
|
||||
}
|
||||
|
||||
//--------------------------------------------------
|
||||
// MARK: - Lifecycle
|
||||
// MARK: - Initializers
|
||||
//--------------------------------------------------
|
||||
open override func initialSetup() {
|
||||
super.initialSetup()
|
||||
override init(frame: CGRect) {
|
||||
super.init(frame: frame)
|
||||
setUp()
|
||||
}
|
||||
|
||||
open override func setup() {
|
||||
super.setup()
|
||||
required init?(coder: NSCoder) {
|
||||
super.init(coder: coder)
|
||||
setUp()
|
||||
}
|
||||
|
||||
//--------------------------------------------------
|
||||
// MARK: - Private Methods
|
||||
//--------------------------------------------------
|
||||
/// Configuring the cell with default setup.
|
||||
private func setUp() {
|
||||
isAccessibilityElement = false
|
||||
|
||||
addSubview(containerView)
|
||||
containerView
|
||||
.pinTop(VDSLayout.space6X)
|
||||
// .pinTop(VDSLayout.space6X)
|
||||
.pinTopLessThanOrEqualTo(topAnchor, VDSLayout.space6X, .defaultLow)
|
||||
.pinBottom()
|
||||
.pinLeadingGreaterThanOrEqualTo(leadingAnchor, VDSLayout.space3X, .defaultLow)
|
||||
.pinLeadingGreaterThanOrEqualTo(leadingAnchor, VDSLayout.space3X, .defaultHigh)
|
||||
.pinTrailingLessThanOrEqualTo(trailingAnchor, VDSLayout.space3X, .defaultHigh)
|
||||
.height(containerSize.height)
|
||||
.width(containerSize.width)
|
||||
|
||||
containerView.centerXAnchor.constraint(equalTo: centerXAnchor).activate()
|
||||
|
||||
.width(containerSize.width - (2*VDSLayout.space3X))
|
||||
.heightLessThanEqualTo(containerSize.height)
|
||||
|
||||
// legend Collection View
|
||||
containerView.addSubview(legendCollectionView)
|
||||
legendCollectionView.pinToSuperView()
|
||||
legendCollectionView.pinTop().pinBottom().pinLeading().pinTrailing().pinCenterY().pinCenterX()
|
||||
|
||||
}
|
||||
|
||||
open override func updateView() {
|
||||
super.updateView()
|
||||
/// Updating UI to show legend with titles.
|
||||
func update(with surface: Surface, indicators: [CalendarBase.CalendarIndicatorModel]) {
|
||||
self.items = indicators
|
||||
self.surface = surface
|
||||
legendCollectionView.reloadData()
|
||||
setNeedsLayout()
|
||||
layoutIfNeeded()
|
||||
}
|
||||
|
||||
override open func layoutSubviews() {
|
||||
super.layoutSubviews()
|
||||
}
|
||||
|
||||
open override func reset() {
|
||||
super.reset()
|
||||
}
|
||||
}
|
||||
|
||||
extension CalendarFooterView: UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
|
||||
extension CalendarFooterReusableView: UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
|
||||
|
||||
public func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
|
||||
return items.count
|
||||
@ -114,7 +99,7 @@ extension CalendarFooterView: UICollectionViewDelegate, UICollectionViewDataSour
|
||||
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: LegendCollectionViewCell.identifier, for: indexPath) as? LegendCollectionViewCell,
|
||||
indexPath.row <= items.count else { return UICollectionViewCell() }
|
||||
let text = items[indexPath.row].label
|
||||
cell.updateTitle(text: text, color: VDSColor.elementsSecondaryOnlight, surface: surface, clearFullcircle: indexPath.row == 1, drawSemiCircle: indexPath.row == 2)
|
||||
cell.updateTitle(text: text, color: VDSColor.elementsSecondaryOnlight, surface: self.surface, clearFullcircle: indexPath.row == 1, drawSemiCircle: indexPath.row == 2)
|
||||
return cell
|
||||
}
|
||||
}
|
||||
@ -133,6 +118,7 @@ private class LegendCollectionViewCell: UICollectionViewCell {
|
||||
$0.numberOfLines = 1
|
||||
$0.textStyle = .bodySmall
|
||||
$0.isAccessibilityElement = false
|
||||
$0.backgroundColor = .clear
|
||||
}
|
||||
|
||||
private var legendIndicatorWrapper: View = View().with {
|
||||
@ -1,27 +1,26 @@
|
||||
//
|
||||
// CalendarHeaderView.swift
|
||||
// CalendarHeaderReusableView.swift
|
||||
// VDS
|
||||
//
|
||||
// Created by Kanamarlapudi, Vasavi on 30/04/24.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import UIKit
|
||||
import VDSTokens
|
||||
|
||||
/// Header view to display month and year along with days of week
|
||||
/// Header view to display month and year along with days of week.
|
||||
class CalendarHeaderReusableView: UICollectionReusableView {
|
||||
|
||||
///Identifier for the Calendar Header Reusable View
|
||||
///Identifier for the Calendar Header Reusable View.
|
||||
static let identifier: String = String(describing: CalendarHeaderReusableView.self)
|
||||
|
||||
//--------------------------------------------------
|
||||
// MARK: - Public Properties
|
||||
//--------------------------------------------------
|
||||
/// A callback when the next button clicked
|
||||
/// A callback when the next button clicked.
|
||||
public var nextClicked: (() -> (Void))?
|
||||
|
||||
/// A callback when the previous button clicked
|
||||
/// A callback when the previous button clicked.
|
||||
public var previousClicked: (() -> (Void))?
|
||||
|
||||
//--------------------------------------------------
|
||||
@ -106,7 +105,10 @@ class CalendarHeaderReusableView: UICollectionReusableView {
|
||||
setUp()
|
||||
}
|
||||
|
||||
/// Configuring the cell with default setup
|
||||
//--------------------------------------------------
|
||||
// MARK: - Private Methods
|
||||
//--------------------------------------------------
|
||||
/// Configuring the cell with default setup.
|
||||
private func setUp() {
|
||||
isAccessibilityElement = false
|
||||
|
||||
@ -150,7 +152,7 @@ class CalendarHeaderReusableView: UICollectionReusableView {
|
||||
}
|
||||
|
||||
/// Updating UI based on next/previous clicks along with surface.
|
||||
/// Updating UI to enable/disable the next & previous buttons, updating header title
|
||||
/// Updating UI to enable/disable the next & previous buttons, updating header title.
|
||||
func update(with surface: Surface, aDate: Date, nextEnabled: Bool, previousEnabled: Bool) {
|
||||
self.surface = surface
|
||||
headerTitle.surface = surface
|
||||
@ -1,32 +0,0 @@
|
||||
//
|
||||
// CalendarReusableView.swift
|
||||
// VDS
|
||||
//
|
||||
// Created by Kanamarlapudi, Vasavi on 24/04/24.
|
||||
//
|
||||
|
||||
import UIKit
|
||||
import VDSTokens
|
||||
|
||||
/// Custom footer view
|
||||
class CalendarFooterReusableView: UICollectionReusableView {
|
||||
|
||||
///Identifier for the Calendar Footer Reusable View
|
||||
static let identifier: String = String(describing: CalendarFooterReusableView.self)
|
||||
|
||||
private lazy var footerView = CalendarFooterView()
|
||||
|
||||
override init(frame: CGRect) {
|
||||
super.init(frame: frame)
|
||||
}
|
||||
|
||||
required init?(coder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
func configure(with surface: Surface, indicators: [CalendarBase.CalendarIndicatorModel]) {
|
||||
footerView.items = indicators
|
||||
footerView.surface = surface
|
||||
addSubview(footerView)
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user