Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

convert to swift4.2 #4

Closed
wants to merge 1 commit into from
Closed

convert to swift4.2 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ProgressHUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallBeat.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class NVActivityIndicatorAnimationBallBeat: NVActivityIndicatorAnimationDelegate
let animation = CAAnimationGroup()

animation.animations = [scaleAnimation, opacityAnimation]
animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
animation.duration = duration
animation.repeatCount = HUGE
animation.isRemovedOnCompletion = false
Expand Down
2 changes: 1 addition & 1 deletion ...ssHUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallClipRotate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class NVActivityIndicatorAnimationBallClipRotate: NVActivityIndicatorAnimationDe
let animation = CAAnimationGroup()

animation.animations = [scaleAnimation, rotateAnimation]
animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
animation.duration = duration
animation.repeatCount = HUGE
animation.isRemovedOnCompletion = false
Expand Down
2 changes: 1 addition & 1 deletion ...ActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallClipRotateMultiple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class NVActivityIndicatorAnimationBallClipRotateMultiple: NVActivityIndicatorAni
let bigCircleSize: CGFloat = size.width
let smallCircleSize: CGFloat = size.width / 2
let longDuration: CFTimeInterval = 1
let timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
let timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)

circleOf(shape: .ringTwoHalfHorizontal,
duration: longDuration,
Expand Down
2 changes: 1 addition & 1 deletion ...ressHUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallGridBeat.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class NVActivityIndicatorAnimationBallGridBeat: NVActivityIndicatorAnimationDele
let durations = [0.96, 0.93, 1.19, 1.13, 1.34, 0.94, 1.2, 0.82, 1.19]
let beginTime = CACurrentMediaTime()
let beginTimes = [0.36, 0.4, 0.68, 0.41, 0.71, -0.15, -0.12, 0.01, 0.32]
let timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionDefault)
let timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.default)

// Animation
let animation = CAKeyframeAnimation(keyPath: "opacity")
Expand Down
2 changes: 1 addition & 1 deletion ...essHUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallGridPulse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class NVActivityIndicatorAnimationBallGridPulse: NVActivityIndicatorAnimationDel
let durations: [CFTimeInterval] = [0.72, 1.02, 1.28, 1.42, 1.45, 1.18, 0.87, 1.45, 1.06]
let beginTime = CACurrentMediaTime()
let beginTimes: [CFTimeInterval] = [ -0.06, 0.25, -0.17, 0.48, 0.31, 0.03, 0.46, 0.78, 0.45]
let timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionDefault)
let timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.default)

// Scale animation
let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")
Expand Down
2 changes: 1 addition & 1 deletion ...essHUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallPulseSync.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class NVActivityIndicatorAnimationBallPulseSync: NVActivityIndicatorAnimationDel
let duration: CFTimeInterval = 0.6
let beginTime = CACurrentMediaTime()
let beginTimes: [CFTimeInterval] = [0.07, 0.14, 0.21]
let timingFunciton = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
let timingFunciton = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)

// Animation
let animation = CAKeyframeAnimation(keyPath: "transform.translation.y")
Expand Down
2 changes: 1 addition & 1 deletion ...rogressHUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallScale.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class NVActivityIndicatorAnimationBallScale: NVActivityIndicatorAnimationDelegat
let animation = CAAnimationGroup()

animation.animations = [scaleAnimation, opacityAnimation]
animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
animation.duration = duration
animation.repeatCount = HUGE
animation.isRemovedOnCompletion = false
Expand Down
2 changes: 1 addition & 1 deletion ...UD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallScaleMultiple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class NVActivityIndicatorAnimationBallScaleMultiple: NVActivityIndicatorAnimatio
let animation = CAAnimationGroup()

animation.animations = [scaleAnimation, opacityAnimation]
animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
animation.duration = duration
animation.repeatCount = HUGE
animation.isRemovedOnCompletion = false
Expand Down
2 changes: 1 addition & 1 deletion ...D/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallSpinFadeLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class NVActivityIndicatorAnimationBallSpinFadeLoader: NVActivityIndicatorAnimati
let animation = CAAnimationGroup()

animation.animations = [scaleAnimation, opacityAnimaton]
animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
animation.duration = duration
animation.repeatCount = HUGE
animation.isRemovedOnCompletion = false
Expand Down
4 changes: 2 additions & 2 deletions ...HUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallTrianglePath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class NVActivityIndicatorAnimationBallTrianglePath: NVActivityIndicatorAnimation
let x = (layer.bounds.size.width - size.width) / 2
let y = (layer.bounds.size.height - size.height) / 2
let duration: CFTimeInterval = 2
let timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
let timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)

