Skip to content

M
Material
Commit 14ba8863 by Daniel Dahan
Options

initial commit of revision

parent 90bd4619
Showing with 47 additions and 44 deletions
Source/BasicCardView.swift
...@@ -32,7 +32,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -32,7 +32,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: titleLabelVerticalInset :name: titleLabelVerticalInset
*/ */
public var titleLabelVerticalInset: CGFloat = MaterialTheme.verticalInset { public var titleLabelVerticalInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
titleLabelTopInset = titleLabelVerticalInset titleLabelTopInset = titleLabelVerticalInset
titleLabelBottomInset = titleLabelVerticalInset titleLabelBottomInset = titleLabelVerticalInset
...@@ -42,7 +42,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -42,7 +42,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: titleLabelTopInset :name: titleLabelTopInset
*/ */
public var titleLabelTopInset: CGFloat = MaterialTheme.verticalInset { public var titleLabelTopInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -51,7 +51,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -51,7 +51,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: titleLabelBottomInset :name: titleLabelBottomInset
*/ */
public var titleLabelBottomInset: CGFloat = MaterialTheme.verticalInset { public var titleLabelBottomInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -60,7 +60,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -60,7 +60,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: titleLabelHorizontalInset :name: titleLabelHorizontalInset
*/ */
public var titleLabelHorizontalInset: CGFloat = MaterialTheme.horizontalInset { public var titleLabelHorizontalInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
titleLabelLeftInset = titleLabelHorizontalInset titleLabelLeftInset = titleLabelHorizontalInset
titleLabelRightInset = titleLabelHorizontalInset titleLabelRightInset = titleLabelHorizontalInset
...@@ -70,7 +70,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -70,7 +70,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: titleLabelLeftInset :name: titleLabelLeftInset
*/ */
public var titleLabelLeftInset: CGFloat = MaterialTheme.horizontalInset { public var titleLabelLeftInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -79,7 +79,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -79,7 +79,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: titleLabelRightInset :name: titleLabelRightInset
*/ */
public var titleLabelRightInset: CGFloat = MaterialTheme.horizontalInset { public var titleLabelRightInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -88,7 +88,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -88,7 +88,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: detailLabelVerticalInset :name: detailLabelVerticalInset
*/ */
public var detailLabelVerticalInset: CGFloat = MaterialTheme.verticalInset { public var detailLabelVerticalInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
detailLabelTopInset = detailLabelVerticalInset detailLabelTopInset = detailLabelVerticalInset
detailLabelBottomInset = detailLabelVerticalInset detailLabelBottomInset = detailLabelVerticalInset
...@@ -98,7 +98,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -98,7 +98,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: detailLabelTopInset :name: detailLabelTopInset
*/ */
public var detailLabelTopInset: CGFloat = MaterialTheme.verticalInset { public var detailLabelTopInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -107,7 +107,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -107,7 +107,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: detailLabelBottomInset :name: detailLabelBottomInset
*/ */
public var detailLabelBottomInset: CGFloat = MaterialTheme.verticalInset { public var detailLabelBottomInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -116,7 +116,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -116,7 +116,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: detailLabelHorizontalInset :name: detailLabelHorizontalInset
*/ */
public var detailLabelHorizontalInset: CGFloat = MaterialTheme.horizontalInset { public var detailLabelHorizontalInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
detailLabelLeftInset = detailLabelHorizontalInset detailLabelLeftInset = detailLabelHorizontalInset
detailLabelRightInset = detailLabelHorizontalInset detailLabelRightInset = detailLabelHorizontalInset
...@@ -126,7 +126,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -126,7 +126,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: detailLabelLeftInset :name: detailLabelLeftInset
*/ */
public var detailLabelLeftInset: CGFloat = MaterialTheme.horizontalInset { public var detailLabelLeftInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -135,7 +135,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -135,7 +135,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: detailLabelRightInset :name: detailLabelRightInset
*/ */
public var detailLabelRightInset: CGFloat = MaterialTheme.horizontalInset { public var detailLabelRightInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -144,7 +144,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -144,7 +144,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: buttonVerticalInset :name: buttonVerticalInset
*/ */
public var buttonVerticalInset: CGFloat = MaterialTheme.verticalInset { public var buttonVerticalInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
buttonTopInset = buttonVerticalInset buttonTopInset = buttonVerticalInset
buttonBottomInset = buttonVerticalInset buttonBottomInset = buttonVerticalInset
...@@ -154,7 +154,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -154,7 +154,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: buttonTopInset :name: buttonTopInset
*/ */
public var buttonTopInset: CGFloat = MaterialTheme.verticalInset / 2 { public var buttonTopInset: CGFloat = MaterialTheme.cardVerticalInset / 2 {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -163,7 +163,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -163,7 +163,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: buttonBottomInset :name: buttonBottomInset
*/ */
public var buttonBottomInset: CGFloat = MaterialTheme.verticalInset / 2 { public var buttonBottomInset: CGFloat = MaterialTheme.cardVerticalInset / 2 {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -172,7 +172,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -172,7 +172,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: buttonHorizontalInset :name: buttonHorizontalInset
*/ */
public var buttonHorizontalInset: CGFloat = MaterialTheme.horizontalInset { public var buttonHorizontalInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
buttonLeftInset = buttonHorizontalInset buttonLeftInset = buttonHorizontalInset
buttonRightInset = buttonHorizontalInset buttonRightInset = buttonHorizontalInset
...@@ -182,7 +182,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -182,7 +182,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: buttonLeftInset :name: buttonLeftInset
*/ */
public var buttonLeftInset: CGFloat = MaterialTheme.horizontalInset / 2 { public var buttonLeftInset: CGFloat = MaterialTheme.cardHorizontalInset / 2 {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -191,7 +191,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -191,7 +191,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: buttonRightInset :name: buttonRightInset
*/ */
public var buttonRightInset: CGFloat = MaterialTheme.horizontalInset / 2 { public var buttonRightInset: CGFloat = MaterialTheme.cardHorizontalInset / 2 {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -239,7 +239,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -239,7 +239,7 @@ public class BasicCardView : 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.medium t.font = Roboto.regular
t.numberOfLines = 0 t.numberOfLines = 0
t.lineBreakMode = .ByTruncatingTail t.lineBreakMode = .ByTruncatingTail
t.textColor = MaterialTheme.white.color t.textColor = MaterialTheme.white.color
......
Source/FlatButton.swift
...@@ -24,11 +24,11 @@ public class FlatButton : MaterialButton { ...@@ -24,11 +24,11 @@ public class FlatButton : MaterialButton {
// //
internal override func prepareView() { internal override func prepareView() {
super.prepareView() super.prepareView()
titleLabel!.font = Roboto.medium titleLabel!.font = Roboto.regular
setTitleColor(MaterialTheme.blueGrey.darken4, forState: .Normal) setTitleColor(MaterialTheme.blueGrey.darken4, forState: .Normal)
pulseColor = MaterialTheme.blueGrey.lighten3 pulseColor = MaterialTheme.blueGrey.lighten3
backgroundColor = MaterialTheme.clear.color backgroundColor = MaterialTheme.clear.color
contentEdgeInsets = UIEdgeInsetsMake(6, 16, 6, 16) contentEdgeInsets = UIEdgeInsetsMake(MaterialTheme.buttonVerticalInset, MaterialTheme.buttonHorizontalInset, MaterialTheme.buttonVerticalInset, MaterialTheme.buttonHorizontalInset)
} }
// //
......
Source/ImageCardView.swift
...@@ -88,7 +88,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -88,7 +88,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: titleLabelVerticalInset :name: titleLabelVerticalInset
*/ */
public var titleLabelVerticalInset: CGFloat = MaterialTheme.verticalInset { public var titleLabelVerticalInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
titleLabelTopInset = titleLabelVerticalInset titleLabelTopInset = titleLabelVerticalInset
titleLabelBottomInset = titleLabelVerticalInset titleLabelBottomInset = titleLabelVerticalInset
...@@ -98,7 +98,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -98,7 +98,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: titleLabelTopInset :name: titleLabelTopInset
*/ */
public var titleLabelTopInset: CGFloat = MaterialTheme.verticalInset { public var titleLabelTopInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -107,7 +107,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -107,7 +107,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: titleLabelBottomInset :name: titleLabelBottomInset
*/ */
public var titleLabelBottomInset: CGFloat = MaterialTheme.verticalInset { public var titleLabelBottomInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -116,7 +116,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -116,7 +116,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: titleLabelHorizontalInset :name: titleLabelHorizontalInset
*/ */
public var titleLabelHorizontalInset: CGFloat = MaterialTheme.horizontalInset { public var titleLabelHorizontalInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
titleLabelLeftInset = titleLabelHorizontalInset titleLabelLeftInset = titleLabelHorizontalInset
titleLabelRightInset = titleLabelHorizontalInset titleLabelRightInset = titleLabelHorizontalInset
...@@ -126,7 +126,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -126,7 +126,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: titleLabelLeftInset :name: titleLabelLeftInset
*/ */
public var titleLabelLeftInset: CGFloat = MaterialTheme.horizontalInset { public var titleLabelLeftInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -135,7 +135,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -135,7 +135,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: titleLabelRightInset :name: titleLabelRightInset
*/ */
public var titleLabelRightInset: CGFloat = MaterialTheme.horizontalInset { public var titleLabelRightInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -144,7 +144,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -144,7 +144,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: detailLabelVerticalInset :name: detailLabelVerticalInset
*/ */
public var detailLabelVerticalInset: CGFloat = MaterialTheme.verticalInset { public var detailLabelVerticalInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
detailLabelTopInset = detailLabelVerticalInset detailLabelTopInset = detailLabelVerticalInset
detailLabelBottomInset = detailLabelVerticalInset detailLabelBottomInset = detailLabelVerticalInset
...@@ -154,7 +154,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -154,7 +154,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: detailLabelTopInset :name: detailLabelTopInset
*/ */
public var detailLabelTopInset: CGFloat = MaterialTheme.verticalInset { public var detailLabelTopInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -163,7 +163,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -163,7 +163,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: detailLabelBottomInset :name: detailLabelBottomInset
*/ */
public var detailLabelBottomInset: CGFloat = MaterialTheme.verticalInset { public var detailLabelBottomInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -172,7 +172,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -172,7 +172,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: detailLabelHorizontalInset :name: detailLabelHorizontalInset
*/ */
public var detailLabelHorizontalInset: CGFloat = MaterialTheme.horizontalInset { public var detailLabelHorizontalInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
detailLabelLeftInset = detailLabelHorizontalInset detailLabelLeftInset = detailLabelHorizontalInset
detailLabelRightInset = detailLabelHorizontalInset detailLabelRightInset = detailLabelHorizontalInset
...@@ -182,7 +182,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -182,7 +182,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: detailLabelLeftInset :name: detailLabelLeftInset
*/ */
public var detailLabelLeftInset: CGFloat = MaterialTheme.horizontalInset { public var detailLabelLeftInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -191,7 +191,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -191,7 +191,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: detailLabelRightInset :name: detailLabelRightInset
*/ */
public var detailLabelRightInset: CGFloat = MaterialTheme.horizontalInset { public var detailLabelRightInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -200,7 +200,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -200,7 +200,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: buttonVerticalInset :name: buttonVerticalInset
*/ */
public var buttonVerticalInset: CGFloat = MaterialTheme.verticalInset { public var buttonVerticalInset: CGFloat = MaterialTheme.cardVerticalInset {
didSet { didSet {
buttonTopInset = buttonVerticalInset buttonTopInset = buttonVerticalInset
buttonBottomInset = buttonVerticalInset buttonBottomInset = buttonVerticalInset
...@@ -210,7 +210,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -210,7 +210,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: buttonTopInset :name: buttonTopInset
*/ */
public var buttonTopInset: CGFloat = MaterialTheme.verticalInset / 2 { public var buttonTopInset: CGFloat = MaterialTheme.cardVerticalInset / 2 {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -219,7 +219,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -219,7 +219,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: buttonBottomInset :name: buttonBottomInset
*/ */
public var buttonBottomInset: CGFloat = MaterialTheme.verticalInset / 2 { public var buttonBottomInset: CGFloat = MaterialTheme.cardVerticalInset / 2 {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -228,7 +228,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -228,7 +228,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: buttonHorizontalInset :name: buttonHorizontalInset
*/ */
public var buttonHorizontalInset: CGFloat = MaterialTheme.horizontalInset { public var buttonHorizontalInset: CGFloat = MaterialTheme.cardHorizontalInset {
didSet { didSet {
buttonLeftInset = buttonHorizontalInset buttonLeftInset = buttonHorizontalInset
buttonRightInset = buttonHorizontalInset buttonRightInset = buttonHorizontalInset
...@@ -238,7 +238,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -238,7 +238,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: buttonLeftInset :name: buttonLeftInset
*/ */
public var buttonLeftInset: CGFloat = MaterialTheme.horizontalInset / 2 { public var buttonLeftInset: CGFloat = MaterialTheme.cardHorizontalInset / 2 {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -247,7 +247,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -247,7 +247,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
/** /**
:name: buttonRightInset :name: buttonRightInset
*/ */
public var buttonRightInset: CGFloat = MaterialTheme.horizontalInset / 2 { public var buttonRightInset: CGFloat = MaterialTheme.cardHorizontalInset / 2 {
didSet { didSet {
prepareCard() prepareCard()
} }
...@@ -341,7 +341,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -341,7 +341,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.medium t.font = Roboto.regular
t.numberOfLines = 0 t.numberOfLines = 0
t.lineBreakMode = .ByTruncatingTail t.lineBreakMode = .ByTruncatingTail
if nil == imageView { if nil == imageView {
......
Source/MaterialTheme.swift
...@@ -22,8 +22,11 @@ public struct MaterialTheme {} ...@@ -22,8 +22,11 @@ public struct MaterialTheme {}
// spacing // spacing
extension MaterialTheme { extension MaterialTheme {
public static var verticalInset: CGFloat = 16 public static var cardVerticalInset: CGFloat = 16
public static var horizontalInset: CGFloat = 16 public static var cardHorizontalInset: CGFloat = 16
public static var buttonVerticalInset: CGFloat = 6
public static var buttonHorizontalInset: CGFloat = 16
} }
// fonts // fonts
......
Source/RaisedButton.swift
...@@ -24,10 +24,10 @@ public class RaisedButton : MaterialButton { ...@@ -24,10 +24,10 @@ public class RaisedButton : MaterialButton {
// //
internal override func prepareView() { internal override func prepareView() {
super.prepareView() super.prepareView()
titleLabel!.font = Roboto.medium titleLabel!.font = Roboto.regular
setTitleColor(MaterialTheme.white.color, forState: .Normal) setTitleColor(MaterialTheme.white.color, forState: .Normal)
backgroundColor = MaterialTheme.blue.accent2 backgroundColor = MaterialTheme.blue.accent2
contentEdgeInsets = UIEdgeInsetsMake(6, 16, 6, 16) contentEdgeInsets = UIEdgeInsetsMake(MaterialTheme.buttonVerticalInset, MaterialTheme.buttonHorizontalInset, MaterialTheme.buttonVerticalInset, MaterialTheme.buttonHorizontalInset)
} }
// //
......
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