Skip to content

M
Material
Commit 88cf9092 by Daniel Dahan
Options

updated colors for cards

parent aca94665
Showing with 11 additions and 11 deletions
Source/BasicCardView.swift
...@@ -240,7 +240,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -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.blueGrey.color titleLabelContainer!.backgroundColor = MaterialTheme.clear.color
addSubview(titleLabelContainer!) addSubview(titleLabelContainer!)
} }
...@@ -283,7 +283,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -283,7 +283,7 @@ 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.blueGrey.color detailLabelContainer!.backgroundColor = MaterialTheme.clear.color
addSubview(detailLabelContainer!) addSubview(detailLabelContainer!)
} }
...@@ -332,7 +332,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -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.blueGrey.color buttonsContainer!.backgroundColor = MaterialTheme.clear.color
addSubview(buttonsContainer!) addSubview(buttonsContainer!)
} }
} else { } else {
...@@ -351,7 +351,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -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.blueGrey.color buttonsContainer!.backgroundColor = MaterialTheme.clear.color
addSubview(buttonsContainer!) addSubview(buttonsContainer!)
} }
} else { } else {
...@@ -400,7 +400,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable { ...@@ -400,7 +400,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
internal override func prepareView() { internal override func prepareView() {
super.prepareView() super.prepareView()
prepareShadow() prepareShadow()
backgroundColor = MaterialTheme.clear.color backgroundColor = MaterialTheme.blueGrey.color
} }
// //
......
Source/ImageCardView.swift
...@@ -345,11 +345,11 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -345,11 +345,11 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
t.numberOfLines = 0 t.numberOfLines = 0
t.lineBreakMode = .ByTruncatingTail t.lineBreakMode = .ByTruncatingTail
if nil == imageView { if nil == imageView {
titleLabelContainer!.backgroundColor = MaterialTheme.white.color titleLabelContainer!.backgroundColor = MaterialTheme.clear.color
t.textColor = MaterialTheme.black.color t.textColor = MaterialTheme.black.color
} else { } else {
titleLabelContainer!.backgroundColor = MaterialTheme.clear.color titleLabelContainer!.backgroundColor = MaterialTheme.clear.color
t.textColor = MaterialTheme.white.color t.textColor = MaterialTheme.clear.color
titleLabelContainer!.removeFromSuperview() titleLabelContainer!.removeFromSuperview()
imageViewContainer!.addSubview(titleLabelContainer!) imageViewContainer!.addSubview(titleLabelContainer!)
} }
...@@ -384,7 +384,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -384,7 +384,7 @@ public class ImageCardView : 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.clear.color
addSubview(detailLabelContainer!) addSubview(detailLabelContainer!)
} }
...@@ -433,7 +433,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -433,7 +433,7 @@ public class ImageCardView : 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.clear.color
addSubview(buttonsContainer!) addSubview(buttonsContainer!)
} }
} else { } else {
...@@ -452,7 +452,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -452,7 +452,7 @@ public class ImageCardView : 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.clear.color
addSubview(buttonsContainer!) addSubview(buttonsContainer!)
} }
} else { } else {
...@@ -502,7 +502,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable { ...@@ -502,7 +502,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
internal override func prepareView() { internal override func prepareView() {
super.prepareView() super.prepareView()
prepareShadow() prepareShadow()
backgroundColor = MaterialTheme.clear.color backgroundColor = MaterialTheme.white.color
} }
// //
......
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