Commit c65fd68e by Daniel Dahan

prepare for release

parent f4c2a71a
......@@ -40,8 +40,14 @@ class AppMenuController: MenuController {
/// MenuView diameter.
private let baseSize: CGSize = CGSizeMake(56, 56)
/// MenuView inset.
private let menuViewInset: CGFloat = 16
/// MenuView bottom inset.
private let menuViewBottomInset: CGFloat = 65
/// MenuView right inset.
private let menuViewRightInset: CGFloat = 16
/// Reference if the menuView is hidden.
public private(set) var isMenuViewHidden: Bool = false
override func viewDidLoad() {
super.viewDidLoad()
......@@ -90,19 +96,25 @@ class AppMenuController: MenuController {
}
/// Shows the menuView.
func showMenu() {
menuView.animate(MaterialAnimation.animationGroup([
MaterialAnimation.rotate(rotation: 3),
MaterialAnimation.translateY(0)
]))
func showMenuView() {
if isMenuViewHidden {
isMenuViewHidden = false
menuView.animate(MaterialAnimation.animationGroup([
MaterialAnimation.rotate(rotation: 3),
MaterialAnimation.translateY(0)
]))
}
}
/// Hides the menuView.
func hideMenu() {
menuView.animate(MaterialAnimation.animationGroup([
MaterialAnimation.rotate(rotation: 3),
MaterialAnimation.translateY(150)
]))
func hideMenuView() {
if !isMenuViewHidden {
isMenuViewHidden = true
menuView.animate(MaterialAnimation.animationGroup([
MaterialAnimation.rotate(rotation: 3),
MaterialAnimation.translateY(150)
]))
}
}
/// Prepares the menuView.
......@@ -147,7 +159,11 @@ class AppMenuController: MenuController {
menuView.menu.views = [menuButton, blueButton, greenButton, yellowButton]
menuView.delegate = self
view.layout(menuView).width(baseSize.width).height(baseSize.height).bottom(menuViewInset).right(menuViewInset)
view.layout(menuView)
.width(baseSize.width)
.height(baseSize.height)
.bottom(menuViewBottomInset)
.right(menuViewRightInset)
}
}
......
......@@ -75,6 +75,7 @@ class ItemViewController: UIViewController {
override func viewWillAppear(animated: Bool) {
super.viewWillAppear(animated)
navigationDrawerController?.enabled = false
(menuController as? AppMenuController)?.hideMenuView()
}
override func viewWillLayoutSubviews() {
......
......@@ -62,9 +62,13 @@ class RecipesViewController: UIViewController {
super.viewWillAppear(animated)
// Stops the tableView contentInsets from being automatically adjusted.
edgesForExtendedLayout = .None
}
override func viewDidAppear(animated: Bool) {
super.viewDidAppear(animated)
// Enable the SideNavigation.
navigationDrawerController?.enabled = true
(menuController as? AppMenuController)?.showMenuView()
}
/// Prepares the items Array.
......
Pod::Spec.new do |s|
s.name = 'Material'
s.version = '1.41.8'
s.version = '1.42.0'
s.license = 'BSD-3-Clause'
s.summary = 'An animation and graphics framework for Material Design in Swift.'
s.homepage = 'http://cosmicmind.io'
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.41.8</string>
<string>1.42.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -331,6 +331,15 @@ public class NavigationDrawerController : UIViewController, UIGestureRecognizerD
return rightView!.x != MaterialDevice.width
}
/**
Content view controller to encompase the entire component. This is
primarily used when the StatusBar is being hidden. The alpha value of
the rootViewController decreases, and shows the StatusBar. To avoid
this, and to add a hidden transition viewController for complex
situations, the contentViewController was added.
*/
public private(set) var contentViewController: UIViewController!
/**
A UIViewController property that references the active
main UIViewController. To swap the rootViewController, it
......@@ -382,17 +391,6 @@ public class NavigationDrawerController : UIViewController, UIGestureRecognizerD
layoutSubviews()
}
public override func viewWillTransitionToSize(size: CGSize, withTransitionCoordinator coordinator: UIViewControllerTransitionCoordinator) {
super.viewWillTransitionToSize(size, withTransitionCoordinator: coordinator)
closeLeftView()
closeRightView()
// Ensures the view is hidden.
if let v: MaterialView = rightView {
v.position.x = size.width + v.width / 2
}
}
/**
A method to swap rootViewController objects.
- Parameter toViewController: The UIViewController to swap
......@@ -872,20 +870,24 @@ public class NavigationDrawerController : UIViewController, UIGestureRecognizerD
public func prepareView() {
view.clipsToBounds = true
view.contentScaleFactor = MaterialDevice.scale
prepareContentViewController()
prepareRootViewController()
prepareLeftView()
prepareRightView()
}
/// Prepares the contentViewController.
private func prepareContentViewController() {
contentViewController = UIViewController()
contentViewController.view.frame = view.bounds
contentViewController.view.backgroundColor = MaterialColor.black
prepareViewControllerWithinContainer(contentViewController, container: view)
}
/// A method that prepares the rootViewController.
private func prepareRootViewController() {
let vc: UIViewController = UIViewController()
vc.view.frame = view.bounds
vc.view.backgroundColor = MaterialColor.black
prepareViewControllerWithinContainer(vc, container: view)
rootViewController.view.frame = view.bounds
prepareViewControllerWithinContainer(rootViewController, container: vc.view)
rootViewController.view.frame = contentViewController.view.bounds
prepareViewControllerWithinContainer(rootViewController, container: contentViewController.view)
}
/// A method that prepares the leftViewController.
......@@ -958,6 +960,7 @@ public class NavigationDrawerController : UIViewController, UIGestureRecognizerD
v.didMoveToParentViewController(self)
v.view.clipsToBounds = true
v.view.autoresizingMask = [.FlexibleWidth, .FlexibleHeight]
v.view.contentScaleFactor = MaterialDevice.scale
container.addSubview(v.view)
container.sendSubviewToBack(v.view)
}
......@@ -1159,6 +1162,12 @@ public class NavigationDrawerController : UIViewController, UIGestureRecognizerD
/// Layout subviews.
private func layoutSubviews() {
if opened {
hideStatusBar()
} else {
showStatusBar()
}
if let v: MaterialView = leftView {
v.width = leftViewWidth
v.height = view.bounds.height
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment