translate at top logic improved, sheet didPresent delegate method added

OfTheWolf · OfTheWolf · commit dc162aefc8e6 · 2020-04-28T23:27:57.000+03:00
diff --git a/Example/UBottomSheet.xcodeproj/project.pbxproj b/Example/UBottomSheet.xcodeproj/project.pbxproj
@@ -84,6 +84,27 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		0C3118AF2458AF9B008F63CC /* Cells */ = {
+			isa = PBXGroup;
+			children = (
+				0CC171412334257C002A02FD /* SimpleTableCell.swift */,
+				0CDF2F68245638C700AAE66E /* EmbeddedCell.swift */,
+				0CDF2F66245638B100AAE66E /* SimpleCollectionCell.swift */,
+			);
+			name = Cells;
+			sourceTree = "<group>";
+		};
+		0C3118B02458AFAE008F63CC /* ViewControllers */ = {
+			isa = PBXGroup;
+			children = (
+				0CC171422334257C002A02FD /* ViewController.swift */,
+				0CA1808B245377CF00C6CBDE /* MapsDemoBottomSheetController.swift */,
+				0CDF2F6A245647ED00AAE66E /* LabelViewController.swift */,
+				0CDF2F6B245647ED00AAE66E /* LabelViewController.xib */,
+			);
+			name = ViewControllers;
+			sourceTree = "<group>";
+		};
 		607FACC71AFB9204008FA782 = {
 			isa = PBXGroup;
 			children = (
@@ -109,15 +130,10 @@
 			isa = PBXGroup;
 			children = (
 				607FACD51AFB9204008FA782 /* AppDelegate.swift */,
-				0CC171422334257C002A02FD /* ViewController.swift */,
-				0CC171412334257C002A02FD /* SimpleTableCell.swift */,
-				0CDF2F68245638C700AAE66E /* EmbeddedCell.swift */,
-				0CDF2F66245638B100AAE66E /* SimpleCollectionCell.swift */,
-				0CA1808B245377CF00C6CBDE /* MapsDemoBottomSheetController.swift */,
+				0C3118AF2458AF9B008F63CC /* Cells */,
+				0C3118B02458AFAE008F63CC /* ViewControllers */,
 				0CC17148233425AA002A02FD /* Images.xcassets */,
 				0CC1714623342585002A02FD /* Main.storyboard */,
-				0CDF2F6A245647ED00AAE66E /* LabelViewController.swift */,
-				0CDF2F6B245647ED00AAE66E /* LabelViewController.xib */,
 				607FACDE1AFB9204008FA782 /* LaunchScreen.xib */,
 				607FACD31AFB9204008FA782 /* Supporting Files */,
 			);
diff --git a/Example/UBottomSheet/ViewController.swift b/Example/UBottomSheet/ViewController.swift
@@ -11,6 +11,7 @@ import UBottomSheet
 
 class ViewController: UIViewController {
     var sheetCoordinator: UBottomSheetCoordinator!
+    var backView: PassThroughView?
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -20,50 +21,53 @@ class ViewController: UIViewController {
         let vc = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "MapsDemoBottomSheetController") as! MapsDemoBottomSheetController
         vc.sheetCoordinator = sheetCoordinator
         sheetCoordinator.addSheet(vc, to: self, didContainerCreate: { container in
-            self.addBackDimmingBackView(below: container)
             let f = self.view.frame
             let rect = CGRect(x: f.minX, y: f.minY, width: f.width, height: f.height)
             container.roundCorners(corners: [.topLeft, .topRight], radius: 10, rect: rect)
         })
         sheetCoordinator.setCornerRadius(10)
         
     }
-
-    override func viewWillLayoutSubviews() {
-        super.viewWillLayoutSubviews()
-        sheetCoordinator.addDropShadowIfNotExist()
-    }
     
     private func addBackDimmingBackView(below container: UIView){
-        let backView = PassThroughView()
-        self.view.insertSubview(backView, belowSubview: container)
-        backView.translatesAutoresizingMaskIntoConstraints = false
-        backView.topAnchor.constraint(equalTo: self.view.topAnchor).isActive = true
-        backView.bottomAnchor.constraint(equalTo: container.topAnchor, constant: 0).isActive = true
-        backView.leadingAnchor.constraint(equalTo: self.view.leadingAnchor).isActive = true
-        backView.trailingAnchor.constraint(equalTo: self.view.trailingAnchor).isActive = true
+        backView = PassThroughView()
+        self.view.insertSubview(backView!, belowSubview: container)
+        backView!.translatesAutoresizingMaskIntoConstraints = false
+        backView!.topAnchor.constraint(equalTo: self.view.topAnchor).isActive = true
+        backView!.bottomAnchor.constraint(equalTo: container.topAnchor, constant: 10).isActive = true
+        backView!.leadingAnchor.constraint(equalTo: self.view.leadingAnchor).isActive = true
+        backView!.trailingAnchor.constraint(equalTo: self.view.trailingAnchor).isActive = true
     }
 }
 
 extension ViewController: UBottomSheetCoordinatorDelegate{
+    
+    func bottomSheet(_ container: UIView?, didPresent state: SheetTranslationState) {
+//        self.addBackDimmingBackView(below: container!)
+        self.sheetCoordinator.addDropShadowIfNotExist()
+        self.handleState(state)
+    }
 
     func bottomSheet(_ container: UIView?, didChange state: SheetTranslationState) {
-//        switch state {
-//        case .progressing(_, let percent):
-//            self.backView?.backgroundColor = UIColor.black.withAlphaComponent(max(0.2, percent/100 * 0.8))
-//        case .finished(_, let percent):
-//            self.backView?.backgroundColor = UIColor.black.withAlphaComponent(max(0.2, percent/100 * 0.8))
-//        default:
-//            break
-//        }
+        handleState(state)
     }
 
     func bottomSheet(_ container: UIView?, finishTranslateWith extraAnimation: @escaping ((CGFloat) -> Void) -> Void) {
         extraAnimation({ percent in
-//            self.backView?.backgroundColor = UIColor.black.withAlphaComponent(max(0.2, percent/100 * 0.8))
+            self.backView?.backgroundColor = UIColor.black.withAlphaComponent(percent/100 * 0.8)
         })
     }
     
+    func handleState(_ state: SheetTranslationState){
+        switch state {
+        case .progressing(_, let percent):
+            self.backView?.backgroundColor = UIColor.black.withAlphaComponent(percent/100 * 0.8)
+        case .finished(_, let percent):
+            self.backView?.backgroundColor = UIColor.black.withAlphaComponent(percent/100 * 0.8)
+        default:
+            break
+        }
+    }
 }
 
 extension UIView{
diff --git a/UBottomSheet.podspec b/UBottomSheet.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'UBottomSheet'
-  s.version          = '1.0.3'
+  s.version          = '1.0.4'
   s.summary          = 'Mimics the iPhone Maps App bottom sheet'
   s.swift_version    = '5.0'
   
diff --git a/UBottomSheet/Classes/Extensions.swift b/UBottomSheet/Classes/Extensions.swift
@@ -9,7 +9,7 @@
 import UIKit
 
 extension UIViewController {
-    func ub_add(_ child: UIViewController, in container: UIView, animated: Bool = true, topInset: CGFloat) {
+    func ub_add(_ child: UIViewController, in container: UIView, animated: Bool = true, topInset: CGFloat, completion: (()->Void)? = nil) {
         addChild(child)
         container.addSubview(child.view)
         child.didMove(toParent: self)
@@ -20,10 +20,12 @@ extension UIViewController {
             UIView.animate(withDuration: 0.3, animations: {
                 container.frame = f
             }) { (_) in
-                self.view.layoutIfNeeded()
+                completion?()
             }
         }else{
-            child.view.pinToEdges(to: container)
+            container.frame = f
+            child.view.frame = container.bounds
+            completion?()
         }
         
     }
diff --git a/UBottomSheet/Classes/UBottomSheetCoordinator.swift b/UBottomSheet/Classes/UBottomSheetCoordinator.swift
@@ -25,6 +25,8 @@ public class UBottomSheetCoordinator {
     private var draggables: [DraggableItem] = []
     ///Drop shadow view behind container.
     private var dropShadowView: PassThroughView?
+    /// accept difference equal if in tolerance
+    private var tolerance: CGFloat = 0.0000001
 
     public var availableHeight: CGFloat{
         return parent.view.frame.height
@@ -118,13 +120,12 @@ public class UBottomSheetCoordinator {
         let container = PassThroughView()
         self.container = container
         parent.view.addSubview(container)
-        parent.ub_add(item, in: container, topInset: dataSource.sheetPositions(availableHeight).min()!)
+        let position = dataSource.initialPosition(availableHeight)
+        parent.ub_add(item, in: container, topInset: position){[weak self] in
+            guard let sSelf = self else { return }
+            sSelf.delegate?.bottomSheet(container, didPresent: .finished(position, sSelf.calculatePercent(at: position)))
+        }
         didContainerCreate?(container)
-        container.translatesAutoresizingMaskIntoConstraints = true
-        let y = dataSource.sheetPositions(availableHeight)[0]
-        container.frame = CGRect(x: 0, y: y, width: parent.view.frame.width, height: parent.view.frame.height - y)
-//        container.pinToEdges(to: parent.view)
-//        container.constraint(parent, for: .top)?.constant = dataSource.sheetPositions(availableHeight)[0]
         setPosition(dataSource.initialPosition(availableHeight), animated: false)
     }
     
@@ -138,10 +139,11 @@ public class UBottomSheetCoordinator {
     }
     
     public func addDropShadowIfNotExist(_ config: ((UIView)->Void)? = nil){
-        guard self.dropShadowView == nil else {return}
-        self.dropShadowView = PassThroughView()
+        guard dropShadowView == nil else {return}
+        dropShadowView = PassThroughView()
         parent.view.insertSubview(dropShadowView!, belowSubview: container!)
-        self.dropShadowView?.pinToEdges(to: container!, insets: UIEdgeInsets(top: -container!.frame.minY, left: 0, bottom: 0, right: 0))
+        dropShadowView?.pinToEdges(to: container!, insets: UIEdgeInsets(top: -getInitialFrame().minY, left: 0, bottom: 0, right: 0))
+        
         self.dropShadowView?.layer.masksToBounds = false
         if config == nil{
             applyDefaultShadowParams()
@@ -151,18 +153,33 @@ public class UBottomSheetCoordinator {
         }
     }
     
+    private func getInitialFrame() -> CGRect{
+        let minY = parent.view.bounds.minY + dataSource.initialPosition(availableHeight)
+        return CGRect(x: parent.view.bounds.minX,
+                      y: minY,
+                      width: parent.view.bounds.width,
+                      height: parent.view.bounds.maxY - minY)
+    }
+    
     private func applyDefaultShadowParams(){
-        dropShadowView?.layer.shadowPath = UIBezierPath(roundedRect: container!.frame, cornerRadius: cornerRadius).cgPath
+        dropShadowView?.layer.shadowPath = UIBezierPath(roundedRect: getInitialFrame(), cornerRadius: cornerRadius).cgPath
         dropShadowView?.layer.shadowColor = UIColor.black.cgColor
         dropShadowView?.layer.shadowRadius = CGFloat.init(10)
-        dropShadowView?.layer.shadowOpacity = Float.init(0.5)
+//        dropShadowView?.layer.shadowOpacity = Float.init(0.5)
         dropShadowView?.layer.shadowOffset = CGSize.init(width: 0.0, height: 4.0)
+        let animation = CABasicAnimation(keyPath: "shadowOpacity")
+        animation.fromValue = 0.0
+        animation.toValue = 0.5
+        animation.isRemovedOnCompletion = false
+        animation.fillMode = .forwards
+        animation.duration = 0.3
+        dropShadowView?.layer.add(animation, forKey: "fadeout")
     }
     
     private func clearShadowBackground(){
         let p = CGMutablePath()
-        p.addRect(parent.view.bounds)
-        p.addPath(UIBezierPath(roundedRect: container!.frame, cornerRadius: cornerRadius).cgPath)
+        p.addRect(parent.view.bounds.insetBy(dx: 0, dy: -availableHeight))
+        p.addPath(UIBezierPath(roundedRect: getInitialFrame(), cornerRadius: cornerRadius).cgPath)
         let mask = CAShapeLayer()
         mask.path = p
         mask.fillRule = .evenOdd
@@ -294,7 +311,7 @@ public class UBottomSheetCoordinator {
         case .changed:
             if let scroll = scrollView{
                 switch dragDirection(vel) {
-                case .up where (container!.frame.minY - minSheetPosition! > 0.001):
+                case .up where (container!.frame.minY - minSheetPosition! > tolerance):
                     translate(dy: dy - lastY)
                     scroll.contentOffset.y = lastContentOffset.y
                 case .down where scroll.contentOffset.y <= 0 && !scroll.isDecelerating:
@@ -303,30 +320,25 @@ public class UBottomSheetCoordinator {
                 default:
                     break
                 }
-//                if vel.y < 0 /*dragging up*/ && (container!.frame.minY - minSheetPosition! > 0.001){
-//                    translate(dy: dy - lastY)
-//                    scroll.contentOffset.y = lastContentOffset.y
-//                }else if vel.y > 0 /*dragging down*/ && scroll.contentOffset.y <= 0 && !scroll.isDecelerating{
-//                    translate(dy: dy - lastY)
-//                    scroll.contentOffset.y = 0
-//                }
             }else{
                 translate(dy: dy)
             }
-        case .ended, .cancelled, .failed:
+        case .ended,
+             .cancelled,
+             .failed:
             if let scroll = scrollView{
                 let minY = container!.frame.minY
                 switch dragDirection(vel) {
-                case .up where minY - minSheetPosition! > 0.001:
+                case .up where minY - minSheetPosition! > tolerance:
                     scroll.setContentOffset(lastContentOffset, animated: false)
-                    self.finishDragging(with: vel)
+                    self.finishDragging(with: vel, position: minY)
                 default:
                     if !isSheetPosition(minY){
-                        self.finishDragging(with: vel)
+                        self.finishDragging(with: vel, position: minY)
                     }
                 }
             }else{
-                self.finishDragging(with: vel)
+                self.finishDragging(with: vel, position: container!.frame.minY + dy)
             }
         default: break
         }
@@ -346,7 +358,7 @@ public class UBottomSheetCoordinator {
      */
     private func isSheetPosition(_ point: CGFloat) -> Bool{
         return dataSource.sheetPositions(availableHeight).first(where: { (p) -> Bool in
-            abs(p - point) < 0.001
+            abs(p - point) < tolerance
         }) != nil
     }
     
@@ -422,13 +434,17 @@ public class UBottomSheetCoordinator {
         let oldFrame = container!.frame
         var newY = oldFrame.minY
         
-        if hasExceededTopLimit(oldFrame.minY + dy, topLimit){
+        if hasExceededTopLimit(oldFrame.minY, topLimit){
             totalTranslationMinY -= dy
+            totalTranslationMaxY = maxSheetPosition!
             newY = dataSource.rubberBandLogicTop(totalTranslationMinY, topLimit)
-        }else if hasExceededBottomLimit(oldFrame.minY + dy, bottomLimit){
+        }else if hasExceededBottomLimit(oldFrame.minY, bottomLimit){
+            totalTranslationMinY = minSheetPosition!
             totalTranslationMaxY += dy
             newY = dataSource.rubberBandLogicBottom(totalTranslationMaxY, bottomLimit)
         }else{
+            totalTranslationMinY = minSheetPosition!
+            totalTranslationMaxY = maxSheetPosition!
             newY += dy
         }
 
@@ -443,10 +459,10 @@ public class UBottomSheetCoordinator {
      Pan gesture finish event
      
      - parameter velocity: Pan gesture velocity
+     - parameter position: new top constraint value
      */
-    private func finishDragging(with velocity: CGPoint){
-        let top = container!.frame.minY
-        let y = filteredPositions(velocity, currentPosition: top).nearest(to: top)
+    private func finishDragging(with velocity: CGPoint, position: CGFloat){
+        let y = filteredPositions(velocity, currentPosition: position).nearest(to: position)
         endTranslate(to: y, animated: true)
     }
     
diff --git a/UBottomSheet/Classes/UBottomSheetCoordinatorDelegate.swift b/UBottomSheet/Classes/UBottomSheetCoordinatorDelegate.swift
@@ -12,10 +12,12 @@ import UIKit
 public protocol UBottomSheetCoordinatorDelegate: class {
     func bottomSheet(_ container: UIView?, finishTranslateWith extraAnimation: @escaping ((_ percent: CGFloat)->Void)->Void)
     func bottomSheet(_ container: UIView?, didChange state: SheetTranslationState)
+    func bottomSheet(_ container: UIView?, didPresent state: SheetTranslationState)
 }
 
 ///Default empty implementations
 extension UBottomSheetCoordinatorDelegate{
     public func bottomSheet(_ container: UIView?, finishTranslateWith extraAnimation: @escaping ((_ percent: CGFloat)->Void)->Void){ }
     public func bottomSheet(_ container: UIView?, didChange state: SheetTranslationState){ }
+    public func bottomSheet(_ container: UIView?, didPresent state: SheetTranslationState){ }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,12 @@ import UIKit`
`12`	`12`	`public protocol UBottomSheetCoordinatorDelegate: class {`
`13`	`13`	`func bottomSheet(_ container: UIView?, finishTranslateWith extraAnimation: @escaping ((_ percent: CGFloat)->Void)->Void)`
`14`	`14`	`func bottomSheet(_ container: UIView?, didChange state: SheetTranslationState)`
	`15`	`+ func bottomSheet(_ container: UIView?, didPresent state: SheetTranslationState)`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`///Default empty implementations`
`18`	`19`	`extension UBottomSheetCoordinatorDelegate{`
`19`	`20`	`public func bottomSheet(_ container: UIView?, finishTranslateWith extraAnimation: @escaping ((_ percent: CGFloat)->Void)->Void){ }`
`20`	`21`	`public func bottomSheet(_ container: UIView?, didChange state: SheetTranslationState){ }`
	`22`	`+ public func bottomSheet(_ container: UIView?, didPresent state: SheetTranslationState){ }`
`21`	`23`	`}`