organicmaps/organicmaps
32
Fork 18
Code Issues 2.7k Pull requests 194 Projects Releases 65 Wiki Activity Actions 1

[ios] fix internal scroll scrolling to the top

Browse source 
When the user starts scrolling to the top from the halfscreen position the internal scroll continues scrolling the table even if the content offset is zero. This commit fixes it.

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2025-03-21 12:56:54 +04:00
parent 5451160965
commit 106961931e
Signed by: kirylkaveryn
SSH key fingerprint: SHA256:P3swI85Rc1ZoE8vyL28Oa6+FgRIaOwsjkKyqcVZ0NtY
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift
View file

@ -7,6 +7,7 @@ protocol SearchOnMapView: AnyObject {
@objc @objc
protocol SearchOnMapScrollViewDelegate: AnyObject { protocol SearchOnMapScrollViewDelegate: AnyObject {
func scrollViewDidScroll(_ scrollView: UIScrollView) func scrollViewDidScroll(_ scrollView: UIScrollView)
func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>)
} }
@objc @objc
@ -463,8 +464,11 @@ extension SearchOnMapViewController: UIGestureRecognizerDelegate {
} }
func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool { func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
// threshold is used to soften transition from the internal scroll zero content offset if gestureRecognizer is UIPanGestureRecognizer && otherGestureRecognizer is UIPanGestureRecognizer {
internalScrollViewContentOffset < Constants.panGestureThreshold // threshold is used to soften transition from the internal scroll zero content offset
return internalScrollViewContentOffset < Constants.panGestureThreshold
}
return false
} }
} }
@ -480,4 +484,11 @@ extension SearchOnMapViewController: SearchOnMapScrollViewDelegate {
} }
internalScrollViewContentOffset = scrollView.contentOffset.y internalScrollViewContentOffset = scrollView.contentOffset.y
} }
func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
// lock internal scroll view when the user fast scrolls screen to the top
if internalScrollViewContentOffset == 0 {
targetContentOffset.pointee = .zero
}
}
} }

4
iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
View file

@ -45,6 +45,10 @@ final class SearchCategoriesViewController: MWMTableViewController {
delegate?.scrollViewDidScroll(scrollView) delegate?.scrollViewDidScroll(scrollView)
} }
override func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
delegate?.scrollViewWillEndDragging(scrollView, withVelocity: velocity, targetContentOffset: targetContentOffset)
}
func category(at indexPath: IndexPath) -> String { func category(at indexPath: IndexPath) -> String {
let index = indexPath.row let index = indexPath.row
return categories[index] return categories[index]

4
iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift
View file

@ -63,6 +63,10 @@ extension SearchTabViewController: SearchOnMapScrollViewDelegate {
func scrollViewDidScroll(_ scrollView: UIScrollView) { func scrollViewDidScroll(_ scrollView: UIScrollView) {
delegate?.scrollViewDidScroll(scrollView) delegate?.scrollViewDidScroll(scrollView)
} }
func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
delegate?.scrollViewWillEndDragging(scrollView, withVelocity: velocity, targetContentOffset: targetContentOffset)
}
} }
extension SearchTabViewController: SearchCategoriesViewControllerDelegate { extension SearchTabViewController: SearchCategoriesViewControllerDelegate {