updated project to Grid from GridView

Examples/Material.xcworkspace/contents.xcworkspacedata

@@ -16,6 +16,13 @@
       </Group>
       </Group>
       <Group
       <Group
          location = "container:"
          location = "container:"
+         name = "Grid">
+         <FileRef
+            location = "group:Programmatic/Grid/Grid.xcodeproj">
+         </FileRef>
+      </Group>
+      <Group
+         location = "container:"
          name = "MaterialLayer">
          name = "MaterialLayer">
          <FileRef
          <FileRef
             location = "group:Programmatic/MaterialLayer/MaterialLayer.xcodeproj">
             location = "group:Programmatic/MaterialLayer/MaterialLayer.xcodeproj">
@@ -98,13 +105,6 @@
             location = "group:Programmatic/CaptureView/CaptureView.xcodeproj">
             location = "group:Programmatic/CaptureView/CaptureView.xcodeproj">
          </FileRef>
          </FileRef>
       </Group>
       </Group>
-      <Group
-         location = "container:"
-         name = "GridView">
-         <FileRef
-            location = "group:Programmatic/GridView/GridView.xcodeproj">
-         </FileRef>
-      </Group>
    </Group>
    </Group>
    <Group
    <Group
       location = "container:"
       location = "container:"

Examples/Programmatic/GridView/GridView.xcodeproj/project.xcworkspace/contents.xcworkspacedata → Examples/Programmatic/Grid/Grid.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,6 @@
 <Workspace
 <Workspace
    version = "1.0">
    version = "1.0">
    <FileRef
    <FileRef
-      location = "self:GridView.xcodeproj">
+      location = "self:Grid.xcodeproj">
    </FileRef>
    </FileRef>
 </Workspace>
 </Workspace>

Examples/Programmatic/GridView/GridView/Info.plist → Examples/Programmatic/Grid/Grid/Info.plist

@@ -28,8 +28,6 @@
 	<array>
 	<array>
 		<string>armv7</string>
 		<string>armv7</string>
 	</array>
 	</array>
-	<key>UIStatusBarHidden</key>
-	<false/>
 	<key>UISupportedInterfaceOrientations</key>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortrait</string>

Examples/Programmatic/GridView/GridView/ViewController.swift → Examples/Programmatic/Grid/Grid/ViewController.swift

@@ -29,7 +29,7 @@
 */
 */
 
 
 /**
 /**
-
+The following ViewController demonstrates using Grid to make complex layouts.
 */
 */
 
 
 import UIKit
 import UIKit
