Enables tapping Next before high res preview is loaded

Yummypets · Jan 8, 2020 · 7c2bb71 · 7c2bb71
1 parent 34b41d2
commit 7c2bb71
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/Source/Pages/Gallery/YPLibraryVC.swift b/Source/Pages/Gallery/YPLibraryVC.swift
@@ -312,7 +312,7 @@ public class YPLibraryVC: UIViewController, YPPermissionCheckable {
 
     func changeAsset(_ asset: PHAsset) {
         latestImageTapped = asset.localIdentifier
-        delegate?.libraryViewStartedLoading()
+        delegate?.libraryViewStartedLoadingImage()
 
         let completion = { (isLowResIntermediaryImage: Bool) in
             self.v.hideGrid()
@@ -414,7 +414,7 @@ public class YPLibraryVC: UIViewController, YPPermissionCheckable {
     private func fetchImageAndCrop(for asset: PHAsset,
                                    withCropRect: CGRect? = nil,
                                    callback: @escaping (_ photo: UIImage, _ exif: [String : Any]) -> Void) {
-        delegate?.libraryViewStartedLoading()
+        delegate?.libraryViewDidTapNext()
         let cropRect = withCropRect ?? DispatchQueue.main.sync { v.currentCropRect() }
         let ts = targetSize(for: asset, cropRect: cropRect)
         mediaManager.imageManager?.fetchImage(for: asset, cropRect: cropRect, targetSize: ts, callback: callback)
@@ -424,7 +424,7 @@ public class YPLibraryVC: UIViewController, YPPermissionCheckable {
                                          withCropRect: CGRect? = nil,
                                          callback: @escaping (_ videoURL: URL) -> Void) {
         if fitsVideoLengthLimits(asset: asset) == true {
-            delegate?.libraryViewStartedLoading()
+            delegate?.libraryViewDidTapNext()
             let normalizedCropRect = withCropRect ?? DispatchQueue.main.sync { v.currentCropRect() }
             let ts = targetSize(for: asset, cropRect: normalizedCropRect)
             let xCrop: CGFloat = normalizedCropRect.origin.x * CGFloat(asset.pixelWidth)

diff --git a/Source/Pages/Gallery/YPLibraryViewDelegate.swift b/Source/Pages/Gallery/YPLibraryViewDelegate.swift
@@ -10,7 +10,8 @@ import Foundation
 
 @objc
 public protocol YPLibraryViewDelegate: class {
-    func libraryViewStartedLoading()
+    func libraryViewDidTapNext()
+    func libraryViewStartedLoadingImage()
     func libraryViewFinishedLoading()
     func libraryViewDidToggleMultipleSelection(enabled: Bool)
     func noPhotosForOptions()

diff --git a/Source/YPPickerVC.swift b/Source/YPPickerVC.swift
@@ -328,7 +328,7 @@ open class YPPickerVC: YPBottomPager, YPBottomPagerDelegate {
 
 extension YPPickerVC: YPLibraryViewDelegate {
 
-    public func libraryViewStartedLoading() {
+    public func libraryViewDidTapNext() {
         libraryVC?.isProcessing = true
         DispatchQueue.main.async {
             self.v.scrollView.isScrollEnabled = false
@@ -337,6 +337,13 @@ extension YPPickerVC: YPLibraryViewDelegate {
         }
     }
 
+    public func libraryViewStartedLoadingImage() {
+        libraryVC?.isProcessing = true //TODO remove to enable changing selection while loading but needs cancelling previous image requests.
+        DispatchQueue.main.async {
+            self.libraryVC?.v.fadeInLoader()
+        }
+    }
+
     public func libraryViewFinishedLoading() {
         libraryVC?.isProcessing = false
         DispatchQueue.main.async {