fix: dangerous implementation of daydate

Author: quivr

QVRWeekView.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
 s.name             = 'QVRWeekView'
-s.version          = '0.14.1'
+s.version          = '0.14.2'
 s.summary          = 'QVRWeekView is a simple calendar week view with support for horizontal, vertical scrolling and zooming.'
 s.swift_version    = '5'
 

QVRWeekView/Classes/Common/DayDate.swift

@@ -9,20 +9,16 @@
 import Foundation
 import UIKit
 
-/**
- Enum stores the text mode that the day date should return.
- */
+/// Enum stores the text mode that the day date should return.
 public enum TextMode {
     case large
     case normal
     case small
 }
 
-/**
- Day date class is used as a reliable way to assign a day to things such as dayViewCells and dictionaries
- storing event and frame data. DayDates are not influenced by timezones and thus the date it has been given will
- remain. DayDates are also easy to compare, print as strings and are hashable.
- */
+/// Day date class is used as a reliable way to assign a day to things such as dayViewCells and dictionaries
+/// storing event and frame data. DayDates are not influenced by timezones and thus the date it has been given will
+/// remain. DayDates are also easy to compare, print as strings and are hashable.
 public struct DayDate: Hashable, Comparable, CustomStringConvertible, Strideable {
     public let day: Int
     public let month: Int
@@ -71,15 +67,9 @@ public struct DayDate: Hashable, Comparable, CustomStringConvertible, Strideable
         self.era = cal.component(.era, from: date)
     }
 
