Skip to content

Fix delegate calls #310

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

Merged
scenee merged 2 commits into from
Jan 28, 2020
Merged

Fix delegate calls #310

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
269c3e2
Call floatingPanelDidEndDecelerating even if an animation interrupted
scenee Jan 27, 2020
c64056c
Make floatingPanelDidEndDragging's velocity zero when it won't animate
scenee Jan 28, 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
22 changes: 12 additions & 10 deletions Framework/Sources/FloatingPanelCore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ class FloatingPanelCore: NSObject, UIGestureRecognizerDelegate {
}
animator.finishAnimation(at: .current)
} else {
self.animator = nil
self.endAnimation(false) // Must call it manually
}
}

Expand Down Expand Up @@ -605,19 +605,22 @@ class FloatingPanelCore: NSObject, UIGestureRecognizerDelegate {
}
}

if let vc = viewcontroller {
vc.delegate?.floatingPanelDidEndDragging(vc, withVelocity: velocity, targetPosition: targetPosition)
}

if scrollView != nil, !stopScrollDeceleration,
surfaceView.frame.minY == layoutAdapter.topY,
targetPosition == layoutAdapter.topMostState {
self.state = targetPosition
self.updateLayout(to: targetPosition)
self.unlockScrollView()
if let vc = viewcontroller {
vc.delegate?.floatingPanelDidEndDragging(vc, withVelocity: .zero, targetPosition: targetPosition)
}
return
}

if let vc = viewcontroller {
vc.delegate?.floatingPanelDidEndDragging(vc, withVelocity: velocity, targetPosition: targetPosition)
}

// Workaround: Disable a tracking scroll to prevent bouncing a scroll content in a panel animating
let isScrollEnabled = scrollView?.isScrollEnabled
if let scrollView = scrollView, targetPosition != .full {
Expand Down Expand Up @@ -761,15 +764,14 @@ class FloatingPanelCore: NSObject, UIGestureRecognizerDelegate {
// Prevent calling `finishAnimation(at:)` by the old animator whose `isInterruptive` is false
// when a new animator has been started after the old one is interrupted.
guard let `self` = self, self.animator == animator else { return }
self.finishAnimation(at: targetPosition)
log.debug("finishAnimation to \(targetPosition)")
self.endAnimation(pos == .end)
}
self.animator = animator
animator.startAnimation()
}

private func finishAnimation(at targetPosition: FloatingPanelPosition) {
log.debug("finishAnimation to \(targetPosition)")

private func endAnimation(_ finished: Bool) {
self.isDecelerating = false
self.animator = nil

Expand All @@ -784,7 +786,7 @@ class FloatingPanelCore: NSObject, UIGestureRecognizerDelegate {
stopScrollDeceleration = false

log.debug("finishAnimation -- state = \(state) surface.minY = \(surfaceView.presentationFrame.minY) topY = \(layoutAdapter.topY)")
if state == layoutAdapter.topMostState, abs(surfaceView.presentationFrame.minY - layoutAdapter.topY) <= 1.0 {
if finished, state == layoutAdapter.topMostState, abs(surfaceView.presentationFrame.minY - layoutAdapter.topY) <= 1.0 {
unlockScrollView()
}
}
Expand Down