// Animation
let animation = CAKeyframeAnimation(keyPath: "transform")
Expand Down Expand Up @@ -76,7 +76,7 @@ class NVActivityIndicatorAnimationBallTrianglePath: NVActivityIndicatorAnimation
let values = NSMutableArray(capacity: 5)

for rawValue in rawValues {
let point = CGPointFromString(translateString(rawValue, deltaX: deltaX, deltaY: deltaY))
let point = NSCoder.cgPoint(for: translateString(rawValue, deltaX: deltaX, deltaY: deltaY))

values.add(NSValue(caTransform3D: CATransform3DMakeTranslation(point.x, point.y, 0)))
}
Expand Down
2 changes: 1 addition & 1 deletion ...ogressHUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallZigZag.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class NVActivityIndicatorAnimationBallZigZag: NVActivityIndicatorAnimationDelega
let animation = CAKeyframeAnimation(keyPath: "transform")

animation.keyTimes = [0, 0.33, 0.66, 1]
animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)

animation.values = [
NSValue(caTransform3D: CATransform3DMakeTranslation(0, 0, 0)),
Expand Down
2 changes: 1 addition & 1 deletion ...UD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallZigZagDeflect.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class NVActivityIndicatorAnimationBallZigZagDeflect: NVActivityIndicatorAnimatio
let animation = CAKeyframeAnimation(keyPath: "transform")

animation.keyTimes = [0, 0.33, 0.66, 1]
animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)

animation.values = [
NSValue(caTransform3D: CATransform3DMakeTranslation(0, 0, 0)),
Expand Down
4 changes: 2 additions & 2 deletions ...HUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationCircleStrokeSpin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class NVActivityIndicatorAnimationCircleStrokeSpin: NVActivityIndicatorAnimation

let rotationAnimation = CABasicAnimation(keyPath: "transform.rotation")
rotationAnimation.byValue = Float.pi * 2
rotationAnimation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
rotationAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)

let strokeEndAnimation = CABasicAnimation(keyPath: "strokeEnd")
strokeEndAnimation.duration = strokeEndDuration
Expand All @@ -56,7 +56,7 @@ class NVActivityIndicatorAnimationCircleStrokeSpin: NVActivityIndicatorAnimation
groupAnimation.duration = strokeStartDuration + beginTime
groupAnimation.repeatCount = .infinity
groupAnimation.isRemovedOnCompletion = false
groupAnimation.fillMode = kCAFillModeForwards
groupAnimation.fillMode = CAMediaTimingFillMode.forwards

let circle = NVActivityIndicatorShape.stroke.layerWith(size: size, color: color)
let frame = CGRect(
Expand Down
2 changes: 1 addition & 1 deletion ...ssHUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationCubeTransition.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class NVActivityIndicatorAnimationCubeTransition: NVActivityIndicatorAnimationDe
let duration: CFTimeInterval = 1.6
let beginTime = CACurrentMediaTime()
let beginTimes: [CFTimeInterval] = [0, -0.8]
let timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
let timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)

// Scale animation
let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")
Expand Down
2 changes: 1 addition & 1 deletion ...ssHUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationLineScaleParty.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class NVActivityIndicatorAnimationLineScaleParty: NVActivityIndicatorAnimationDe
let durations: [CFTimeInterval] = [1.26, 0.43, 1.01, 0.73]
let beginTime = CACurrentMediaTime()
let beginTimes: [CFTimeInterval] = [0.77, 0.29, 0.28, 0.74]
let timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionDefault)
let timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.default)

// Animation
let animation = CAKeyframeAnimation(keyPath: "transform.scale")
Expand Down
2 changes: 1 addition & 1 deletion ...D/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationLineSpinFadeLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class NVActivityIndicatorAnimationLineSpinFadeLoader: NVActivityIndicatorAnimati
let duration: CFTimeInterval = 1.2
let beginTime = CACurrentMediaTime()
let beginTimes: [CFTimeInterval] = [0.12, 0.24, 0.36, 0.48, 0.6, 0.72, 0.84, 0.96]
let timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
let timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)