@@ -40,10 +40,10 @@ class ViewController: UIViewController {
 	override func viewDidLoad() {
 	override func viewDidLoad() {
 		super.viewDidLoad()
 		super.viewDidLoad()
 		prepareView()
 		prepareView()
-//		prepareHorizontalGridViewExample()
-//		prepareVerticalGridViewExample()
-//		prepareSmallCardViewExample()
-//		prepareMediumCardViewExample()
+		//		prepareHorizontalGridViewExample()
+		//		prepareVerticalGridViewExample()
+		//		prepareSmallCardViewExample()
+		//		prepareMediumCardViewExample()
 		prepareLargeCardViewExample()
 		prepareLargeCardViewExample()
 	}
 	}
 	
 	
@@ -55,8 +55,8 @@ class ViewController: UIViewController {
 	
 	
 	/// Prepares the medium card example.
 	/// Prepares the medium card example.
 	private func prepareLargeCardViewExample() {
 	private func prepareLargeCardViewExample() {
-		let cardView: MaterialPulseView = MaterialPulseView(frame: CGRectMake(16, 100, view.bounds.width - 32, 350))
-		cardView.pulseColor = MaterialColor.blueGrey.lighten5
+		let cardView: MaterialPulseView = MaterialPulseView(frame: CGRectMake(16, 100, view.bounds.width - 32, 400))
+		cardView.pulseColor = MaterialColor.blueGrey.base
 		cardView.grid.axis.direction = .Vertical
 		cardView.grid.axis.direction = .Vertical
 		cardView.depth = .Depth1
 		cardView.depth = .Depth1
 		view.addSubview(cardView)
 		view.addSubview(cardView)
@@ -65,6 +65,7 @@ class ViewController: UIViewController {
 		imageView.grid.rows = 7
 		imageView.grid.rows = 7
 		imageView.grid.columns = 6
 		imageView.grid.columns = 6
 		imageView.grid.spacing = 4
 		imageView.grid.spacing = 4
+		imageView.backgroundColor = MaterialColor.clear
 		cardView.addSubview(imageView)
 		cardView.addSubview(imageView)
 		
 		
 		var image: UIImage? = UIImage(named: "CosmicMindInverted")
 		var image: UIImage? = UIImage(named: "CosmicMindInverted")
@@ -78,6 +79,7 @@ class ViewController: UIViewController {
 		rightImageViewCollection.grid.columns = 3
 		rightImageViewCollection.grid.columns = 3
 		rightImageViewCollection.grid.axis.direction = .Vertical
 		rightImageViewCollection.grid.axis.direction = .Vertical
 		rightImageViewCollection.grid.spacing = 4
 		rightImageViewCollection.grid.spacing = 4
+		rightImageViewCollection.backgroundColor = MaterialColor.clear
 		imageView.addSubview(rightImageViewCollection)
 		imageView.addSubview(rightImageViewCollection)
 		
 		
 		image = UIImage(named: "CosmicMindInverted")
 		image = UIImage(named: "CosmicMindInverted")
@@ -169,7 +171,7 @@ class ViewController: UIViewController {
 	/// Prepares the medium card example.
 	/// Prepares the medium card example.
 	private func prepareMediumCardViewExample() {
 	private func prepareMediumCardViewExample() {
 		let cardView: MaterialPulseView = MaterialPulseView(frame: CGRectMake(16, 100, view.bounds.width - 32, 240))
 		let cardView: MaterialPulseView = MaterialPulseView(frame: CGRectMake(16, 100, view.bounds.width - 32, 240))
-		cardView.pulseColor = MaterialColor.blueGrey.lighten5
+		cardView.pulseColor = MaterialColor.blueGrey.base
 		cardView.depth = .Depth1
 		cardView.depth = .Depth1
 		view.addSubview(cardView)
 		view.addSubview(cardView)
 		
 		
@@ -254,7 +256,7 @@ class ViewController: UIViewController {
 	/// Prepares the small card example.
 	/// Prepares the small card example.
 	private func prepareSmallCardViewExample() {
 	private func prepareSmallCardViewExample() {
 		let cardView: MaterialPulseView = MaterialPulseView(frame: CGRectMake(16, 100, view.bounds.width - 32, 152))
 		let cardView: MaterialPulseView = MaterialPulseView(frame: CGRectMake(16, 100, view.bounds.width - 32, 152))
-		cardView.pulseColor = MaterialColor.blueGrey.lighten5
+		cardView.pulseColor = MaterialColor.blueGrey.base
 		cardView.depth = .Depth1
 		cardView.depth = .Depth1
 		view.addSubview(cardView)
 		view.addSubview(cardView)
 		
 		
@@ -378,7 +380,7 @@ class ViewController: UIViewController {
 		label2.text = "B"
 		label2.text = "B"
 		label2.backgroundColor = MaterialColor.blue.base
 		label2.backgroundColor = MaterialColor.blue.base
 		
 		
-//		view.grid.columns = 9
+		//		view.grid.columns = 9
 		view.grid.spacing = 16
 		view.grid.spacing = 16
 		view.grid.contentInset.left = 16
 		view.grid.contentInset.left = 16
 		view.grid.contentInset.right = 16
 		view.grid.contentInset.right = 16

Sources/Grid.swift

@@ -59,6 +59,12 @@ public class GridAxis {
 		}
 		}
 	}
 	}
 	
 	
+	/**
+	Initializer.
+	- Parameter grid: The Grid reference used for offset values.
+	- Parameter rows: The number of rows, Vertical axis the grid will use.
+	- Parameter columns: The number of columns, Horizontal axis the grid will use.
+	*/
 	public init(grid: Grid, rows: Int = 12, columns: Int = 12) {
 	public init(grid: Grid, rows: Int = 12, columns: Int = 12) {
 		self.grid = grid
 		self.grid = grid
 		self.rows = rows
 		self.rows = rows
@@ -84,6 +90,12 @@ public class GridOffset {
 		}
 		}
 	}
 	}
 	
 	
+	/**
+	Initializer.
+	- Parameter grid: The Grid reference used for offset values.
+	- Parameter rows: The number of rows, Vertical axis the grid will use.
+	- Parameter columns: The number of columns, Horizontal axis the grid will use.
+	*/
 	public init(grid: Grid, rows: Int = 0, columns: Int = 0) {
 	public init(grid: Grid, rows: Int = 0, columns: Int = 0) {
 		self.grid = grid
 		self.grid = grid
 		self.rows = rows
 		self.rows = rows
@@ -140,6 +152,12 @@ public class Grid {
 		}
 		}
 	}
 	}
 	
 	
+	/**
+	Initializer.
+	- Parameter rows: The number of rows, Vertical axis the grid will use.
+	- Parameter columns: The number of columns, Horizontal axis the grid will use.
+	- Parameter spacing: The spacing between rows or columns.
+	*/
 	public init(rows: Int = 12, columns: Int = 12, spacing: CGFloat = 0) {
 	public init(rows: Int = 12, columns: Int = 12, spacing: CGFloat = 0) {
 		self.rows = rows
 		self.rows = rows
 		self.columns = columns
 		self.columns = columns
@@ -152,17 +170,14 @@ public class Grid {
 	public func reloadLayout() {
 	public func reloadLayout() {
 		if let v: Array<UIView> = views {
 		if let v: Array<UIView> = views {
 			var n: Int = 0
 			var n: Int = 0
-			var m: Int = 0
 			for var i: Int = 0, l: Int = v.count - 1; i <= l; ++i {
 			for var i: Int = 0, l: Int = v.count - 1; i <= l; ++i {
 				let view: UIView = v[i]
 				let view: UIView = v[i]
 				if let sv: UIView = view.superview {
 				if let sv: UIView = view.superview {
+					sv.layoutIfNeeded()
+					if .Horizontal == axis.direction {
 						let w: CGFloat = (sv.bounds.width - contentInset.left - contentInset.right + spacing) / CGFloat(axis.inherited ? columns : axis.columns)
 						let w: CGFloat = (sv.bounds.width - contentInset.left - contentInset.right + spacing) / CGFloat(axis.inherited ? columns : axis.columns)
-					let h: CGFloat = (sv.bounds.height - contentInset.top - contentInset.bottom + spacing) / CGFloat(axis.inherited ? rows : axis.rows)
 						let c: Int = view.grid.columns
 						let c: Int = view.grid.columns
-					let r: Int = view.grid.rows
 						let co: Int = view.grid.offset.columns
 						let co: Int = view.grid.offset.columns
-					let ro: Int = view.grid.offset.rows
-					if .Horizontal == axis.direction {
 						
 						
 						// View height.
 						// View height.
 						let vh: CGFloat = sv.bounds.height - contentInset.top - contentInset.bottom
 						let vh: CGFloat = sv.bounds.height - contentInset.top - contentInset.bottom
@@ -173,34 +188,24 @@ public class Grid {
 						// View width.
 						// View width.
 						let vw: CGFloat = (w * CGFloat(c)) - spacing
 						let vw: CGFloat = (w * CGFloat(c)) - spacing
 						
 						
-						if 0 == i {
 						view.frame = CGRectMake(vl, contentInset.top, vw, vh)
 						view.frame = CGRectMake(vl, contentInset.top, vw, vh)
-						} else if l == i {
-							view.frame = CGRectMake(vl, contentInset.top, vw, vh)
-						} else {
-							view.frame = CGRectMake(vl, contentInset.top, vw, vh)
-						}
-					
 						n += c + co - 1
 						n += c + co - 1
 					} else if .Vertical == axis.direction {
 					} else if .Vertical == axis.direction {
+						let h: CGFloat = (sv.bounds.height - contentInset.top - contentInset.bottom + spacing) / CGFloat(axis.inherited ? rows : axis.rows)
+						let r: Int = view.grid.rows
+						let ro: Int = view.grid.offset.rows
+						
 						// View width.
 						// View width.
 						let vw: CGFloat = sv.bounds.width - contentInset.left - contentInset.right
 						let vw: CGFloat = sv.bounds.width - contentInset.left - contentInset.right
 						
 						
 						// View top.
 						// View top.
-						let vt: CGFloat = CGFloat(i + m + ro) * h + contentInset.top
+						let vt: CGFloat = CGFloat(i + n + ro) * h + contentInset.top
 						
 						
 						// View height.
 						// View height.
 						let vh: CGFloat = (h * CGFloat(r)) - spacing
 						let vh: CGFloat = (h * CGFloat(r)) - spacing
 						
 						
-						if 0 == i {
-							view.frame = CGRectMake(contentInset.left, vt, vw, vh)
-						} else if l == i {
-							view.frame = CGRectMake(contentInset.left, vt, vw, vh)
-						} else {
 						view.frame = CGRectMake(contentInset.left, vt, vw, vh)
 						view.frame = CGRectMake(contentInset.left, vt, vw, vh)
-						}
-					
-						m += r + ro - 1
+						n += r + ro - 1
 					}
 					}
 				}
 				}
 			}
 			}
@@ -208,31 +213,48 @@ public class Grid {
 	}
 	}
 }
 }
 
 
-private func associatedObject<T: AnyObject>(base: AnyObject, key: UnsafePointer<UInt8>, initialiser: () -> T) -> T {
+/**
+Gets the Obj-C reference for the Grid object within the UIView extension.
+- Parameter base: Base object.
+- Parameter key: Memory key pointer.
+- Parameter initializer: Object initializer.
+- Returns: The associated reference for the initializer object.
+*/
+private func GridAssociatedObject<T: AnyObject>(base: AnyObject, key: UnsafePointer<UInt8>, initializer: () -> T) -> T {
 	if let associated: T = objc_getAssociatedObject(base, key) as? T {
 	if let associated: T = objc_getAssociatedObject(base, key) as? T {
 		return associated
 		return associated
 	}
 	}
 	
 	
-	let associated = initialiser()
+	let associated = initializer()
 	objc_setAssociatedObject(base, key, associated, .OBJC_ASSOCIATION_RETAIN)
 	objc_setAssociatedObject(base, key, associated, .OBJC_ASSOCIATION_RETAIN)
 	return associated
 	return associated
 }
 }
 
 
-private func associateObject<T: AnyObject>(base: AnyObject, key: UnsafePointer<UInt8>, value: T) {
+/**
+Sets the Obj-C reference for the Grid object within the UIView extension.
+- Parameter base: Base object.
+- Parameter key: Memory key pointer.
+- Parameter value: The object instance to set for the associated object.
+- Returns: The associated reference for the initializer object.
+*/
+private func GridAssociateObject<T: AnyObject>(base: AnyObject, key: UnsafePointer<UInt8>, value: T) {
 	objc_setAssociatedObject(base, key, value, .OBJC_ASSOCIATION_RETAIN)
 	objc_setAssociatedObject(base, key, value, .OBJC_ASSOCIATION_RETAIN)
 }
 }
 
 
+/// A memory reference to the Grid instance for UIView extensions.
 private var gridKey: UInt8 = 0
 private var gridKey: UInt8 = 0
 
 
+/// Grid extension for UIView.
 public extension UIView {
 public extension UIView {
+	/// Grid reference.
 	public var grid: Grid {
 	public var grid: Grid {
 		get {
 		get {
-			return associatedObject(self, key: &gridKey) {
+			return GridAssociatedObject(self, key: &gridKey) {
 				return Grid()
 				return Grid()
 			}
 			}
 		}
 		}
 		set(value) {
 		set(value) {
-			associateObject(self, key: &gridKey, value: value)
+			GridAssociateObject(self, key: &gridKey, value: value)
 		}
 		}
 	}
 	}
 }
 }
\ No newline at end of file