updated colors for cards and default alignment values

Source/BasicCardView.swift

@@ -51,7 +51,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
 	/**
 	/**
 		:name:	titleLabelBottomInset
 		:name:	titleLabelBottomInset
 	*/
 	*/
-	public var titleLabelBottomInset: CGFloat = MaterialTheme.verticalInset {
+	public var titleLabelBottomInset: CGFloat = 0 {
 		didSet {
 		didSet {
 			prepareCard()
 			prepareCard()
 		}
 		}
@@ -154,7 +154,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
 	/**
 	/**
 		:name:	buttonTopInset
 		:name:	buttonTopInset
 	*/
 	*/
-	public var buttonTopInset: CGFloat = MaterialTheme.verticalInset {
+	public var buttonTopInset: CGFloat = MaterialTheme.verticalInset / 2 {
 		didSet {
 		didSet {
 			prepareCard()
 			prepareCard()
 		}
 		}
@@ -163,7 +163,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
 	/**
 	/**
 		:name:	buttonBottomInset
 		:name:	buttonBottomInset
 	*/
 	*/
-	public var buttonBottomInset: CGFloat = MaterialTheme.verticalInset {
+	public var buttonBottomInset: CGFloat = MaterialTheme.verticalInset / 2 {
 		didSet {
 		didSet {
 			prepareCard()
 			prepareCard()
 		}
 		}
@@ -182,7 +182,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
 	/**
 	/**
 		:name:	buttonLeftInset
 		:name:	buttonLeftInset
 	*/
 	*/
-	public var buttonLeftInset: CGFloat = MaterialTheme.horizontalInset {
+	public var buttonLeftInset: CGFloat = MaterialTheme.horizontalInset / 2 {
 		didSet {
 		didSet {
 			prepareCard()
 			prepareCard()
 		}
 		}
@@ -191,7 +191,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
 	/**
 	/**
 		:name:	buttonRightInset
 		:name:	buttonRightInset
 	*/
 	*/
-	public var buttonRightInset: CGFloat = MaterialTheme.horizontalInset {
+	public var buttonRightInset: CGFloat = MaterialTheme.horizontalInset / 2 {
 		didSet {
 		didSet {
 			prepareCard()
 			prepareCard()
 		}
 		}
@@ -240,7 +240,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
 				if nil == titleLabelContainer {
 				if nil == titleLabelContainer {
 					titleLabelContainer = UIView()
 					titleLabelContainer = UIView()
 					titleLabelContainer!.setTranslatesAutoresizingMaskIntoConstraints(false)
 					titleLabelContainer!.setTranslatesAutoresizingMaskIntoConstraints(false)
-					titleLabelContainer!.backgroundColor = MaterialTheme.white.color
+					titleLabelContainer!.backgroundColor = MaterialTheme.blueGrey.color
 					addSubview(titleLabelContainer!)
 					addSubview(titleLabelContainer!)
 				}
 				}
 				
 				
@@ -251,7 +251,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
 				t.font = Roboto.medium
 				t.font = Roboto.medium
 				t.numberOfLines = 0
 				t.numberOfLines = 0
 				t.lineBreakMode = .ByTruncatingTail
 				t.lineBreakMode = .ByTruncatingTail
-				t.textColor = MaterialTheme.black.color
+				t.textColor = MaterialTheme.white.color
 			} else {
 			} else {
 				titleLabelContainer?.removeFromSuperview()
 				titleLabelContainer?.removeFromSuperview()
 			}
 			}
@@ -283,14 +283,14 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
 				if nil == detailLabelContainer {
 				if nil == detailLabelContainer {
 					detailLabelContainer = UIView()
 					detailLabelContainer = UIView()
 					detailLabelContainer!.setTranslatesAutoresizingMaskIntoConstraints(false)
 					detailLabelContainer!.setTranslatesAutoresizingMaskIntoConstraints(false)
-					detailLabelContainer!.backgroundColor = MaterialTheme.white.color
+					detailLabelContainer!.backgroundColor = MaterialTheme.blueGrey.color
 					addSubview(detailLabelContainer!)
 					addSubview(detailLabelContainer!)
 				}
 				}
 				
 				
 				// text
 				// text
 				detailLabelContainer!.addSubview(l)
 				detailLabelContainer!.addSubview(l)
 				l.setTranslatesAutoresizingMaskIntoConstraints(false)
 				l.setTranslatesAutoresizingMaskIntoConstraints(false)
-				l.textColor = MaterialTheme.black.color
+				l.textColor = MaterialTheme.white.color
 				l.backgroundColor = MaterialTheme.clear.color
 				l.backgroundColor = MaterialTheme.clear.color
 				l.font = Roboto.light
 				l.font = Roboto.light
 				l.numberOfLines = 0
 				l.numberOfLines = 0
@@ -309,7 +309,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
 		didSet {
 		didSet {
 			if let d = divider {
 			if let d = divider {
 				d.setTranslatesAutoresizingMaskIntoConstraints(false)
 				d.setTranslatesAutoresizingMaskIntoConstraints(false)
-				d.backgroundColor = MaterialTheme.blueGrey.lighten5
+				d.backgroundColor = MaterialTheme.blueGrey.darken1
 				addSubview(d)
 				addSubview(d)
 			} else {
 			} else {
 				divider?.removeFromSuperview()
 				divider?.removeFromSuperview()
@@ -332,7 +332,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
 				if nil == buttonsContainer {
 				if nil == buttonsContainer {
 					buttonsContainer = UIView()
 					buttonsContainer = UIView()
 					buttonsContainer!.setTranslatesAutoresizingMaskIntoConstraints(false)
 					buttonsContainer!.setTranslatesAutoresizingMaskIntoConstraints(false)
-					buttonsContainer!.backgroundColor = MaterialTheme.white.color
+					buttonsContainer!.backgroundColor = MaterialTheme.blueGrey.color
 					addSubview(buttonsContainer!)
 					addSubview(buttonsContainer!)
 				}
 				}
 			} else {
 			} else {
@@ -351,7 +351,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
 				if nil == buttonsContainer {
 				if nil == buttonsContainer {
 					buttonsContainer = UIView()
 					buttonsContainer = UIView()
 					buttonsContainer!.setTranslatesAutoresizingMaskIntoConstraints(false)
 					buttonsContainer!.setTranslatesAutoresizingMaskIntoConstraints(false)
-					buttonsContainer!.backgroundColor = MaterialTheme.white.color
+					buttonsContainer!.backgroundColor = MaterialTheme.blueGrey.color
 					addSubview(buttonsContainer!)
 					addSubview(buttonsContainer!)
 				}
 				}
 			} else {
 			} else {

Source/ImageCardView.swift

@@ -210,7 +210,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
 	/**
 	/**
 		:name:	buttonTopInset
 		:name:	buttonTopInset
 	*/
 	*/
-	public var buttonTopInset: CGFloat = MaterialTheme.verticalInset {
+	public var buttonTopInset: CGFloat = MaterialTheme.verticalInset / 2 {
 		didSet {
 		didSet {
 			prepareCard()
 			prepareCard()
 		}
 		}
@@ -219,7 +219,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
 	/**
 	/**
 		:name:	buttonBottomInset
 		:name:	buttonBottomInset
 	*/
 	*/
-	public var buttonBottomInset: CGFloat = MaterialTheme.verticalInset {
+	public var buttonBottomInset: CGFloat = MaterialTheme.verticalInset / 2 {
 		didSet {
 		didSet {
 			prepareCard()
 			prepareCard()
 		}
 		}
@@ -238,7 +238,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
 	/**
 	/**
 		:name:	buttonLeftInset
 		:name:	buttonLeftInset
 	*/
 	*/
-	public var buttonLeftInset: CGFloat = MaterialTheme.horizontalInset {
+	public var buttonLeftInset: CGFloat = MaterialTheme.horizontalInset / 2 {
 		didSet {
 		didSet {
 			prepareCard()
 			prepareCard()
 		}
 		}
@@ -247,7 +247,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
 	/**
 	/**
 		:name:	buttonRightInset
 		:name:	buttonRightInset
 	*/
 	*/
-	public var buttonRightInset: CGFloat = MaterialTheme.horizontalInset {
+	public var buttonRightInset: CGFloat = MaterialTheme.horizontalInset / 2 {
 		didSet {
 		didSet {
 			prepareCard()
 			prepareCard()
 		}
 		}