// Animation
let animation = CAKeyframeAnimation(keyPath: "opacity")
Expand Down
10 changes: 5 additions & 5 deletions ...D/iProgressHUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationOrbit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class NVActivityIndicatorAnimationOrbit: NVActivityIndicatorAnimationDelegate {
let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")

scaleAnimation.keyTimes = [0, 0.45, 0.45, 1]
scaleAnimation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
scaleAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
scaleAnimation.values = [0, 0, 1.3, 2]
scaleAnimation.duration = duration

Expand All @@ -59,7 +59,7 @@ class NVActivityIndicatorAnimationOrbit: NVActivityIndicatorAnimationDelegate {
let timingFunction = CAMediaTimingFunction(controlPoints: 0.19, 1, 0.22, 1)

opacityAnimation.keyTimes = [0, 0.45, 1]
scaleAnimation.timingFunctions = [CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear), timingFunction]
scaleAnimation.timingFunctions = [CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear), timingFunction]
opacityAnimation.values = [0.8, 0.8, 0]
opacityAnimation.duration = duration

Expand Down Expand Up @@ -88,7 +88,7 @@ class NVActivityIndicatorAnimationOrbit: NVActivityIndicatorAnimationDelegate {
let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")

scaleAnimation.keyTimes = [0, 0.55, 0.55, 1]
scaleAnimation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
scaleAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
scaleAnimation.values = [0, 0, 1.3, 2.1]
scaleAnimation.duration = duration

Expand All @@ -97,7 +97,7 @@ class NVActivityIndicatorAnimationOrbit: NVActivityIndicatorAnimationDelegate {
let timingFunction = CAMediaTimingFunction(controlPoints: 0.19, 1, 0.22, 1)

opacityAnimation.keyTimes = [0, 0.55, 0.65, 1]
scaleAnimation.timingFunctions = [CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear), timingFunction]
scaleAnimation.timingFunctions = [CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear), timingFunction]
opacityAnimation.values = [0.7, 0.7, 0, 0]
opacityAnimation.duration = duration

Expand All @@ -124,7 +124,7 @@ class NVActivityIndicatorAnimationOrbit: NVActivityIndicatorAnimationDelegate {
func coreInLayer(_ layer: CALayer, size _: CGSize, color: UIColor) {
let inTimingFunction = CAMediaTimingFunction(controlPoints: 0.7, 0, 1, 0.5)
let outTimingFunction = CAMediaTimingFunction(controlPoints: 0, 0.7, 0.5, 1)
let standByTimingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
let standByTimingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)

// Scale animation
let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")
Expand Down
4 changes: 2 additions & 2 deletions .../iProgressHUD/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationPacman.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class NVActivityIndicatorAnimationPacman: NVActivityIndicatorAnimationDelegate {
func pacmanInLayer(_ layer: CALayer, size: CGSize, color: UIColor) {
let pacmanSize = 2 * size.width / 3
let pacmanDuration: CFTimeInterval = 0.5
let timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionDefault)
let timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.default)

// Stroke start animation
let strokeStartAnimation = CAKeyframeAnimation(keyPath: "strokeStart")
Expand Down Expand Up @@ -99,7 +99,7 @@ class NVActivityIndicatorAnimationPacman: NVActivityIndicatorAnimationDelegate {
let animation = CAAnimationGroup()

animation.animations = [translateAnimation, opacityAnimation]
animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
animation.duration = circleDuration
animation.repeatCount = HUGE
animation.isRemovedOnCompletion = false
Expand Down
2 changes: 1 addition & 1 deletion iProgressHUD/iProgressHUD/NVActivityIndicatorView/NVActivityIndicatorView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ public final class NVActivityIndicatorView: UIView {

internal final func setUpAnimation() {
let animation: NVActivityIndicatorAnimationDelegate = type.animation()
var animationRect = UIEdgeInsetsInsetRect(frame, UIEdgeInsetsMake(padding, padding, padding, padding))
var animationRect = frame.inset(by: UIEdgeInsets(top: padding, left: padding, bottom: padding, right: padding))
let minEdge = min(animationRect.width, animationRect.height)

layer.sublayers = nil
Expand Down
6 changes: 3 additions & 3 deletions iProgressHUD/iProgressHUD/iProgressHUD.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@ open class iProgressHUD {
view.addSubview(modalView)
view.addSubview(boxView)
if let lastViews = view.subviews.last {
modalView.bringSubview(toFront: lastViews)
modalView.bringSubviewToFront(lastViews)
} else {
modalView.bringSubview(toFront: view)
modalView.bringSubviewToFront(view)
}
boxView.bringSubview(toFront: modalView)
boxView.bringSubviewToFront(modalView)
modalView.isHidden = true
boxView.isHidden = true

Expand Down