From 2365e61fb81e7ffb2e3e2a3d2c1078357d8a5536 Mon Sep 17 00:00:00 2001
From: JayT <patchthecode@gmail.com>
Date: Sat, 4 Jun 2016 17:08:36 -0700
Subject: [PATCH] Updated final fix for version 4.0

---
 .../Base.lproj/Main.storyboard                |  33 +++---
 Example/JTAppleCalendar/ViewController.swift  |  18 +--
 Pod/Classes/JTAppleCalendarDelegates.swift    |   6 +-
 Pod/Classes/JTAppleCalendarView.swift         |  64 +++++++----
 Pod/Classes/UserInteractionFunctions.swift    | 104 +++++++++++++-----
 5 files changed, 144 insertions(+), 81 deletions(-)

diff --git a/Example/JTAppleCalendar/Base.lproj/Main.storyboard b/Example/JTAppleCalendar/Base.lproj/Main.storyboard
index ffe0a3c1..67223b78 100644
--- a/Example/JTAppleCalendar/Base.lproj/Main.storyboard
+++ b/Example/JTAppleCalendar/Base.lproj/Main.storyboard
@@ -79,55 +79,48 @@
                             <stackView opaque="NO" contentMode="scaleToFill" misplaced="YES" axis="vertical" distribution="fillEqually" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="iQI-Hq-aUc">
                                 <rect key="frame" x="16" y="14925" width="157" height="150"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nfk-D6-bAe">
-                                        <rect key="frame" x="0.0" y="0.0" width="47" height="22"/>
-                                        <state key="normal" title="Reload"/>
-                                        <connections>
-                                            <action selector="reloadCal" destination="BYZ-38-t0r" eventType="touchUpInside" id="asI-2d-7Db"/>
-                                        </connections>
-                                    </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rWO-5s-mKQ">
-                                        <rect key="frame" x="0.0" y="22" width="107" height="22"/>
+                                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rWO-5s-mKQ">
+                                        <rect key="frame" x="0.0" y="0.0" width="107" height="25"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Change to 3 rows"/>
                                         <connections>
                                             <action selector="changeToThreeRows:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Wb1-go-yPa"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="13p-cR-5Oy">
-                                        <rect key="frame" x="0.0" y="43" width="110" height="22"/>
+                                    <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="13p-cR-5Oy">
+                                        <rect key="frame" x="0.0" y="25" width="110" height="25"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Change to 6 Rows"/>
                                         <connections>
                                             <action selector="changeToSixRows:" destination="BYZ-38-t0r" eventType="touchUpInside" id="YTT-Xm-Hgz"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EZB-eU-i2Z">
-                                        <rect key="frame" x="0.0" y="65" width="146" height="21"/>
+                                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EZB-eU-i2Z">
+                                        <rect key="frame" x="0.0" y="50" width="146" height="25"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Select many 2016 dates"/>
                                         <connections>
                                             <action selector="select10:" destination="BYZ-38-t0r" eventType="touchUpInside" id="ce9-dQ-iNd"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WaY-fY-0lz">
-                                        <rect key="frame" x="0.0" y="86" width="126" height="22"/>
+                                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WaY-fY-0lz">
+                                        <rect key="frame" x="0.0" y="75" width="126" height="25"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Select 11th Feb 2016"/>
                                         <connections>
                                             <action selector="select11:" destination="BYZ-38-t0r" eventType="touchUpInside" id="2hr-AE-WhN"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4fl-ZS-PXq">
-                                        <rect key="frame" x="0.0" y="107" width="139" height="22"/>
+                                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4fl-ZS-PXq">
+                                        <rect key="frame" x="0.0" y="100" width="139" height="25"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Scroll to 11th Mar 2016"/>
                                         <connections>
                                             <action selector="scrollToDate:" destination="BYZ-38-t0r" eventType="touchUpInside" id="WYt-WI-pJk"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="X5M-bv-yCY">
-                                        <rect key="frame" x="0.0" y="129" width="123" height="22"/>
+                                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="X5M-bv-yCY">
+                                        <rect key="frame" x="0.0" y="125" width="123" height="25"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Print Selected dates"/>
                                         <connections>
