Simplify the API

thumbtack · Jul 30, 2024 · 44749f8 · 44749f8
1 parent 16bc939
commit 44749f8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/Sources/Thumbprint/Presentations/Sheet/PartialSheetPresentation.swift b/Sources/Thumbprint/Presentations/Sheet/PartialSheetPresentation.swift
@@ -7,11 +7,11 @@ open class PartialSheetPresentation: NSObject, UIViewControllerTransitioningDele
         private let triggerPercentage: CGFloat = 0.42
 
         let panGestureRecognizer: UIPanGestureRecognizer
-        let completion: ((_ didFinish: Bool) -> Void)?
+        let transitionCompletion: (() -> Void)?
 
-        required init(panGestureRecognizer: UIPanGestureRecognizer, completion: ((_ didFinish: Bool) -> Void)?) {
+        required init(panGestureRecognizer: UIPanGestureRecognizer, transitionCompletion: (() -> Void)?) {
             self.panGestureRecognizer = panGestureRecognizer
-            self.completion = completion
+            self.transitionCompletion = transitionCompletion
 
             super.init()
 
@@ -42,17 +42,20 @@ open class PartialSheetPresentation: NSObject, UIViewControllerTransitioningDele
             case .ended:
                 if percentComplete > triggerPercentage {
                     finish()
-                    completion?(true)
                 } else {
                     cancel()
-                    completion?(false)
                 }
 
             default:
                 break
             }
         }
 
+        override func finish() {
+            super.finish()
+            transitionCompletion?()
+        }
+
         public func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
             transitionContext?.isInteractive == true ? 0.5 : 0.2
         }
@@ -80,8 +83,8 @@ open class PartialSheetPresentation: NSObject, UIViewControllerTransitioningDele
             return nil
         }
 
-        return PercentDrivenInteractiveTransition(panGestureRecognizer: partialSheetPresentationController.panGestureRecognizer) { didFinish in
-            partialSheetPresentationController.didCompleteInteractiveTransition(success: didFinish)
+        return PercentDrivenInteractiveTransition(panGestureRecognizer: partialSheetPresentationController.panGestureRecognizer) {
+            partialSheetPresentationController.didCompleteInteractiveTransition()
         }
     }
 

diff --git a/Sources/Thumbprint/Presentations/Sheet/PartialSheetPresentationController.swift b/Sources/Thumbprint/Presentations/Sheet/PartialSheetPresentationController.swift
@@ -101,10 +101,8 @@ open class PartialSheetPresentationController: UIPresentationController {
 
     // Indicates that the modal was dismissed either by tapping the background area, or swiping down
     var userDidDismissModal = false
-    func didCompleteInteractiveTransition(success: Bool) {
-        if success {
-            userDidDismissModal = true
-        }
+    func didCompleteInteractiveTransition() {
+        userDidDismissModal = true
     }
 
     public var partialSheetDelegate: PartialSheetPresentationControllerDelegate? {