Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

triggerScrollToDateDelegate in calendar.scrollToDate now triggers willScrollToDateSegmentWith delegate function #1264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
Loading
from
Open

triggerScrollToDateDelegate in calendar.scrollToDate now triggers willScrollToDateSegmentWith delegate function #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8263410
add calendar willScroll to triggerdelegate
kushsolitary May 8, 2020
9c3472e
final fix
kushsolitary May 8, 2020
d2d4ee0
move call outside onScroll
kushsolitary May 8, 2020
a1ad992
visibledates were wrong; trying the syncronous version
kushsolitary May 8, 2020
4a730dc
correct visible dates with the willScroll delegate function
kushsolitary May 8, 2020
a79b7af
expose scrollDidEndScrollingAnimation through the delegate
kushsolitary May 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 4 JTAppleCalendar.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GBBYECNDQ9;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need

DEVELOPMENT_TEAM = D35B5Y6JX8;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down Expand Up @@ -384,7 +384,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GBBYECNDQ9;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need

DEVELOPMENT_TEAM = D35B5Y6JX8;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down
11 changes: 8 additions & 3 deletions 11 Sources/JTAppleCalendar/JTACInteractionMonthFunctions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,8 @@ extension JTACMonthView {

// Set triggereing of delegate on scroll
self.triggerScrollToDateDelegate = triggerScrollToDateDelegate
// Ensure date is within valid boundary

// Ensure date is within valid boundary
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need extra tabulation

let components = calendar.dateComponents([.year, .month, .day], from: date)
let firstDayOfDate = calendar.date(from: components)!
if !((firstDayOfDate >= startOfMonthCache!) && (firstDayOfDate <= endOfMonthCache!)) { return }
Expand All @@ -551,7 +551,12 @@ extension JTACMonthView {
assert(false, "Could not determine CGPoint. This is an error. contact developer on github. In production, there will not be a crash, but scrolling will not occur")
return
}


if self.triggerScrollToDateDelegate == true {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need extra tabulation

let dateSegmentInfo = datesAtCurrentOffset(point)
self.scrollViewWillBeginDragging(self, visibleDates: dateSegmentInfo)
}

scrollTo(point: point,
triggerScrollToDateDelegate: triggerScrollToDateDelegate,
isAnimationEnabled: animateScroll,
Expand Down
4 changes: 4 additions & 0 deletions 4 Sources/JTAppleCalendar/JTACMonthViewProtocols.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ public protocol JTACMonthViewDelegate: class {
/// Informs the delegate that the user just lifted their finger from swiping the calendar
func scrollDidEndDecelerating(for calendar: JTACMonthView)

/// Informs the delegate that the scrolling animation concludes
func scrollDidEndScrollingAnimation(for calendar: JTACMonthView)

/// Tells the delegate that a scroll occured
func calendarDidScroll(_ calendar: JTACMonthView)

Expand Down Expand Up @@ -178,4 +181,5 @@ public extension JTACMonthViewDelegate {
func calendarSizeForMonths(_ calendar: JTACMonthView?) -> MonthSize? { return nil }
func sizeOfDecorationView(indexPath: IndexPath) -> CGRect { return .zero }
func scrollDidEndDecelerating(for calendar: JTACMonthView) {}
func scrollDidEndScrollingAnimation(for calendar: JTACMonthView) {}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need extra tabulation

}
16 changes: 14 additions & 2 deletions 16 Sources/JTAppleCalendar/JTACScrollViewDelegates.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@ extension JTACMonthView: UIScrollViewDelegate {
DispatchQueue.main.async { // https://github.com/patchthecode/JTAppleCalendar/issues/778
self.executeDelayedTasks(.scroll)
}

DispatchQueue.main.async {
self.calendarDelegate?.scrollDidEndScrollingAnimation(for: self)
}
}

/// Tells the delegate that the scroll view has
Expand All @@ -207,8 +211,16 @@ extension JTACMonthView: UIScrollViewDelegate {
self.calendarDelegate?.calendar(self, didScrollToDateSegmentWith: dates)
}
}

/// Tells the delegate that a scroll occured

/// Tells the delegate when a scrolling animaton
/// in the scroll view begins
public func scrollViewWillBeginDragging(_ scrollView: UIScrollView, visibleDates: DateSegmentInfo) {
if let shouldTrigger = triggerScrollToDateDelegate, shouldTrigger == true {
self.calendarDelegate?.calendar(self, willScrollToDateSegmentWith: visibleDates)
}
}

/// Tells the delegate that a scroll occured
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need extra tabulation

public func scrollViewDidScroll(_ scrollView: UIScrollView) {
calendarDelegate?.calendarDidScroll(self)
}
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.