commit

wangfei · wangfei · commit b26570f28505 · 2018-12-05T14:12:41.000+08:00
diff --git a/TodayTransition/TodayTransition/DetailViewController.swift b/TodayTransition/TodayTransition/DetailViewController.swift
@@ -39,8 +39,9 @@ class DetailViewController: UIViewController {
         
         let btn = UIButton(type: .custom)
         btn.setBackgroundImage(UIImage(named: "btn_close"), for: .normal)
-        btn.frame = CGRect(x: UIScreen.main.bounds.width - 50, y: 30, width: 40, height: 40)
+        btn.frame = CGRect(x: UIScreen.main.bounds.width - 50, y: 30, width: 30, height: 30)
         btn.addTarget(self, action: #selector(closeAction(_:)), for: .touchUpInside)
+        btn.tag = 99
         view.addSubview(btn)
         
         panGesture = UIPanGestureRecognizer(target: self, action: #selector(panAction(_:)))
@@ -58,33 +59,49 @@ class DetailViewController: UIViewController {
 //    }
     
     @objc private func closeAction(_ btn: UIButton) {
-        self.table.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
+        
         self.navigationController?.popViewController(animated: true)
     }
 
     @objc func panAction(_ pan: UIPanGestureRecognizer) {
         
         var scale = percentForGesture(pan)
-        print(scale)
+//        print(scale)
         
         switch pan.state {
         case .possible, .began:
+//            self.navigationController?.delegate = self.navTransition
+//            self.navTransition.gesture = panGesture
             break
         case .changed:
             
-            if scale > 0.85 {
-                self.view.transform = CGAffineTransform(scaleX: scale, y: scale)
+            let btn = view.viewWithTag(99)
+            
+            if scale >= 0.85 {
+                self.table.transform = CGAffineTransform(scaleX: scale, y: scale)
+
+                btn?.alpha =  1 - (1 - scale) * 1 / 0.15
+                
+                self.table.layer.masksToBounds = true
+                self.table.layer.cornerRadius = (1 - scale) * 10 / 0.15
+                
             }else {
                 scale = 0.85
                 self.navigationController?.popViewController(animated: true)
-                self.view.transform = CGAffineTransform.identity
+                self.table.transform = CGAffineTransform.identity
+                btn?.alpha = 0
+                btn?.removeFromSuperview()
+
             }
             
             break
             
         case .cancelled, .ended, .failed:
             UIView.animate(withDuration: 0.3) {
                 self.table.transform = CGAffineTransform.identity
+                let btn = self.view.viewWithTag(99)
+                
+                btn?.alpha = 1
             }
         }
         
@@ -128,7 +145,7 @@ extension DetailViewController: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        self.navigationController?.popViewController(animated: true)
+//        self.navigationController?.popViewController(animated: true)
     }
     
 }
diff --git a/TodayTransition/TodayTransition/NavInteractiveTransition.swift b/TodayTransition/TodayTransition/NavInteractiveTransition.swift
@@ -120,9 +120,6 @@ class CustomAnimation: NSObject, UIViewControllerAnimatedTransitioning {
         
         let convertFrame = cell.convert((imgView.frame), to: fromView)
         
-//        let tableHeaderImg = UIImageView(image: imgView.image)
-//        tableHeaderImg.contentMode = .scaleAspectFill
-//        imgView.frame = CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: convertFrame.height)
         imgView.layer.cornerRadius = 0
         detailTable.tableHeaderView = imgView
         
@@ -138,8 +135,6 @@ class CustomAnimation: NSObject, UIViewControllerAnimatedTransitioning {
             
         }) { (complete) in
             
-//            self.blurEffectView.removeFromSuperview()
-            
             transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
             
         }
@@ -175,16 +170,18 @@ class CustomAnimation: NSObject, UIViewControllerAnimatedTransitioning {
         
         let convertFrame = cell.convert(CGRect(x: 20, y: 20, width: cell.frame.width - 40, height: cell.frame.height - 40), to: fromV)
         
-//        detailTable.transform = CGAffineTransform.identity
-        
         DispatchQueue.main.async {
             detailTable.setContentOffset(CGPoint(x: 0, y: 0), animated: false)
         }
         
+        let btn = fromV.viewWithTag(99)
+        
         UIView.animate(withDuration: transitionDuration(using: transitionContext), delay: 0, usingSpringWithDamping: 0.7, initialSpringVelocity: 1, options: .curveEaseInOut, animations: {
             
             detailTable.frame = convertFrame
             
+            btn?.alpha = 0
+            
         }) { (complete) in
             
             cell.addSubview(imgView)
@@ -240,16 +237,17 @@ class DrivePercentAnimation: UIPercentDrivenInteractiveTransition {
         case .began:
             break
         case .changed:
-//            update(1 - scale)
             
-            if scale > 0.9 {
+            
+            if scale >= 0.85 {
+                update(1 - scale)
                 pan.view?.transform = CGAffineTransform(scaleX: scale, y: scale)
             }else {
                 finish()
             }
             
         case .ended:
-            if scale < 0.9 {
+            if scale < 0.85 {
                 finish()
             }else {
                 UIView.animate(withDuration: 0.3) {
