Simplify EventInfo.

Clocker/ClockerUnitTests/EventInfoTests.swift

@@ -14,10 +14,7 @@ class EventInfoTests: XCTestCase {
         mockEvent.startDate = Date().add(futureChunk)
         
         let mockEventInfo = EventInfo(event: mockEvent,
-                                      isStartDate: false,
-                                      isEndDate: false,
                                       isAllDay: false,
-                                      isSingleDay: true,
                                       meetingURL: nil,
                                       attendeStatus: .accepted)
         XCTAssert(mockEventInfo.metadataForMeeting() == "in 5m",
@@ -31,10 +28,7 @@ class EventInfoTests: XCTestCase {
         mockEvent.startDate = Date().add(futureChunk)
         
         let mockEventInfo = EventInfo(event: mockEvent,
-                                      isStartDate: false,
-                                      isEndDate: false,
                                       isAllDay: false,
-                                      isSingleDay: true,
                                       meetingURL: nil,
                                       attendeStatus: .accepted)
         XCTAssert(mockEventInfo.metadataForMeeting() == "in <1m",
@@ -48,10 +42,7 @@ class EventInfoTests: XCTestCase {
         mockEvent.startDate = Date().subtract(pastChunk)
         
         let mockEventInfo = EventInfo(event: mockEvent,
-                                      isStartDate: false,
-                                      isEndDate: false,
                                       isAllDay: false,
-                                      isSingleDay: true,
                                       meetingURL: nil,
                                       attendeStatus: .accepted)
         XCTAssert(mockEventInfo.metadataForMeeting() == "started +2m.",
@@ -65,10 +56,7 @@ class EventInfoTests: XCTestCase {
         mockEvent.startDate = Date().subtract(pastChunk)
         
         let mockEventInfo = EventInfo(event: mockEvent,
-                                      isStartDate: false,
-                                      isEndDate: false,
                                       isAllDay: false,
-                                      isSingleDay: true,
                                       meetingURL: nil,
                                       attendeStatus: .accepted)
         XCTAssert(mockEventInfo.metadataForMeeting() == "Error",
@@ -82,10 +70,7 @@ class EventInfoTests: XCTestCase {
         mockEvent.startDate = Date().add(pastChunk)
         
         let mockEventInfo = EventInfo(event: mockEvent,
-                                      isStartDate: false,
-                                      isEndDate: false,
                                       isAllDay: false,
-                                      isSingleDay: true,
                                       meetingURL: nil,
                                       attendeStatus: .accepted)
         XCTAssert(mockEventInfo.metadataForMeeting() == "in 25h",

Clocker/Events and Reminders/CalendarHandler.swift

@@ -362,17 +362,11 @@ extension EventCenter {
 
     private func generateEventInfo(for event: EKEvent, _ date: Date, _ nextDate: Date) -> EventInfo {
         // Make a customized struct
-        let isStartDate = autoupdatingCalendar.isDate(date, inSameDayAs: event.startDate) && (event.endDate.compare(date) == .orderedDescending)
-        let isEndDate = autoupdatingCalendar.isDate(date, inSameDayAs: event.endDate) && (event.startDate.compare(date) == .orderedAscending)
         let isAllDay = event.isAllDay || (event.startDate.compare(date) == .orderedAscending && event.endDate.compare(nextDate) == .orderedSame)
-        let isSingleDay = event.isAllDay && (event.startDate.compare(date) == .orderedSame && event.endDate.compare(nextDate) == .orderedSame)
         let eventParticipationStatus = attendingStatusForUser(event)
         let meetingURL = retrieveMeetingURL(event)
         let eventInfo = EventInfo(event: event,
-                                  isStartDate: isStartDate,
-                                  isEndDate: isEndDate,
                                   isAllDay: isAllDay,
-                                  isSingleDay: isSingleDay,
                                   meetingURL: meetingURL,
                                   attendeStatus: eventParticipationStatus)
         return eventInfo
@@ -481,10 +475,7 @@ struct CalendarInfo {
 
 struct EventInfo {
     let event: EKEvent
-    let isStartDate: Bool
-    let isEndDate: Bool
     let isAllDay: Bool
-    let isSingleDay: Bool
     let meetingURL: URL?
     let attendeStatus: EKParticipantStatus