Commit 11f70164 by Daniel Dahan

updated defaults for frame sizing

parent ffcb12a1
......@@ -64,6 +64,10 @@ public class BasicCardView: MaterialPulseView {
didSet {
if let v = titleLabel {
v.translatesAutoresizingMaskIntoConstraints = false
v.lineBreakMode = .ByWordWrapping
v.numberOfLines = 0
v.textColor = MaterialColor.white
v.font = RobotoFont.regularWithSize(18)
}
reloadView()
}
......@@ -95,6 +99,10 @@ public class BasicCardView: MaterialPulseView {
didSet {
if let v = detailLabel {
v.translatesAutoresizingMaskIntoConstraints = false
v.lineBreakMode = .ByWordWrapping
v.numberOfLines = 0
v.textColor = MaterialColor.white
v.font = RobotoFont.regularWithSize(14)
}
reloadView()
}
......
......@@ -53,7 +53,7 @@ public class MaterialPulseView: MaterialView {
:name: init
*/
public convenience init() {
self.init(frame: CGRectMake(MaterialTheme.pulseView.x, MaterialTheme.pulseView.y, MaterialTheme.pulseView.width, MaterialTheme.pulseView.height))
self.init(frame: CGRectZero)
}
/**
......
......@@ -31,12 +31,6 @@ public struct MaterialTheme {
// view
public extension MaterialTheme.view {
// frame
public static var x: CGFloat = 0
public static var y: CGFloat = 0
public static var width: CGFloat = UIScreen.mainScreen().bounds.width
public static var height: CGFloat = UIScreen.mainScreen().bounds.height
// shadow
public static var shadowDepth: MaterialDepth = .Depth0
public static var shadowColor: UIColor = MaterialColor.black
......@@ -67,12 +61,6 @@ public extension MaterialTheme.view {
// pulseView
public extension MaterialTheme.pulseView {
// frame
public static var x: CGFloat = MaterialTheme.view.x
public static var y: CGFloat = MaterialTheme.view.y
public static var width: CGFloat = MaterialTheme.view.width
public static var height: CGFloat = MaterialTheme.view.height
// shadow
public static var shadowDepth: MaterialDepth = MaterialTheme.view.shadowDepth
public static var shadowColor: UIColor = MaterialTheme.view.shadowColor
......@@ -105,19 +93,13 @@ public extension MaterialTheme.pulseView {
// basicCardView
public extension MaterialTheme.basicCardView {
// frame
public static var x: CGFloat = MaterialTheme.view.x
public static var y: CGFloat = MaterialTheme.view.y
public static var width: CGFloat = MaterialTheme.view.width
public static var height: CGFloat = MaterialTheme.view.height
// shadow
public static var shadowDepth: MaterialDepth = MaterialTheme.view.shadowDepth
public static var shadowDepth: MaterialDepth = .Depth2
public static var shadowColor: UIColor = MaterialTheme.view.shadowColor
// shape
public static var masksToBounds: Bool = true
public static var cornerRadius: MaterialRadius = MaterialTheme.view.cornerRadius
public static var cornerRadius: MaterialRadius = .Radius1
public static var contentInsetsRef: MaterialInsetsType = MaterialInsetsToValue(.Square2)
public static var titleLabelInsetsRef: MaterialInsetsType = MaterialInsetsToValue(.Square2)
public static var detailLabelInsetsRef: MaterialInsetsType = MaterialInsetsToValue(.Square2)
......@@ -129,7 +111,7 @@ public extension MaterialTheme.basicCardView {
public static var bordercolor: UIColor = MaterialTheme.view.bordercolor
// color
public static var backgroudColor: UIColor = MaterialColor.clear
public static var backgroudColor: UIColor = MaterialColor.blueGrey.darken1
public static var pulseColor: UIColor = MaterialColor.white
public static var pulseColorOpacity: CGFloat = 0.25
......@@ -149,13 +131,13 @@ public extension MaterialTheme.basicCardView {
// navigationBarView
public extension MaterialTheme.navigationBarView {
// frame
public static var x: CGFloat = MaterialTheme.view.x
public static var y: CGFloat = MaterialTheme.view.y
public static var width: CGFloat = MaterialTheme.view.width
public static var x: CGFloat = 0
public static var y: CGFloat = 0
public static var width: CGFloat = UIScreen.mainScreen().bounds.width
public static var height: CGFloat = 70
// shadow
public static var shadowDepth: MaterialDepth = .Depth1
public static var shadowDepth: MaterialDepth = .Depth2
public static var shadowColor: UIColor = MaterialTheme.view.shadowColor
// shape
......
......@@ -266,7 +266,7 @@ public class MaterialView: UIView {
:name: init
*/
public convenience init() {
self.init(frame: CGRectMake(MaterialTheme.view.x, MaterialTheme.view.y, MaterialTheme.view.width, MaterialTheme.view.height))
self.init(frame: CGRectZero)
}
/**
......
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