Commit ca800bda by Daniel Dahan

updated README to test new gif animations

parent 80ffe511
......@@ -31,88 +31,90 @@ Motion offers a clean API to add animations to your views and layers. Simply pas
<table>
<thead>
<tr>
<th>Animation</th>
<th>Example</th>
<th>Property</th>
<th>Swift</th>
</tr>
</thead>
<tbody>
<tr>
<td width="40%">
<td width="30%">
<img src="http://www.cosmicmind.com/motion/background_color.gif" />
</td>
<td width="30%">Border Color</td>
<td width="30%">```swift
view.animate(.background(color: .cyan))
```
<td width="40%">
<pre><code>
view.animate(.background(color: .cyan))
</code></pre>
</td>
</tr>
<tr>
<td width="40%" style="background-color: #ffffff">
<td width="30%" style="background-color: #ffffff">
<img src="http://www.cosmicmind.com/motion/border_color.gif" />
</td>
<td width="30%">Border Color & Border Width</td>
<td width="30%">```swift
view.animate(.border(color: .cyan), .border(width: 20))
```
</td>
<td width="40%">
<pre><code>
view.animate(.border(color: .cyan), .border(width: 20))
</code></pre>
</td>
</tr>
<tr style="background-color: #fff">
<td width="40%">
<td width="30%">
<img src="http://www.cosmicmind.com/motion/corner_radius.gif" />
</td>
<td width="30%">Border Color & Border Width</td>
<td width="30%">```swift
<td width="40%">```swift
view.animate(.border(color: .cyan), .border(width: 20))
```
</td>
</tr>
<tr style="background-color: #fff">
<td width="40%">
<td width="30%">
<img src="http://www.cosmicmind.com/motion/depth.gif" />
</td>
<td width="30%">Border Color & Border Width</td>
<td width="30%">```swift
<td width="40%">```swift
view.animate(.border(color: .cyan), .border(width: 20))
```
</td>
</tr>
<tr style="background-color: #fff">
<td width="40%">
<td width="30%">
<img src="http://www.cosmicmind.com/motion/fade.gif" />
</td>
<td width="30%">Border Color & Border Width</td>
<td width="30%">```swift
<td width="40%">```swift
view.animate(.border(color: .cyan), .border(width: 20))
```
</td>
</tr>
<tr style="background-color: #fff">
<td width="40%">
<td width="30%">
<img src="http://www.cosmicmind.com/motion/position.gif" />
</td>
<td width="30%">Border Color & Border Width</td>
<td width="30%">```swift
<td width="40%">```swift
view.animate(.border(color: .cyan), .border(width: 20))
```
</td>
</tr>
<tr style="background-color: #fff">
<td width="40%">
<td width="30%">
<img src="http://www.cosmicmind.com/motion/rotate.gif" />
</td>
<td width="30%">Border Color & Border Width</td>
<td width="30%">```swift
<td width="40%">```swift
view.animate(.border(color: .cyan), .border(width: 20))
```
</td>
</tr>
<tr style="background-color: #fff">
<td width="40%">
<td width="30%">
<img src="http://www.cosmicmind.com/motion/scale.gif" />
</td>
<td width="30%">Border Color & Border Width</td>
<td width="30%">```swift
<td width="40%">```swift
view.animate(.border(color: .cyan), .border(width: 20))
```
</td>
......
......@@ -130,17 +130,17 @@ public extension CALayer {
- Parameter completion: An optional completion block.
*/
func animate(_ animations: [MotionAnimation], completion: (() -> Void)? = nil) {
animate(animations: animations, completion: completion)
startAnimations(animations, completion: completion)
}
}
fileprivate extension CALayer {
/**
A function that executes an Array of MotionAnimation values.
- Parameter animations: An Array of MotionAnimations.
- Parameter _ animations: An Array of MotionAnimations.
- Parameter completion: An optional completion block.
*/
func animate(animations: [MotionAnimation], completion: (() -> Void)? = nil) {
func startAnimations(_ animations: [MotionAnimation], completion: (() -> Void)? = nil) {
let targetState = MotionAnimationState(animations: animations)
Motion.delay(targetState.delay) { [weak self,
......@@ -274,7 +274,6 @@ fileprivate extension CALayer {
s.animate(g)
if let v = targetState.completion {
print(duration)
Motion.delay(duration, execute: v)
}
......
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