refactor the code

QuickBirdEng · Feb 16, 2018 · b0ddfd3 · b0ddfd3
1 parent 6e6c7ba
commit b0ddfd3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/...eproj/project.xcworkspace/xcuserdata/joandisho.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/joandisho.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/FlippingNotch/Constants.swift b/FlippingNotch/Constants.swift
@@ -12,8 +12,7 @@ import UIKit
 struct Constants {
 
     static let notchWidth: CGFloat = 209
-    static let notchTopOffset: CGFloat = 26
+    static let notchHeight: CGFloat = 26
     static let maxScrollOffset: CGFloat = -86
-    static let scrollThreshold: CGFloat = -80
-
+    static let notchViewTopInset: CGFloat = 40
 }
diff --git a/FlippingNotch/Extentions/NSLayoutConstraint+Extention.swift b/FlippingNotch/Extentions/NSLayoutConstraint+Extention.swift
@@ -11,11 +11,11 @@ import UIKit
 
 extension NSLayoutConstraint {
 
-    var activate: Void {
+    func activate() {
         NSLayoutConstraint.activate([self])
     }
 
-    var deactivate: Void {
+    func deactivate() {
         NSLayoutConstraint.deactivate([self])
     }
 

diff --git a/FlippingNotch/ViewController.swift b/FlippingNotch/ViewController.swift
@@ -17,7 +17,7 @@ class ViewController: UIViewController {
     // MARK: Fileprivates
 
     fileprivate var notchView = UIView()
-    fileprivate var notchViewTopConstraint: NSLayoutConstraint!
+    fileprivate var notchViewBottomConstraint: NSLayoutConstraint!
     fileprivate var isPulling: Bool = false
     fileprivate var numberOfItemsInSection = 1
 
@@ -44,12 +44,12 @@ class ViewController: UIViewController {
         notchView.layer.cornerRadius = 20
         notchView.layer.masksToBounds = false
 
-        notchView.centerXAnchor.constraint(equalTo: self.view.centerXAnchor).activate
-        notchView.widthAnchor.constraint(equalToConstant: Constants.notchWidth).activate
-        notchView.heightAnchor.constraint(equalToConstant: 200).activate
-        notchViewTopConstraint = notchView.bottomAnchor.constraint(equalTo: self.view.topAnchor, 
-                                                                       constant: Constants.notchTopOffset)
-        notchViewTopConstraint.activate
+        notchView.centerXAnchor.constraint(equalTo: self.view.centerXAnchor).activate()
+        notchView.widthAnchor.constraint(equalToConstant: Constants.notchWidth).activate()
+        notchView.heightAnchor.constraint(equalToConstant: 200).activate()
+        notchViewBottomConstraint = notchView.bottomAnchor.constraint(equalTo: self.view.topAnchor, 
+                                                                       constant: Constants.notchHeight)
+        notchViewBottomConstraint.activate()
     }
 
     private func animateView() {
@@ -60,7 +60,7 @@ class ViewController: UIViewController {
         animatableView.frame = self.notchView.frame
         self.view.addSubview(animatableView)
 
-        notchViewTopConstraint.constant = Constants.notchTopOffset
+        notchViewBottomConstraint.constant = Constants.notchHeight
 
         let flowLayout = collectionView.collectionViewLayout as! UICollectionViewFlowLayout
         let height = flowLayout.itemSize.height + flowLayout.minimumInteritemSpacing
@@ -72,7 +72,7 @@ class ViewController: UIViewController {
             animatableView.frame.size = CGSize(width: Constants.notchWidth, 
                                                height: (itemSize.height / itemSize.width) * Constants.notchWidth)
             animatableView.image = UIImage.fromColor(self.view.backgroundColor?.withAlphaComponent(0.2) ?? UIColor.black)
-            animatableView.frame.origin.y = 40
+            animatableView.frame.origin.y = Constants.notchViewTopInset
             self.collectionView.transform = CGAffineTransform.identity.translatedBy(x: 0, y: height * 0.5)
         }) { _ in
             let item = self.collectionView.cellForItem(at: IndexPath(row: 0, section: 0))
@@ -125,7 +125,7 @@ extension ViewController: UICollectionViewDataSource {
 extension ViewController: UICollectionViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
         scrollView.contentOffset.y = max(Constants.maxScrollOffset, scrollView.contentOffset.y)
-        notchViewTopConstraint.constant = Constants.notchTopOffset - min(0, scrollView.contentOffset.y)
+        notchViewBottomConstraint.constant = Constants.notchHeight - min(0, scrollView.contentOffset.y)
     }
 
     func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {