added border types

Source/FlatButton.swift

@@ -29,7 +29,8 @@ public class FlatButton : MaterialButton {
 		backgroundColor = MaterialColor.red.base //MaterialTheme.button.flat.backgroudColor
 		backgroundColor = MaterialColor.red.base //MaterialTheme.button.flat.backgroudColor
 		cornerRadius = MaterialTheme.button.flat.cornerRadius
 		cornerRadius = MaterialTheme.button.flat.cornerRadius
 		contentInsets = MaterialTheme.button.flat.contentInsets
 		contentInsets = MaterialTheme.button.flat.contentInsets
-		border = MaterialTheme.button.flat.border
+		borderWidth = MaterialTheme.button.flat.borderWidth
+		borderColor = MaterialTheme.button.flat.bordercolor
 	}
 	}
 	
 	
 	//
 	//

Source/MaterialBorder.swift

@@ -32,8 +32,8 @@ public enum MaterialBorder : MaterialBorderType {
 /**
 /**
 	:name:	MaterialBorderToValue
 	:name:	MaterialBorderToValue
 */
 */
-public func MaterialBorderToValue(border: MaterialBorder) -> MaterialBorderType {
-	switch border {
+public func MaterialBorderToValue(width: MaterialBorder) -> MaterialBorderType {
+	switch width {
 	case .None:
 	case .None:
 		return 0
 		return 0
 	case .Thin:
 	case .Thin:

Source/MaterialButton.swift

@@ -127,11 +127,20 @@ public class MaterialButton : UIButton {
 	}
 	}
 	
 	
 	/**
 	/**
-		:name:	border
+		:name:	borderWidth
 	*/
 	*/
-	public var border: MaterialBorder! {
+	public var borderWidth: MaterialBorder! {
 		didSet {
 		didSet {
-			layer.borderWidth = MaterialBorderToValue(border)
+			layer.borderWidth = MaterialBorderToValue(borderWidth)
+		}
+	}
+	
+	/**
+		:name:	borderColor
+	*/
+	public var borderColor: UIColor! {
+		didSet {
+			layer.borderColor = borderColor.CGColor
 		}
 		}
 	}
 	}
 	
 	

Source/MaterialTheme.swift

@@ -45,7 +45,8 @@ public extension MaterialTheme.view {
 	public static let cornerRadius: MaterialRadius = .Square
 	public static let cornerRadius: MaterialRadius = .Square
 	
 	
 	// border
 	// border
-	public static let border: MaterialBorder = .None
+	public static let borderWidth: MaterialBorder = .None
+	public static let bordercolor: UIColor = MaterialColor.black
 	
 	
 	// color
 	// color
 	public static let backgroudColor: UIColor = MaterialColor.white
 	public static let backgroudColor: UIColor = MaterialColor.white
@@ -80,7 +81,8 @@ public extension MaterialTheme.navigation {
 	public static let cornerRadius: MaterialRadius = MaterialTheme.view.cornerRadius
 	public static let cornerRadius: MaterialRadius = MaterialTheme.view.cornerRadius
 	
 	
 	// border
 	// border
-	public static let border: MaterialBorder = MaterialTheme.view.border
+	public static let borderWidth: MaterialBorder = MaterialTheme.view.borderWidth
+	public static let bordercolor: UIColor = MaterialTheme.view.bordercolor
 	
 	
 	// color
 	// color
 	public static let backgroudColor: UIColor = MaterialColor.blue.accent3
 	public static let backgroudColor: UIColor = MaterialColor.blue.accent3
@@ -111,7 +113,8 @@ public extension MaterialTheme.button {
 	public static let contentInsets: MaterialInsets = .Inset2
 	public static let contentInsets: MaterialInsets = .Inset2
 	
 	
 	// border
 	// border
-	public static let border: MaterialBorder = MaterialTheme.view.border
+	public static let borderWidth: MaterialBorder = MaterialTheme.view.borderWidth
+	public static let bordercolor: UIColor = MaterialTheme.view.bordercolor
 	
 	
 	// color
 	// color
 	public static let backgroudColor: UIColor = MaterialColor.clear
 	public static let backgroudColor: UIColor = MaterialColor.clear
@@ -139,7 +142,8 @@ public extension MaterialTheme.button.flat {
 	public static let contentInsets: MaterialInsets = MaterialTheme.button.contentInsets
 	public static let contentInsets: MaterialInsets = MaterialTheme.button.contentInsets
 	
 	
 	// border
 	// border
-	public static let border: MaterialBorder = MaterialTheme.button.border
+	public static let borderWidth: MaterialBorder = MaterialTheme.button.borderWidth
+	public static let bordercolor: UIColor = MaterialTheme.button.bordercolor
 	
 	
 	// color
 	// color
 	public static let backgroudColor: UIColor = MaterialTheme.button.backgroudColor
 	public static let backgroudColor: UIColor = MaterialTheme.button.backgroudColor

Source/MaterialView.swift

@@ -172,11 +172,20 @@ public class MaterialView: UIView {
 	}
 	}
 	
 	
 	/**
 	/**
-		:name:	border
+		:name:	borderWidth
 	*/
 	*/
-	public var border: MaterialBorder! {
+	public var borderWidth: MaterialBorder! {
 		didSet {
 		didSet {
-			layer.borderWidth = MaterialBorderToValue(border)
+			layer.borderWidth = MaterialBorderToValue(borderWidth)
+		}
+	}
+	
+	/**
+		:name:	borderColor
+	*/
+	public var borderColor: UIColor! {
+		didSet {
+			layer.borderColor = borderColor.CGColor
 		}
 		}
 	}
 	}
 	
 	
@@ -256,6 +265,8 @@ public class MaterialView: UIView {
 		zPosition = MaterialTheme.view.zPosition
 		zPosition = MaterialTheme.view.zPosition
 		masksToBounds = MaterialTheme.view.masksToBounds
 		masksToBounds = MaterialTheme.view.masksToBounds
 		cornerRadius = MaterialTheme.view.cornerRadius
 		cornerRadius = MaterialTheme.view.cornerRadius
+		borderWidth = .None
+		borderColor = MaterialTheme.view.bordercolor
 	}
 	}
 }
 }
 
 

Source/NavigationBarView.swift

@@ -59,5 +59,7 @@ public class NavigationBarView: MaterialView {
 		zPosition = MaterialTheme.navigation.zPosition
 		zPosition = MaterialTheme.navigation.zPosition
 		masksToBounds = MaterialTheme.navigation.masksToBounds
 		masksToBounds = MaterialTheme.navigation.masksToBounds
 		cornerRadius = MaterialTheme.navigation.cornerRadius
 		cornerRadius = MaterialTheme.navigation.cornerRadius
+		borderWidth = .None
+		borderColor = MaterialTheme.view.bordercolor
 	}
 	}
 }
 }