fix: Wait until scrollView animation stops before navigating

rewardStyle · Mar 15, 2024 · b0f7bdc · b0f7bdc
1 parent 6733b5b
commit b0f7bdc
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/Source/Pages/Gallery/YPAssetZoomableView.swift b/Source/Pages/Gallery/YPAssetZoomableView.swift
@@ -42,6 +42,8 @@ final class YPAssetZoomableView: UIScrollView {
 
     private let minimumTreshold: CGFloat = 0.001
 
+    public var isAnimating: Bool = false
+
     // Image view of the asset for convenience. Can be video preview image view or photo image view.
     public var assetImageView: UIImageView {
         return isVideoMode ? videoView.previewImageView : photoImageView
@@ -401,11 +403,19 @@ extension YPAssetZoomableView: UIScrollViewDelegate {
     func viewForZooming(in scrollView: UIScrollView) -> UIView? {
         return isVideoMode ? videoView : photoImageView
     }
-
+
+    func scrollViewWillBeginZooming(_ scrollView: UIScrollView, with view: UIView?) {
+        isAnimating = true
+    }
+
     func scrollViewDidZoom(_ scrollView: UIScrollView) {
         zoomableViewDelegate?.ypAssetZoomableViewScrollViewDidZoom()
     }
-
+
+    func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
+        isAnimating = true
+    }
+
     func scrollViewDidEndZooming(_ scrollView: UIScrollView, with view: UIView?, atScale scale: CGFloat) {
         guard let view = view, view == photoImageView || view == videoView else { return }
 
@@ -416,13 +426,16 @@ extension YPAssetZoomableView: UIScrollViewDelegate {
 
         zoomableViewDelegate?.ypAssetZoomableViewScrollViewDidEndZooming()
         cropAreaDidChange()
+        isAnimating = false
     }
 
     func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
         cropAreaDidChange()
+        isAnimating = decelerate
     }
 
     func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
         cropAreaDidChange()
+        isAnimating = false
     }
 }
diff --git a/Source/Pages/Gallery/YPLibraryVC.swift b/Source/Pages/Gallery/YPLibraryVC.swift
@@ -22,6 +22,10 @@ public final class YPLibraryVC: UIViewController, YPPermissionCheckable {
     internal var isInitialized = false
     var disableAutomaticCellSelection = false
 
+    public var isAnimating: Bool {
+        v.assetZoomableView.isAnimating
+    }
+
     // MARK: - Init
 
     public override func loadView() {

diff --git a/Source/YPPickerVC.swift b/Source/YPPickerVC.swift
@@ -337,6 +337,11 @@ open class YPPickerVC: YPBottomPager, YPBottomPagerDelegate {
     @objc
     func done() {
         guard let libraryVC = libraryVC else { ypLog("YPLibraryVC deallocated"); return }
+        if libraryVC.isAnimating {
+            self.navigationItem.rightBarButtonItem = YPLoaders.defaultLoader
+            retryDoneUntilAnimatingStops(retryCount: 0)
+            return
+        }
         didTapNext?()
 
         if mode == .library {
@@ -350,7 +355,19 @@ open class YPPickerVC: YPBottomPager, YPBottomPagerDelegate {
             })
         }
     }
-
+
+    let maxRetryCount = 6
+    func retryDoneUntilAnimatingStops(retryCount: Int = 0) {
+        guard let libraryVC = libraryVC else { ypLog("YPLibraryVC deallocated"); return }
+        if libraryVC.isAnimating, retryCount < maxRetryCount {
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self ] in
+                self?.retryDoneUntilAnimatingStops(retryCount: retryCount + 1)
+            }
+        } else {
+            done()
+        }
+    }
+
     func stopAll() {
         libraryVC?.v.assetZoomableView.videoView.deallocate()
         videoVC?.stopCamera()