updated contents* defaults

Source/MaterialTheme+View.swift

@@ -37,7 +37,6 @@ public extension MaterialTheme.view {
 	public static let shadowOffset: CGSize = CGSizeMake(0.2, 0.2)
 	public static let shadowOffset: CGSize = CGSizeMake(0.2, 0.2)
 	public static let shadowOpacity: Float = 0.5
 	public static let shadowOpacity: Float = 0.5
 	public static let shadowRadius: CGFloat = 1
 	public static let shadowRadius: CGFloat = 1
-	public static let contentScale: CGFloat = UIScreen.mainScreen().scale
 	public static let masksToBounds: Bool = false
 	public static let masksToBounds: Bool = false
 	
 	
 	// color
 	// color
@@ -47,8 +46,9 @@ public extension MaterialTheme.view {
 	public static let userInteractionEnabled: Bool = true
 	public static let userInteractionEnabled: Bool = true
 	
 	
 	// image
 	// image
-	public static let imageGravity: String = kCAGravityCenter
-	public static let imageContentsRect: CGRect = CGRectMake(0, 0, 1, 1)
+	public static let contentsGravity: String = kCAGravityResizeAspectFill
+	public static let contentsRect: CGRect = CGRectMake(0, 0, 1, 1)
+	public static let contentsScale: CGFloat = UIScreen.mainScreen().scale
 }
 }
 
 
 // navigation
 // navigation
@@ -64,7 +64,6 @@ public extension MaterialTheme.navigation {
 	public static let shadowOffset: CGSize = MaterialTheme.view.shadowOffset
 	public static let shadowOffset: CGSize = MaterialTheme.view.shadowOffset
 	public static let shadowOpacity: Float = MaterialTheme.view.shadowOpacity
 	public static let shadowOpacity: Float = MaterialTheme.view.shadowOpacity
 	public static let shadowRadius: CGFloat = MaterialTheme.view.shadowRadius
 	public static let shadowRadius: CGFloat = MaterialTheme.view.shadowRadius
-	public static let contentScale: CGFloat = MaterialTheme.view.contentScale
 	public static let masksToBounds: Bool = MaterialTheme.view.masksToBounds
 	public static let masksToBounds: Bool = MaterialTheme.view.masksToBounds
 	
 	
 	// color
 	// color
@@ -75,7 +74,8 @@ public extension MaterialTheme.navigation {
 	public static let userInteractionEnabled: Bool = false
 	public static let userInteractionEnabled: Bool = false
 	
 	
 	// image
 	// image
-	public static let imageGravity: String = MaterialTheme.view.imageGravity
-	public static let imageContentsRect: CGRect = MaterialTheme.view.imageContentsRect
+	public static let contentsGravity: String = MaterialTheme.view.contentsGravity
+	public static let contentsRect: CGRect = MaterialTheme.view.contentsRect
+	public static let contentsScale: CGFloat = MaterialTheme.view.contentsScale
 }
 }
 
 

Source/MaterialView.swift

@@ -30,20 +30,29 @@ public class MaterialView: UIView {
 	}
 	}
 	
 	
 	/**
 	/**
-		:name:	imageGravity
+		:name:	contentsGravity
 	*/
 	*/
-	public var imageGravity: String? {
+	public var contentsGravity: String! {
 		didSet {
 		didSet {
-			layer.contentsGravity = nil == imageGravity ? MaterialTheme.view.imageGravity : imageGravity!
+			layer.contentsGravity = contentsGravity
 		}
 		}
 	}
 	}
 	
 	
 	/**
 	/**
-		:name:	imageContentsRect
+		:name:	contentsRect
 	*/
 	*/
-	public var imageContentsRect: CGRect? {
+	public var contentsRect: CGRect! {
 		didSet {
 		didSet {
-			layer.contentsRect = nil == imageContentsRect ? MaterialTheme.view.imageContentsRect : imageContentsRect!
+			layer.contentsRect = contentsRect
+		}
+	}
+	
+	/**
+		:name:	contentsScale
+	*/
+	public var contentsScale: CGFloat! {
+		didSet {
+			layer.contentsScale = contentsScale
 		}
 		}
 	}
 	}
 	
 	
@@ -189,7 +198,9 @@ public class MaterialView: UIView {
 		:name:	prepareLayer
 		:name:	prepareLayer
 	*/
 	*/
 	internal func prepareLayer() {
 	internal func prepareLayer() {
-		layer.contentsScale = MaterialTheme.view.contentScale
+		contentsScale = MaterialTheme.view.contentsScale
+		contentsGravity = MaterialTheme.view.contentsGravity
+		contentsRect = MaterialTheme.view.contentsRect
 		shadowColor = MaterialTheme.view.shadowColor
 		shadowColor = MaterialTheme.view.shadowColor
 		shadowOffset = MaterialTheme.view.shadowOffset
 		shadowOffset = MaterialTheme.view.shadowOffset
 		shadowOpacity = MaterialTheme.view.shadowOpacity
 		shadowOpacity = MaterialTheme.view.shadowOpacity

Source/NavigationBarView.swift

@@ -29,24 +29,6 @@ public class NavigationBarView: MaterialView {
 	}
 	}
 	
 	
 	/**
 	/**
-		:name:	imageGravity
-	*/
-	public override var imageGravity: String? {
-		didSet {
-			layer.contentsGravity = nil == imageGravity ? MaterialTheme.navigation.imageGravity : imageGravity!
-		}
-	}
-	
-	/**
-		:name:	imageContentsRect
-	*/
-	public override var imageContentsRect: CGRect? {
-		didSet {
-			layer.contentsRect = nil == imageContentsRect ? MaterialTheme.navigation.imageContentsRect : imageContentsRect!
-		}
-	}
-	
-	/**
 		:name:	init
 		:name:	init
 	*/
 	*/
 	public convenience init() {
 	public convenience init() {
@@ -69,7 +51,9 @@ public class NavigationBarView: MaterialView {
 		:name:	prepareLayer
 		:name:	prepareLayer
 	*/
 	*/
 	internal override func prepareLayer() {
 	internal override func prepareLayer() {
-		layer.contentsScale = MaterialTheme.navigation.contentScale
+		contentsScale = MaterialTheme.navigation.contentsScale
+		contentsGravity = MaterialTheme.navigation.contentsGravity
+		contentsRect = MaterialTheme.navigation.contentsRect
 		shadowColor = MaterialTheme.navigation.shadowColor
 		shadowColor = MaterialTheme.navigation.shadowColor
 		shadowOffset = MaterialTheme.navigation.shadowOffset
 		shadowOffset = MaterialTheme.navigation.shadowOffset
 		shadowOpacity = MaterialTheme.navigation.shadowOpacity
 		shadowOpacity = MaterialTheme.navigation.shadowOpacity