Commit 17ab204d by Daniel Dahan

updated animation property to animate

parent cecb946a
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'MK' s.name = 'MK'
s.version = '1.24.11' s.version = '1.24.12'
s.license = { :type => "AGPL-3.0", :file => "LICENSE" } s.license = { :type => "AGPL-3.0", :file => "LICENSE" }
s.summary = 'Beautiful Material Design in Swift.' s.summary = 'Beautiful Material Design in Swift.'
s.homepage = 'http://materialkit.io' s.homepage = 'http://materialkit.io'
......
...@@ -137,7 +137,7 @@ public class CapturePreviewView : MaterialView, UIGestureRecognizerDelegate { ...@@ -137,7 +137,7 @@ public class CapturePreviewView : MaterialView, UIGestureRecognizerDelegate {
/** /**
:name: prepareView :name: prepareView
*/ */
internal override func prepareView() { public override func prepareView() {
super.prepareView() super.prepareView()
preparePreviewLayer() preparePreviewLayer()
tapToFocusEnabled = true tapToFocusEnabled = true
......
...@@ -166,7 +166,7 @@ public class CaptureView : MaterialView, CaptureSessionDelegate, CapturePreviewV ...@@ -166,7 +166,7 @@ public class CaptureView : MaterialView, CaptureSessionDelegate, CapturePreviewV
/** /**
:name: prepareView :name: prepareView
*/ */
internal override func prepareView() { public override func prepareView() {
super.prepareView() super.prepareView()
preparePreviewView() preparePreviewView()
prepareFocusLayer() prepareFocusLayer()
......
...@@ -392,7 +392,7 @@ public class CardView : MaterialPulseView { ...@@ -392,7 +392,7 @@ public class CardView : MaterialPulseView {
/** /**
:name: prepareView :name: prepareView
*/ */
internal override func prepareView() { public override func prepareView() {
super.prepareView() super.prepareView()
userInteractionEnabled = MaterialTheme.basicCardView.userInteractionEnabled userInteractionEnabled = MaterialTheme.basicCardView.userInteractionEnabled
backgroundColor = MaterialTheme.basicCardView.backgroundColor backgroundColor = MaterialTheme.basicCardView.backgroundColor
......
...@@ -22,7 +22,7 @@ public class FabButton : MaterialButton { ...@@ -22,7 +22,7 @@ public class FabButton : MaterialButton {
/** /**
:name: prepareView :name: prepareView
*/ */
internal override func prepareView() { public override func prepareView() {
super.prepareView() super.prepareView()
setTitleColor(MaterialTheme.fabButton.titleLabelColorForNormalState, forState: .Normal) setTitleColor(MaterialTheme.fabButton.titleLabelColorForNormalState, forState: .Normal)
titleLabel?.font = MaterialTheme.fabButton.titleLabelFont titleLabel?.font = MaterialTheme.fabButton.titleLabelFont
......
...@@ -22,7 +22,7 @@ public class FlatButton : MaterialButton { ...@@ -22,7 +22,7 @@ public class FlatButton : MaterialButton {
/** /**
:name: prepareView :name: prepareView
*/ */
internal override func prepareView() { public override func prepareView() {
super.prepareView() super.prepareView()
setTitleColor(MaterialTheme.flatButton.titleLabelColorForNormalState, forState: .Normal) setTitleColor(MaterialTheme.flatButton.titleLabelColorForNormalState, forState: .Normal)
titleLabel?.font = MaterialTheme.flatButton.titleLabelFont titleLabel?.font = MaterialTheme.flatButton.titleLabelFont
......
...@@ -529,7 +529,7 @@ public class ImageCardView : MaterialPulseView { ...@@ -529,7 +529,7 @@ public class ImageCardView : MaterialPulseView {
/** /**
:name: prepareView :name: prepareView
*/ */
internal override func prepareView() { public override func prepareView() {
super.prepareView() super.prepareView()
userInteractionEnabled = MaterialTheme.imageCardView.userInteractionEnabled userInteractionEnabled = MaterialTheme.imageCardView.userInteractionEnabled
backgroundColor = MaterialTheme.imageCardView.backgroundColor backgroundColor = MaterialTheme.imageCardView.backgroundColor
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.24.11</string> <string>1.24.12</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
...@@ -449,7 +449,7 @@ public class MaterialButton : UIButton { ...@@ -449,7 +449,7 @@ public class MaterialButton : UIButton {
/** /**
:name: prepareView :name: prepareView
*/ */
internal func prepareView() { public func prepareView() {
prepareVisualLayer() prepareVisualLayer()
preparePulseLayer() preparePulseLayer()
} }
......
...@@ -129,7 +129,7 @@ public class MaterialLabel : UILabel { ...@@ -129,7 +129,7 @@ public class MaterialLabel : UILabel {
/** /**
:name: prepareView :name: prepareView
*/ */
internal func prepareView() { public func prepareView() {
textAlignment = MaterialTheme.label.textAlignment textAlignment = MaterialTheme.label.textAlignment
wrapped = MaterialTheme.label.wrapped wrapped = MaterialTheme.label.wrapped
contentsScale = MaterialTheme.label.contentsScale contentsScale = MaterialTheme.label.contentsScale
......
...@@ -133,7 +133,7 @@ public class MaterialPulseView : MaterialView { ...@@ -133,7 +133,7 @@ public class MaterialPulseView : MaterialView {
/** /**
:name: prepareView :name: prepareView
*/ */
internal override func prepareView() { public override func prepareView() {
super.prepareView() super.prepareView()
userInteractionEnabled = MaterialTheme.pulseView.userInteractionEnabled userInteractionEnabled = MaterialTheme.pulseView.userInteractionEnabled
backgroundColor = MaterialTheme.pulseView.backgroundColor backgroundColor = MaterialTheme.pulseView.backgroundColor
......
...@@ -382,7 +382,7 @@ public class MaterialView : UIView { ...@@ -382,7 +382,7 @@ public class MaterialView : UIView {
/** /**
:name: prepareView :name: prepareView
*/ */
internal func prepareView() { public func prepareView() {
userInteractionEnabled = MaterialTheme.view.userInteractionEnabled userInteractionEnabled = MaterialTheme.view.userInteractionEnabled
backgroundColor = MaterialTheme.view.backgroundColor backgroundColor = MaterialTheme.view.backgroundColor
......
...@@ -318,7 +318,7 @@ public class NavigationBarView : MaterialView { ...@@ -318,7 +318,7 @@ public class NavigationBarView : MaterialView {
/** /**
:name: prepareView :name: prepareView
*/ */
internal override func prepareView() { public override func prepareView() {
super.prepareView() super.prepareView()
userInteractionEnabled = MaterialTheme.navigationBarView.userInteractionEnabled userInteractionEnabled = MaterialTheme.navigationBarView.userInteractionEnabled
backgroundColor = MaterialTheme.navigationBarView.backgroundColor backgroundColor = MaterialTheme.navigationBarView.backgroundColor
......
...@@ -22,7 +22,7 @@ public class RaisedButton : MaterialButton { ...@@ -22,7 +22,7 @@ public class RaisedButton : MaterialButton {
/** /**
:name: prepareView :name: prepareView
*/ */
internal override func prepareView() { public override func prepareView() {
super.prepareView() super.prepareView()
setTitleColor(MaterialTheme.raisedButton.titleLabelColorForNormalState, forState: .Normal) setTitleColor(MaterialTheme.raisedButton.titleLabelColorForNormalState, forState: .Normal)
titleLabel!.font = MaterialTheme.raisedButton.titleLabelFont titleLabel!.font = MaterialTheme.raisedButton.titleLabelFont
......
...@@ -330,7 +330,7 @@ public class SideNavigationViewController: UIViewController, UIGestureRecognizer ...@@ -330,7 +330,7 @@ public class SideNavigationViewController: UIViewController, UIGestureRecognizer
/** /**
:name: prepareView :name: prepareView
*/ */
internal func prepareView() { public func prepareView() {
prepareBackdropLayer() prepareBackdropLayer()
} }
......
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