Skip to content
This repository was archived by the owner on Jan 5, 2020. It is now read-only.

Commit d64d3a4

Browse files
author
Draveness
committed
Fixed conflict
2 parents f264330 + d2edc25 commit d64d3a4

4 files changed

Lines changed: 76 additions & 58 deletions

File tree

‎DKChainableAnimationKit/Classes/DKChainableAnimationKit.swift‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public class DKChainableAnimationKit {
154154
self.sanityCheck()
155155
CATransaction.begin()
156156
CATransaction.setCompletionBlock { () -> Void in
157-
self.view.layer.removeAnimationForKey("AnimationChain")
157+
self.view?.layer.removeAnimationForKey("AnimationChain")
158158
self.chainLinkDidFinishAnimating()
159159
}
160160
self.animateChainLink()
@@ -165,7 +165,7 @@ public class DKChainableAnimationKit {
165165

166166
private func animateChainLink() {
167167
self.makeAnchor(0.5, 0.5)
168-
if let animationCluster = self.animationCalculationActions.first {
168+
if let animationCluster = self.animationCalculationActions.first, let _ = self.view {
169169
for action in animationCluster {
170170
action(self.view)
171171
}
@@ -177,7 +177,7 @@ public class DKChainableAnimationKit {
177177
animation.calculte()
178178
}
179179
group.animations = animationCluster
180-
self.view.layer.addAnimation(group, forKey: "AnimationChain")
180+
self.view?.layer.addAnimation(group, forKey: "AnimationChain")
181181
}
182182
}
183183

@@ -187,10 +187,12 @@ public class DKChainableAnimationKit {
187187
let delayTime = dispatch_time(DISPATCH_TIME_NOW,
188188
Int64(delay * Double(NSEC_PER_SEC)))
189189
dispatch_after(delayTime, dispatch_get_main_queue()) {
190-
if let actionCluster: [AnimationCompletionAction] = self.animationCompletionActions.first {
191-
for action in actionCluster {
192-
action(self.view)
193-
}
190+
if let
191+
actionCluster: [AnimationCompletionAction] = self.animationCompletionActions.first,
192+
view = self.view {
193+
for action in actionCluster {
194+
action(view)
195+
}
194196
}
195197
}
196198
}

‎DKChainableAnimationKit/Classes/DKKeyFrameAnimation.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public class DKKeyFrameAnimation: CAKeyframeAnimation {
116116
let numberOfTransforms = m11.count;
117117
let values = NSMutableArray(capacity: numberOfTransforms)
118118
var value: CATransform3D!
119-
for (var i = 1; i < numberOfTransforms; i++) {
119+
for i in 0..<numberOfTransforms {
120120
value = CATransform3DIdentity;
121121
value.m11 = CGFloat(m11.objectAtIndex(i).floatValue)
122122
value.m12 = CGFloat(m12.objectAtIndex(i).floatValue)

‎DKChainableAnimationKit/Classes/DKKeyframeAnimationFunction.swift‎

Lines changed: 52 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,42 @@ import UIKit
1010

1111
typealias DKKeyframeAnimationFunctionBlock = (Double, Double, Double, Double) -> Double
1212

13-
func DKKeyframeAnimationFunctionLinear(var t: Double, b: Double, c: Double, d: Double) -> Double {
14-
t /= d
13+
func DKKeyframeAnimationFunctionLinear(t: Double, b: Double, c: Double, d: Double) -> Double {
14+
let t = t / d
1515
return c * t + b
1616
}
1717

18-
func DKKeyframeAnimationFunctionEaseInQuad(var t: Double, b: Double, c: Double, d: Double) -> Double {
19-
t /= d
18+
func DKKeyframeAnimationFunctionEaseInQuad(t: Double, b: Double, c: Double, d: Double) -> Double {
19+
let t = t / d
2020
return c * t * t + b;
2121
}
2222

23-
func DKKeyframeAnimationFunctionEaseOutQuad(var t: Double, b: Double, c: Double, d: Double) -> Double {
24-
t /= d
23+
func DKKeyframeAnimationFunctionEaseOutQuad(t: Double, b: Double, c: Double, d: Double) -> Double {
24+
let t = t / d
2525
return -c * t * (t - 2) + b;
2626
}
2727

28-
func DKKeyframeAnimationFunctionEaseInOutQuad(var t: Double, b: Double, c: Double, d: Double) -> Double {
29-
t /= d / 2
28+
func DKKeyframeAnimationFunctionEaseInOutQuad(t: Double, b: Double, c: Double, d: Double) -> Double {
29+
var t = t / (d / 2)
3030
if t < 1 {
3131
return c / 2 * t * t + b;
3232
}
33-
return -c / 2 * ((--t) * (t - 2) - 1) + b;
33+
t -= 1
34+
return -c / 2 * ((t) * (t - 2) - 1) + b;
3435
}
3536

36-
func DKKeyframeAnimationFunctionEaseInCubic(var t: Double, b: Double, c: Double, d: Double) -> Double {
37-
t /= d
37+
func DKKeyframeAnimationFunctionEaseInCubic(t: Double, b: Double, c: Double, d: Double) -> Double {
38+
let t = t / d
3839
return c * t * t * t + b;
3940
}
4041

41-
func DKKeyframeAnimationFunctionEaseOutCubic(var t: Double, b: Double, c: Double, d: Double) -> Double {
42-
t = t / d - 1
42+
func DKKeyframeAnimationFunctionEaseOutCubic(t: Double, b: Double, c: Double, d: Double) -> Double {
43+
let t = t / d - 1
4344
return c * (t * t * t + 1) + b;
4445
}
4546

46-
func DKKeyframeAnimationFunctionEaseInOutCubic(var t: Double, b: Double, c: Double, d: Double) -> Double {
47-
t /= d / 2
47+
func DKKeyframeAnimationFunctionEaseInOutCubic(t: Double, b: Double, c: Double, d: Double) -> Double {
48+
var t = t / (d / 2)
4849
if t < 1 {
4950
return c / 2 * t * t * t + b;
5051
} else {
@@ -53,18 +54,18 @@ func DKKeyframeAnimationFunctionEaseInOutCubic(var t: Double, b: Double, c: Doub
5354
}
5455
}
5556

56-
func DKKeyframeAnimationFunctionEaseInQuart(var t: Double, b: Double, c: Double, d: Double) -> Double {
57-
t /= d
57+
func DKKeyframeAnimationFunctionEaseInQuart(t: Double, b: Double, c: Double, d: Double) -> Double {
58+
let t = t / d
5859
return c * t * t * t * t + b;
5960
}
6061

61-
func DKKeyframeAnimationFunctionEaseOutQuart(var t: Double, b: Double, c: Double, d: Double) -> Double {
62-
t = t / d - 1
62+
func DKKeyframeAnimationFunctionEaseOutQuart(t: Double, b: Double, c: Double, d: Double) -> Double {
63+
let t = t / d - 1
6364
return -c * (t * t * t * t - 1) + b;
6465
}
6566

66-
func DKKeyframeAnimationFunctionEaseInOutQuart(var t: Double, b: Double, c: Double, d: Double) -> Double {
67-
t /= d / 2
67+
func DKKeyframeAnimationFunctionEaseInOutQuart(t: Double, b: Double, c: Double, d: Double) -> Double {
68+
var t = t / (d / 2)
6869
if t < 1 {
6970
return c / 2 * t * t * t * t + b;
7071
} else {
@@ -73,18 +74,18 @@ func DKKeyframeAnimationFunctionEaseInOutQuart(var t: Double, b: Double, c: Doub
7374
}
7475
}
7576

76-
func DKKeyframeAnimationFunctionEaseInQuint(var t: Double, b: Double, c: Double, d: Double) -> Double {
77-
t /= d
77+
func DKKeyframeAnimationFunctionEaseInQuint(t: Double, b: Double, c: Double, d: Double) -> Double {
78+
let t = t / d
7879
return c * t * t * t * t * t + b;
7980
}
8081

81-
func DKKeyframeAnimationFunctionEaseOutQuint(var t: Double, b: Double, c: Double, d: Double) -> Double {
82-
t = t / d - 1
82+
func DKKeyframeAnimationFunctionEaseOutQuint(t: Double, b: Double, c: Double, d: Double) -> Double {
83+
let t = t / d - 1
8384
return c * (t * t * t * t * t + 1) + b;
8485
}
8586

86-
func DKKeyframeAnimationFunctionEaseInOutQuint(var t: Double, b: Double, c: Double, d: Double) -> Double {
87-
t /= d / 2
87+
func DKKeyframeAnimationFunctionEaseInOutQuint(t: Double, b: Double, c: Double, d: Double) -> Double {
88+
var t = t / (d / 2)
8889
if t < 1 {
8990
return c / 2 * t * t * t * t * t + b;
9091
} else {
@@ -114,48 +115,49 @@ func DKKeyframeAnimationFunctionEaseOutExpo(t: Double, b: Double, c: Double, d:
114115
return (t == d) ? b+c : c * (-pow(2, -10 * t / d) + 1) + b;
115116
}
116117

117-
func DKKeyframeAnimationFunctionEaseInOutExpo(var t: Double, b: Double, c: Double, d: Double) -> Double {
118+
func DKKeyframeAnimationFunctionEaseInOutExpo(t: Double, b: Double, c: Double, d: Double) -> Double {
118119
if t == 0 {
119120
return b
120121
}
121122
if t == d {
122123
return b + c
123124
}
124-
t /= d / 2
125+
var t = t / (d / 2)
125126
if t < 1 {
126127
return c / 2 * pow(2, 10 * (t - 1)) + b
127128
}
128-
return c / 2 * (-pow(2, -10 * --t) + 2) + b
129+
t -= 1
130+
return c / 2 * (-pow(2, -10 * t) + 2) + b
129131
}
130132

131-
func DKKeyframeAnimationFunctionEaseInCirc(var t: Double, b: Double, c: Double, d: Double) -> Double {
132-
t /= d
133+
func DKKeyframeAnimationFunctionEaseInCirc(t: Double, b: Double, c: Double, d: Double) -> Double {
134+
let t = t / d
133135
return -c * (sqrt(1 - t * t) - 1) + b;
134136
}
135137

136-
func DKKeyframeAnimationFunctionEaseOutCirc(var t: Double, b: Double, c: Double, d: Double) -> Double {
137-
t = t / d - 1
138+
func DKKeyframeAnimationFunctionEaseOutCirc(t: Double, b: Double, c: Double, d: Double) -> Double {
139+
let t = t / d - 1
138140
return c * sqrt(1 - t * t) + b
139141
}
140142

141-
func DKKeyframeAnimationFunctionEaseInOutCirc(var t: Double, b: Double, c: Double, d: Double) -> Double {
142-
t /= d / 2
143+
func DKKeyframeAnimationFunctionEaseInOutCirc(t: Double, b: Double, c: Double, d: Double) -> Double {
144+
var t = t / (d / 2)
143145
if t < 1 {
144146
return -c / 2 * (sqrt(1 - t * t) - 1) + b
145147
}
146148
t -= 2
147149
return c / 2 * (sqrt(1 - t * t) + 1) + b
148150
}
149151

150-
func DKKeyframeAnimationFunctionEaseInElastic(var t: Double, b: Double, c: Double, d: Double) -> Double {
152+
func DKKeyframeAnimationFunctionEaseInElastic(t: Double, b: Double, c: Double, d: Double) -> Double {
151153
var s = 1.70158
152154
var p = 0.0
153155
var a = c
154156

155157
if t == 0 {
156158
return b
157159
}
158-
t /= d
160+
var t = t / d
159161
if t == 1 {
160162
return b + c
161163
}
@@ -172,14 +174,14 @@ func DKKeyframeAnimationFunctionEaseInElastic(var t: Double, b: Double, c: Doubl
172174
return -(a * pow(2, 10 * t) * sin((t * d - s) * (2 * M_PI) / p )) + b;
173175
}
174176

175-
func DKKeyframeAnimationFunctionEaseOutElastic(var t: Double, b: Double, c: Double, d: Double) -> Double {
177+
func DKKeyframeAnimationFunctionEaseOutElastic(t: Double, b: Double, c: Double, d: Double) -> Double {
176178
var s = 1.70158
177179
var p = 0.0
178180
var a = c
179181
if t == 0 {
180182
return b
181183
}
182-
t /= d
184+
var t = t / d
183185
if t == 1 {
184186
return b + c
185187
}
@@ -196,14 +198,14 @@ func DKKeyframeAnimationFunctionEaseOutElastic(var t: Double, b: Double, c: Doub
196198
return (a * pow(2, 10 * t) * sin((t * d - s) * (2 * M_PI) / p)) + b;
197199
}
198200

199-
func DKKeyframeAnimationFunctionEaseInOutElastic(var t: Double, b: Double, c: Double, d: Double) -> Double {
201+
func DKKeyframeAnimationFunctionEaseInOutElastic(t: Double, b: Double, c: Double, d: Double) -> Double {
200202
var s = 1.70158
201203
var p = 0.0
202204
var a = c;
203205
if t == 0 {
204206
return b
205207
}
206-
t /= d
208+
var t = t / d
207209
if t == 2 {
208210
return b + c
209211
}
@@ -226,21 +228,21 @@ func DKKeyframeAnimationFunctionEaseInOutElastic(var t: Double, b: Double, c: Do
226228
}
227229
}
228230

229-
func DKKeyframeAnimationFunctionEaseInBack(var t: Double, b: Double, c: Double, d: Double) -> Double {
231+
func DKKeyframeAnimationFunctionEaseInBack(t: Double, b: Double, c: Double, d: Double) -> Double {
230232
let s = 1.70158
231-
t /= d
233+
let t = t / d
232234
return c * t * t * ((s + 1) * t - s) + b;
233235
}
234236

235-
func DKKeyframeAnimationFunctionEaseOutBack(var t: Double, b: Double, c: Double, d: Double) -> Double {
237+
func DKKeyframeAnimationFunctionEaseOutBack(t: Double, b: Double, c: Double, d: Double) -> Double {
236238
let s = 1.70158
237-
t = t / d - 1
239+
let t = t / d - 1
238240
return c * (t * t * ((s + 1) * t + s) + 1) + b;
239241
}
240242

241-
func DKKeyframeAnimationFunctionEaseInOutBack(var t: Double, b: Double, c: Double, d: Double) -> Double {
243+
func DKKeyframeAnimationFunctionEaseInOutBack(t: Double, b: Double, c: Double, d: Double) -> Double {
242244
var s = 1.70158
243-
t /= d / 2
245+
var t = t / (d / 2)
244246

245247
if t < 1 {
246248
s *= 1.525
@@ -256,8 +258,8 @@ func DKKeyframeAnimationFunctionEaseInBounce(t: Double, b: Double, c: Double, d:
256258
return c - DKKeyframeAnimationFunctionEaseOutBounce(d - t, b: 0, c: c, d: d) + b;
257259
}
258260

259-
func DKKeyframeAnimationFunctionEaseOutBounce(var t: Double, b: Double, c: Double, d: Double) -> Double {
260-
t /= d
261+
func DKKeyframeAnimationFunctionEaseOutBounce(t: Double, b: Double, c: Double, d: Double) -> Double {
262+
var t = t / d
261263
if t < 1 / 2.75 {
262264
return c * (7.5625 * t * t) + b;
263265
} else if t < 2 / 2.75 {

‎iOS Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3+
<<<<<<< HEAD
34
LastUpgradeVersion = "0710"
5+
=======
6+
LastUpgradeVersion = "0700"
7+
>>>>>>> origin/swift-2.0
48
version = "1.3">
59
<BuildAction
610
parallelizeBuildables = "YES"
@@ -28,6 +32,16 @@
2832
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2933
shouldUseLaunchSchemeArgsEnv = "YES">
3034
<Testables>
35+
<TestableReference
36+
skipped = "NO">
37+
<BuildableReference
38+
BuildableIdentifier = "primary"
39+
BlueprintIdentifier = "18CEB5D01B059B0300B6ACCB"
40+
BuildableName = "iOS ExampleTests.xctest"
41+
BlueprintName = "iOS ExampleTests"
42+
ReferencedContainer = "container:iOS Example.xcodeproj">
43+
</BuildableReference>
44+
</TestableReference>
3145
</Testables>
3246
<MacroExpansion>
3347
<BuildableReference

0 commit comments

Comments
 (0)