Skip to content

M
Material
Commit f77ba634 by Daniel Dahan
Options

update prior to adding buttons to BasicCardView

parent 11f70164
Showing with 43 additions and 44 deletions
Source/MaterialButton.swift
...@@ -259,7 +259,7 @@ public class MaterialButton : UIButton { ...@@ -259,7 +259,7 @@ public class MaterialButton : UIButton {
:name: init :name: init
*/ */
public convenience init() { public convenience init() {
self.init(frame: CGRectMake(MaterialTheme.view.x, MaterialTheme.view.y, MaterialTheme.view.width, MaterialTheme.view.height)) self.init(frame: CGRectZero)
} }
/** /**
......
Source/MaterialTheme.swift
...@@ -62,16 +62,16 @@ public extension MaterialTheme.view { ...@@ -62,16 +62,16 @@ public extension MaterialTheme.view {
// pulseView // pulseView
public extension MaterialTheme.pulseView { public extension MaterialTheme.pulseView {
// shadow // shadow
public static var shadowDepth: MaterialDepth = MaterialTheme.view.shadowDepth public static var shadowDepth: MaterialDepth = .Depth0
public static var shadowColor: UIColor = MaterialTheme.view.shadowColor public static var shadowColor: UIColor = MaterialColor.black
// shape // shape
public static var masksToBounds: Bool = true public static var masksToBounds: Bool = true
public static var cornerRadius: MaterialRadius = MaterialTheme.view.cornerRadius public static var cornerRadius: MaterialRadius = .Radius0
// border // border
public static var borderWidth: MaterialBorder = MaterialTheme.view.borderWidth public static var borderWidth: MaterialBorder = .Border0
public static var bordercolor: UIColor = MaterialTheme.view.bordercolor public static var bordercolor: UIColor = MaterialColor.black
// color // color
public static var backgroudColor: UIColor = MaterialColor.clear public static var backgroudColor: UIColor = MaterialColor.clear
...@@ -79,23 +79,23 @@ public extension MaterialTheme.pulseView { ...@@ -79,23 +79,23 @@ public extension MaterialTheme.pulseView {
public static var pulseColorOpacity: CGFloat = 0.25 public static var pulseColorOpacity: CGFloat = 0.25
// interaction // interaction
public static var userInteractionEnabled: Bool = MaterialTheme.view.userInteractionEnabled public static var userInteractionEnabled: Bool = true
// image // image
public static var contentsRect: CGRect = MaterialTheme.view.contentsRect public static var contentsRect: CGRect = CGRectMake(0, 0, 1, 1)
public static var contentsCenter: CGRect = MaterialTheme.view.contentsCenter public static var contentsCenter: CGRect = CGRectMake(0, 0, 1, 1)
public static var contentsScale: CGFloat = MaterialTheme.view.contentsScale public static var contentsScale: CGFloat = UIScreen.mainScreen().scale
public static var contentsGravity: MaterialGravity = MaterialTheme.view.contentsGravity public static var contentsGravity: MaterialGravity = .ResizeAspectFill
// position // position
public static var zPosition: CGFloat = MaterialTheme.view.zPosition public static var zPosition: CGFloat = 0
} }
// basicCardView // basicCardView
public extension MaterialTheme.basicCardView { public extension MaterialTheme.basicCardView {
// shadow // shadow
public static var shadowDepth: MaterialDepth = .Depth2 public static var shadowDepth: MaterialDepth = .Depth2
public static var shadowColor: UIColor = MaterialTheme.view.shadowColor public static var shadowColor: UIColor = MaterialColor.black
// shape // shape
public static var masksToBounds: Bool = true public static var masksToBounds: Bool = true
...@@ -107,8 +107,8 @@ public extension MaterialTheme.basicCardView { ...@@ -107,8 +107,8 @@ public extension MaterialTheme.basicCardView {
public static var rightButtonsInsetsRef: MaterialInsetsType = MaterialInsetsToValue(.Square2) public static var rightButtonsInsetsRef: MaterialInsetsType = MaterialInsetsToValue(.Square2)
// border // border
public static var borderWidth: MaterialBorder = MaterialTheme.view.borderWidth public static var borderWidth: MaterialBorder = .Border0
public static var bordercolor: UIColor = MaterialTheme.view.bordercolor public static var bordercolor: UIColor = MaterialColor.black
// color // color
public static var backgroudColor: UIColor = MaterialColor.blueGrey.darken1 public static var backgroudColor: UIColor = MaterialColor.blueGrey.darken1
...@@ -116,16 +116,16 @@ public extension MaterialTheme.basicCardView { ...@@ -116,16 +116,16 @@ public extension MaterialTheme.basicCardView {
public static var pulseColorOpacity: CGFloat = 0.25 public static var pulseColorOpacity: CGFloat = 0.25
// interaction // interaction
public static var userInteractionEnabled: Bool = MaterialTheme.view.userInteractionEnabled public static var userInteractionEnabled: Bool = true
// image // image
public static var contentsRect: CGRect = MaterialTheme.view.contentsRect public static var contentsRect: CGRect = CGRectMake(0, 0, 1, 1)
public static var contentsCenter: CGRect = MaterialTheme.view.contentsCenter public static var contentsCenter: CGRect = CGRectMake(0, 0, 1, 1)
public static var contentsScale: CGFloat = MaterialTheme.view.contentsScale public static var contentsScale: CGFloat = UIScreen.mainScreen().scale
public static var contentsGravity: MaterialGravity = MaterialTheme.view.contentsGravity public static var contentsGravity: MaterialGravity = .ResizeAspectFill
// position // position
public static var zPosition: CGFloat = MaterialTheme.view.zPosition public static var zPosition: CGFloat = 0
} }
// navigationBarView // navigationBarView
...@@ -138,19 +138,18 @@ public extension MaterialTheme.navigationBarView { ...@@ -138,19 +138,18 @@ public extension MaterialTheme.navigationBarView {
// shadow // shadow
public static var shadowDepth: MaterialDepth = .Depth2 public static var shadowDepth: MaterialDepth = .Depth2
public static var shadowColor: UIColor = MaterialTheme.view.shadowColor public static var shadowColor: UIColor = MaterialColor.black
// shape // shape
public static var masksToBounds: Bool = MaterialTheme.view.masksToBounds public static var masksToBounds: Bool = true
public static var cornerRadius: MaterialRadius = MaterialTheme.view.cornerRadius public static var cornerRadius: MaterialRadius = .Radius0
public static var contentInsetsRef: MaterialInsetsType = MaterialInsetsToValue(.Square2) public static var titleLabelInsetsRef: MaterialInsetsType = MaterialInsetsToValue(.Rectangle3)
public static var titleLabelInsetsRef: MaterialInsetsType = MaterialInsetsToValue(.Square2)
public static var leftButtonsInsetsRef: MaterialInsetsType = MaterialInsetsToValue(.Square2) public static var leftButtonsInsetsRef: MaterialInsetsType = MaterialInsetsToValue(.Square2)
public static var rightButtonsInsetsRef: MaterialInsetsType = MaterialInsetsToValue(.Square2) public static var rightButtonsInsetsRef: MaterialInsetsType = MaterialInsetsToValue(.Square2)
// border // border
public static var borderWidth: MaterialBorder = MaterialTheme.view.borderWidth public static var borderWidth: MaterialBorder = .Border0
public static var bordercolor: UIColor = MaterialTheme.view.bordercolor public static var bordercolor: UIColor = MaterialColor.black
// color // color
public static var backgroudColor: UIColor = MaterialColor.blue.accent3 public static var backgroudColor: UIColor = MaterialColor.blue.accent3
...@@ -160,10 +159,10 @@ public extension MaterialTheme.navigationBarView { ...@@ -160,10 +159,10 @@ public extension MaterialTheme.navigationBarView {
public static var userInteractionEnabled: Bool = true public static var userInteractionEnabled: Bool = true
// image // image
public static var contentsRect: CGRect = MaterialTheme.view.contentsRect public static var contentsRect: CGRect = CGRectMake(0, 0, 1, 1)
public static var contentsCenter: CGRect = MaterialTheme.view.contentsCenter public static var contentsCenter: CGRect = CGRectMake(0, 0, 1, 1)
public static var contentsScale: CGFloat = MaterialTheme.view.contentsScale public static var contentsScale: CGFloat = UIScreen.mainScreen().scale
public static var contentsGravity: MaterialGravity = MaterialTheme.view.contentsGravity public static var contentsGravity: MaterialGravity = .ResizeAspectFill
// position // position
public static var zPosition: CGFloat = 100 public static var zPosition: CGFloat = 100
...@@ -186,7 +185,7 @@ public extension MaterialTheme.label { ...@@ -186,7 +185,7 @@ public extension MaterialTheme.label {
public extension MaterialTheme.flatButton { public extension MaterialTheme.flatButton {
// shadow // shadow
public static var shadowDepth: MaterialDepth = .Depth0 public static var shadowDepth: MaterialDepth = .Depth0
public static var shadowColor: UIColor = MaterialTheme.view.shadowColor public static var shadowColor: UIColor = MaterialColor.black
// shape // shape
public static var masksToBounds: Bool = true public static var masksToBounds: Bool = true
...@@ -195,13 +194,13 @@ public extension MaterialTheme.flatButton { ...@@ -195,13 +194,13 @@ public extension MaterialTheme.flatButton {
public static var shape: MaterialShape? = nil public static var shape: MaterialShape? = nil
// border // border
public static var borderWidth: MaterialBorder = MaterialTheme.view.borderWidth public static var borderWidth: MaterialBorder = .Border0
public static var bordercolor: UIColor = MaterialTheme.view.bordercolor public static var bordercolor: UIColor = MaterialColor.black
// color // color
public static var backgroudColor: UIColor = MaterialColor.clear public static var backgroudColor: UIColor = MaterialColor.clear
public static var pulseColor: UIColor = MaterialColor.blue.accent3 public static var pulseColor: UIColor = MaterialColor.blue.accent3
public static var pulseColorOpacity: CGFloat = MaterialTheme.pulseView.pulseColorOpacity public static var pulseColorOpacity: CGFloat = 0.25
public static var titleLabelColorForNormalState: UIColor = MaterialColor.blue.accent3 public static var titleLabelColorForNormalState: UIColor = MaterialColor.blue.accent3
// interaction // interaction
...@@ -218,7 +217,7 @@ public extension MaterialTheme.flatButton { ...@@ -218,7 +217,7 @@ public extension MaterialTheme.flatButton {
public extension MaterialTheme.raisedButton { public extension MaterialTheme.raisedButton {
// shadow // shadow
public static var shadowDepth: MaterialDepth = .Depth2 public static var shadowDepth: MaterialDepth = .Depth2
public static var shadowColor: UIColor = MaterialTheme.view.shadowColor public static var shadowColor: UIColor = MaterialColor.black
// shape // shape
public static var masksToBounds: Bool = true public static var masksToBounds: Bool = true
...@@ -227,13 +226,13 @@ public extension MaterialTheme.raisedButton { ...@@ -227,13 +226,13 @@ public extension MaterialTheme.raisedButton {
public static var shape: MaterialShape? = nil public static var shape: MaterialShape? = nil
// border // border
public static var borderWidth: MaterialBorder = MaterialTheme.view.borderWidth public static var borderWidth: MaterialBorder = .Border0
public static var bordercolor: UIColor = MaterialTheme.view.bordercolor public static var bordercolor: UIColor = MaterialColor.black
// color // color
public static var backgroudColor: UIColor = MaterialColor.blue.accent3 public static var backgroudColor: UIColor = MaterialColor.blue.accent3
public static var pulseColor: UIColor = MaterialColor.white public static var pulseColor: UIColor = MaterialColor.white
public static var pulseColorOpacity: CGFloat = MaterialTheme.pulseView.pulseColorOpacity public static var pulseColorOpacity: CGFloat = 0.25
public static var titleLabelColorForNormalState: UIColor = MaterialColor.white public static var titleLabelColorForNormalState: UIColor = MaterialColor.white
// interaction // interaction
...@@ -251,7 +250,7 @@ public extension MaterialTheme.raisedButton { ...@@ -251,7 +250,7 @@ public extension MaterialTheme.raisedButton {
public extension MaterialTheme.fabButton { public extension MaterialTheme.fabButton {
// shadow // shadow
public static var shadowDepth: MaterialDepth = .Depth2 public static var shadowDepth: MaterialDepth = .Depth2
public static var shadowColor: UIColor = MaterialTheme.view.shadowColor public static var shadowColor: UIColor = MaterialColor.black
// shape // shape
public static var masksToBounds: Bool = true public static var masksToBounds: Bool = true
...@@ -260,13 +259,13 @@ public extension MaterialTheme.fabButton { ...@@ -260,13 +259,13 @@ public extension MaterialTheme.fabButton {
public static var shape: MaterialShape? = .Circle public static var shape: MaterialShape? = .Circle
// border // border
public static var borderWidth: MaterialBorder = MaterialTheme.view.borderWidth public static var borderWidth: MaterialBorder = .Border0
public static var bordercolor: UIColor = MaterialTheme.view.bordercolor public static var bordercolor: UIColor = MaterialColor.black
// color // color
public static var backgroudColor: UIColor = MaterialColor.red.darken1 public static var backgroudColor: UIColor = MaterialColor.red.darken1
public static var pulseColor: UIColor = MaterialColor.white public static var pulseColor: UIColor = MaterialColor.white
public static var pulseColorOpacity: CGFloat = MaterialTheme.pulseView.pulseColorOpacity public static var pulseColorOpacity: CGFloat = 0.25
public static var titleLabelColorForNormalState: UIColor = MaterialColor.white public static var titleLabelColorForNormalState: UIColor = MaterialColor.white
// interaction // interaction
......
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