Merge branch 'swift-2.0' of https://github.com/yoavlt/LiquidLoader in…

…to swift-2.0 # Conflicts: # Example/LiquidLoader/ViewController.swift # Pod/Classes/LiquidCircleEffect.swift # Pod/Classes/LiquidLoadEffect.swift # Pod/Classes/LiquidLoader.swift # Pod/Classes/ObjC.swift
yoavlt · Feb 15, 2016 · c261b2d · c261b2d
2 parents a20b787 + c67fc19
commit c261b2d
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 37 deletions.
diff --git a/Example/LiquidLoader/ViewController.swift b/Example/LiquidLoader/ViewController.swift
@@ -21,19 +21,19 @@ class ViewController: UIViewController {
  let growColor = UIColor.redColor()
 
  let lineFrame = CGRect(x: self.view.frame.width * 0.5 - 100, y: 100, width: 200, height: 100)
- let lineLoader = LiquidLoader(frame: lineFrame, effect: .GrowLine(lineColor, growColor))
+ let lineLoader = LiquidLoader(frame: lineFrame, effect: .GrowLine(lineColor, growColor,7,10.0))
 
  let circleFrame = CGRect(x: self.view.frame.width * 0.5 - 100, y: 200, width: 200, height: 200)
  let circleColor = UIColor(red: 77 / 255.0, green: 182 / 255.0, blue: 255 / 255.0, alpha: 1.0)
- let circleLoader = LiquidLoader(frame: circleFrame, effect: .GrowCircle(circleColor, growColor))
+ let circleLoader = LiquidLoader(frame: circleFrame, effect: .GrowCircle(circleColor, growColor,10,1.0))
 
  let circleMatColor = UIColor(red: 255 / 255.0, green: 188 / 255.0, blue: 188 / 255.0, alpha: 1.0)
  let circleMatFrame = CGRect(x: self.view.frame.width * 0.5 - 25, y: 450, width: 50, height: 50)
- let circleMat = LiquidLoader(frame: circleMatFrame, effect: .Circle(circleMatColor, growColor))
+ let circleMat = LiquidLoader(frame: circleMatFrame, effect: .Circle(circleMatColor, growColor,8,5.0))
 
  let lineMatColor = UIColor(red: 255 / 255.0, green: 255 / 255.0, blue: 188 / 255.0, alpha: 1.0)
  let lineMatFrame = CGRect(x: self.view.frame.width * 0.5 - 25, y: 500, width: 50, height: 50)
- let lineMat = LiquidLoader(frame: lineMatFrame, effect: .Line(lineMatColor, growColor))
+ let lineMat = LiquidLoader(frame: lineMatFrame, effect: .Line(lineMatColor, growColor,4,1.0))
 
  view.addSubview(lineLoader)
  view.addSubview(circleLoader)

diff --git a/Pod/Classes/LiquidCircleEffect.swift b/Pod/Classes/LiquidCircleEffect.swift
@@ -15,15 +15,9 @@ class LiquidCircleEffect : LiquidLoadEffect {
  get {
  return loader!.frame.width * 0.5
  }
- }
- let NumberOfCircles = 8
-
- internal override init(loader: LiquidLoader, color: UIColor, growColor: UIColor? = UIColor.redColor()) {
- super.init(loader: loader, color: color, growColor: growColor)
- }
-
+
  override func setupShape() -> [LiquittableCircle] {
- return Array(0..<NumberOfCircles).map { i in
+ return Array(0..<numberOfCircles).map { i in
  let angle = CGFloat(i) * CGFloat(2 * M_PI) / 8.0
  let frame = self.loader.frame
  let center = CGMath.circlePoint(frame.center.minus(frame.origin), radius: self.radius - self.circleRadius, rad: angle)
@@ -50,7 +44,7 @@ class LiquidCircleEffect : LiquidLoadEffect {
  override func update() {
  switch key {
  case 0.0...1.0:
- key += 0.006
+ key += 1/(duration*60)
  default:
  key = key - 1.0
  }

diff --git a/Pod/Classes/LiquidLineEffect.swift b/Pod/Classes/LiquidLineEffect.swift
@@ -11,11 +11,10 @@ import UIKit
 
 class LiquidLineEffect : LiquidLoadEffect {
 
- let NumberOfCircles = 5
  var circleInter: CGFloat!
 
  override func setupShape() -> [LiquittableCircle] {
- return Array(0..<NumberOfCircles).map { i in
+ return Array(0..<numberOfCircles).map { i in
  return LiquittableCircle(
  center: CGPoint(x: self.circleInter + self.circleRadius + CGFloat(i) * (self.circleInter + 2 * self.circleRadius), y: self.loader.frame.height * 0.5),
  radius: self.circleRadius,
@@ -28,7 +27,7 @@ class LiquidLineEffect : LiquidLoadEffect {
  override func movePosition(key: CGFloat) -> CGPoint {
  if loader != nil {
  return CGPoint(
- x: loader.frame.width * sineTransform(key),
+ x:  (circles.last!.frame.rightBottom.x + circleInter)  * sineTransform(key),
  y: loader.frame.height * 0.5
  )
  } else {
@@ -43,7 +42,7 @@ class LiquidLineEffect : LiquidLoadEffect {
  override func update() {
  switch key {
  case 0.0...2.0:
- key += 0.01
+ key += 2.0/(duration*60)
  default:
  key = 0.0
  }

diff --git a/Pod/Classes/LiquidLoadEffect.swift b/Pod/Classes/LiquidLoadEffect.swift
@@ -11,6 +11,8 @@ import UIKit
 
 class LiquidLoadEffect : NSObject {
 
+ var numberOfCircles: Int
+ var duration: CGFloat
  var circleScale: CGFloat = 1.17
  var moveScale: CGFloat = 0.80
  var color = UIColor.whiteColor()
@@ -40,7 +42,9 @@ class LiquidLoadEffect : NSObject {
  }
  }
 
- init(loader: LiquidLoader, color: UIColor, growColor: UIColor? = UIColor.redColor()) {
+ init(loader: LiquidLoader, color: UIColor, growColor: UIColor? = UIColor.redColor(), circleCount: Int, duration: CGFloat) {
+ self.numberOfCircles = circleCount
+ self.duration = duration
  self.circleRadius = loader.frame.width * 0.05
  self.loader = loader
  self.color = color

diff --git a/Pod/Classes/LiquidLoader.swift b/Pod/Classes/LiquidLoader.swift
@@ -10,27 +10,28 @@ import Foundation
 import UIKit
 
 public enum Effect {
- case Line(UIColor, UIColor?)
- case Circle(UIColor, UIColor?)
- case GrowLine(UIColor, UIColor?)
- case GrowCircle(UIColor, UIColor?)
+ case Line(UIColor, UIColor?, Int, CGFloat)
+ case Circle(UIColor, UIColor?, Int, CGFloat)
+ case GrowLine(UIColor, UIColor?, Int, CGFloat)
+ case GrowCircle(UIColor, UIColor?, Int, CGFloat)
 
  func setup(loader: LiquidLoader) -> LiquidLoadEffect {
  switch self {
- case .Line(let color, let growColor):
- return LiquidLineEffect(loader: loader, color: color, growColor: growColor)
- case .Circle(let color, let growColor):
- return LiquidCircleEffect(loader: loader, color: color, growColor: growColor)
- case .GrowLine(let color, let growColor):
- let line = LiquidLineEffect(loader: loader, color: color, growColor: growColor)
+ case .Line(let color, let growColor, let count, let duration):
+ return LiquidLineEffect(loader: loader, color: color, growColor: growColor, circleCount: count, duration: duration)
+ case .Circle(let color, let growColor, let count, let duration):
+ return LiquidCircleEffect(loader: loader, color: color, growColor: growColor, circleCount: count, duration: duration)
+ case .GrowLine(let color, let growColor, let count, let duration):
+ let line = LiquidLineEffect(loader: loader, color: color, growColor: growColor, circleCount: count, duration: duration)
  line.isGrow = true
  return line
- case .GrowCircle(let color, let growColor):
- let circle = LiquidCircleEffect(loader: loader, color: color, growColor: growColor)
+ case .GrowCircle(let color, let growColor,let count, let duration):
+ let circle = LiquidCircleEffect(loader: loader, color: color, growColor: growColor, circleCount: count, duration: duration)
  circle.isGrow = true
  return circle
  }
  }
+
 }
 
 public class LiquidLoader : UIView {
@@ -44,7 +45,7 @@ public class LiquidLoader : UIView {
  }
 
  public required init?(coder aDecoder: NSCoder) {
- self.effect = .Circle(UIColor.whiteColor(), UIColor.redColor())
+ self.effect = .Circle(UIColor.whiteColor(), UIColor.redColor(), 5, 3.0)
  super.init(coder: aDecoder)
  self.effectDelegate = self.effect.setup(self)
  }

diff --git a/Pod/Classes/ObjC.swift b/Pod/Classes/ObjC.swift
@@ -18,17 +18,17 @@ import UIKit
 
 extension LiquidLoader {
 
- @objc public convenience init(frame: CGRect, effect: ObjCEffect, color: UIColor, growColor: UIColor? = UIColor.redColor()) {
+ @objc public convenience init(frame: CGRect, effect: ObjCEffect, color: UIColor, growColor: UIColor? = UIColor.redColor(), numberOfCircle: Int, duration: CGFloat) {
  var s: Effect
 
  if effect == .Line {
- s = Effect.Line(color, growColor)
+ s = Effect.Line(color, growColor, numberOfCircle, duration)
  } else if effect == .Circle {
- s = Effect.Circle(color, growColor)
+ s = Effect.Circle(color, growColor, numberOfCircle, duration)
  } else if effect == .GrowLine {
- s = Effect.GrowLine(color, growColor)
+ s = Effect.GrowLine(color, growColor, numberOfCircle, duration)
  } else { //if effect == .GrowCircle {
- s = Effect.GrowCircle(color, growColor)
+ s = Effect.GrowCircle(color, growColor, numberOfCircle, duration)
  }
 
  self.init(frame: frame, effect: s)

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ LiquidLoader is the spinner loader UI components with liquid animation, inspired
 ## Usage
 
 ```swift
-let loader = LiquidLoader(frame: loaderFrame, effect: .GrowCircle(circleColor))
+let loader = LiquidLoader(frame: loaderFrame, effect: .GrowCircle(circleColor, growColor, 10, 1.0)) //color, growColor, number of circles, duration.
 view.addSubview(loader)
 ```