merged issue-21

MaterialKit.xcodeproj/project.pbxproj

@@ -322,7 +322,7 @@
 			isa = PBXProject;
 			isa = PBXProject;
 			attributes = {
 			attributes = {
 				LastUpgradeCheck = 0640;
 				LastUpgradeCheck = 0640;
-				ORGANIZATIONNAME = "GraphKit Inc.";
+				ORGANIZATIONNAME = "GraphKit, Inc.";
 				TargetAttributes = {
 				TargetAttributes = {
 					963832351B88DFD80015F710 = {
 					963832351B88DFD80015F710 = {
 						CreatedOnToolsVersion = 6.4;
 						CreatedOnToolsVersion = 6.4;

Source/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.0</string>
+	<string>1.7.0</string>
 	<key>CFBundleSignature</key>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>

Source/Layout.swift

@@ -46,18 +46,32 @@ public struct Layout {
 	}
 	}
 	
 	
 	/**
 	/**
-		:name:	expandToParentSize
+		:name:	expandToParent
 	*/
 	*/
-	public static func expandToParentSize(parent: UIView, child: UIView) {
+	public static func expandToParent(parent: UIView, child: UIView) {
 		let views: Dictionary<String, AnyObject> = ["child" : child]
 		let views: Dictionary<String, AnyObject> = ["child" : child]
 		parent.addConstraints(constraint("H:|[child]|", options: nil, metrics: nil, views: views))
 		parent.addConstraints(constraint("H:|[child]|", options: nil, metrics: nil, views: views))
 		parent.addConstraints(constraint("V:|[child]|", options: nil, metrics: nil, views: views))
 		parent.addConstraints(constraint("V:|[child]|", options: nil, metrics: nil, views: views))
 	}
 	}
 	
 	
 	/**
 	/**
-		:name:	expandToParentSizeWithPad
+		:name:	expandToParentHorizontallyWithPad
 	*/
 	*/
-	public static func expandToParentSizeWithPad(parent: UIView, child: UIView, left: CGFloat, bottom: CGFloat, right: CGFloat, top: CGFloat) {
+	public static func expandToParentHorizontallyWithPad(parent: UIView, child: UIView, left: CGFloat, right: CGFloat) {
+		parent.addConstraints(constraint("H:|-(left)-[child]-(right)-|", options: nil, metrics: ["left": left, "right": right], views: ["child" : child]))
+	}
+	
+	/**
+		:name:	expandToParentVerticallyWithPad
+	*/
+	public static func expandToParentVerticallyWithPad(parent: UIView, child: UIView, top: CGFloat, bottom: CGFloat) {
+		parent.addConstraints(constraint("V:|-(top)-[child]-(bottom)-|", options: nil, metrics: ["bottom": bottom, "top": top], views: ["child" : child]))
+	}
+	
+	/**
+		:name:	expandToParentWithPad
+	*/
+	public static func expandToParentWithPad(parent: UIView, child: UIView, left: CGFloat, bottom: CGFloat, right: CGFloat, top: CGFloat) {
 		let views: Dictionary<String, AnyObject> = ["child" : child]
 		let views: Dictionary<String, AnyObject> = ["child" : child]
 		parent.addConstraints(constraint("H:|-(left)-[child]-(right)-|", options: nil, metrics: ["left": left, "right": right], views: views))
 		parent.addConstraints(constraint("H:|-(left)-[child]-(right)-|", options: nil, metrics: ["left": left, "right": right], views: views))
 		parent.addConstraints(constraint("V:|-(top)-[child]-(bottom)-|", options: nil, metrics: ["bottom": bottom, "top": top], views: views))
 		parent.addConstraints(constraint("V:|-(top)-[child]-(bottom)-|", options: nil, metrics: ["bottom": bottom, "top": top], views: views))

Source/MaterialButton.swift

@@ -174,7 +174,7 @@ public class MaterialButton : UIButton {
 		backgroundColorView.clipsToBounds = true
 		backgroundColorView.clipsToBounds = true
 		backgroundColorView.userInteractionEnabled = false
 		backgroundColorView.userInteractionEnabled = false
 		insertSubview(backgroundColorView, atIndex: 0)
 		insertSubview(backgroundColorView, atIndex: 0)
-		Layout.expandToParentSize(self, child: backgroundColorView)
+		Layout.expandToParent(self, child: backgroundColorView)
 	}
 	}
 	
 	
 	//
 	//

Source/MaterialCard.swift

@@ -170,7 +170,7 @@ public class MaterialCard : UIView {
 		backgroundColorView.clipsToBounds = true
 		backgroundColorView.clipsToBounds = true
 		backgroundColorView.userInteractionEnabled = false
 		backgroundColorView.userInteractionEnabled = false
 		insertSubview(backgroundColorView, atIndex: 0)
 		insertSubview(backgroundColorView, atIndex: 0)
-		Layout.expandToParentSize(self, child: backgroundColorView)
+		Layout.expandToParent(self, child: backgroundColorView)
 	}
 	}
 	
 	
 	//
 	//