Skip to content

M
Material
Commit f5ae321d by Daniel Dahan
Options

minor syntax update

parent 884b03ab
Showing with 4 additions and 6 deletions
Sources/MaterialButton.swift
...@@ -457,10 +457,9 @@ public class MaterialButton : UIButton { ...@@ -457,10 +457,9 @@ public class MaterialButton : UIButton {
let v: CGFloat = r / f let v: CGFloat = r / f
let d: CGFloat = 2 * f let d: CGFloat = 2 * f
let s: CGFloat = 1.05 let s: CGFloat = 1.05
var t: CFTimeInterval = CFTimeInterval(1.5 * width / UIScreen.mainScreen().bounds.width) var t: CFTimeInterval = CFTimeInterval(1.5 * width / UIScreen.mainScreen().bounds.width)
if 0.55 < t { if 0.55 < t || 0.25 > t {
t = 0.55
} else if 0.25 > t {
t = 0.55 t = 0.55
} }
t /= 1.3 t /= 1.3
......
Sources/MaterialPulseView.swift
...@@ -115,10 +115,9 @@ public class MaterialPulseView : MaterialView { ...@@ -115,10 +115,9 @@ public class MaterialPulseView : MaterialView {
let v: CGFloat = r / f let v: CGFloat = r / f
let d: CGFloat = 2 * f let d: CGFloat = 2 * f
let s: CGFloat = 1.05 let s: CGFloat = 1.05
var t: CFTimeInterval = CFTimeInterval(1.5 * width / UIScreen.mainScreen().bounds.width) var t: CFTimeInterval = CFTimeInterval(1.5 * width / UIScreen.mainScreen().bounds.width)
if 0.55 < t { if 0.55 < t || 0.25 > t {
t = 0.55
} else if 0.25 > t {
t = 0.55 t = 0.55
} }
t /= 1.3 t /= 1.3
......
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