updated ***Preset properties

Examples/Programmatic/SideNavigationViewController/SideNavigationViewController/FeedViewController.swift

@@ -78,7 +78,7 @@ class FeedViewController: UIViewController {
 	
 	
 	/// Prepares the tableView.
 	/// Prepares the tableView.
 	private func prepareTableView() {
 	private func prepareTableView() {
-		tableView.registerClass(UITableViewCell.self, forCellReuseIdentifier: "Cell")
+		tableView.registerClass(MaterialTableViewCell.self, forCellReuseIdentifier: "MaterialTableViewCell")
 		tableView.dataSource = self
 		tableView.dataSource = self
 		tableView.delegate = self
 		tableView.delegate = self
 		
 		
@@ -103,7 +103,7 @@ extension FeedViewController: UITableViewDataSource {
 	
 	
 	/// Prepares the cells within the tableView.
 	/// Prepares the cells within the tableView.
 	func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
 	func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
-		let cell: UITableViewCell = UITableViewCell(style: .Subtitle, reuseIdentifier: "Cell")
+		let cell: MaterialTableViewCell = MaterialTableViewCell(style: .Subtitle, reuseIdentifier: "MaterialTableViewCell")
 		
 		
 		let item: Item = items[indexPath.row]
 		let item: Item = items[indexPath.row]
 		cell.selectionStyle = .None
 		cell.selectionStyle = .None

Sources/MaterialButton.swift

@@ -174,7 +174,7 @@ public class MaterialButton : UIButton {
 	for the backing layer. This is the preferred method of setting depth
 	for the backing layer. This is the preferred method of setting depth
 	in order to maintain consitency across UI objects.
 	in order to maintain consitency across UI objects.
 	*/
 	*/
-	public var depth: MaterialDepth {
+	public var depth: MaterialDepth = .None {
 		didSet {
 		didSet {
 			let value: MaterialDepthType = MaterialDepthToValue(depth)
 			let value: MaterialDepthType = MaterialDepthToValue(depth)
 			shadowOffset = value.offset
 			shadowOffset = value.offset
@@ -188,7 +188,7 @@ public class MaterialButton : UIButton {
 	property has a value of .Circle when the cornerRadius is set, it will
 	property has a value of .Circle when the cornerRadius is set, it will
 	become .None, as it no longer maintains its circle shape.
 	become .None, as it no longer maintains its circle shape.
 	*/
 	*/
-	public var cornerRadiusPreset: MaterialRadius {
+	public var cornerRadiusPreset: MaterialRadius = .None {
 		didSet {
 		didSet {
 			if let v: MaterialRadius = cornerRadiusPreset {
 			if let v: MaterialRadius = cornerRadiusPreset {
 				cornerRadius = MaterialRadiusToValue(v)
 				cornerRadius = MaterialRadiusToValue(v)
@@ -211,7 +211,7 @@ public class MaterialButton : UIButton {
 	width or height property is set, the other will be automatically adjusted
 	width or height property is set, the other will be automatically adjusted
 	to maintain the shape of the object.
 	to maintain the shape of the object.
 	*/
 	*/
-	public var shape: MaterialShape {
+	public var shape: MaterialShape = .None {
 		didSet {
 		didSet {
 			if .None != shape {
 			if .None != shape {
 				if width < height {
 				if width < height {
@@ -223,8 +223,15 @@ public class MaterialButton : UIButton {
 		}
 		}
 	}
 	}
 	
 	
+	/// A preset property to set the borderWidth.
+	public var borderWidthPreset: MaterialBorder = .None {
+		didSet {
+			borderWidth = MaterialBorderToValue(borderWidthPreset)
+		}
+	}
+	
 	/// A property that accesses the layer.borderWith.
 	/// A property that accesses the layer.borderWith.
-	public var borderWidth: CGFloat {
+	public var borderWidth: CGFloat = 0 {
 		didSet {
 		didSet {
 			layer.borderWidth = borderWidth
 			layer.borderWidth = borderWidth
 		}
 		}
@@ -270,10 +277,6 @@ public class MaterialButton : UIButton {
 	- Parameter aDecoder: A NSCoder instance.
 	- Parameter aDecoder: A NSCoder instance.
 	*/
 	*/
 	public required init?(coder aDecoder: NSCoder) {
 	public required init?(coder aDecoder: NSCoder) {
-		depth = .None
-		cornerRadiusPreset = .None
-		shape = .None
-		borderWidth = 0
 		contentEdgeInsetsPreset = .None
 		contentEdgeInsetsPreset = .None
 		super.init(coder: aDecoder)
 		super.init(coder: aDecoder)
 		prepareView()
 		prepareView()
@@ -286,10 +289,6 @@ public class MaterialButton : UIButton {
 	- Parameter frame: A CGRect instance.
 	- Parameter frame: A CGRect instance.
 	*/
 	*/
 	public override init(frame: CGRect) {
 	public override init(frame: CGRect) {
-		depth = .None
-		cornerRadiusPreset = .None
-		shape = .None
-		borderWidth = 0
 		contentEdgeInsetsPreset = .None
 		contentEdgeInsetsPreset = .None
 		super.init(frame: frame)
 		super.init(frame: frame)
 		prepareView()
 		prepareView()
@@ -415,10 +414,7 @@ public class MaterialButton : UIButton {
 	*/
 	*/
 	public func prepareView() {
 	public func prepareView() {
 		prepareVisualLayer()
 		prepareVisualLayer()
-		shadowColor = MaterialColor.black
-		borderColor = MaterialColor.black
 		pulseColor = MaterialColor.white
 		pulseColor = MaterialColor.white
-		pulseColorOpacity = 0.25
 	}
 	}
 	
 	
 	/// Prepares the visualLayer property.
 	/// Prepares the visualLayer property.

Sources/MaterialLayer.swift

@@ -159,7 +159,7 @@ public class MaterialLayer : CAShapeLayer {
 	for the backing layer. This is the preferred method of setting depth
 	for the backing layer. This is the preferred method of setting depth
 	in order to maintain consitency across UI objects.
 	in order to maintain consitency across UI objects.
 	*/
 	*/
-	public var depth: MaterialDepth {
+	public var depth: MaterialDepth = .None {
 		didSet {
 		didSet {
 			let value: MaterialDepthType = MaterialDepthToValue(depth)
 			let value: MaterialDepthType = MaterialDepthToValue(depth)
 			shadowOffset = value.offset
 			shadowOffset = value.offset
@@ -173,6 +173,22 @@ public class MaterialLayer : CAShapeLayer {
 	property has a value of .Circle when the cornerRadius is set, it will
 	property has a value of .Circle when the cornerRadius is set, it will
 	become .None, as it no longer maintains its circle shape.
 	become .None, as it no longer maintains its circle shape.
 	*/
 	*/
+	public var cornerRadiusPreset: MaterialRadius = .None {
+		didSet {
+			if let v: MaterialRadius = cornerRadiusPreset {
+				cornerRadius = MaterialRadiusToValue(v)
+				if .Circle == shape {
+					shape = .None
+				}
+			}
+		}
+	}
+	
+	/**
+	A property that sets the cornerRadius of the backing layer. If the shape
+	property has a value of .Circle when the cornerRadius is set, it will
+	become .None, as it no longer maintains its circle shape.
+	*/
 	public override var cornerRadius: CGFloat {
 	public override var cornerRadius: CGFloat {
 		didSet {
 		didSet {
 			if .Circle == shape {
 			if .Circle == shape {
@@ -186,7 +202,7 @@ public class MaterialLayer : CAShapeLayer {
 	width or height property is set, the other will be automatically adjusted
 	width or height property is set, the other will be automatically adjusted
 	to maintain the shape of the object.
 	to maintain the shape of the object.
 	*/
 	*/
-	public var shape: MaterialShape {
+	public var shape: MaterialShape = .None {
 		didSet {
 		didSet {
 			if .None != shape {
 			if .None != shape {
 				if width < height {
 				if width < height {
@@ -198,13 +214,18 @@ public class MaterialLayer : CAShapeLayer {
 		}
 		}
 	}
 	}
 	
 	
+	/// A preset property to set the borderWidth.
+	public var borderWidthPreset: MaterialBorder = .None {
+		didSet {
+			borderWidth = MaterialBorderToValue(borderWidthPreset)
+		}
+	}
+	
 	/**
 	/**
 	An initializer that initializes the object with a NSCoder object.
 	An initializer that initializes the object with a NSCoder object.
 	- Parameter aDecoder: A NSCoder instance.
 	- Parameter aDecoder: A NSCoder instance.
 	*/
 	*/
 	public required init?(coder aDecoder: NSCoder) {
 	public required init?(coder aDecoder: NSCoder) {
-		shape = .None
-		depth = .None
 		super.init(coder: aDecoder)
 		super.init(coder: aDecoder)
 		prepareVisualLayer()
 		prepareVisualLayer()
 	}
 	}
@@ -215,16 +236,12 @@ public class MaterialLayer : CAShapeLayer {
 	- Parameter layer: AnyObject.
 	- Parameter layer: AnyObject.
 	*/
 	*/
 	public override init(layer: AnyObject) {
 	public override init(layer: AnyObject) {
-		shape = .None
-		depth = .None
 		super.init()
 		super.init()
 		prepareVisualLayer()
 		prepareVisualLayer()
 	}
 	}
 	
 	
 	/// A convenience initializer.
 	/// A convenience initializer.
 	public override init() {
 	public override init() {
-		shape = .None
-		depth = .None
 		super.init()
 		super.init()
 		prepareVisualLayer()
 		prepareVisualLayer()
 	}
 	}

Sources/MaterialView.swift

@@ -217,7 +217,7 @@ public class MaterialView : UIView {
 	for the backing layer. This is the preferred method of setting depth 
 	for the backing layer. This is the preferred method of setting depth 
 	in order to maintain consitency across UI objects.
 	in order to maintain consitency across UI objects.
 	*/
 	*/
-	public var depth: MaterialDepth {
+	public var depth: MaterialDepth = .None {
 		didSet {
 		didSet {
 			let value: MaterialDepthType = MaterialDepthToValue(depth)
 			let value: MaterialDepthType = MaterialDepthToValue(depth)
 			shadowOffset = value.offset
 			shadowOffset = value.offset
@@ -231,7 +231,7 @@ public class MaterialView : UIView {
 	property has a value of .Circle when the cornerRadius is set, it will 
 	property has a value of .Circle when the cornerRadius is set, it will 
 	become .None, as it no longer maintains its circle shape.
 	become .None, as it no longer maintains its circle shape.
 	*/
 	*/
-	public var cornerRadiusPreset: MaterialRadius {
+	public var cornerRadiusPreset: MaterialRadius = .None {
 		didSet {
 		didSet {
 			if let v: MaterialRadius = cornerRadiusPreset {
 			if let v: MaterialRadius = cornerRadiusPreset {
 				cornerRadius = MaterialRadiusToValue(v)
 				cornerRadius = MaterialRadiusToValue(v)
@@ -254,7 +254,7 @@ public class MaterialView : UIView {
 	width or height property is set, the other will be automatically adjusted 
 	width or height property is set, the other will be automatically adjusted 
 	to maintain the shape of the object.
 	to maintain the shape of the object.
 	*/
 	*/
-	public var shape: MaterialShape {
+	public var shape: MaterialShape = .None {
 		didSet {
 		didSet {
 			if .None != shape {
 			if .None != shape {
 				if width < height {
 				if width < height {
@@ -266,8 +266,15 @@ public class MaterialView : UIView {
 		}
 		}
 	}
 	}
 	
 	
+	/// A preset property to set the borderWidth.
+	public var borderWidthPreset: MaterialBorder = .None {
+		didSet {
+			borderWidth = MaterialBorderToValue(borderWidthPreset)
+		}
+	}
+	
 	/// A property that accesses the layer.borderWith.
 	/// A property that accesses the layer.borderWith.
-	public var borderWidth: CGFloat {
+	public var borderWidth: CGFloat = 0 {
 		didSet {
 		didSet {
 			layer.borderWidth = borderWidth
 			layer.borderWidth = borderWidth
 		}
 		}
@@ -309,10 +316,6 @@ public class MaterialView : UIView {
 		contentsCenter = CGRectMake(0, 0, 1, 1)
 		contentsCenter = CGRectMake(0, 0, 1, 1)
 		contentsScale = UIScreen.mainScreen().scale
 		contentsScale = UIScreen.mainScreen().scale
 		contentsGravity = .ResizeAspectFill
 		contentsGravity = .ResizeAspectFill
-		depth = .None
-		cornerRadiusPreset = .None
-		shape = .None
-		borderWidth = 0
 		super.init(coder: aDecoder)
 		super.init(coder: aDecoder)
 		prepareView()
 		prepareView()
 	}
 	}
@@ -328,10 +331,6 @@ public class MaterialView : UIView {
 		contentsCenter = CGRectMake(0, 0, 1, 1)
 		contentsCenter = CGRectMake(0, 0, 1, 1)
 		contentsScale = UIScreen.mainScreen().scale
 		contentsScale = UIScreen.mainScreen().scale
 		contentsGravity = .ResizeAspectFill
 		contentsGravity = .ResizeAspectFill
-		depth = .None
-		cornerRadiusPreset = .None
-		shape = .None
-		borderWidth = 0
 		super.init(frame: frame)
 		super.init(frame: frame)
 		prepareView()
 		prepareView()
 	}
 	}

Sources/TextField.swift

@@ -153,7 +153,7 @@ public class TextField : UITextField {
 	for the backing layer. This is the preferred method of setting depth
 	for the backing layer. This is the preferred method of setting depth
 	in order to maintain consitency across UI objects.
 	in order to maintain consitency across UI objects.
 	*/
 	*/
-	public var depth: MaterialDepth {
+	public var depth: MaterialDepth = .None {
 		didSet {
 		didSet {
 			let value: MaterialDepthType = MaterialDepthToValue(depth)
 			let value: MaterialDepthType = MaterialDepthToValue(depth)
 			shadowOffset = value.offset
 			shadowOffset = value.offset
@@ -167,7 +167,7 @@ public class TextField : UITextField {
 	property has a value of .Circle when the cornerRadius is set, it will
 	property has a value of .Circle when the cornerRadius is set, it will
 	become .None, as it no longer maintains its circle shape.
 	become .None, as it no longer maintains its circle shape.
 	*/
 	*/
-	public var cornerRadiusPreset: MaterialRadius {
+	public var cornerRadiusPreset: MaterialRadius = .None {
 		didSet {
 		didSet {
 			if let v: MaterialRadius = cornerRadiusPreset {
 			if let v: MaterialRadius = cornerRadiusPreset {
 				cornerRadius = MaterialRadiusToValue(v)
 				cornerRadius = MaterialRadiusToValue(v)
@@ -190,7 +190,7 @@ public class TextField : UITextField {
 	width or height property is set, the other will be automatically adjusted
 	width or height property is set, the other will be automatically adjusted
 	to maintain the shape of the object.
 	to maintain the shape of the object.
 	*/
 	*/
-	public var shape: MaterialShape {
+	public var shape: MaterialShape = .None {
 		didSet {
 		didSet {
 			if .None != shape {
 			if .None != shape {
 				if width < height {
 				if width < height {
@@ -202,8 +202,15 @@ public class TextField : UITextField {
 		}
 		}
 	}
 	}
 	
 	
+	/// A preset property to set the borderWidth.
+	public var borderWidthPreset: MaterialBorder = .None {
+		didSet {
+			borderWidth = MaterialBorderToValue(borderWidthPreset)
+		}
+	}
+
 	/// A property that accesses the layer.borderWith.
 	/// A property that accesses the layer.borderWith.
-	public var borderWidth: CGFloat {
+	public var borderWidth: CGFloat = 0 {
 		didSet {
 		didSet {
 			layer.borderWidth = borderWidth
 			layer.borderWidth = borderWidth
 		}
 		}
@@ -339,10 +346,6 @@ public class TextField : UITextField {
 	- Parameter aDecoder: A NSCoder instance.
 	- Parameter aDecoder: A NSCoder instance.
 	*/
 	*/
 	public required init?(coder aDecoder: NSCoder) {
 	public required init?(coder aDecoder: NSCoder) {
-		depth = .None
-		cornerRadiusPreset = .None
-		shape = .None
-		borderWidth = 0
 		super.init(coder: aDecoder)
 		super.init(coder: aDecoder)
 		prepareView()
 		prepareView()
 	}
 	}
@@ -354,10 +357,6 @@ public class TextField : UITextField {
 	- Parameter frame: A CGRect instance.
 	- Parameter frame: A CGRect instance.
 	*/
 	*/
 	public override init(frame: CGRect) {
 	public override init(frame: CGRect) {
-		depth = .None
-		cornerRadiusPreset = .None
-		shape = .None
-		borderWidth = 0
 		super.init(frame: frame)
 		super.init(frame: frame)
 		prepareView()
 		prepareView()
 	}
 	}

Sources/TextView.swift

@@ -155,7 +155,7 @@ public class TextView: UITextView {
 	for the backing layer. This is the preferred method of setting depth
 	for the backing layer. This is the preferred method of setting depth
 	in order to maintain consitency across UI objects.
 	in order to maintain consitency across UI objects.
 	*/
 	*/
-	public var depth: MaterialDepth {
+	public var depth: MaterialDepth = .None {
 		didSet {
 		didSet {
 			let value: MaterialDepthType = MaterialDepthToValue(depth)
 			let value: MaterialDepthType = MaterialDepthToValue(depth)
 			shadowOffset = value.offset
 			shadowOffset = value.offset
@@ -169,7 +169,7 @@ public class TextView: UITextView {
 	property has a value of .Circle when the cornerRadius is set, it will
 	property has a value of .Circle when the cornerRadius is set, it will
 	become .None, as it no longer maintains its circle shape.
 	become .None, as it no longer maintains its circle shape.
 	*/
 	*/
-	public var cornerRadiusPreset: MaterialRadius {
+	public var cornerRadiusPreset: MaterialRadius = .None {
 		didSet {
 		didSet {
 			if let v: MaterialRadius = cornerRadiusPreset {
 			if let v: MaterialRadius = cornerRadiusPreset {
 				cornerRadius = MaterialRadiusToValue(v)
 				cornerRadius = MaterialRadiusToValue(v)
@@ -192,7 +192,7 @@ public class TextView: UITextView {
 	width or height property is set, the other will be automatically adjusted
 	width or height property is set, the other will be automatically adjusted
 	to maintain the shape of the object.
 	to maintain the shape of the object.
 	*/
 	*/
-	public var shape: MaterialShape {
+	public var shape: MaterialShape = .None {
 		didSet {
 		didSet {
 			if .None != shape {
 			if .None != shape {
 				if width < height {
 				if width < height {
@@ -204,8 +204,15 @@ public class TextView: UITextView {
 		}
 		}
 	}
 	}
 	
 	
+	/// A preset property to set the borderWidth.
+	public var borderWidthPreset: MaterialBorder = .None {
+		didSet {
+			borderWidth = MaterialBorderToValue(borderWidthPreset)
+		}
+	}
+	
 	/// A property that accesses the layer.borderWith.
 	/// A property that accesses the layer.borderWith.
-	public var borderWidth: CGFloat {
+	public var borderWidth: CGFloat = 0 {
 		didSet {
 		didSet {
 			layer.borderWidth = borderWidth
 			layer.borderWidth = borderWidth
 		}
 		}
@@ -308,10 +315,6 @@ public class TextView: UITextView {
 	- Parameter aDecoder: A NSCoder instance.
 	- Parameter aDecoder: A NSCoder instance.
 	*/
 	*/
 	public required init?(coder aDecoder: NSCoder) {
 	public required init?(coder aDecoder: NSCoder) {
-		depth = .None
-		cornerRadiusPreset = .None
-		shape = .None
-		borderWidth = 0
 		super.init(coder: aDecoder)
 		super.init(coder: aDecoder)
 		prepareView()
 		prepareView()
 	}
 	}
@@ -324,10 +327,6 @@ public class TextView: UITextView {
 	- Parameter textContainer: A NSTextContainer instance.
 	- Parameter textContainer: A NSTextContainer instance.
 	*/
 	*/
 	public override init(frame: CGRect, textContainer: NSTextContainer?) {
 	public override init(frame: CGRect, textContainer: NSTextContainer?) {
-		depth = .None
-		cornerRadiusPreset = .None
-		shape = .None
-		borderWidth = 0
 		super.init(frame: frame, textContainer: textContainer)
 		super.init(frame: frame, textContainer: textContainer)
 		prepareView()
 		prepareView()
 	}
 	}