Commit 13ec5abd by Daniel Dahan

fixing Layout constraints on card with constructor paramaters

parent a60c8773
...@@ -72,7 +72,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -72,7 +72,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
t.setTranslatesAutoresizingMaskIntoConstraints(false) t.setTranslatesAutoresizingMaskIntoConstraints(false)
t.textColor = MaterialTheme.white.color t.textColor = MaterialTheme.white.color
t.backgroundColor = MaterialTheme.clear.color t.backgroundColor = MaterialTheme.clear.color
t.font = Roboto.mediumWithSize(18) t.font = Roboto.medium
t.numberOfLines = 1 t.numberOfLines = 1
prepareCard() prepareCard()
} else { } else {
...@@ -110,7 +110,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -110,7 +110,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
l.setTranslatesAutoresizingMaskIntoConstraints(false) l.setTranslatesAutoresizingMaskIntoConstraints(false)
l.textColor = MaterialTheme.white.color l.textColor = MaterialTheme.white.color
l.backgroundColor = MaterialTheme.clear.color l.backgroundColor = MaterialTheme.clear.color
l.font = Roboto.lightWithSize(16) l.font = Roboto.light
l.numberOfLines = 0 l.numberOfLines = 0
l.lineBreakMode = .ByWordWrapping l.lineBreakMode = .ByWordWrapping
prepareCard() prepareCard()
...@@ -161,7 +161,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -161,7 +161,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
} }
/** /**
:name: rightButtons :name: rightButtons
*/ */
public var rightButtons: Array<MaterialButton>? { public var rightButtons: Array<MaterialButton>? {
didSet { didSet {
...@@ -189,29 +189,16 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -189,29 +189,16 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: init :name: init
*/ */
public convenience init() {
self.init(frame: CGRectZero)
}
/**
:name: init
*/
public convenience init(titleLabel: UILabel? = nil, detailLabel: UILabel? = nil, divider: UIView? = nil, leftButtons: Array<MaterialButton>? = nil, rightButtons: Array<MaterialButton>? = nil) { public convenience init(titleLabel: UILabel? = nil, detailLabel: UILabel? = nil, divider: UIView? = nil, leftButtons: Array<MaterialButton>? = nil, rightButtons: Array<MaterialButton>? = nil) {
self.init(frame: CGRectZero) self.init(frame: CGRectZero)
self.titleLabel = titleLabel prepareProperties(detailLabel)
self.detailLabel = detailLabel
self.leftButtons = leftButtons
self.rightButtons = rightButtons
} }
/** /**
:name: init :name: init
*/ */
public required init(frame: CGRect) { public required init(frame: CGRect) {
super.init(frame: frame) super.init(frame: CGRectZero)
if CGRectZero == frame {
setTranslatesAutoresizingMaskIntoConstraints(false)
}
} }
// //
...@@ -224,6 +211,13 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -224,6 +211,13 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
} }
// //
// :name: prepareProperties
//
internal func prepareProperties(detailLabel: UILabel?) {
self.detailLabel = detailLabel
}
//
// :name: prepareCard // :name: prepareCard
// //
internal override func prepareCard() { internal override func prepareCard() {
......
...@@ -113,7 +113,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -113,7 +113,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
titleLabelContainer!.addSubview(t) titleLabelContainer!.addSubview(t)
t.setTranslatesAutoresizingMaskIntoConstraints(false) t.setTranslatesAutoresizingMaskIntoConstraints(false)
t.backgroundColor = MaterialTheme.clear.color t.backgroundColor = MaterialTheme.clear.color
t.font = Roboto.mediumWithSize(18) t.font = Roboto.medium
t.numberOfLines = 1 t.numberOfLines = 1
if nil == imageView { if nil == imageView {
titleLabelContainer!.backgroundColor = MaterialTheme.white.color titleLabelContainer!.backgroundColor = MaterialTheme.white.color
...@@ -160,7 +160,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -160,7 +160,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
l.setTranslatesAutoresizingMaskIntoConstraints(false) l.setTranslatesAutoresizingMaskIntoConstraints(false)
l.textColor = MaterialTheme.black.color l.textColor = MaterialTheme.black.color
l.backgroundColor = MaterialTheme.clear.color l.backgroundColor = MaterialTheme.clear.color
l.font = Roboto.lightWithSize(16) l.font = Roboto.light
l.numberOfLines = 0 l.numberOfLines = 0
l.lineBreakMode = .ByWordWrapping l.lineBreakMode = .ByWordWrapping
prepareCard() prepareCard()
...@@ -192,7 +192,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -192,7 +192,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
public private(set) var buttonsContainer: UIView? public private(set) var buttonsContainer: UIView?
/** /**
:name: leftButtons :name: leftButtons
*/ */
public var leftButtons: Array<MaterialButton>? { public var leftButtons: Array<MaterialButton>? {
didSet { didSet {
......
...@@ -132,12 +132,10 @@ public struct Layout { ...@@ -132,12 +132,10 @@ public struct Layout {
} }
/** /**
:name: alignAllSides :name: alignAllSides
*/ */
public static func alignAllSides(parent: UIView, child: UIView) { public static func alignAllSides(parent: UIView, child: UIView) {
let views: Dictionary<String, AnyObject> = ["child" : child] expandToParent(parent, child: child)
parent.addConstraints(constraint("H:|[child]|", options: nil, metrics: nil, views: views))
parent.addConstraints(constraint("V:|[child]|", options: nil, metrics: nil, views: views))
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment