Commit f5ae321d by Daniel Dahan

minor syntax update

parent 884b03ab
......@@ -457,10 +457,9 @@ public class MaterialButton : UIButton {
let v: CGFloat = r / f
let d: CGFloat = 2 * f
let s: CGFloat = 1.05
var t: CFTimeInterval = CFTimeInterval(1.5 * width / UIScreen.mainScreen().bounds.width)
if 0.55 < t {
t = 0.55
} else if 0.25 > t {
if 0.55 < t || 0.25 > t {
t = 0.55
}
t /= 1.3
......@@ -484,7 +483,7 @@ public class MaterialButton : UIButton {
if nil != self.pulseColor && 0 < self.pulseColorOpacity {
MaterialAnimation.animateWithDuration(t, animations: {
pulseLayer.hidden = true
}) {
}) {
pulseLayer.removeFromSuperlayer()
}
}
......
......@@ -115,10 +115,9 @@ public class MaterialPulseView : MaterialView {
let v: CGFloat = r / f
let d: CGFloat = 2 * f
let s: CGFloat = 1.05
var t: CFTimeInterval = CFTimeInterval(1.5 * width / UIScreen.mainScreen().bounds.width)
if 0.55 < t {
t = 0.55
} else if 0.25 > t {
if 0.55 < t || 0.25 > t {
t = 0.55
}
t /= 1.3
......@@ -142,7 +141,7 @@ public class MaterialPulseView : MaterialView {
if nil != self.pulseColor && 0 < self.pulseColorOpacity {
MaterialAnimation.animateWithDuration(t, animations: {
pulseLayer.hidden = true
}) {
}) {
pulseLayer.removeFromSuperlayer()
}
}
......
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