Skip to content

Allow scrolling to decelerate based on the scroll velocity #131

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 1 commit into
base: master
Choose a base branch
from
Open

Allow scrolling to decelerate based on the scroll velocity #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions JZCalendarWeekView/JZBaseWeekView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ open class JZBaseWeekView: UIView {
}
public var numOfDays: Int!
public var scrollType: JZScrollType!
public var scrollWithVelocity: Bool = false
public var currentTimelineType: JZCurrentTimelineType! {
didSet {
let viewClass = currentTimelineType == .section ? JZCurrentTimelineSection.self : JZCurrentTimelinePage.self
Expand Down Expand Up @@ -562,8 +563,13 @@ extension JZBaseWeekView: UICollectionViewDelegate, UICollectionViewDelegateFlow
var shouldScrollToPage: Int

if isVelocitySatisfied {
// If velocity is satisfied, then scroll to next page or current page(currentSection calculated by floor Int)
shouldScrollToPage = currentPage + (velocity.x > 0 ? 1 : 0)
if scrollWithVelocity {
// If velocity is satisfied, then scroll to the nearest page accounting for velocity
shouldScrollToPage = currentPage + Int(round(velocity.x))
} else {
// If velocity is satisfied, then scroll to next page or current page(currentSection calculated by floor Int)
shouldScrollToPage = currentPage + (velocity.x > 0 ? 1 : 0)
}
} else {
// If velocity unsatisfied, then using half distance(round) to check whether scroll to next or current
let scrollDistanceX = currentContentOffset.x - CGFloat(currentPage) * pageWidth
Expand Down