Merge pull request #20 from niralishaha25/dev

stop spinner if photo permission not given
niralishaha25 · Jan 30, 2023 · 3c0f2b9 · 3c0f2b9
2 parents 8634b0e + adb12c5
commit 3c0f2b9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/Source/Helpers/Permissions/YPPermissionCheckable.swift b/Source/Helpers/Permissions/YPPermissionCheckable.swift
@@ -9,20 +9,20 @@
 import UIKit
 
 internal protocol YPPermissionCheckable {
-    func doAfterLibraryPermissionCheck(block: @escaping () -> Void)
+    func doAfterLibraryPermissionCheck(block: @escaping (Bool) -> Void)
     func doAfterCameraPermissionCheck(block: @escaping () -> Void)
     func checkLibraryPermission()
     func checkCameraPermission()
 }
 
 internal extension YPPermissionCheckable where Self: UIViewController {
-    func doAfterLibraryPermissionCheck(block: @escaping () -> Void) {
+    func doAfterLibraryPermissionCheck(block: @escaping (Bool) -> Void) {
         YPPermissionManager.checkLibraryPermissionAndAskIfNeeded(sourceVC: self) { hasPermission in
-            if hasPermission {
-                block()
-            } else {
+            if !hasPermission {
                 ypLog("Not enough permissions.")
             }
+            block(hasPermission)
+
         }
     }
 

diff --git a/Source/Pages/Gallery/YPLibraryVC.swift b/Source/Pages/Gallery/YPLibraryVC.swift
@@ -157,8 +157,10 @@ internal final class YPLibraryVC: UIViewController, YPPermissionCheckable {
 
     @objc
     func squareCropButtonTapped() {
-        doAfterLibraryPermissionCheck { [weak self] in
-            self?.v.assetViewContainer.squareCropButtonTapped()
+        doAfterLibraryPermissionCheck {  hasPermission in
+            if hasPermission {
+                self.v.assetViewContainer.squareCropButtonTapped()
+            }
         }
     }
 
@@ -194,11 +196,13 @@ internal final class YPLibraryVC: UIViewController, YPPermissionCheckable {
             return
         }
 
-        doAfterLibraryPermissionCheck { [weak self] in
-            if self?.isMultipleSelectionEnabled == false {
-                self?.selectedItems.removeAll()
+        doAfterLibraryPermissionCheck { hasPermission in
+            if hasPermission {
+                if self.isMultipleSelectionEnabled == false {
+                    self.selectedItems.removeAll()
+                }
+                self.toggleMultipleSelection()
             }
-            self?.toggleMultipleSelection()
         }
     }
 

diff --git a/Source/YPPickerVC.swift b/Source/YPPickerVC.swift
@@ -166,8 +166,12 @@ open class YPPickerVC: YPBottomPager, YPBottomPagerDelegate {
 
         // Re-trigger permission check
         if let vc = vc as? YPLibraryVC {
-            vc.doAfterLibraryPermissionCheck { [weak vc] in
-                vc?.initialize()
+            vc.doAfterLibraryPermissionCheck {  hasPermission in
+                if hasPermission {
+                    vc.initialize()
+                } else {
+                    vc.v.stopSpinner()
+                }
             }
         } else if let cameraVC = vc as? YPCameraVC {
             cameraVC.start()