Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
code style improvements
  • Loading branch information
0ber committed Mar 14, 2019
1 parent 80a5fc4 commit 115a7d6
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
Expand Up @@ -74,7 +74,7 @@ open class RAMBounceAnimation: RAMItemAnimation {

func playBounceAnimation(_ icon: UIImageView) {

let bounceAnimation = CAKeyframeAnimation(keyPath: Constants.AnimationKeys.Scale)
let bounceAnimation = CAKeyframeAnimation(keyPath: Constants.AnimationKeys.scale)
bounceAnimation.values = [1.0, 1.4, 0.9, 1.15, 0.95, 1.02, 1.0]
bounceAnimation.duration = TimeInterval(duration)
bounceAnimation.calculationMode = CAAnimationCalculationMode.cubic
Expand Down
Expand Up @@ -120,7 +120,7 @@ open class RAMFrameItemAnimation: RAMItemAnimation {
}

@nonobjc func playFrameAnimation(_ icon: UIImageView, images: Array<CGImage>) {
let frameAnimation = CAKeyframeAnimation(keyPath: Constants.AnimationKeys.KeyFrame)
let frameAnimation = CAKeyframeAnimation(keyPath: Constants.AnimationKeys.keyFrame)
frameAnimation.calculationMode = CAAnimationCalculationMode.discrete
frameAnimation.duration = TimeInterval(duration)
frameAnimation.values = images
Expand Down
Expand Up @@ -88,7 +88,7 @@ open class RAMFumeAnimation: RAMItemAnimation {

func playMoveIconAnimation(_ icon: UIImageView, values: [AnyObject]) {

let yPositionAnimation = createAnimation(Constants.AnimationKeys.PositionY, values: values, duration: duration / 2)
let yPositionAnimation = createAnimation(Constants.AnimationKeys.positionY, values: values, duration: duration / 2)

icon.layer.add(yPositionAnimation, forKey: nil)
}
Expand All @@ -97,17 +97,17 @@ open class RAMFumeAnimation: RAMItemAnimation {

func playLabelAnimation(_ textLabel: UILabel) {

let yPositionAnimation = createAnimation(Constants.AnimationKeys.PositionY, values: [textLabel.center.y as AnyObject, (textLabel.center.y - 60.0) as AnyObject], duration: duration)
let yPositionAnimation = createAnimation(Constants.AnimationKeys.positionY, values: [textLabel.center.y as AnyObject, (textLabel.center.y - 60.0) as AnyObject], duration: duration)
yPositionAnimation.fillMode = CAMediaTimingFillMode.removed
yPositionAnimation.isRemovedOnCompletion = true
textLabel.layer.add(yPositionAnimation, forKey: nil)

let scaleAnimation = createAnimation(Constants.AnimationKeys.Scale, values: [1.0 as AnyObject, 2.0 as AnyObject], duration: duration)
let scaleAnimation = createAnimation(Constants.AnimationKeys.scale, values: [1.0 as AnyObject, 2.0 as AnyObject], duration: duration)
scaleAnimation.fillMode = CAMediaTimingFillMode.removed
scaleAnimation.isRemovedOnCompletion = true
textLabel.layer.add(scaleAnimation, forKey: nil)

let opacityAnimation = createAnimation(Constants.AnimationKeys.Opacity, values: [1.0 as AnyObject, 0.0 as AnyObject], duration: duration)
let opacityAnimation = createAnimation(Constants.AnimationKeys.opacity, values: [1.0 as AnyObject, 0.0 as AnyObject], duration: duration)
textLabel.layer.add(opacityAnimation, forKey: nil)
}

Expand All @@ -126,10 +126,10 @@ open class RAMFumeAnimation: RAMItemAnimation {

func playDeselectLabelAnimation(_ textLabel: UILabel) {

let yPositionAnimation = createAnimation(Constants.AnimationKeys.PositionY, values: [(textLabel.center.y + 15) as AnyObject, textLabel.center.y as AnyObject], duration: duration)
let yPositionAnimation = createAnimation(Constants.AnimationKeys.positionY, values: [(textLabel.center.y + 15) as AnyObject, textLabel.center.y as AnyObject], duration: duration)
textLabel.layer.add(yPositionAnimation, forKey: nil)

let opacityAnimation = createAnimation(Constants.AnimationKeys.Opacity, values: [0 as AnyObject, 1 as AnyObject], duration: duration)
let opacityAnimation = createAnimation(Constants.AnimationKeys.opacity, values: [0 as AnyObject, 1 as AnyObject], duration: duration)
textLabel.layer.add(opacityAnimation, forKey: nil)
}
}
Expand Up @@ -89,7 +89,7 @@ open class RAMRotationAnimation: RAMItemAnimation {

func playRoatationAnimation(_ icon: UIImageView) {

let rotateAnimation = CABasicAnimation(keyPath: Constants.AnimationKeys.Rotation)
let rotateAnimation = CABasicAnimation(keyPath: Constants.AnimationKeys.rotation)
rotateAnimation.fromValue = 0.0

var toValue = CGFloat.pi * 2
Expand Down
10 changes: 5 additions & 5 deletions RAMAnimatedTabBarController/RAMItemAnimationProtocol.swift
Expand Up @@ -39,11 +39,11 @@ open class RAMItemAnimation: NSObject, RAMItemAnimationProtocol {

struct AnimationKeys {

static let Scale = "transform.scale"
static let Rotation = "transform.rotation"
static let KeyFrame = "contents"
static let PositionY = "position.y"
static let Opacity = "opacity"
static let scale = "transform.scale"
static let rotation = "transform.rotation"
static let keyFrame = "contents"
static let positionY = "position.y"
static let opacity = "opacity"
}
}

Expand Down

0 comments on commit 115a7d6

Please sign in to comment.