Merge dateinterval into master

Author: richardtop

CalendarKit.podspec

@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
   s.author           = { "Richard Topchii" => "richardtop@users.noreply.github.com" }
   s.source           = { :git => "https://github.com/richardtop/CalendarKit.git", :tag => s.version.to_s }
   s.social_media_url = 'https://github.com/richardtop'
-  s.platform     = :ios, '9.0'
+  s.platform     = :ios, '10.0'
   s.swift_version = '5.3'
   s.requires_arc = true
   s.source_files = 'Sources/**/*.swift'

CalendarKitDemo/CalendarApp/CustomCalendarExampleController.swift

@@ -86,15 +86,14 @@ class CustomCalendarExampleController: DayViewController {
       let event = Event()
 
       let duration = Int.random(in: 60 ... 160)
-      event.startDate = workingDate
-      event.endDate = Calendar.current.date(byAdding: .minute, value: duration, to: workingDate)!
+      event.dateInterval = DateInterval(start: workingDate, duration: TimeInterval(duration * 60))
 
       var info = data[Int(arc4random_uniform(UInt32(data.count)))]
 
       let timezone = dayView.calendar.timeZone
       print(timezone)
 
-      info.append(rangeFormatter.string(from: event.startDate, to: event.endDate))
+      info.append(rangeFormatter.string(from: event.dateInterval.start, to: event.dateInterval.end))
       event.text = info.reduce("", {$0 + $1 + "\n"})
       event.color = colors[Int(arc4random_uniform(UInt32(colors.count)))]
       event.isAllDay = Int(arc4random_uniform(2)) % 2 == 0
@@ -164,13 +163,12 @@ class CustomCalendarExampleController: DayViewController {
     let duration = Int(arc4random_uniform(160) + 60)
     let startDate = Calendar.current.date(byAdding: .minute, value: -Int(CGFloat(duration) / 2), to: date)!
     let event = Event()
-
-    event.startDate = startDate
-    event.endDate = Calendar.current.date(byAdding: .minute, value: duration, to: startDate)!
+    
+    event.dateInterval = DateInterval(start: startDate, duration: TimeInterval(duration * 60))
 
     var info = data[Int(arc4random_uniform(UInt32(data.count)))]
 
-    info.append(rangeFormatter.string(from: event.startDate, to: event.endDate))
+    info.append(rangeFormatter.string(from: event.dateInterval)!)
     event.text = info.reduce("", {$0 + $1 + "\n"})
     event.color = colors[Int(arc4random_uniform(UInt32(colors.count)))]
     event.editedEvent = event
@@ -180,7 +178,7 @@ class CustomCalendarExampleController: DayViewController {
 
   override func dayView(dayView: DayView, didUpdate event: EventDescriptor) {
     print("did finish editing \(event)")
-    print("new startDate: \(event.startDate) new endDate: \(event.endDate)")
+    print("new startDate: \(event.dateInterval.start) new endDate: \(event.dateInterval.end)")
 
     if let _ = event.editedEvent {
       event.commitEditing()

Package.swift

@@ -6,7 +6,7 @@ let package = Package(
   name: "CalendarKit",
   defaultLocalization: "en",
   platforms: [
-    .iOS(.v9),
+    .iOS(.v10),
   ],
   products: [
     // Products define the executables and libraries produced by a package, and make them visible to other packages.

README.md

@@ -68,9 +68,8 @@ override func eventsForDate(_ date: Date) -> [EventDescriptor] {
   for model in models {
       // Create new EventView
       let event = Event()
-      // Specify StartDate and EndDate
-      event.startDate = model.startDate
-      event.endDate = model.endDate
+      // Specify DateInterval
+      event.dateInterval = DateInterval(start: model.startDate, end: model.endDate)
       // Add info: event title, subtitle, location to the array of Strings
       var info = [model.title, model.location]
       info.append("\(datePeriod.beginning!.format(with: "HH:mm")) - \(datePeriod.end!.format(with: "HH:mm"))")
@@ -120,7 +119,7 @@ dayView.updateStyle(style)
 
 ## Requirements
 
-- iOS 9.0+, macOS (Catalyst) 10.15+
+- iOS 10.0+, macOS (Catalyst) 10.15+
 - Swift 4+ (Library is written in Swift 5)
 
 ## Contributing

Sources/Extensions/EventDescriptor+DatePeriod.swift

@@ -1,8 +1,7 @@
 import UIKit
 
 public final class Event: EventDescriptor {
-  public var startDate = Date()
-  public var endDate = Date()
+  public var dateInterval = DateInterval()
   public var isAllDay = false
   public var text = ""
   public var attributedText: NSAttributedString?
@@ -26,8 +25,7 @@ public final class Event: EventDescriptor {
 
   public func makeEditable() -> Event {
     let cloned = Event()
-    cloned.startDate = startDate
-    cloned.endDate = endDate
+    cloned.dateInterval = dateInterval
     cloned.isAllDay = isAllDay
     cloned.text = text
     cloned.attributedText = attributedText
@@ -42,8 +40,7 @@ public final class Event: EventDescriptor {
 
   public func commitEditing() {
     guard let edited = editedEvent else {return}
-    edited.startDate = startDate
-    edited.endDate = endDate
+    edited.dateInterval = dateInterval
   }
 
   private func updateColors() {

Sources/Timeline/Event.swift

@@ -2,8 +2,7 @@ import Foundation
 import UIKit
 
 public protocol EventDescriptor: AnyObject {
-  var startDate: Date {get set}
-  var endDate: Date {get set}
+  var dateInterval: DateInterval {get set}
   var isAllDay: Bool {get}
   var text: String {get}
   var attributedText: NSAttributedString? {get}

Sources/Timeline/EventDescriptor.swift

@@ -193,8 +193,8 @@ public final class TimelinePagerView: UIView, UIGestureRecognizerDelegate, UIScr
     let events = dataSource.eventsForDate(date)
 
     let end = calendar.date(byAdding: .day, value: 1, to: date)!
-    let day = date ... end
-    let validEvents = events.filter{$0.datePeriod.overlaps(day)}
+    let day = DateInterval(start: date, end: end)
+    let validEvents = events.filter{$0.dateInterval.intersects(day)}
     timeline.layoutAttributes = validEvents.map(EventLayoutAttributes.init)
   }
 
@@ -233,8 +233,8 @@ public final class TimelinePagerView: UIView, UIGestureRecognizerDelegate, UIScr
       let timeline = currentTimeline.timeline
       let offset = currentTimeline.container.contentOffset.y
       // algo needs to be extracted to a separate object
-      let yStart = timeline.dateToY(event.startDate) - offset
-      let yEnd = timeline.dateToY(event.endDate) - offset
+      let yStart = timeline.dateToY(event.dateInterval.start) - offset
+      let yEnd = timeline.dateToY(event.dateInterval.end) - offset
 
 
       let rightToLeft = UIView.userInterfaceLayoutDirection(for: semanticContentAttribute) == .rightToLeft
@@ -355,7 +355,7 @@ public final class TimelinePagerView: UIView, UIGestureRecognizerDelegate, UIScr
         eventFrame.origin.y = timeline.dateToY(snapped) - currentTimeline.container.contentOffset.y
 
         if resizeHandleTag == 0 {
-          eventFrame.size.height = timeline.dateToY(descriptor.endDate) - timeline.dateToY(snapped)
+          eventFrame.size.height = timeline.dateToY(descriptor.dateInterval.end) - timeline.dateToY(snapped)
         } else if resizeHandleTag == 1 {
           let bottomHandleYTD = yToDate(y: editedEventView.frame.origin.y + editedEventView.frame.size.height,
                                         timeline: timeline)
@@ -417,8 +417,7 @@ public final class TimelinePagerView: UIView, UIGestureRecognizerDelegate, UIScr
       let endY = converted.maxY
       let beginning = timeline.yToDate(beginningY)
       let end = timeline.yToDate(endY)
-      descriptor.startDate = beginning
-      descriptor.endDate = end
+      descriptor.dateInterval = DateInterval(start: beginning, end: end)
     }
   }
 

Sources/Timeline/TimelinePagerView.swift

@@ -436,8 +436,8 @@ public final class TimelineView: UIView {
 
     // only non allDay events need their frames to be set
     let sortedEvents = self.regularLayoutAttributes.sorted { (attr1, attr2) -> Bool in
-      let start1 = attr1.descriptor.startDate
-      let start2 = attr2.descriptor.startDate
+      let start1 = attr1.descriptor.dateInterval.start
+      let start2 = attr2.descriptor.dateInterval.start
       return start1 < start2
     }
 
@@ -451,26 +451,26 @@ public final class TimelineView: UIView {
       }
 
       let longestEvent = overlappingEvents.sorted { (attr1, attr2) -> Bool in
-        var period = attr1.descriptor.datePeriod
-        let period1 = period.upperBound.timeIntervalSince(period.lowerBound)
-        period = attr2.descriptor.datePeriod
-        let period2 = period.upperBound.timeIntervalSince(period.lowerBound)
+        var period = attr1.descriptor.dateInterval
+        let period1 = period.end.timeIntervalSince(period.start)
+        period = attr2.descriptor.dateInterval
+        let period2 = period.end.timeIntervalSince(period.start)
 
         return period1 > period2
         }
         .first!
 
       if style.eventsWillOverlap {
-        guard let earliestEvent = overlappingEvents.first?.descriptor.startDate else { continue }
+        guard let earliestEvent = overlappingEvents.first?.descriptor.dateInterval.start else { continue }
         let dateInterval = getDateInterval(date: earliestEvent)
-        if event.descriptor.datePeriod.contains(dateInterval.lowerBound) {
+        if event.descriptor.dateInterval.contains(dateInterval.start) {
           overlappingEvents.append(event)
           continue
         }
       } else {
         let lastEvent = overlappingEvents.last!
-        if (longestEvent.descriptor.datePeriod.overlaps(event.descriptor.datePeriod) && (longestEvent.descriptor.endDate != event.descriptor.startDate || style.eventGap <= 0.0)) ||
-          (lastEvent.descriptor.datePeriod.overlaps(event.descriptor.datePeriod) && (lastEvent.descriptor.endDate != event.descriptor.startDate || style.eventGap <= 0.0)) {
+        if (longestEvent.descriptor.dateInterval.intersects(event.descriptor.dateInterval) && (longestEvent.descriptor.dateInterval.end != event.descriptor.dateInterval.start || style.eventGap <= 0.0)) ||
+          (lastEvent.descriptor.dateInterval.intersects(event.descriptor.dateInterval) && (lastEvent.descriptor.dateInterval.end != event.descriptor.dateInterval.start || style.eventGap <= 0.0)) {
           overlappingEvents.append(event)
           continue
         }
@@ -485,8 +485,8 @@ public final class TimelineView: UIView {
     for overlappingEvents in groupsOfEvents {
       let totalCount = CGFloat(overlappingEvents.count)
       for (index, event) in overlappingEvents.enumerated() {
-        let startY = dateToY(event.descriptor.datePeriod.lowerBound)
-        let endY = dateToY(event.descriptor.datePeriod.upperBound)
+        let startY = dateToY(event.descriptor.dateInterval.start)
+        let endY = dateToY(event.descriptor.dateInterval.end)
         let floatIndex = CGFloat(index)
         let x = style.leadingInset + floatIndex / totalCount * calendarWidth
         let equalWidth = calendarWidth / totalCount
@@ -561,13 +561,13 @@ public final class TimelineView: UIView {
     return calendar.component(component, from: date)
   }
 
-  private func getDateInterval(date: Date) -> ClosedRange<Date> {
+  private func getDateInterval(date: Date) -> DateInterval {
     let earliestEventMintues = component(component: .minute, from: date)
     let splitMinuteInterval = style.splitMinuteInterval
     let minute = component(component: .minute, from: date)
     let minuteRange = (minute / splitMinuteInterval) * splitMinuteInterval
     let beginningRange = calendar.date(byAdding: .minute, value: -(earliestEventMintues - minuteRange), to: date)!
     let endRange = calendar.date(byAdding: .minute, value: splitMinuteInterval, to: beginningRange)!
-    return beginningRange ... endRange
+    return DateInterval(start: beginningRange, end: endRange)
   }
 }