Code cleanup, reformat example app

richardtop · Jan 31, 2024 · 1d8cfbf · 1d8cfbf
1 parent 2154298
commit 1d8cfbf
Show file tree

Hide file tree

Showing 2 changed files with 184 additions and 188 deletions.
diff --git a/CalendarKitDemo/CalendarApp/CustomCalendarExampleController.swift b/CalendarKitDemo/CalendarApp/CustomCalendarExampleController.swift
@@ -2,194 +2,194 @@ import UIKit
 import CalendarKit
 
 final class CustomCalendarExampleController: DayViewController {
-  var data = [["Breakfast at Tiffany's",
-               "New York, 5th avenue"],
-
-              ["Workout",
-               "Tufteparken"],
-
-              ["Meeting with Alex",
-               "Home",
-               "Oslo, Tjuvholmen"],
-
-              ["Beach Volleyball",
-               "Ipanema Beach",
-               "Rio De Janeiro"],
-
-              ["WWDC",
-               "Moscone West Convention Center",
-               "747 Howard St"],
-
-              ["Google I/O",
-               "Shoreline Amphitheatre",
-               "One Amphitheatre Parkway"],
-
-              ["✈️️ to Svalbard ❄️️❄️️❄️️❤️️",
-               "Oslo Gardermoen"],
-
-              ["💻📲 Developing CalendarKit",
-               "🌍 Worldwide"],
-
-              ["Software Development Lecture",
-               "Mikpoli MB310",
-               "Craig Federighi"],
-
-  ]
-
-  var generatedEvents = [EventDescriptor]()
-  var alreadyGeneratedSet = Set<Date>()
-
-  var colors = [UIColor.blue,
-                UIColor.yellow,
-                UIColor.green,
-                UIColor.red]
-
-  private lazy var dateIntervalFormatter: DateIntervalFormatter = {
-    let dateIntervalFormatter = DateIntervalFormatter()
-    dateIntervalFormatter.dateStyle = .none
-    dateIntervalFormatter.timeStyle = .short
-
-    return dateIntervalFormatter
-  }()
-
-  override func loadView() {
-    calendar.timeZone = TimeZone(identifier: "Europe/Paris")!
-
-    dayView = DayView(calendar: calendar)
-    view = dayView
-  }
-
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    title = "CalendarKit Demo"
-    navigationController?.navigationBar.isTranslucent = false
-    dayView.autoScrollToFirstEvent = true
-    reloadData()
-  }
-
-  // MARK: EventDataSource
-
-  override func eventsForDate(_ date: Date) -> [EventDescriptor] {
-    if !alreadyGeneratedSet.contains(date) {
-      alreadyGeneratedSet.insert(date)
-      generatedEvents.append(contentsOf: generateEventsForDate(date))
+    var data = [["Breakfast at Tiffany's",
+                 "New York, 5th avenue"],
+
+                ["Workout",
+                 "Tufteparken"],
+
+                ["Meeting with Alex",
+                 "Home",
+                 "Oslo, Tjuvholmen"],
+
+                ["Beach Volleyball",
+                 "Ipanema Beach",
+                 "Rio De Janeiro"],
+
+                ["WWDC",
+                 "Moscone West Convention Center",
+                 "747 Howard St"],
+
+                ["Google I/O",
+                 "Shoreline Amphitheatre",
+                 "One Amphitheatre Parkway"],
+
+                ["✈️️ to Svalbard ❄️️❄️️❄️️❤️️",
+                 "Oslo Gardermoen"],
+
+                ["💻📲 Developing CalendarKit",
+                 "🌍 Worldwide"],
+
+                ["Software Development Lecture",
+                 "Mikpoli MB310",
+                 "Craig Federighi"],
+
+    ]
+
+    var generatedEvents = [EventDescriptor]()
+    var alreadyGeneratedSet = Set<Date>()
+
+    var colors = [UIColor.blue,
+                  UIColor.yellow,
+                  UIColor.green,
+                  UIColor.red]
+
+    private lazy var dateIntervalFormatter: DateIntervalFormatter = {
+        let dateIntervalFormatter = DateIntervalFormatter()
+        dateIntervalFormatter.dateStyle = .none
+        dateIntervalFormatter.timeStyle = .short
+
+        return dateIntervalFormatter
+    }()
+
+    override func loadView() {
+        calendar.timeZone = TimeZone(identifier: "Europe/Paris")!
+
+        dayView = DayView(calendar: calendar)
+        view = dayView
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        title = "CalendarKit Demo"
+        navigationController?.navigationBar.isTranslucent = false
+        dayView.autoScrollToFirstEvent = true
+        reloadData()
+    }
+
+    // MARK: EventDataSource
+
+    override func eventsForDate(_ date: Date) -> [EventDescriptor] {
+        if !alreadyGeneratedSet.contains(date) {
+            alreadyGeneratedSet.insert(date)
+            generatedEvents.append(contentsOf: generateEventsForDate(date))
+        }
+        return generatedEvents
+    }
+
+    private func generateEventsForDate(_ date: Date) -> [EventDescriptor] {
+        var workingDate = Calendar.current.date(byAdding: .hour, value: Int.random(in: 1...15), to: date)!
+        var events = [Event]()
+
+        for i in 0...4 {
+            let event = Event()
+
+            let duration = Int.random(in: 60 ... 160)
+            event.dateInterval = DateInterval(start: workingDate, duration: TimeInterval(duration * 60))
+
+            var info = data.randomElement() ?? []
+
+            let timezone = dayView.calendar.timeZone
+            print(timezone)
+
+            info.append(dateIntervalFormatter.string(from: event.dateInterval.start, to: event.dateInterval.end))
+            event.text = info.reduce("", {$0 + $1 + "\n"})
+            event.color = colors.randomElement() ?? .red
+            event.isAllDay = Bool.random()
+            event.lineBreakMode = .byTruncatingTail
+
+            events.append(event)
+
+            let nextOffset = Int.random(in: 40 ... 250)
+            workingDate = Calendar.current.date(byAdding: .minute, value: nextOffset, to: workingDate)!
+            event.userInfo = String(i)
+        }
+
+        print("Events for \(date)")
+        return events
+    }
+
+    // MARK: DayViewDelegate
+
+    private var createdEvent: EventDescriptor?
+
+    override func dayViewDidSelectEventView(_ eventView: EventView) {
+        guard let descriptor = eventView.descriptor as? Event else {
+            return
+        }
+        print("Event has been selected: \(descriptor) \(String(describing: descriptor.userInfo))")
+    }
+
+    override func dayViewDidLongPressEventView(_ eventView: EventView) {
+        guard let descriptor = eventView.descriptor as? Event else {
+            return
+        }
+        endEventEditing()
+        print("Event has been longPressed: \(descriptor) \(String(describing: descriptor.userInfo))")
+        beginEditing(event: descriptor, animated: true)
+        print(Date())
+    }
+
+    override func dayView(dayView: DayView, didTapTimelineAt date: Date) {
+        endEventEditing()
+        print("Did Tap at date: \(date)")
+    }
+
+    override func dayViewDidBeginDragging(dayView: DayView) {
+        endEventEditing()
+        print("DayView did begin dragging")
     }
-    return generatedEvents
-  }
-
-  private func generateEventsForDate(_ date: Date) -> [EventDescriptor] {
-    var workingDate = Calendar.current.date(byAdding: .hour, value: Int.random(in: 1...15), to: date)!
-    var events = [Event]()
-
-    for i in 0...4 {
-      let event = Event()
-
-      let duration = Int.random(in: 60 ... 160)
-      event.dateInterval = DateInterval(start: workingDate, duration: TimeInterval(duration * 60))
-
-      var info = data.randomElement() ?? []
-
-      let timezone = dayView.calendar.timeZone
-      print(timezone)
-
-      info.append(dateIntervalFormatter.string(from: event.dateInterval.start, to: event.dateInterval.end))
-      event.text = info.reduce("", {$0 + $1 + "\n"})
-      event.color = colors.randomElement() ?? .red
-      event.isAllDay = Bool.random()
-      event.lineBreakMode = .byTruncatingTail
-
-      events.append(event)
-
-      let nextOffset = Int.random(in: 40 ... 250)
-      workingDate = Calendar.current.date(byAdding: .minute, value: nextOffset, to: workingDate)!
-      event.userInfo = String(i)
+
+    override func dayView(dayView: DayView, willMoveTo date: Date) {
+        print("DayView = \(dayView) will move to: \(date)")
     }
-
-    print("Events for \(date)")
-    return events
-  }
-
-  // MARK: DayViewDelegate
-
-  private var createdEvent: EventDescriptor?
-
-  override func dayViewDidSelectEventView(_ eventView: EventView) {
-    guard let descriptor = eventView.descriptor as? Event else {
-      return
+
+    override func dayView(dayView: DayView, didMoveTo date: Date) {
+        print("DayView = \(dayView) did move to: \(date)")
     }
-    print("Event has been selected: \(descriptor) \(String(describing: descriptor.userInfo))")
-  }
-
-  override func dayViewDidLongPressEventView(_ eventView: EventView) {
-    guard let descriptor = eventView.descriptor as? Event else {
-      return
+
+    override func dayView(dayView: DayView, didLongPressTimelineAt date: Date) {
+        print("Did long press timeline at date \(date)")
+        // Cancel editing current event and start creating a new one
+        endEventEditing()
+        let event = generateEventNearDate(date)
+        print("Creating a new event")
+        create(event: event, animated: true)
+        createdEvent = event
     }
-    endEventEditing()
-    print("Event has been longPressed: \(descriptor) \(String(describing: descriptor.userInfo))")
-    beginEditing(event: descriptor, animated: true)
-    print(Date())
-  }
-
-  override func dayView(dayView: DayView, didTapTimelineAt date: Date) {
-    endEventEditing()
-    print("Did Tap at date: \(date)")
-  }
-
-  override func dayViewDidBeginDragging(dayView: DayView) {
-    endEventEditing()
-    print("DayView did begin dragging")
-  }
-
-  override func dayView(dayView: DayView, willMoveTo date: Date) {
-    print("DayView = \(dayView) will move to: \(date)")
-  }
-
-  override func dayView(dayView: DayView, didMoveTo date: Date) {
-    print("DayView = \(dayView) did move to: \(date)")
-  }
-
-  override func dayView(dayView: DayView, didLongPressTimelineAt date: Date) {
-    print("Did long press timeline at date \(date)")
-    // Cancel editing current event and start creating a new one
-    endEventEditing()
-    let event = generateEventNearDate(date)
-    print("Creating a new event")
-    create(event: event, animated: true)
-    createdEvent = event
-  }
-
-  private func generateEventNearDate(_ date: Date) -> EventDescriptor {
-    let duration = (60...220).randomElement()!
-    let startDate = Calendar.current.date(byAdding: .minute, value: -Int(Double(duration) / 2), to: date)!
-    let event = Event()
-
-    event.dateInterval = DateInterval(start: startDate, duration: TimeInterval(duration * 60))
-
-    var info = data.randomElement()!
-
-    info.append(dateIntervalFormatter.string(from: event.dateInterval)!)
-    event.text = info.reduce("", {$0 + $1 + "\n"})
-    event.color = colors.randomElement()!
-    event.editedEvent = event
-
-    return event
-  }
-
-  override func dayView(dayView: DayView, didUpdate event: EventDescriptor) {
-    print("did finish editing \(event)")
-    print("new startDate: \(event.dateInterval.start) new endDate: \(event.dateInterval.end)")
-
-    if let _ = event.editedEvent {
-      event.commitEditing()
+
+    private func generateEventNearDate(_ date: Date) -> EventDescriptor {
+        let duration = (60...220).randomElement()!
+        let startDate = Calendar.current.date(byAdding: .minute, value: -Int(Double(duration) / 2), to: date)!
+        let event = Event()
+
+        event.dateInterval = DateInterval(start: startDate, duration: TimeInterval(duration * 60))
+
+        var info = data.randomElement()!
+
+        info.append(dateIntervalFormatter.string(from: event.dateInterval)!)
+        event.text = info.reduce("", {$0 + $1 + "\n"})
+        event.color = colors.randomElement()!
+        event.editedEvent = event
+
+        return event
     }
-
-    if let createdEvent = createdEvent {
-      createdEvent.editedEvent = nil
-      generatedEvents.append(createdEvent)
-      self.createdEvent = nil
-      endEventEditing()
+
+    override func dayView(dayView: DayView, didUpdate event: EventDescriptor) {
+        print("did finish editing \(event)")
+        print("new startDate: \(event.dateInterval.start) new endDate: \(event.dateInterval.end)")
+
+        if let _ = event.editedEvent {
+            event.commitEditing()
+        }
+
+        if let createdEvent = createdEvent {
+            createdEvent.editedEvent = nil
+            generatedEvents.append(createdEvent)
+            self.createdEvent = nil
+            endEventEditing()
+        }
+
+        reloadData()
     }
-
-    reloadData()
-  }
 }
diff --git a/Package.swift b/Package.swift
@@ -1,5 +1,4 @@
 // swift-tools-version:5.7
-// The swift-tools-version declares the minimum version of Swift required to build this package.
 import PackageDescription
 
 let package = Package(
@@ -10,14 +9,11 @@ let package = Package(
         .tvOS(.v11)
     ],
     products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "CalendarKit",
             targets: ["CalendarKit"]),
     ],
     targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(name: "CalendarKit",
                 path: "Sources")
     ]