Intergation custom table view to vc

Sources/CalendarStyle.swift

@@ -73,7 +73,7 @@ public struct TimelineStyle {
   public var verticalDiff: CGFloat = 50
   public var verticalInset: CGFloat = 10
   public var leadingInset: CGFloat = 53
-  public var eventGap: CGFloat = 0
+  public var eventGap: CGFloat = 1
   public init() {}
 }
 

Sources/DayView.swift

@@ -47,6 +47,12 @@ public class DayView: UIView, TimelinePagerViewDelegate, DayHeaderViewDelegate {
     }
   }
 
+    public var minDate: Date? {
+        didSet {
+            timelinePagerView.minDate = minDate
+        }
+    }
+
     public var horizontalSpacing: CGFloat = 0 {
         didSet {
             layoutTableView()
@@ -73,6 +79,15 @@ public class DayView: UIView, TimelinePagerViewDelegate, DayHeaderViewDelegate {
       timelinePagerView.autoScrollToFirstEvent = value
     }
   }
+
+    public var timeIntervalBefore: Float {
+        get {
+            timelinePagerView.timeIntervalBefore
+        }
+        set (value) {
+            timelinePagerView.timeIntervalBefore = value
+        }
+    }
 
   public let dayHeaderView: DayHeaderView
   public let timelinePagerView: TimelinePagerView
@@ -220,7 +235,7 @@ public class DayView: UIView, TimelinePagerViewDelegate, DayHeaderViewDelegate {
   }
 
     public func scrollToCurrentTime(animated: Bool = true) {
-      timelinePagerView.scrollToCurrentTime(animated: animated)
+        timelinePagerView.scrollToCurrentTime(animated: animated)
     }
 
   public func reloadData() {

Sources/Extensions/Date+DateOnly.swift

@@ -22,4 +22,19 @@ extension Date {
     func year() -> Int {
         return  Calendar.current.component(.year, from: self)
     }
+
+    /* Returns current time in Float
+     - before point - hours
+     - after point  - percent of minutes in hour
+     */
+    func timeOnly() -> Float {
+        let hours = Double(Calendar.current.component(.hour, from: Date()))
+        let minutes = Double(Calendar.current.component(.minute, from: Date()))
+        var time = hours
+        let minutesInPercent = minutes / 60.0
+        if minutesInPercent < 1 {
+            time = hours + minutesInPercent
+        }
+        return Float(time)
+    }
 }

Sources/Timeline/TimelineContainer.swift

@@ -3,6 +3,13 @@ import UIKit
 public final class TimelineContainer: UIScrollView {
   public let timeline: TimelineView
   unowned var parent: UIViewController?
+
+    var timeIntervalBefore: Float {
+        if let parent = parent?.parent as? CKPageViewController {
+            return parent.timeIntervalBefore
+        }
+        return .zero
+    }
 
   public init(_ timeline: TimelineView) {
     self.timeline = timeline
@@ -60,24 +67,30 @@ public final class TimelineContainer: UIScrollView {
   }
 
     public func scroollToCurrentTime(animated: Bool) {
-        let allDayViewHeight = timeline.allDayViewHeight
-        let padding = allDayViewHeight + 200
-        if let yToScroll = timeline.currentTimeYPosition {
-            setTimelineOffset(CGPoint(x: contentOffset.x, y: yToScroll - padding), animated: animated)
-        }
+        let timeToScroll = Date().timeOnly() - timeIntervalBefore
+        scrollTo(hour24: timeToScroll, animated: animated)
     }
 
   public func scrollTo(hour24: Float, animated: Bool = true) {
     let percentToScroll = CGFloat(hour24 / 24)
     let yToScroll = contentSize.height * percentToScroll
-    let padding: CGFloat = 8
-    setTimelineOffset(CGPoint(x: contentOffset.x, y: yToScroll - padding), animated: animated)
+    setTimelineOffset(CGPoint(x: contentOffset.x, y: yToScroll), animated: animated)
   }
 
-  private func setTimelineOffset(_ offset: CGPoint, animated: Bool) {
-    let yToScroll = offset.y
-    let bottomOfScrollView = contentSize.height - bounds.size.height
-    let newContentY = (yToScroll < bottomOfScrollView) ? yToScroll : bottomOfScrollView
-    setContentOffset(CGPoint(x: offset.x, y: newContentY), animated: animated)
-  }
+    private func setTimelineOffset(_ offset: CGPoint, animated: Bool) {
+        let yToScroll = offset.y
+        let bottomOfScrollView = contentSize.height - bounds.size.height
+
+        var newContentY: CGFloat = yToScroll
+        if yToScroll < bottomOfScrollView {
+            newContentY = (yToScroll < frame.minY) ? frame.minY : yToScroll
+        } else {
+            newContentY = bottomOfScrollView
+        }
+
+        if let parent = parent?.parent as? CKPageViewController {
+            parent.commonOffset?.y = newContentY
+        }
+        setContentOffset(CGPoint(x: offset.x, y: newContentY), animated: animated)
+    }
 }

Sources/Timeline/TimelineContainerController.swift

@@ -30,6 +30,13 @@ public final class TimelineContainerController: UIViewController {
   public override func viewDidLayoutSubviews() {
     super.viewDidLayoutSubviews()
     container.contentSize = timeline.frame.size
+      if let parent = self.parent as? CKPageViewController {
+          if parent.isFirstLaunch {
+              container.scroollToCurrentTime(animated: true)
+              parent.isFirstLaunch = false
+          }
+      }
+
       if let newOffset = self.pendingContentOffset {
       // Apply new offset only once the size has been determined
       if view.bounds != .zero {

Sources/Timeline/TimelinePagerView.swift

@@ -16,6 +16,8 @@ public protocol TimelinePagerViewDelegate: AnyObject {
 
 final class CKPageViewController: UIPageViewController {
     var commonOffset: CGPoint?
+    var isFirstLaunch = true
+    var timeIntervalBefore: Float = .zero
 }
 
 public final class TimelinePagerView: UIView, UIGestureRecognizerDelegate, UIScrollViewDelegate, DayViewStateUpdating, UIPageViewControllerDataSource, UIPageViewControllerDelegate, TimelineViewDelegate {
@@ -43,6 +45,16 @@ public final class TimelinePagerView: UIView, UIGestureRecognizerDelegate, UIScr
   }
 
   public var autoScrollToFirstEvent = false
+
+    /// Min date in calendar for swipe
+    public var minDate: Date?
+
+    /// Time interval before current time
+    public var timeIntervalBefore: Float = .zero {
+        didSet {
+            pagingViewController.timeIntervalBefore = timeIntervalBefore
+        }
+    }
 
   private var pagingViewController = CKPageViewController(transitionStyle: .scroll,
                                                           navigationOrientation: .horizontal,
@@ -455,7 +467,6 @@ public final class TimelinePagerView: UIView, UIGestureRecognizerDelegate, UIScr
                                                       completion: nil)
 
         self.pagingViewController.viewControllers?.first?.view.setNeedsLayout()
-        self.scrollToFirstEventIfNeeded(animated: true)
         self.delegate?.timelinePager(timelinePager: self, didMoveTo: newDate)
       }
     }
@@ -500,6 +511,9 @@ 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)!
+      if let minDate = minDate {
+          guard previousDate >= minDate else { return nil }
+      }
     let timelineContainerController = configureTimelineController(date: previousDate)
     let offset = containerController.container.contentOffset
     timelineContainerController.pendingContentOffset = offset