-    public init() {
-        self.day = -1
-        self.month = -1
-        self.year = -1
-        self.era = -1
-    }
-
     public static func == (lhs: DayDate, rhs: DayDate) -> Bool {
-        return lhs.day == rhs.day && lhs.month == rhs.month && lhs.year == rhs.year && lhs.era == rhs.era
+        return lhs.day == rhs.day && lhs.month == rhs.month && lhs.year == rhs.year
+            && lhs.era == rhs.era
     }
 
     public static func < (lhs: DayDate, rhs: DayDate) -> Bool {
@@ -88,14 +78,22 @@ public struct DayDate: Hashable, Comparable, CustomStringConvertible, Strideable
                 if lhs.month == rhs.month {
                     if lhs.day == rhs.day {
                         return false
-                    } else { return lhs.day < rhs.day }
-                } else { return lhs.month < rhs.month }
-            } else { return lhs.year < rhs.year }
-        } else { return lhs.era < rhs.era }
+                    } else {
+                        return lhs.day < rhs.day
+                    }
+                } else {
+                    return lhs.month < rhs.month
+                }
+            } else {
+                return lhs.year < rhs.year
+            }
+        } else {
+            return lhs.era < rhs.era
+        }
     }
 
     static func + (lhs: DayDate, rhs: Int) -> DayDate {
-        return DayDate(day: lhs.day + rhs, month: lhs.month, year: lhs.year, era: lhs.era)
+        return lhs.getDayDateWith(daysAdded: rhs)
     }
 
     public func hash(into hasher: inout Hasher) {

QVRWeekView/Classes/Common/EventLayer.swift

@@ -29,16 +29,18 @@ class EventLayer: CALayer {
         let eventTextLayer = CATextLayer()
         eventTextLayer.isWrapped = true
         eventTextLayer.contentsScale = UIScreen.main.scale
-        eventTextLayer.string = event.getDisplayString(withMainFont: layout.eventLabelFont,
-                                                       infoFont: layout.eventLabelInfoFont,
-                                                       andColor: layout.eventLabelTextColor)
+        eventTextLayer.string = event.getDisplayString(
+            withMainFont: layout.eventLabelFont,
+            infoFont: layout.eventLabelInfoFont,
+            andColor: layout.eventLabelTextColor)
 
         let xPadding = layout.eventLabelHorizontalTextPadding
         let yPadding = layout.eventLabelVerticalTextPadding
-        eventTextLayer.frame = CGRect(x: frame.origin.x + xPadding,
-                                      y: frame.origin.y + yPadding,
-                                      width: frame.width - 2*xPadding,
-                                      height: frame.height - 2*yPadding)
+        eventTextLayer.frame = CGRect(
+            x: frame.origin.x + xPadding,
+            y: frame.origin.y + yPadding,
+            width: frame.width - 2 * xPadding,
+            height: frame.height - 2 * yPadding)
         self.addSublayer(eventTextLayer)
     }
 

QVRWeekView/Classes/Views/DayScrollView.swift

@@ -211,9 +211,10 @@ UICollectionViewDelegate, UICollectionViewDataSource, DayViewCellDelegate, Frame
             let cvLeft = CGPoint(x: collectionView.contentOffset.x, y: collectionView.center.y + collectionView.contentOffset.y)
             if  let path = collectionView.indexPathForItem(at: cvLeft),
                 let dayViewCell = collectionView.cellForItem(at: path) as? DayViewCell,
-                !scrollingToDay, activeDay != dayViewCell.date {
+                let dayViewCellDate = dayViewCell.date,
+                !scrollingToDay, activeDay != dayViewCellDate {
 
-                self.activeDay = dayViewCell.date
+                self.activeDay = dayViewCellDate
                 if activeDay > currentPeriod.lateMidLimit {
                     updatePeriod()
                 }
@@ -264,8 +265,7 @@ UICollectionViewDelegate, UICollectionViewDataSource, DayViewCellDelegate, Frame
     }
 
     func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if let dayViewCell = cell as? DayViewCell {
-            let dayDate = dayViewCell.date
+        if let dayViewCell = cell as? DayViewCell, let dayDate = dayViewCell.date {
             self.weekView?.addDayLabel(forIndexPath: indexPath, withDate: dayDate)
             if let allDayEvents = allDayEventsData[dayDate] {
                 self.weekView?.addAllDayEvents(allDayEvents, forIndexPath: indexPath, withDate: dayDate)
@@ -274,8 +274,7 @@ UICollectionViewDelegate, UICollectionViewDataSource, DayViewCellDelegate, Frame
     }
 
     func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if let dayViewCell = cell as? DayViewCell {
-            let dayDate = dayViewCell.date
+        if let dayViewCell = cell as? DayViewCell, let dayDate = dayViewCell.date {
             self.weekView?.discardDayLabel(withDate: dayDate)
             if self.weekView?.hasAllDayEvents(forDate: dayDate) == true {
                 self.weekView?.removeAllDayEvents(forDate: dayDate)
@@ -468,8 +467,7 @@ UICollectionViewDelegate, UICollectionViewDataSource, DayViewCellDelegate, Frame
         self.eventsData = newEventsData
         self.allDayEventsData = newAllDayEvents
         for cell in self.dayCollectionView.visibleCells {
-            if let dayViewCell = cell as? DayViewCell {
-                let dayDate = dayViewCell.date
+            if let dayViewCell = cell as? DayViewCell, let dayDate = dayViewCell.date {
                 let allThisDayEvents = self.allDayEventsData[dayDate]
                 if allThisDayEvents == nil && self.weekView?.hasAllDayEvents(forDate: dayDate) == true {
                     self.weekView?.removeAllDayEvents(forDate: dayDate)
@@ -490,10 +488,12 @@ UICollectionViewDelegate, UICollectionViewDataSource, DayViewCellDelegate, Frame
         for dayDate in sortedChangedDays {
             self.processEventsData(forDayDate: dayDate)
         }
-        // Redraw days with no changed data
-        for (_, dayViewCell) in self.dayViewCells where !sortedChangedDays.contains(dayViewCell.date) {
-            dayViewCell.setNeedsLayout()
+        for (_, dayViewCell) in self.dayViewCells {
+            if let date = dayViewCell.date, !sortedChangedDays.contains(date) {
+                dayViewCell.setNeedsLayout()
+            }
         }
+
     }
 
     func requestEvents() {