Skip to content

Commit f2515eb

Browse files
author
Aladdin
committed
Adopt to Xcode 7
1 parent ee9b941 commit f2515eb

14 files changed

+29
-22
lines changed

NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallClipRotateMultiple.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class NVActivityIndicatorAnimationBallClipRotateMultiple: NVActivityIndicatorAni
3131
color: color, reverse: true)
3232
}
3333

34-
func createAnimationIn(# duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, reverse: Bool) -> CAAnimation {
34+
func createAnimationIn(duration duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, reverse: Bool) -> CAAnimation {
3535
// Scale animation
3636
let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")
3737

@@ -63,7 +63,7 @@ class NVActivityIndicatorAnimationBallClipRotateMultiple: NVActivityIndicatorAni
6363
return animation
6464
}
6565

66-
func circleOf(# shape: NVActivityIndicatorShape, duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGFloat, color: UIColor, reverse: Bool) {
66+
func circleOf(shape shape: NVActivityIndicatorShape, duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGFloat, color: UIColor, reverse: Bool) {
6767
let circle = shape.createLayerWith(size: CGSize(width: size, height: size), color: color)
6868
let frame = CGRect(x: (layer.bounds.size.width - size) / 2,
6969
y: (layer.bounds.size.height - size) / 2,

NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallClipRotatePulse.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class NVActivityIndicatorAnimationBallClipRotatePulse: NVActivityIndicatorAnimat
1818
bigCircleWith(duration: duration, timingFunction: timingFunction, layer: layer, size: size, color: color)
1919
}
2020

21-
func smallCircleWith(# duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGSize, color: UIColor) {
21+
func smallCircleWith(duration duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGSize, color: UIColor) {
2222
// Animation
2323
let animation = CAKeyframeAnimation(keyPath:"transform.scale")
2424

@@ -42,7 +42,7 @@ class NVActivityIndicatorAnimationBallClipRotatePulse: NVActivityIndicatorAnimat
4242
layer.addSublayer(circle)
4343
}
4444

45-
func bigCircleWith(# duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGSize, color: UIColor) {
45+
func bigCircleWith(duration duration: CFTimeInterval, timingFunction: CAMediaTimingFunction, layer: CALayer, size: CGSize, color: UIColor) {
4646
// Scale animation
4747
let scaleAnimation = CAKeyframeAnimation(keyPath:"transform.scale")
4848

NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallPulseRise.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class NVActivityIndicatorAnimationBallPulseRise: NVActivityIndicatorAnimationDel
3939
}
4040
}
4141

42-
func oddAnimation(# duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {
42+
func oddAnimation(duration duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {
4343
// Scale animation
4444
let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")
4545

@@ -66,7 +66,7 @@ class NVActivityIndicatorAnimationBallPulseRise: NVActivityIndicatorAnimationDel
6666
return animation
6767
}
6868

69-
func evenAnimation(# duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {
69+
func evenAnimation(duration duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {
7070
// Scale animation
7171
let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")
7272

NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallSpinFadeLoader.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class NVActivityIndicatorAnimationBallSpinFadeLoader: NVActivityIndicatorAnimati
5656
}
5757
}
5858

59-
func circleAt(# angle: CGFloat, size: CGFloat, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {
59+
func circleAt(angle angle: CGFloat, size: CGFloat, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {
6060
let radius = containerSize.width / 2
6161
let circle = NVActivityIndicatorShape.Circle.createLayerWith(size: CGSize(width: size, height: size), color: color)
6262
let frame = CGRect(

NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallZigZag.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class NVActivityIndicatorAnimationBallZigZag: NVActivityIndicatorAnimationDelega
4545
circleAt(frame: frame, layer: layer, size: CGSize(width: circleSize, height: circleSize), color: color, animation: animation)
4646
}
4747

48-
func circleAt(# frame: CGRect, layer: CALayer, size: CGSize, color: UIColor, animation: CAAnimation) {
48+
func circleAt(frame frame: CGRect, layer: CALayer, size: CGSize, color: UIColor, animation: CAAnimation) {
4949
let circle = NVActivityIndicatorShape.Circle.createLayerWith(size: size, color: color)
5050

5151
circle.frame = frame

NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallZigZagDeflect.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class NVActivityIndicatorAnimationBallZigZagDeflect: NVActivityIndicatorAnimatio
4545
circleAt(frame: frame, layer: layer, size: CGSize(width: circleSize, height: circleSize), color: color, animation: animation)
4646
}
4747

48-
func circleAt(# frame: CGRect, layer: CALayer, size: CGSize, color: UIColor, animation: CAAnimation) {
48+
func circleAt(frame frame: CGRect, layer: CALayer, size: CGSize, color: UIColor, animation: CAAnimation) {
4949
let circle = NVActivityIndicatorShape.Circle.createLayerWith(size: size, color: color)
5050

5151
circle.frame = frame

NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationLineSpinFadeLoader.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class NVActivityIndicatorAnimationLineSpinFadeLoader: NVActivityIndicatorAnimati
4444
}
4545
}
4646

47-
func lineAt(# angle: CGFloat, size: CGSize, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {
47+
func lineAt(angle angle: CGFloat, size: CGSize, origin: CGPoint, containerSize: CGSize, color: UIColor) -> CALayer {
4848
let radius = containerSize.width / 2
4949
let lineContainerSize = CGSize(width: max(size.width, size.height), height: max(size.width, size.height))
5050
let lineContainer = CALayer()

NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationSquareSpin.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ class NVActivityIndicatorAnimationSquareSpin: NVActivityIndicatorAnimationDelega
4141
layer.addSublayer(square)
4242
}
4343

44-
func createRotateXTransform(# angle: CGFloat) -> CATransform3D {
44+
func createRotateXTransform(angle angle: CGFloat) -> CATransform3D {
4545
var transform = CATransform3DMakeRotation(angle, 1, 0, 0)
4646

4747
transform.m34 = CGFloat(-1) / 100
4848

4949
return transform
5050
}
5151

52-
func createRotateYTransform(# angle: CGFloat) -> CATransform3D {
52+
func createRotateYTransform(angle angle: CGFloat) -> CATransform3D {
5353
var transform = CATransform3DMakeRotation(angle, 0, 1, 0)
5454

5555
transform.m34 = CGFloat(-1) / 100

NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationTriangleSkewSpin.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ class NVActivityIndicatorAnimationTriangleSkewSpin: NVActivityIndicatorAnimation
3939
layer.addSublayer(triangle)
4040
}
4141

42-
func createRotateXTransform(# angle: CGFloat) -> CATransform3D {
42+
func createRotateXTransform(angle angle: CGFloat) -> CATransform3D {
4343
var transform = CATransform3DMakeRotation(angle, 1, 0, 0)
4444

4545
transform.m34 = CGFloat(-1) / 100
4646

4747
return transform
4848
}
4949

50-
func createRotateYTransform(# angle: CGFloat) -> CATransform3D {
50+
func createRotateYTransform(angle angle: CGFloat) -> CATransform3D {
5151
var transform = CATransform3DMakeRotation(angle, 0, 1, 0)
5252

5353
transform.m34 = CGFloat(-1) / 100

NVActivityIndicatorView/NVActivityIndicatorShape.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ enum NVActivityIndicatorShape {
2020
case Line
2121
case Pacman
2222

23-
func createLayerWith(# size: CGSize, color: UIColor) -> CALayer {
23+
func createLayerWith(size size: CGSize, color: UIColor) -> CALayer {
2424
let layer: CAShapeLayer = CAShapeLayer()
2525
var path: UIBezierPath = UIBezierPath()
2626
let lineWidth: CGFloat = 2
@@ -34,7 +34,7 @@ enum NVActivityIndicatorShape {
3434
clockwise: false);
3535
layer.fillColor = color.CGColor
3636
case .CircleSemi:
37-
let radius = CGFloat(size.width / 2)
37+
_ = CGFloat(size.width / 2)
3838

3939
path.addArcWithCenter(CGPoint(x: size.width / 2, y: size.height / 2),
4040
radius: size.width / 2,
@@ -53,7 +53,7 @@ enum NVActivityIndicatorShape {
5353
layer.strokeColor = color.CGColor
5454
layer.lineWidth = lineWidth
5555
case .RingTwoHalfVertical:
56-
let radius = CGFloat(size.width / 2)
56+
_ = CGFloat(size.width / 2)
5757

5858
path.addArcWithCenter(CGPoint(x: size.width / 2, y: size.height / 2),
5959
radius:size.width / 2,
@@ -73,7 +73,7 @@ enum NVActivityIndicatorShape {
7373
layer.strokeColor = color.CGColor
7474
layer.lineWidth = lineWidth
7575
case .RingTwoHalfHorizontal:
76-
let radius = size.width / 2
76+
_ = size.width / 2
7777

7878
path.addArcWithCenter(CGPoint(x: size.width / 2, y: size.height / 2),
7979
radius:size.width / 2,

0 commit comments

Comments
 (0)