@@ -250,8 +243,8 @@
                         </constraints>
                         <variation key="default">
                             <mask key="constraints">
-                                <exclude reference="SnB-SU-fZX"/>
                                 <exclude reference="jXl-ia-jmV"/>
+                                <exclude reference="SnB-SU-fZX"/>
                             </mask>
                         </variation>
                     </view>
diff --git a/Example/JTAppleCalendar/ViewController.swift b/Example/JTAppleCalendar/ViewController.swift
index c90dc350..236ae7ce 100644
--- a/Example/JTAppleCalendar/ViewController.swift
+++ b/Example/JTAppleCalendar/ViewController.swift
@@ -46,7 +46,6 @@ class ViewController: UIViewController {
         // Enable the following code line to show headers. There are other lines of code to uncomment as well
          calendarView.registerHeaderViewXibs(fileNames: ["PinkSectionHeaderView", "WhiteSectionHeaderView"]) // headers are Optional. You can register multiple if you want.
         
-        
         // The following default code can be removed since they are already the default.
         // They are only included here so that you can know what properties can be configured
         calendarView.direction = .Horizontal                       // default is horizontal
@@ -60,9 +59,11 @@ class ViewController: UIViewController {
         calendarView.scrollResistance = 0.75                       // default is 0.75 - this is only applicable when paging is not enabled.
         calendarView.reloadData()
         
-        // After reloading. Scroll to your selected date, and setup your calendar views
-        let currentDate = self.calendarView.currentCalendarDateSegment()
-        self.setupViewsOfCalendar(currentDate.startDate, endDate: currentDate.endDate)
+        // After reloading. Scroll to your selected date, and setup your calendar
+        calendarView.scrollToDate(NSDate(), triggerScrollToDateDelegate: false, animateScroll: false) {
+            let currentDate = self.calendarView.currentCalendarDateSegment()
+            self.setupViewsOfCalendar(currentDate.startDate, endDate: currentDate.endDate)
+        }
     }
     
     @IBAction func select10(sender: AnyObject?) {
@@ -78,15 +79,6 @@ class ViewController: UIViewController {
         calendarView.selectDates(dates, triggerSelectionDelegate: false)
     }
     
-    @IBAction func reloadCal() {
-        monthLabel.text = ""
-        calendarView.reloadData()
-        
-        let currentDate = self.calendarView.currentCalendarDateSegment()
-        self.setupViewsOfCalendar(currentDate.startDate, endDate: currentDate.endDate)
-
-    }
-    
     @IBAction func select11(sender: AnyObject?) {
         calendarView.allowsMultipleSelection = false
         let date = formatter.dateFromString("2016 02 11")
diff --git a/Pod/Classes/JTAppleCalendarDelegates.swift b/Pod/Classes/JTAppleCalendarDelegates.swift
index 2517f349..5a857d58 100644
--- a/Pod/Classes/JTAppleCalendarDelegates.swift
+++ b/Pod/Classes/JTAppleCalendarDelegates.swift
@@ -116,14 +116,18 @@ extension JTAppleCalendarView: UIScrollViewDelegate {
     
     /// Tells the delegate when a scrolling animation in the scroll view concludes.
     public func scrollViewDidEndScrollingAnimation(scrollView: UIScrollView) {
-        if triggerScrollToDateDelegate {
+        if let shouldTrigger = triggerScrollToDateDelegate where shouldTrigger == true {
             scrollViewDidEndDecelerating(scrollView)
+            triggerScrollToDateDelegate = nil
         }
         
         executeDelayedTasks()
     
         // Update the focus item whenever scrolled
         (calendarView.collectionViewLayout as! JTAppleCalendarLayoutProtocol).pointForFocusItem = scrollView.contentOffset
+        
+        // A scroll was just completed. 
+        scrollInProgress = false
     }
     
     /// Tells the delegate that the scroll view has ended decelerating the scrolling movement.
diff --git a/Pod/Classes/JTAppleCalendarView.swift b/Pod/Classes/JTAppleCalendarView.swift
index 14d637cc..d356d4db 100644
--- a/Pod/Classes/JTAppleCalendarView.swift
+++ b/Pod/Classes/JTAppleCalendarView.swift
@@ -179,7 +179,7 @@ public class JTAppleCalendarView: UIView {
         }
     }
     
-    var triggerScrollToDateDelegate = true
+    var triggerScrollToDateDelegate: Bool? = true
     
     // Keeps track of item size for a section. This is an optimization
     var indexPathSectionItemSize: (section: Int, itemSize: CGSize)?
@@ -432,19 +432,41 @@ public class JTAppleCalendarView: UIView {
         return nil
     }
     
-    func scrollToHeaderInSection(section:Int, animated: Bool = true)  {
+    func scrollToHeaderInSection(section:Int, triggerScrollToDateDelegate: Bool = false, withAnimation animation: Bool = true, completionHandler: (()->Void)? = nil)  {
+        if headerViewXibs.count < 1 { return }
+        
+        self.triggerScrollToDateDelegate = triggerScrollToDateDelegate
+        
         let indexPath = NSIndexPath(forItem: 0, inSection: section)
         calendarView.layoutIfNeeded()
         if let attributes =  calendarView.layoutAttributesForSupplementaryElementOfKind(UICollectionElementKindSectionHeader, atIndexPath: indexPath) {
+            if let validHandler = completionHandler {
+                delayedExecutionClosure.append(validHandler)
+            }
             
-            let topOfHeader = CGPointMake(0, attributes.frame.origin.y - calendarView.contentInset.top)
-            delayRunOnMainThread(0.0, closure: { 
-                self.calendarView.setContentOffset(topOfHeader, animated:animated)
+            let topOfHeader = CGPointMake(attributes.frame.origin.x, attributes.frame.origin.y)
+            self.scrollInProgress = true
+            delayRunOnMainThread(0.0, closure: {
+                self.calendarView.setContentOffset(topOfHeader, animated:animation)
+
+                delayRunOnMainThread(0.0, closure: {
+                    if  !animation {
+                        self.scrollViewDidEndScrollingAnimation(self.calendarView)
+                        self.scrollInProgress = false
+                    } else {
+                        // If the scroll is set to animate, and the target content offset is already on the screen, then the didFinishScrollingAnimation
+                        // delegate will not get called. Once animation is on let's force a scroll so the delegate MUST get caalled
+                        if let check = self.calendarOffsetIsAlreadyAtScrollPosition(forOffset: topOfHeader) where check == true {
+                            self.scrollViewDidEndScrollingAnimation(self.calendarView)
+                            self.scrollInProgress = false
+                        }
+                    }
+                })
             })
         }
     }
     
-    func reloadData(checkDelegateDataSource check: Bool, withAnchorDate anchorDate: NSDate? = nil, completionHandler:(()->Void)? = nil) {
+    func reloadData(checkDelegateDataSource check: Bool, withAnchorDate anchorDate: NSDate? = nil, withAnimation animation: Bool = false, completionHandler:(()->Void)? = nil) {
         if check {
             reloadDelegateDataSource() // Reload the datasource
         }
@@ -452,23 +474,27 @@ public class JTAppleCalendarView: UIView {
         // Delay on main thread. We want this to be called after the view is displayed on the main run loop
         if layoutNeedsUpdating {
             delayRunOnMainThread(0.0, closure: {
-                self.configureChangeOfRows()
-                
-                guard let validAnchorDate = anchorDate else { // If the date is invalid just scroll to the the first item on the view or scroll to the start of a header (if header is enabled)
-                    if headerViewXibs.count < 1 {
-                        if !self.scrollInProgress { // Make sure this scroll only gets activated if no other scroll is in queue
-                            self.scrollToDate(self.startOfMonthCache, triggerScrollToDateDelegate: false, animateScroll: false, completionHandler: completionHandler)
+                if !self.scrollInProgress { // Make sure this scroll only gets activated if no other scroll is in queue
+                    self.configureChangeOfRows()
+                    
+                    guard let validAnchorDate = anchorDate else { // If the date is invalid just scroll to the the first item on the view or scroll to the start of a header (if header is enabled)
+                        if headerViewXibs.count < 1 {
+                            self.scrollToDate(self.startOfMonthCache, triggerScrollToDateDelegate: false, animateScroll: animation, completionHandler: completionHandler)
+                        } else {
+                            self.scrollToHeaderForDate(self.startOfMonthCache, triggerScrollToDateDelegate: false, withAnimation: animation, completionHandler: completionHandler)
                         }
-                    } else {
-                        self.scrollToHeaderForDate(self.startOfMonthCache)
+                        return
+                    }
+                    
+                    delayRunOnMainThread(0.0, closure: { () -> () in
+                        self.scrollToDate(validAnchorDate, triggerScrollToDateDelegate: false, animateScroll: animation, completionHandler: completionHandler)
+                    })
+                } else {
+                    if let validHandler = completionHandler {
+                        self.delayedExecutionClosure.append(validHandler)
                     }
-                    return
                 }
                 
-                delayRunOnMainThread(0.0, closure: { () -> () in
-                    self.scrollToDate(validAnchorDate, triggerScrollToDateDelegate: false, animateScroll: false, completionHandler: completionHandler)
-                })
-                
             })
         } else {
             (calendarView.collectionViewLayout as! JTAppleCalendarLayoutProtocol).clearCache()
diff --git a/Pod/Classes/UserInteractionFunctions.swift b/Pod/Classes/UserInteractionFunctions.swift
index a8bad155..da9ad092 100644
--- a/Pod/Classes/UserInteractionFunctions.swift
+++ b/Pod/Classes/UserInteractionFunctions.swift
@@ -92,8 +92,8 @@ extension JTAppleCalendarView {
     }
     
     /// Reloads the data on the calendar view
-    public func reloadData(withAnchorDate date:NSDate? = nil, completionHandler: (()->Void)? = nil) {
-        reloadData(checkDelegateDataSource: true, withAnchorDate: date, completionHandler: completionHandler)
+    public func reloadData(withAnchorDate date:NSDate? = nil, withAnimation animation: Bool = false, completionHandler: (()->Void)? = nil) {
+        reloadData(checkDelegateDataSource: true, withAnchorDate: date, withAnimation: animation, completionHandler: completionHandler)
     }
     
     /// Reload the date of specified date-cells on the calendar-view
@@ -239,57 +239,105 @@ extension JTAppleCalendarView {
             
             if retrievedPathsFromDates.count > 0 {
                 let sectionIndexPath =  self.pathsFromDates([date])[0]
-                if let validCompletionHandler = completionHandler {
-                    self.delayedExecutionClosure.append(validCompletionHandler)
+                let position: UICollectionViewScrollPosition = self.direction == .Horizontal ? .Left : .Top
+                
+                let scrollToIndexPath = {(iPath: NSIndexPath, withAnimation: Bool)-> Void in
+                    if let validCompletionHandler = completionHandler {
+                        self.delayedExecutionClosure.append(validCompletionHandler)
+                    }
+                     
+                    // regular movement
+                    self.calendarView.scrollToItemAtIndexPath(iPath, atScrollPosition: position, animated: animateScroll)
+                    
+                    
+                    if animateScroll {
+                        if let check = self.calendarOffsetIsAlreadyAtScrollPosition(forIndexPath: iPath) where check == true {
+                                self.scrollViewDidEndScrollingAnimation(self.calendarView)
+                                self.scrollInProgress = false
+                                return
+                        }
+                    }
                 }
                 
-                let position: UICollectionViewScrollPosition = self.direction == .Horizontal ? .Left : .Top
                 if self.pagingEnabled {
                     if headerViewXibs.count > 0 {
                         // If both paging and header is on, then scroll to the actual date
                         if self.direction == .Vertical {
-                            self.scrollToHeaderInSection(sectionIndexPath.section, animated: animateScroll)
+                            self.scrollToHeaderInSection(sectionIndexPath.section, triggerScrollToDateDelegate: triggerScrollToDateDelegate, withAnimation: animateScroll)
+                            return
                         } else {
-                            self.calendarView.scrollToItemAtIndexPath(NSIndexPath(forItem: 0,
-                                inSection: sectionIndexPath.section),
-                                atScrollPosition: position, animated: animateScroll
-                            )
+                            scrollToIndexPath(NSIndexPath(forItem: 0, inSection: sectionIndexPath.section), animateScroll)
                         }
                     } else {
                         // If paging is on and header is off, then scroll to the start date in section
-                        self.calendarView.scrollToItemAtIndexPath(NSIndexPath(forItem: 0,
-                            inSection: sectionIndexPath.section),
-                            atScrollPosition: position,
-                            animated: animateScroll
-                        )
+                        scrollToIndexPath(NSIndexPath(forItem: 0, inSection: sectionIndexPath.section), animateScroll)
                     }
                 } else {
                     // If paging is off, then scroll to the actual date in the section
-                    self.calendarView.scrollToItemAtIndexPath(sectionIndexPath,
-                        atScrollPosition: position,
-                        animated: animateScroll
-                    )
+                    scrollToIndexPath(sectionIndexPath, animateScroll)
                 }
                 
-                if  !animateScroll {
-                    delayRunOnMainThread(0.0, closure: {
+                // Jt101 put this into a function to reduce code between this and the scroll to header function
+                delayRunOnMainThread(0.0, closure: {
+                    if  !animateScroll  {
                         self.scrollViewDidEndScrollingAnimation(self.calendarView)
                         self.scrollInProgress = false
-                    })
-                }
+                    }
+                })
             }
-            self.scrollInProgress = false
         })
     }
     
+    func calendarOffsetIsAlreadyAtScrollPosition(forIndexPath indexPath:NSIndexPath) -> Bool? {
+        var retval: Bool?
+        
+        // If the scroll is set to animate, and the target content offset is already on the screen, then the didFinishScrollingAnimation
+        // delegate will not get called. Once animation is on let's force a scroll so the delegate MUST get caalled
+        if let attributes = self.calendarView.layoutAttributesForItemAtIndexPath(indexPath) {
+            let origin = attributes.frame.origin
+            let offset = direction == .Horizontal ? origin.x : origin.y
+            if
+                self.calendarView.contentOffset.x == offset ||
+                (self.pagingEnabled && (indexPath.section ==  currentSectionPage)){
+                
+                retval = true
+            } else {
+                retval = false
+            }
+        }
+
+        return retval
+    }
+    
+    func calendarOffsetIsAlreadyAtScrollPosition(forOffset offset:CGPoint) -> Bool? {
+        var retval: Bool?
+        
+        // If the scroll is set to animate, and the target content offset is already on the screen, then the didFinishScrollingAnimation
+        // delegate will not get called. Once animation is on let's force a scroll so the delegate MUST get caalled
+        
+        let theOffset = direction == .Horizontal ? offset.x : offset.y
+        let sectionForOffset = Int(theOffset / calendarView.frame.width)
+        if
+            self.calendarView.contentOffset.x == offset.x ||
+            (self.pagingEnabled && (sectionForOffset ==  currentSectionPage)){
+            retval = true
+        } else {
+            retval = false
+        }
+        
+    
+        return retval
+    }
+    
+    
+    
+    
     /// Scrolls the calendar view to the start of a section view header. If the calendar has no headers registered, then this function does nothing
     /// - Paramater date: The calendar view will scroll to the header of a this provided date
-    public func scrollToHeaderForDate(date: NSDate) {
-        // Return if sections are not registered
-        if headerViewXibs.count < 1 { return }
+    public func scrollToHeaderForDate(date: NSDate, triggerScrollToDateDelegate: Bool = false, withAnimation animation: Bool = false, completionHandler: (()->Void)? = nil) {
         let path = pathsFromDates([date])
         // Return if date was incalid and no path was returned
         if path.count < 1 { return }
-        scrollToHeaderInSection(path[0].section)
+        scrollToHeaderInSection(path[0].section, triggerScrollToDateDelegate: triggerScrollToDateDelegate, withAnimation: animation, completionHandler: completionHandler)
     }
 }
\ No newline at end of file