Improve readability

Author: richardtop

CalendarKitDemo/CalendarApp/CustomCalendarExampleController.swift

@@ -45,12 +45,12 @@ class CustomCalendarExampleController: DayViewController {
                 UIColor.green,
                 UIColor.red]
 
-  private lazy var rangeFormatter: DateIntervalFormatter = {
-    let fmt = DateIntervalFormatter()
-    fmt.dateStyle = .none
-    fmt.timeStyle = .short
+  private lazy var dateIntervalFormatter: DateIntervalFormatter = {
+    let dateIntervalFormatter = DateIntervalFormatter()
+    dateIntervalFormatter.dateStyle = .none
+    dateIntervalFormatter.timeStyle = .short
 
-    return fmt
+    return dateIntervalFormatter
   }()
 
   override func loadView() {
@@ -93,7 +93,7 @@ class CustomCalendarExampleController: DayViewController {
       let timezone = dayView.calendar.timeZone
       print(timezone)
 
-      info.append(rangeFormatter.string(from: event.dateInterval.start, to: event.dateInterval.end))
+      info.append(dateIntervalFormatter.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
@@ -168,7 +168,7 @@ class CustomCalendarExampleController: DayViewController {
 
     var info = data[Int(arc4random_uniform(UInt32(data.count)))]
 
-    info.append(rangeFormatter.string(from: event.dateInterval)!)
+    info.append(dateIntervalFormatter.string(from: event.dateInterval)!)
     event.text = info.reduce("", {$0 + $1 + "\n"})
     event.color = colors[Int(arc4random_uniform(UInt32(colors.count)))]
     event.editedEvent = event

Sources/Header/DayHeaderView.swift

@@ -57,27 +57,27 @@ public final class DayHeaderView: UIView, DaySelectorDelegate, DayViewStateUpdat
 
   private func configurePagingViewController() {
     let selectedDate = Date()
-    let vc = makeSelectorController(startDate: beginningOfWeek(selectedDate))
-    vc.selectedDate = selectedDate
-    currentWeekdayIndex = vc.selectedIndex
+    let daySelectorController = makeSelectorController(startDate: beginningOfWeek(selectedDate))
+    daySelectorController.selectedDate = selectedDate
+    currentWeekdayIndex = daySelectorController.selectedIndex
 
     let leftToRight = UIView.userInterfaceLayoutDirection(for: semanticContentAttribute) == .leftToRight
     let direction: UIPageViewController.NavigationDirection = leftToRight ? .forward : .reverse
 
-    pagingViewController.setViewControllers([vc], direction: direction, animated: false, completion: nil)
+    pagingViewController.setViewControllers([daySelectorController], direction: direction, animated: false, completion: nil)
     pagingViewController.dataSource = self
     pagingViewController.delegate = self
     addSubview(pagingViewController.view!)
   }
 
   private func makeSelectorController(startDate: Date) -> DaySelectorController {
-    let new = DaySelectorController()
-    new.calendar = calendar
-    new.transitionToHorizontalSizeClass(currentSizeClass)
-    new.updateStyle(style.daySelector)
-    new.startDate = startDate
-    new.delegate = self
-    return new
+    let daySelectorController = DaySelectorController()
+    daySelectorController.calendar = calendar
+    daySelectorController.transitionToHorizontalSizeClass(currentSizeClass)
+    daySelectorController.updateStyle(style.daySelector)
+    daySelectorController.startDate = startDate
+    daySelectorController.delegate = self
+    return daySelectorController
   }
 
   private func beginningOfWeek(_ date: Date) -> Date {

Sources/Timeline/TimelinePagerView.swift

@@ -470,19 +470,19 @@ public final class TimelinePagerView: UIView, UIGestureRecognizerDelegate, UIScr
   public func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
     guard let containerController = viewController as? TimelineContainerController  else {return nil}
     let previousDate = calendar.date(byAdding: .day, value: -1, to: containerController.timeline.date)!
-    let vc = configureTimelineController(date: previousDate)
+    let timelineContainerController = configureTimelineController(date: previousDate)
     let offset = (pageViewController.viewControllers?.first as? TimelineContainerController)?.container.contentOffset
-    vc.pendingContentOffset = offset
-    return vc
+    timelineContainerController.pendingContentOffset = offset
+    return timelineContainerController
   }
 
   public func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? {
     guard let containerController = viewController as? TimelineContainerController  else {return nil}
     let nextDate = calendar.date(byAdding: .day, value: 1, to: containerController.timeline.date)!
-    let vc = configureTimelineController(date: nextDate)
+    let timelineContainerController = configureTimelineController(date: nextDate)
     let offset = (pageViewController.viewControllers?.first as? TimelineContainerController)?.container.contentOffset
-    vc.pendingContentOffset = offset
-    return vc
+    timelineContainerController.pendingContentOffset = offset
+    return timelineContainerController
   }
 
   // MARK: UIPageViewControllerDelegate