Commit 63296568 by Daniel Dahan

updated Scale animation for pulse views

parent 70ad31b8
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'MK' s.name = 'MK'
s.version = '1.19.0' s.version = '1.19.1'
s.license = { :type => "AGPLv3+", :file => "LICENSE" } s.license = { :type => "AGPLv3+", :file => "LICENSE" }
s.summary = 'A Material Design Framework In Swift' s.summary = 'A Material Design Framework In Swift'
s.homepage = 'http://materialkit.io' s.homepage = 'http://materialkit.io'
......
...@@ -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.19.0</string> <string>1.19.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
...@@ -387,18 +387,23 @@ public class MaterialButton : UIButton { ...@@ -387,18 +387,23 @@ public class MaterialButton : UIButton {
let s: CGFloat = (width < height ? height : width) / 2 let s: CGFloat = (width < height ? height : width) / 2
let f: CGFloat = 3 let f: CGFloat = 3
let v: CGFloat = s / f let v: CGFloat = s / f
let d: CGFloat = pulseFill ? 5 * f : 2.5 * f let d: CGFloat = pulseFill ? 5 * f : 2 * f
let r: CGFloat = 1.05
let a: CFTimeInterval = 0.25
MaterialAnimation.animationDisabled({ MaterialAnimation.animationDisabled({
self.pulseLayer.hidden = false self.pulseLayer.hidden = false
self.pulseLayer.bounds = CGRectMake(0, 0, v, v) self.pulseLayer.bounds = CGRectMake(0, 0, v, v)
self.pulseLayer.position = point self.pulseLayer.position = point
self.pulseLayer.cornerRadius = s / d self.pulseLayer.cornerRadius = s / d
}) })
MaterialAnimation.animationWithDuration(0.25, animations: {
if pulseScale {
layer.addAnimation(MaterialAnimation.scale(CATransform3DMakeScale(r, r, r), duration: a), forKey: nil)
}
MaterialAnimation.animationWithDuration(a, animations: {
self.pulseLayer.transform = CATransform3DMakeScale(d, d, d) self.pulseLayer.transform = CATransform3DMakeScale(d, d, d)
if self.pulseScale {
self.layer.transform = CATransform3DMakeScale(1.05, 1.05, 1.05)
}
}) })
} }
} }
...@@ -478,9 +483,7 @@ public class MaterialButton : UIButton { ...@@ -478,9 +483,7 @@ public class MaterialButton : UIButton {
MaterialAnimation.animationWithDuration(0.25, animations: { MaterialAnimation.animationWithDuration(0.25, animations: {
self.pulseLayer.hidden = true self.pulseLayer.hidden = true
self.pulseLayer.transform = CATransform3DIdentity self.pulseLayer.transform = CATransform3DIdentity
if self.pulseScale {
self.layer.transform = CATransform3DIdentity
}
}) })
self.layer.addAnimation(MaterialAnimation.scale(CATransform3DIdentity), forKey: nil)
} }
} }
\ No newline at end of file
...@@ -68,17 +68,22 @@ public class MaterialPulseView : MaterialView { ...@@ -68,17 +68,22 @@ public class MaterialPulseView : MaterialView {
let f: CGFloat = 3 let f: CGFloat = 3
let v: CGFloat = s / f let v: CGFloat = s / f
let d: CGFloat = pulseFill ? 5 * f : 2 * f let d: CGFloat = pulseFill ? 5 * f : 2 * f
let r: CGFloat = 1.05
let a: CFTimeInterval = 0.25
MaterialAnimation.animationDisabled({ MaterialAnimation.animationDisabled({
self.pulseLayer.hidden = false self.pulseLayer.hidden = false
self.pulseLayer.bounds = CGRectMake(0, 0, v, v) self.pulseLayer.bounds = CGRectMake(0, 0, v, v)
self.pulseLayer.position = point self.pulseLayer.position = point
self.pulseLayer.cornerRadius = s / d self.pulseLayer.cornerRadius = s / d
}) })
MaterialAnimation.animationWithDuration(0.25, animations: {
if pulseScale {
layer.addAnimation(MaterialAnimation.scale(CATransform3DMakeScale(r, r, r), duration: a), forKey: nil)
}
MaterialAnimation.animationWithDuration(a, animations: {
self.pulseLayer.transform = CATransform3DMakeScale(d, d, d) self.pulseLayer.transform = CATransform3DMakeScale(d, d, d)
if self.pulseScale {
self.layer.transform = CATransform3DMakeScale(1.05, 1.05, 1.05)
}
}) })
} }
} }
...@@ -162,9 +167,7 @@ public class MaterialPulseView : MaterialView { ...@@ -162,9 +167,7 @@ public class MaterialPulseView : MaterialView {
MaterialAnimation.animationWithDuration(0.25, animations: { MaterialAnimation.animationWithDuration(0.25, animations: {
self.pulseLayer.hidden = true self.pulseLayer.hidden = true
self.pulseLayer.transform = CATransform3DIdentity self.pulseLayer.transform = CATransform3DIdentity
if self.pulseScale {
self.layer.transform = CATransform3DIdentity
}
}) })
self.layer.addAnimation(MaterialAnimation.scale(CATransform3DIdentity), forKey: nil)
} }
} }
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