menu backdrop animation working using native addAnimation call

577c196b · Daniel Dahan · 5f151b22 · 577c196b · 577c196b · 577c196b
Commit 577c196b authored Feb 15, 2016 by Daniel Dahan
7 changed files
--- a/Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/FeedCollectionView.swift
+++ b/Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/FeedCollectionView.swift
@@ -53,6 +53,6 @@ class FeedCollectionView : UICollectionView {
 	internal func prepareView() {
 		registerClass(FeedCollectionViewCell.self, forCellWithReuseIdentifier: "FeedCollectionViewCell")
 		backgroundColor = MaterialColor.clear
-		contentInset = UIEdgeInsetsZero
+		contentInset = UIEdgeInsetsMake(4, 0, 4, 0)
 	}
 }
--- a/Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/FeedCollectionViewCell.swift
+++ b/Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/FeedCollectionViewCell.swift
@@ -52,14 +52,13 @@ class FeedCollectionViewCell : UICollectionViewCell {
 	}
 	private func prepareView() {
-		cardView = MaterialPulseView(frame: CGRectMake(0, 0, bounds.width, 152))
+		cardView = MaterialPulseView(frame: CGRectMake(4, 0, bounds.width - 8, 156))
 		cardView.pulseScale = false
-		cardView.pulseColor = MaterialColor.blueGrey.base
+		cardView.pulseColor = MaterialColor.blue.lighten4
 		addSubview(cardView)
 		var image: UIImage?
-		imageView.shape = .Circle
 		imageView.contentsGravity = .ResizeAspectFill
 		cardView.addSubview(imageView)
@@ -87,8 +86,6 @@ class FeedCollectionViewCell : UICollectionViewCell {
 		detailLabel.backgroundColor = MaterialColor.clear
 		contentView.addSubview(detailLabel)
-		cardView.grid.contentInsetPreset = .Square2
 		imageView.grid.columns = 4
 		contentView.grid.columns = 8
@@ -98,14 +95,14 @@ class FeedCollectionViewCell : UICollectionViewCell {
 			contentView
 		]
-		titleLabel.grid.rows = 3
+		titleLabel.grid.rows = 4
-		titleLabel.grid.columns = 9
+		titleLabel.grid.columns = 8
 		moreButton.grid.rows = 3
 		moreButton.grid.columns = 2
 		moreButton.grid.offset.columns = 10
-		detailLabel.grid.rows = 4
+		detailLabel.grid.rows = 8
 		detailLabel.grid.offset.rows = 4
 		contentView.grid.spacing = 8

--- a/Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/FeedCollectionViewLayout.swift
+++ b/Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/FeedCollectionViewLayout.swift
@@ -33,7 +33,7 @@ import UIKit
 class FeedCollectionViewLayout : UICollectionViewLayout {
 	private var contentSize: CGSize = CGSizeZero
 	private var layoutItems: Array<(UICollectionViewLayoutAttributes, NSIndexPath)>?
-	internal var height: CGFloat = 152
+	internal var height: CGFloat = 160
 	internal var offset: CGFloat = 1
 	override func layoutAttributesForItemAtIndexPath(indexPath: NSIndexPath) -> UICollectionViewLayoutAttributes? {

--- a/Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/Info.plist
+++ b/Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/Info.plist
@@ -31,6 +31,9 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>

--- a/Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/MainViewController.swift
+++ b/Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/MainViewController.swift
@@ -45,6 +45,9 @@ struct Item {
 }
 class MainViewController: UIViewController {
+	/// Menu backdrop layer.
+	private lazy var menuBackdropLayer: MaterialLayer = MaterialLayer()
 	/// MenuView diameter.
 	private let menuViewDiameter: CGFloat = 56
@@ -67,8 +70,9 @@ class MainViewController: UIViewController {
 		super.viewDidLoad()
 		prepareView()
 		prepareItems()
-		prepareTableView()
+		prepareCollectionView()
 		prepareNavigationBarView()
+		prepareMenuBackdropLayer()
 		prepareMenuView()
 	}
@@ -106,9 +110,26 @@ class MainViewController: UIViewController {
 		let image: UIImage?
 		if menuView.menu.opened {
+			// Enable the side nav.
+			sideNavigationViewController?.enabled = true
+			// Position the menuBackdropLayer for the animation when closing.
+			menuBackdropLayer.addAnimation(MaterialAnimation.scale(1, duration: 0.25), forKey: nil)
 			menuView.menu.close()
 			image = UIImage(named: "ic_add_white")
 		} else {
+			// Disable the side nav, so users can't swipe while viewing the menu.
+			sideNavigationViewController?.enabled = false
+			// Position the menuBackdropLayer for the animation when opening.
+			MaterialAnimation.animationDisabled { [unowned self] in
+				self.menuBackdropLayer.frame = self.menuView.frame
+				self.menuBackdropLayer.shape = .Circle
+			}
+			menuBackdropLayer.addAnimation(MaterialAnimation.scale(30, duration: 0.25), forKey: nil)
+			menuBackdropLayer.hidden = false
 			menuView.menu.open() { (v: UIView) in
 				(v as? MaterialButton)?.pulse()
 			}
@@ -131,52 +152,52 @@ class MainViewController: UIViewController {
 	private func prepareItems() {
 		items.append(Item(
 			title: "Raw Vegan Blackberry Tart!",
-			detail: "Wish I could come, but I am out of town this weekend.",
+			detail: "Treat yourself today and every day with this sweet nutritious cake!",
 			image: UIImage(named: "VeganCakeFull")
 		))
 		items.append(Item(
 			title: "Raw Vegan Pumpkin Pie",
-			detail: "Have any ideas about what we should get Heidi for her birthday?",
+			detail: "Pumpkin lovers, desert lovers, and anyone who likes simple healthy cooking and enjoys eating! Light up your day with a piece of happiness- raw vegan pumpkin pie :)",
 			image: UIImage(named: "VeganPieAbove")
 		))
 		items.append(Item(
 			title: "Raw Vegan Nutty Sweets!",
-			detail: "I'll be in your neighborhood doing errands this weekend.",
+			detail: "Since most of my readers have a sweet tooth, here is another simple recipe to boost your happiness :)",
 			image: UIImage(named: "VeganHempBalls")
 		))
 		items.append(Item(
 			title: "Avocado Chocolate Cake!",
-			detail: "Are we on this weekend for the game?",
+			detail: "Do you know what are the two best things about vegan food besides that it's healthy and full of nutrition? It's absolutely delicious and easy to make!",
 			image: UIImage(named: "AssortmentOfFood")
 		))
 		items.append(Item(
 			title: "Homemade brunch: Crepe Indulgence",
-			detail: "We should eat this: Squash, Corn and tomatillo Tacos.",
+			detail: "Looking for a perfect sunday brunch spot? How about staying in and making something to die for?:)",
 			image: UIImage(named: "AssortmentOfDessert")
 		))
 		items.append(Item(
 			title: "Raw Vegan Chocolate Cookies",
-			detail: "The candidate will be arriving at 11:30, are you free?",
+			detail: "Once I start making sweets it's hard for me to stop! I've got another exciting recipe, which hopefully you will love! :D",
 			image: UIImage(named: "HeartCookies")
 		))
 		items.append(Item(
 			title: "Homemade Avocado Ice Cream",
-			detail: "I found the book title, Surely You’re Joking, Mr. Feynman!",
+			detail: "Avocado ice cream (and vegan!) might not sound so appealing to some of you, but the truth is- it's mind blowing!!!",
 			image: UIImage(named: "AvocadoIceCream")
 		))
 	}
 	/// Prepares the tableView.
-	private func prepareTableView() {
+	private func prepareCollectionView() {
 		collectionView.delegate = self
 		collectionView.dataSource = self
-		collectionView.backgroundColor = MaterialColor.blueGrey.lighten3
+		collectionView.backgroundColor = MaterialColor.grey.lighten4
 		view.addSubview(collectionView)
 		collectionView.translatesAutoresizingMaskIntoConstraints = false
@@ -187,17 +208,18 @@ class MainViewController: UIViewController {
 	private func prepareNavigationBarView() {
 		// Title label.
 		let titleLabel: UILabel = UILabel()
-		titleLabel.text = "Material"
+		titleLabel.text = "Rcipes"
 		titleLabel.textAlignment = .Left
 		titleLabel.textColor = MaterialColor.white
-		titleLabel.font = RobotoFont.regularWithSize(17)
+		titleLabel.font = RobotoFont.regularWithSize(20)
-		// Detail label.
+		// Detail label. Uncomment the code below to use a detail label.
-		let detailLabel: UILabel = UILabel()
+//		let detailLabel: UILabel = UILabel()
-		detailLabel.text = "Build Beautiful Software"
+//		detailLabel.text = "Build Beautiful Software"
-		detailLabel.textAlignment = .Left
+//		detailLabel.textAlignment = .Left
-		detailLabel.textColor = MaterialColor.white
+//		detailLabel.textColor = MaterialColor.white
-		detailLabel.font = RobotoFont.regularWithSize(12)
+//		detailLabel.font = RobotoFont.regularWithSize(12)
+//		navigationBarView.detailLabel = detailLabel
 		var image = UIImage(named: "ic_menu_white")
@@ -229,13 +251,19 @@ class MainViewController: UIViewController {
 		navigationBarView.backgroundColor = MaterialColor.blue.base
 		navigationBarView.titleLabel = titleLabel
-		navigationBarView.detailLabel = detailLabel
 		navigationBarView.leftControls = [menuButton]
 		navigationBarView.rightControls = [switchControl, searchButton]
 		view.addSubview(navigationBarView)
 	}
+	/// Prepares the menuBackdropLayer.
+	private func prepareMenuBackdropLayer() {
+		menuBackdropLayer.backgroundColor = MaterialColor.grey.base.colorWithAlphaComponent(0.75).CGColor
+		menuBackdropLayer.hidden = true
+		view.layer.addSublayer(menuBackdropLayer)
+	}
 	/// Prepares the add button.
 	private func prepareMenuView() {
 		var image: UIImage? = UIImage(named: "ic_add_white")

--- a/Sources/MaterialBasicAnimation.swift
+++ b/Sources/MaterialBasicAnimation.swift
@@ -41,7 +41,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -57,7 +57,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -73,7 +73,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -89,7 +89,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -105,7 +105,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -121,7 +121,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -137,7 +137,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -153,7 +153,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -169,7 +169,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -185,7 +185,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -201,7 +201,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -217,7 +217,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -233,7 +233,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -249,7 +249,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -265,7 +265,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation
@@ -281,7 +281,7 @@ public extension MaterialAnimation {
 		animation.fillMode = MaterialAnimationFillModeToValue(.Forwards)
 		animation.removedOnCompletion = false
 		animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
-		if let d = duration {
+		if let d: CFTimeInterval = duration {
 			animation.duration = d
 		}
 		return animation

--- a/Sources/MaterialLayer.swift
+++ b/Sources/MaterialLayer.swift
@@ -283,11 +283,11 @@ public class MaterialLayer : CAShapeLayer {
 		if let a: CAPropertyAnimation = anim as? CAPropertyAnimation {
 			if let b: CABasicAnimation = a as? CABasicAnimation {
 				MaterialAnimation.animationDisabled { [unowned self] in
-					self.setValue(nil == b.toValue ? b.byValue : b.toValue, forKey: b.keyPath!)
+//					self.setValue(nil == b.toValue ? b.byValue : b.toValue, forKey: b.keyPath!)
 				}
 			}
 			(delegate as? MaterialAnimationDelegate)?.materialAnimationDidStop?(anim, finished: flag)
-			removeAnimationForKey(a.keyPath!)
+//			removeAnimationForKey(a.keyPath!)
 		} else if let a: CAAnimationGroup = anim as? CAAnimationGroup {
 			for x in a.animations! {
 				animationDidStop(x, finished: true)