added GridAxis to Grid

Examples/Programmatic/GridView/GridView/ViewController.swift

@@ -67,7 +67,7 @@ class ViewController: UIViewController {
 		
 		
 		let contentView: MaterialView = MaterialView()
 		let contentView: MaterialView = MaterialView()
 		contentView.grid.column = .Column8
 		contentView.grid.column = .Column8
-		contentView.grid.layout = .Vertical
+		contentView.grid.axis = .Vertical
 		contentView.grid.contentInsetPreset = .Square3
 		contentView.grid.contentInsetPreset = .Square3
 		contentView.grid.spacing = 16
 		contentView.grid.spacing = 16
 		contentView.backgroundColor = MaterialColor.clear
 		contentView.backgroundColor = MaterialColor.clear
@@ -233,7 +233,7 @@ class ViewController: UIViewController {
 		label2.text = "B"
 		label2.text = "B"
 		label2.backgroundColor = MaterialColor.blue.base
 		label2.backgroundColor = MaterialColor.blue.base
 		
 		
-		view.grid.layout = .Vertical
+		view.grid.axis = .Vertical
 		view.grid.row = .Row9
 		view.grid.row = .Row9
 		view.grid.spacing = 16
 		view.grid.spacing = 16
 		view.grid.contentInset.left = 16
 		view.grid.contentInset.left = 16

Sources/Grid.swift

@@ -60,7 +60,7 @@ public enum GridColumn : Int {
 	case Column12 = 12
 	case Column12 = 12
 }
 }
 
 
-public enum GridLayout {
+public enum GridAxis {
 	case Horizontal
 	case Horizontal
 	case Vertical
 	case Vertical
 }
 }
@@ -115,8 +115,8 @@ public class Grid {
 		}
 		}
 	}
 	}
 	
 	
-	/// The direction in which the animation opens the menu.
-	public var layout: GridLayout = .Horizontal {
+	/// The axis in which the Grid is laying out its views.
+	public var axis: GridAxis = .Horizontal {
 		didSet {
 		didSet {
 			reloadLayout()
 			reloadLayout()
 		}
 		}
@@ -149,7 +149,7 @@ public class Grid {
 					let r: Int = view.grid.row.rawValue
 					let r: Int = view.grid.row.rawValue
 					let co: Int = nil == view.grid.columnOffset ? 0 : view.grid.columnOffset!.rawValue
 					let co: Int = nil == view.grid.columnOffset ? 0 : view.grid.columnOffset!.rawValue
 					let ro: Int = nil == view.grid.rowOffset ? 0 : view.grid.rowOffset!.rawValue
 					let ro: Int = nil == view.grid.rowOffset ? 0 : view.grid.rowOffset!.rawValue
-					if .Horizontal == layout {
+					if .Horizontal == axis {
 						
 						
 						// View height.
 						// View height.
 						let vh: CGFloat = sv.bounds.height - contentInset.top - contentInset.bottom
 						let vh: CGFloat = sv.bounds.height - contentInset.top - contentInset.bottom
@@ -167,7 +167,7 @@ public class Grid {
 						} else {
 						} else {
 							view.frame = CGRectMake(vl, contentInset.top, vw, vh)
 							view.frame = CGRectMake(vl, contentInset.top, vw, vh)
 						}
 						}
-					} else if .Vertical == layout {
+					} else if .Vertical == axis {
 						// View width.
 						// View width.
 						let vw: CGFloat = sv.bounds.width - contentInset.left - contentInset.right
 						let vw: CGFloat = sv.bounds.width - contentInset.left - contentInset.right