Blackout #1
Blackout #1
Conversation
| selectedIndexPaths.remove(at: index) | ||
| selectedDates.remove(at: index) | ||
| // We want to prevent deselecting ship date | ||
| // delegate?.calendar(self, didDeselectDate: date) |
There was a problem hiding this comment.
Maybe we could make this more mergeable with another delegate method:
if delegate?.calendar(self, canDeselectDate: date) ?? false {
delegate?.calendar(self, didDeselectDate: date)
selectedIndexPaths.remove(at: index)
selectedDates.remove(at: index)
}There was a problem hiding this comment.
Another "too big of a refactor" where I think the correct generalization would be a SelectionMode enum with an .alwaysOneSelectedDay option. The delegate method rings false since everything CAN be deselected, but only by selecting something else.
| @@ -117,7 +117,7 @@ extension CalendarView: UICollectionViewDataSource { | |||
| } | |||
| if let delegate = self.delegate, let dateBeingSelected = self.dateFromIndexPath(indexPath) { | |||
| if delegate.calendar(self, canSelectDate: dateBeingSelected) == false { | |||
| dayCell.isWeekend = true | |||
| dayCell.isBlackout = true | |||
There was a problem hiding this comment.
Is there any way to add backwards compatibility for isWeekend?
There was a problem hiding this comment.
I was originally trying to re-purpose isWeekend to give us our blackout behavior, and this is actually un-doing that. isWeekend should be back to normal now, and un-used by our app. We set .marksWeekends to false now.
| @@ -81,7 +81,7 @@ public class CalendarView: UIView { | |||
|
|
|||
| public lazy var calendar: Calendar = { | |||
| var gregorian = Calendar(identifier: .gregorian) | |||
| gregorian.timeZone = TimeZone(abbreviation: "UTC")! | |||
| //gregorian.timeZone = TimeZone(abbreviation: "UTC")! | |||
There was a problem hiding this comment.
So the Calendar should always be in the user's current time zone?
There was a problem hiding this comment.
Should be in the timezone of the shipping facility, if known, but this fixes an off-by-one error since it handles day-dates as "midnight". There is a lot of clean-up that could improve this, but it'd be a large refactor on the pod.
| @@ -118,6 +118,17 @@ public class CalendarView: UIView { | |||
| return calFlowLayout | |||
| } | |||
|
|
|||
| // var startOfMonth = { | |||
There was a problem hiding this comment.
No longer needed? Can a shim be used for backwards compatibility?
| @@ -329,8 +340,10 @@ extension CalendarView { | |||
| function: - scroll calendar at date (month/year) passed as parameter. | |||
| */ | |||
| public func setDisplayDate(_ date: Date, animated: Bool = false) { | |||
|
|
|||
| guard (date >= startDateCache) && (date <= endDateCache) else { return } | |||
| print("startOfMonthCache = \(startOfMonthCache)") | |||
| public func isLastMonth() -> Bool { | ||
| var dateComponents = DateComponents() | ||
| dateComponents.month = 1 | ||
| print("isLastMonth") |
| @@ -380,6 +408,18 @@ extension CalendarView { | |||
| goToMonthWithOffet(-1) | |||
| } | |||
|
|
|||
| public func isFirstMonth() -> Bool { | |||
| var dateComponents = DateComponents() | |||
| dateComponents.month = -1 | |||
There was a problem hiding this comment.
My favorite month of the year is -1
|
Looks good! Main cleanup is just a few stray comments and print statements. Thoughts on upstreaming this code would be good but not necessary |
Probably a mess, but tried to minimize customizing changes (but there are a few, like commenting out the "de-select" code to turn off that feature).