Skip to content

M
Material
Commit e50b0c11 by Daniel Dahan
Options

finalized default NavigationBarView grid settings

parent 6e3438dc
Showing with 586 additions and 285 deletions
Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/AppViewController.swift
...@@ -93,25 +93,12 @@ class AppViewController: NavigationViewController { ...@@ -93,25 +93,12 @@ class AppViewController: NavigationViewController {
let image: UIImage? let image: UIImage?
if menuView.menu.opened { if menuView.menu.opened {
// Enable the side nav. hideMenuBackdropLayer()
sideNavigationViewController?.enabled = true
// Position the menuBackdropLayer for the animation when closing.
menuBackdropLayer.animate(MaterialAnimation.scale(1))
menuView.menu.close() menuView.menu.close()
image = UIImage(named: "ic_add_white") image = UIImage(named: "ic_add_white")
} else { } else {
// Disable the side nav, so users can't swipe while viewing the menu. showMenuBackdropLayer()
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.animate(MaterialAnimation.scale(30))
menuBackdropLayer.hidden = false
menuView.menu.open() { (v: UIView) in menuView.menu.open() { (v: UIView) in
(v as? MaterialButton)?.pulse() (v as? MaterialButton)?.pulse()
...@@ -138,7 +125,7 @@ class AppViewController: NavigationViewController { ...@@ -138,7 +125,7 @@ class AppViewController: NavigationViewController {
titleLabel.text = "Recipes" titleLabel.text = "Recipes"
titleLabel.textAlignment = .Left titleLabel.textAlignment = .Left
titleLabel.textColor = MaterialColor.white titleLabel.textColor = MaterialColor.white
titleLabel.font = RobotoFont.regularWithSize(20) titleLabel.font = RobotoFont.regularWithSize(17)
// Detail label. Uncomment the code below to use a detail label. // Detail label. Uncomment the code below to use a detail label.
// let detailLabel: UILabel = UILabel() // let detailLabel: UILabel = UILabel()
...@@ -232,6 +219,37 @@ class AppViewController: NavigationViewController { ...@@ -232,6 +219,37 @@ class AppViewController: NavigationViewController {
MaterialLayout.size(view, child: menuView, width: menuViewDiameter, height: menuViewDiameter) MaterialLayout.size(view, child: menuView, width: menuViewDiameter, height: menuViewDiameter)
MaterialLayout.alignFromBottomRight(view, child: menuView, bottom: menuViewInset, right: menuViewInset) MaterialLayout.alignFromBottomRight(view, child: menuView, bottom: menuViewInset, right: menuViewInset)
} }
/// Displays the menuBackdropLayer.
private func showMenuBackdropLayer() {
// 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
self.menuBackdropLayer.hidden = false
}
menuBackdropLayer.animate(MaterialAnimation.scale(30, duration: 0.25))
}
/// Hides the menuBackdropLayer.
private func hideMenuBackdropLayer() {
// Enable the side nav.
sideNavigationViewController?.enabled = true
// Position the menuBackdropLayer for the animation when closing.
menuBackdropLayer.animate(MaterialAnimation.animationGroup([
MaterialAnimation.scale(1),
MaterialAnimation.position(menuView.center)
], duration: 0.25))
MaterialAnimation.delay(0.25) { [weak self] in
self?.menuBackdropLayer.hidden = true
}
}
} }
/// SideNavigationViewControllerDelegate methods. /// SideNavigationViewControllerDelegate methods.
......
Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/FeedCollectionViewCell.swift
...@@ -31,8 +31,7 @@ ...@@ -31,8 +31,7 @@
import UIKit import UIKit
import Material import Material
class FeedCollectionViewCell : UICollectionViewCell { class FeedCollectionViewCell : MaterialCollectionViewCell {
private var cardView: MaterialPulseView!
let titleLabel: UILabel = UILabel() let titleLabel: UILabel = UILabel()
let detailLabel: UILabel = UILabel() let detailLabel: UILabel = UILabel()
let imageView: MaterialView = MaterialView() let imageView: MaterialView = MaterialView()
...@@ -51,20 +50,18 @@ class FeedCollectionViewCell : UICollectionViewCell { ...@@ -51,20 +50,18 @@ class FeedCollectionViewCell : UICollectionViewCell {
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
private func prepareView() { override func prepareView() {
cardView = MaterialPulseView() pulseScale = false
cardView.pulseScale = false pulseColor = MaterialColor.blue.lighten4
cardView.pulseColor = MaterialColor.blue.lighten4
addSubview(cardView)
var image: UIImage? var image: UIImage?
imageView.contentsGravity = .ResizeAspectFill imageView.contentsGravity = .ResizeAspectFill
cardView.addSubview(imageView) addSubview(imageView)
let contentView: MaterialView = MaterialView() let contentView: MaterialView = MaterialView()
contentView.backgroundColor = MaterialColor.clear contentView.backgroundColor = MaterialColor.clear
cardView.addSubview(contentView) addSubview(contentView)
titleLabel.textColor = MaterialColor.blueGrey.darken4 titleLabel.textColor = MaterialColor.blueGrey.darken4
titleLabel.backgroundColor = MaterialColor.clear titleLabel.backgroundColor = MaterialColor.clear
...@@ -72,7 +69,7 @@ class FeedCollectionViewCell : UICollectionViewCell { ...@@ -72,7 +69,7 @@ class FeedCollectionViewCell : UICollectionViewCell {
image = UIImage(named: "ic_more_vert_white")?.imageWithRenderingMode(.AlwaysTemplate) image = UIImage(named: "ic_more_vert_white")?.imageWithRenderingMode(.AlwaysTemplate)
let moreButton: FlatButton = FlatButton() let moreButton: FlatButton = FlatButton()
moreButton.contentInsetPreset = .None moreButton.contentEdgeInsetsPreset = .None
moreButton.pulseColor = MaterialColor.blueGrey.darken4 moreButton.pulseColor = MaterialColor.blueGrey.darken4
moreButton.tintColor = MaterialColor.blueGrey.darken4 moreButton.tintColor = MaterialColor.blueGrey.darken4
moreButton.setImage(image, forState: .Normal) moreButton.setImage(image, forState: .Normal)
...@@ -89,15 +86,14 @@ class FeedCollectionViewCell : UICollectionViewCell { ...@@ -89,15 +86,14 @@ class FeedCollectionViewCell : UICollectionViewCell {
let g: Int = Int(bounds.width / 48) let g: Int = Int(bounds.width / 48)
grid.axis.columns = g grid.axis.columns = g
grid.views = [cardView]
imageView.grid.columns = 4 imageView.grid.columns = 4
contentView.grid.columns = g - 4 contentView.grid.columns = g - 4
cardView.grid.contentInset.right = 8 grid.contentInset.right = 8
cardView.grid.axis.columns = g grid.axis.columns = g
cardView.grid.views = [ grid.views = [
imageView, imageView,
contentView contentView
] ]
......
Sources/FlatButton.swift
...@@ -43,6 +43,6 @@ public class FlatButton : MaterialButton { ...@@ -43,6 +43,6 @@ public class FlatButton : MaterialButton {
setTitleColor(MaterialColor.blue.accent3, forState: .Normal) setTitleColor(MaterialColor.blue.accent3, forState: .Normal)
pulseColor = MaterialColor.blue.accent3 pulseColor = MaterialColor.blue.accent3
cornerRadiusPreset = .Radius1 cornerRadiusPreset = .Radius1
contentInsetPreset = .WideRectangle3 contentEdgeInsetsPreset = .WideRectangle3
} }
} }
\ No newline at end of file
Sources/MaterialButton.swift
...@@ -257,12 +257,10 @@ public class MaterialButton : UIButton { ...@@ -257,12 +257,10 @@ public class MaterialButton : UIButton {
} }
} }
/** /// A preset property for updated contentEdgeInsets.
:name: contentInsets public var contentEdgeInsetsPreset: MaterialEdgeInset {
*/
public var contentInsetPreset: MaterialEdgeInset {
didSet { didSet {
let value: UIEdgeInsets = MaterialEdgeInsetToValue(contentInsetPreset) let value: UIEdgeInsets = MaterialEdgeInsetToValue(contentEdgeInsetsPreset)
contentEdgeInsets = UIEdgeInsetsMake(value.top, value.left, value.bottom, value.right) contentEdgeInsets = UIEdgeInsetsMake(value.top, value.left, value.bottom, value.right)
} }
} }
...@@ -276,7 +274,7 @@ public class MaterialButton : UIButton { ...@@ -276,7 +274,7 @@ public class MaterialButton : UIButton {
cornerRadiusPreset = .None cornerRadiusPreset = .None
shape = .None shape = .None
borderWidth = 0 borderWidth = 0
contentInsetPreset = .None contentEdgeInsetsPreset = .None
super.init(coder: aDecoder) super.init(coder: aDecoder)
prepareView() prepareView()
} }
...@@ -292,7 +290,7 @@ public class MaterialButton : UIButton { ...@@ -292,7 +290,7 @@ public class MaterialButton : UIButton {
cornerRadiusPreset = .None cornerRadiusPreset = .None
shape = .None shape = .None
borderWidth = 0 borderWidth = 0
contentInsetPreset = .None contentEdgeInsetsPreset = .None
super.init(frame: frame) super.init(frame: frame)
prepareView() prepareView()
} }
......
Sources/MaterialCollectionViewCell.swift
///* /*
//* Copyright (C) 2015 - 2016, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.io>. * Copyright (C) 2015 - 2016, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.io>.
//* All rights reserved. * All rights reserved.
//* *
//* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
//* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
//* *
//* * Redistributions of source code must retain the above copyright notice, this * * Redistributions of source code must retain the above copyright notice, this
//* list of conditions and the following disclaimer. * list of conditions and the following disclaimer.
//* *
//* * Redistributions in binary form must reproduce the above copyright notice, * * Redistributions in binary form must reproduce the above copyright notice,
//* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
//* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
//* *
//* * Neither the name of Material nor the names of its * * Neither the name of Material nor the names of its
//* contributors may be used to endorse or promote products derived from * contributors may be used to endorse or promote products derived from
//* this software without specific prior written permission. * this software without specific prior written permission.
//* *
//* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
//* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
//* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
//* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
//* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
//* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
//* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
//* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
//* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
//* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//*/ */
//
//import UIKit import UIKit
//
//@objc(floatingViewControllerCollectionViewCellDelegate) @objc(MaterialCollectionViewCell)
//public protocol MaterialCollectionViewCellDelegate : MaterialDelegate { public class MaterialCollectionViewCell : UICollectionViewCell {
// optional func collectionViewCellWillPassThresholdForLeftLayer(cell: MaterialCollectionViewCell) /**
// optional func collectionViewCellWillPassThresholdForRightLayer(cell: MaterialCollectionViewCell) A CAShapeLayer used to manage elements that would be affected by
// optional func collectionViewCellDidRevealLeftLayer(cell: MaterialCollectionViewCell) the clipToBounds property of the backing layer. For example, this
// optional func collectionViewCellDidRevealRightLayer(cell: MaterialCollectionViewCell) allows the dropshadow effect on the backing layer, while clipping
// optional func collectionViewCellDidCloseLeftLayer(cell: MaterialCollectionViewCell) the image to a desired shape within the visualLayer.
// optional func collectionViewCellDidCloseRightLayer(cell: MaterialCollectionViewCell) */
//} public private(set) lazy var visualLayer: CAShapeLayer = CAShapeLayer()
//
//@objc(MaterialCollectionViewCell) /**
//public class MaterialCollectionViewCell : MaterialPulseCollectionViewCell, UIGestureRecognizerDelegate { A base delegate reference used when subclassing MaterialView.
// // */
// // :name: panRecognizer public weak var delegate: MaterialDelegate?
// //
// private var panRecognizer: UIPanGestureRecognizer! /// Sets whether the scaling animation should be used.
// public lazy var pulseScale: Bool = true
// //
// // :name: originalPosition /// The opcaity value for the pulse animation.
// // public var pulseColorOpacity: CGFloat = 0.25
// private var originalPosition: CGPoint!
// /// The color of the pulse effect.
// // public var pulseColor: UIColor?
// // :name: leftOnDragRelease
// // /**
// private lazy var leftOnDragRelease: Bool = false This property is the same as clipsToBounds. It crops any of the view's
// contents from bleeding past the view's frame. If an image is set using
// // the image property, then this value does not need to be set, since the
// // :name: rightOnDragRelease visualLayer's maskToBounds is set to true by default.
// // */
// private lazy var rightOnDragRelease: Bool = false public var masksToBounds: Bool {
// get {
// /** return layer.masksToBounds
// :name: leftView }
// */ set(value) {
// public private(set) lazy var leftView: MaterialView = MaterialView() layer.masksToBounds = value
// }
// /** }
// :name: rightView
// */ /// A property that accesses the backing layer's backgroundColor.
// public private(set) lazy var rightView: MaterialView = MaterialView() public override var backgroundColor: UIColor? {
// didSet {
// /** layer.backgroundColor = backgroundColor?.CGColor
// :name: revealed }
// */ }
// public private(set) lazy var revealed: Bool = false
// /// A property that accesses the layer.frame.origin.x property.
// /** public var x: CGFloat {
// :name: closeAutomatically get {
// */ return layer.frame.origin.x
// public lazy var closeAutomatically: Bool = true }
// set(value) {
// /** layer.frame.origin.x = value
// :name: gestureRecognizerShouldBegin }
// */ }
// public override func gestureRecognizerShouldBegin(gestureRecognizer: UIGestureRecognizer) -> Bool {
// if let panGestureRecognizer = gestureRecognizer as? UIPanGestureRecognizer { /// A property that accesses the layer.frame.origin.y property.
// let translation = panGestureRecognizer.translationInView(superview!) public var y: CGFloat {
// return fabs(translation.x) > fabs(translation.y) get {
// } return layer.frame.origin.y
// return false }
// } set(value) {
// layer.frame.origin.y = value
// /** }
// :name: prepareView }
// */
// public override func prepareView() { /**
// super.prepareView() A property that accesses the layer.frame.origin.width property.
// When setting this property in conjunction with the shape property having a
// userInteractionEnabled = MaterialTheme.pulseCollectionView.userInteractionEnabled value that is not .None, the height will be adjusted to maintain the correct
// backgroundColor = MaterialTheme.pulseCollectionView.backgroundColor shape.
// pulseColorOpacity = MaterialTheme.pulseCollectionView.pulseColorOpacity */
// pulseColor = MaterialTheme.pulseCollectionView.pulseColor public var width: CGFloat {
// get {
// depth = MaterialTheme.pulseCollectionView.depth return layer.frame.size.width
// shadowColor = MaterialTheme.pulseCollectionView.shadowColor }
// zPosition = MaterialTheme.pulseCollectionView.zPosition set(value) {
// borderWidth = MaterialTheme.pulseCollectionView.borderWidth layer.frame.size.width = value
// borderColor = MaterialTheme.pulseCollectionView.bordercolor if .None != shape {
// masksToBounds = true layer.frame.size.height = value
// }
// prepareLeftView() }
// prepareRightView() }
// preparePanGesture()
// } /**
// A property that accesses the layer.frame.origin.height property.
// /** When setting this property in conjunction with the shape property having a
// :name: animationDidStop value that is not .None, the width will be adjusted to maintain the correct
// */ shape.
// public override func animationDidStop(anim: CAAnimation, finished flag: Bool) { */
// super.animationDidStop(anim, finished: flag) public var height: CGFloat {
// get {
// if let a: CABasicAnimation = anim as? CABasicAnimation { return layer.frame.size.height
// if "position" == a.keyPath { }
// masksToBounds = true set(value) {
// if leftOnDragRelease { layer.frame.size.height = value
// (delegate as? MaterialCollectionViewCellDelegate)?.collectionViewCellDidCloseLeftLayer?(self) if .None != shape {
// } else if rightOnDragRelease { layer.frame.size.width = value
// (delegate as? MaterialCollectionViewCellDelegate)?.collectionViewCellDidCloseRightLayer?(self) }
// } }
// } }
// }
// } /// A property that accesses the backing layer's shadowColor.
// public var shadowColor: UIColor? {
// /** didSet {
// :name: open layer.shadowColor = shadowColor?.CGColor
// */ }
// public func open() { }
// animate(MaterialAnimation.position(CGPointMake(width * 1.5, y + height / 2), duration: 0.25))
// } /// A property that accesses the backing layer's shadowOffset.
// public var shadowOffset: CGSize {
// /** get {
// :name: close return layer.shadowOffset
// */ }
// public func close() { set(value) {
// animate(MaterialAnimation.position(CGPointMake(width / 2, y + height / 2), duration: 0.25)) layer.shadowOffset = value
// } }
// }
// //
// // :name: prepareLeftView /// A property that accesses the backing layer's shadowOpacity.
// // public var shadowOpacity: Float {
// internal func prepareLeftView() { get {
// leftView.frame = CGRectMake(-width, 0, width, height) return layer.shadowOpacity
// addSubview(leftView) }
// } set(value) {
// layer.shadowOpacity = value
// // }
// // :name: prepareRightView }
// //
// internal func prepareRightView() { /// A property that accesses the backing layer's shadowRadius.
// rightView.frame = CGRectMake(width, 0, width, height) public var shadowRadius: CGFloat {
// addSubview(rightView) get {
// } return layer.shadowRadius
// }
// // set(value) {
// // :name: preparePanGesture layer.shadowRadius = value
// // }
// internal func preparePanGesture() { }
// panRecognizer = UIPanGestureRecognizer(target: self, action: "handlePanGesture:")
// panRecognizer.delegate = self /**
// addGestureRecognizer(panRecognizer) A property that sets the shadowOffset, shadowOpacity, and shadowRadius
// } for the backing layer. This is the preferred method of setting depth
// in order to maintain consitency across UI objects.
// // */
// // :name: handlePanGesture public var depth: MaterialDepth {
// // didSet {
// internal func handlePanGesture(recognizer: UIPanGestureRecognizer) { let value: MaterialDepthType = MaterialDepthToValue(depth)
// switch recognizer.state { shadowOffset = value.offset
// case .Began: shadowOpacity = value.opacity
// originalPosition = position shadowRadius = value.radius
// masksToBounds = false }
// leftOnDragRelease = x > width / 2 }
// rightOnDragRelease = x < -width / 2
// /**
// case .Changed: A property that sets the cornerRadius of the backing layer. If the shape
// let translation = recognizer.translationInView(self) property has a value of .Circle when the cornerRadius is set, it will
// MaterialAnimation.animationDisabled { become .None, as it no longer maintains its circle shape.
// self.position.x = self.originalPosition.x + translation.x */
// } public var cornerRadiusPreset: MaterialRadius {
// didSet {
// leftOnDragRelease = x > width / 2 if let v: MaterialRadius = cornerRadiusPreset {
// rightOnDragRelease = x < -width / 2 cornerRadius = MaterialRadiusToValue(v)
// if .Circle == shape {
// if !revealed && (leftOnDragRelease || rightOnDragRelease) { shape = .None
// revealed = true }
// if leftOnDragRelease { }
// (delegate as? MaterialCollectionViewCellDelegate)?.collectionViewCellWillPassThresholdForLeftLayer?(self) }
// } else if rightOnDragRelease { }
// (delegate as? MaterialCollectionViewCellDelegate)?.collectionViewCellWillPassThresholdForRightLayer?(self)
// } /// A property that accesses the layer.cornerRadius.
// } public var cornerRadius: CGFloat = 0 {
// case .Ended: didSet {
// revealed = false layer.cornerRadius = cornerRadius
// }
// if leftOnDragRelease { }
// (delegate as? MaterialCollectionViewCellDelegate)?.collectionViewCellDidRevealLeftLayer?(self)
// } else if rightOnDragRelease { /**
// (delegate as? MaterialCollectionViewCellDelegate)?.collectionViewCellDidRevealRightLayer?(self) A property that manages the overall shape for the object. If either the
// } width or height property is set, the other will be automatically adjusted
// to maintain the shape of the object.
// if !leftOnDragRelease && !rightOnDragRelease { */
// close() public var shape: MaterialShape {
// } else if closeAutomatically && (leftOnDragRelease || rightOnDragRelease) { didSet {
// close() if .None != shape {
// } if width < height {
// default:break frame.size.width = height
// } } else {
// } frame.size.height = width
//} }
\ No newline at end of file }
}
}
/// A property that accesses the layer.borderWith.
public var borderWidth: CGFloat {
didSet {
layer.borderWidth = borderWidth
}
}
/// A property that accesses the layer.borderColor property.
public var borderColor: UIColor? {
didSet {
layer.borderColor = borderColor?.CGColor
}
}
/// A property that accesses the layer.position property.
public var position: CGPoint {
get {
return layer.position
}
set(value) {
layer.position = value
}
}
/// A property that accesses the layer.zPosition property.
public var zPosition: CGFloat {
get {
return layer.zPosition
}
set(value) {
layer.zPosition = value
}
}
/**
An initializer that initializes the object with a NSCoder object.
- Parameter aDecoder: A NSCoder instance.
*/
public required init?(coder aDecoder: NSCoder) {
depth = .None
cornerRadiusPreset = .None
shape = .None
borderWidth = 0
super.init(coder: aDecoder)
prepareView()
}
/**
An initializer that initializes the object with a CGRect object.
If AutoLayout is used, it is better to initilize the instance
using the init() initializer.
- Parameter frame: A CGRect instance.
*/
public override init(frame: CGRect) {
depth = .None
cornerRadiusPreset = .None
shape = .None
borderWidth = 0
super.init(frame: frame)
prepareView()
}
/// A convenience initializer.
public convenience init() {
self.init(frame: CGRectNull)
}
/// Overriding the layout callback for sublayers.
public override func layoutSublayersOfLayer(layer: CALayer) {
super.layoutSublayersOfLayer(layer)
if self.layer == layer {
layoutShape()
layoutVisualLayer()
}
}
/**
A method that accepts CAAnimation objects and executes them on the
view's backing layer.
- Parameter animation: A CAAnimation instance.
*/
public func animate(animation: CAAnimation) {
animation.delegate = self
if let a: CABasicAnimation = animation as? CABasicAnimation {
a.fromValue = (nil == layer.presentationLayer() ? layer : layer.presentationLayer() as! CALayer).valueForKeyPath(a.keyPath!)
}
if let a: CAPropertyAnimation = animation as? CAPropertyAnimation {
layer.addAnimation(a, forKey: a.keyPath!)
} else if let a: CAAnimationGroup = animation as? CAAnimationGroup {
layer.addAnimation(a, forKey: nil)
} else if let a: CATransition = animation as? CATransition {
layer.addAnimation(a, forKey: kCATransition)
}
}
/**
A delegation method that is executed when the backing layer starts
running an animation.
- Parameter anim: The currently running CAAnimation instance.
*/
public override func animationDidStart(anim: CAAnimation) {
(delegate as? MaterialAnimationDelegate)?.materialAnimationDidStart?(anim)
}
/**
A delegation method that is executed when the backing layer stops
running an animation.
- Parameter anim: The CAAnimation instance that stopped running.
- Parameter flag: A boolean that indicates if the animation stopped
because it was completed or interrupted. True if completed, false
if interrupted.
*/
public override func animationDidStop(anim: CAAnimation, finished flag: Bool) {
if anim is CAPropertyAnimation {
(delegate as? MaterialAnimationDelegate)?.materialAnimationDidStop?(anim, finished: flag)
} else if let a: CAAnimationGroup = anim as? CAAnimationGroup {
for x in a.animations! {
animationDidStop(x, finished: true)
}
}
layoutVisualLayer()
}
/**
A delegation method that is executed when the view has began a
touch event.
- Parameter touches: A set of UITouch objects.
- Parameter event: A UIEvent object.
*/
public override func touchesBegan(touches: Set<UITouch>, withEvent event: UIEvent?) {
super.touchesBegan(touches, withEvent: event)
pulseAnimation(layer.convertPoint(touches.first!.locationInView(self), fromLayer: layer))
}
/**
A delegation method that is executed when the view touch event has
ended.
- Parameter touches: A set of UITouch objects.
- Parameter event: A UIEvent object.
*/
public override func touchesEnded(touches: Set<UITouch>, withEvent event: UIEvent?) {
super.touchesEnded(touches, withEvent: event)
shrinkAnimation()
}
/**
A delegation method that is executed when the view touch event has
been cancelled.
- Parameter touches: A set of UITouch objects.
- Parameter event: A UIEvent object.
*/
public override func touchesCancelled(touches: Set<UITouch>?, withEvent event: UIEvent?) {
super.touchesCancelled(touches, withEvent: event)
shrinkAnimation()
}
/**
Triggers the pulse animation.
- Parameter point: A Optional point to pulse from, otherwise pulses
from the center.
*/
public func pulse(var point: CGPoint? = nil) {
if nil == point {
point = CGPointMake(CGFloat(width / 2), CGFloat(height / 2))
}
if let v: CFTimeInterval = pulseAnimation(point!) {
MaterialAnimation.delay(v) { [weak self] in
self?.shrinkAnimation()
}
}
}
/**
Prepares the view instance when intialized. When subclassing,
it is recommended to override the prepareView method
to initialize property values and other setup operations.
The super.prepareView method should always be called immediately
when subclassing.
*/
public func prepareView() {
prepareVisualLayer()
shadowColor = MaterialColor.black
borderColor = MaterialColor.black
pulseColor = MaterialColor.white
pulseColorOpacity = 0.25
}
/// Prepares the visualLayer property.
internal func prepareVisualLayer() {
visualLayer.zPosition = 0
visualLayer.masksToBounds = true
layer.addSublayer(visualLayer)
}
/// Manages the layout for the visualLayer property.
internal func layoutVisualLayer() {
visualLayer.frame = bounds
visualLayer.position = CGPointMake(width / 2, height / 2)
visualLayer.cornerRadius = layer.cornerRadius
}
/// Manages the layout for the shape of the view instance.
internal func layoutShape() {
if .Circle == shape {
layer.cornerRadius = width / 2
}
}
/**
Triggers the pulse animation.
- Parameter point: A point to pulse from.
- Returns: A Ooptional CFTimeInternal if the point exists within
the view. The time internal represents the animation time.
*/
internal func pulseAnimation(point: CGPoint) -> CFTimeInterval? {
if true == layer.containsPoint(point) {
let r: CGFloat = (width < height ? height : width) / 2
let f: CGFloat = 3
let v: CGFloat = r / f
let d: CGFloat = 2 * f
let s: CGFloat = 1.05
var t: CFTimeInterval = CFTimeInterval(1.5 * width / UIScreen.mainScreen().bounds.width)
if 0.55 < t || 0.25 > t {
t = 0.55
}
t /= 1.3
if nil != pulseColor && 0 < pulseColorOpacity {
let pulseLayer: CAShapeLayer = CAShapeLayer()
pulseLayer.hidden = true
pulseLayer.zPosition = 1
pulseLayer.backgroundColor = pulseColor?.colorWithAlphaComponent(pulseColorOpacity).CGColor
visualLayer.addSublayer(pulseLayer)
MaterialAnimation.animationDisabled {
pulseLayer.bounds = CGRectMake(0, 0, v, v)
pulseLayer.position = point
pulseLayer.cornerRadius = r / d
pulseLayer.hidden = false
}
pulseLayer.addAnimation(MaterialAnimation.scale(3 * d, duration: t), forKey: nil)
MaterialAnimation.delay(t) { [weak self] in
if nil != self && nil != self!.pulseColor && 0 < self!.pulseColorOpacity {
MaterialAnimation.animateWithDuration(t, animations: {
pulseLayer.hidden = true
}) {
pulseLayer.removeFromSuperlayer()
}
}
}
}
if pulseScale {
layer.addAnimation(MaterialAnimation.scale(s, duration: t), forKey: nil)
return t
}
}
return nil
}
/// Executes the shrink animation for the pulse effect.
internal func shrinkAnimation() {
if pulseScale {
var t: CFTimeInterval = CFTimeInterval(1.5 * width / UIScreen.mainScreen().bounds.width)
if 0.55 < t || 0.25 > t {
t = 0.55
}
t /= 1.3
layer.addAnimation(MaterialAnimation.scale(1, duration: t), forKey: nil)
}
}
}
\ No newline at end of file
Sources/NavigationBarView.swift
...@@ -121,32 +121,41 @@ public class NavigationBarView : MaterialView { ...@@ -121,32 +121,41 @@ public class NavigationBarView : MaterialView {
// General alignment. // General alignment.
switch UIDevice.currentDevice().orientation { switch UIDevice.currentDevice().orientation {
case .LandscapeLeft, .LandscapeRight: case .LandscapeLeft, .LandscapeRight:
grid.contentInset.top = 0 grid.contentInset.top = 8
grid.contentInset.bottom = 0
titleView.grid.spacing = 2 // TitleView alignment.
titleView.grid.contentInset.top = 4 if let v: UILabel = titleLabel {
titleView.grid.contentInset.bottom = 8 if let d: UILabel = detailLabel {
v.grid.rows = 7
d.grid.rows = 5
titleView.grid.spacing = 4
titleView.grid.contentInset.top = -3
} else {
v.grid.rows = 12
titleView.grid.spacing = 0
titleView.grid.contentInset.top = 0
}
}
height = 44 height = 44
default: default:
grid.contentInset.top = 20 grid.contentInset.top = 28
grid.contentInset.bottom = 8
titleView.grid.spacing = 0 // TitleView alignment.
titleView.grid.contentInset.top = 0 if let v: UILabel = titleLabel {
titleView.grid.contentInset.bottom = 0 if let d: UILabel = detailLabel {
v.grid.rows = 7
d.grid.rows = 5
titleView.grid.spacing = 4
titleView.grid.contentInset.top = -3
} else {
v.grid.rows = 12
titleView.grid.spacing = 0
titleView.grid.contentInset.top = 0
}
}
height = 64 height = 64
} }
// TitleView alignment.
titleView.grid.axis.rows = 6
if let v: UILabel = titleLabel {
titleView.grid.views?.append(v)
v.grid.rows = nil == detailLabel ? 6 : 4
}
if let v: UILabel = detailLabel {
titleView.grid.views?.append(v)
v.grid.rows = 2
}
// Column adjustment. // Column adjustment.
width = UIScreen.mainScreen().bounds.width width = UIScreen.mainScreen().bounds.width
grid.axis.columns = Int(width / 48) grid.axis.columns = Int(width / 48)
...@@ -241,7 +250,6 @@ public class NavigationBarView : MaterialView { ...@@ -241,7 +250,6 @@ public class NavigationBarView : MaterialView {
super.prepareView() super.prepareView()
grid.spacing = 8 grid.spacing = 8
grid.axis.inherited = false grid.axis.inherited = false
grid.contentInset.top = 20
grid.contentInset.left = 8 grid.contentInset.left = 8
grid.contentInset.bottom = 8 grid.contentInset.bottom = 8
grid.contentInset.right = 8 grid.contentInset.right = 8
...@@ -252,7 +260,6 @@ public class NavigationBarView : MaterialView { ...@@ -252,7 +260,6 @@ public class NavigationBarView : MaterialView {
/// Prepares the titleView. /// Prepares the titleView.
public func prepareTitleView() { public func prepareTitleView() {
titleView.backgroundColor = nil titleView.backgroundColor = nil
titleView.grid.axis.inherited = false
titleView.grid.axis.direction = .Vertical titleView.grid.axis.direction = .Vertical
addSubview(titleView) addSubview(titleView)
} }
......
Sources/NavigationViewController.swift
...@@ -156,7 +156,8 @@ public class NavigationViewController: UIViewController { ...@@ -156,7 +156,8 @@ public class NavigationViewController: UIViewController {
/// Layout subviews. /// Layout subviews.
private func layoutSubviews() { private func layoutSubviews() {
let size: CGSize = UIScreen.mainScreen().bounds.size let size: CGSize = UIScreen.mainScreen().bounds.size
mainViewController.view.frame = CGRectMake(0, navigationBarView.height, size.width, size.height - navigationBarView.height) let h: CGFloat = UIApplication.sharedApplication().statusBarFrame.size.height
mainViewController.view.frame = CGRectMake(0, navigationBarView.height, size.width, size.height - navigationBarView.height - (20 >= h ? 0 : h - 20))
} }
} }
......
Sources/RaisedButton.swift
...@@ -44,6 +44,6 @@ public class RaisedButton : MaterialButton { ...@@ -44,6 +44,6 @@ public class RaisedButton : MaterialButton {
backgroundColor = MaterialColor.blue.accent3 backgroundColor = MaterialColor.blue.accent3
depth = .Depth1 depth = .Depth1
cornerRadiusPreset = .Radius1 cornerRadiusPreset = .Radius1
contentInsetPreset = .WideRectangle3 contentEdgeInsetsPreset = .WideRectangle3
} }
} }
\ No newline at end of file
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