Moved growColor at the end of initializer

yoavlt · Feb 15, 2016 · abb33b7 · abb33b7
1 parent 2b48ee5
commit abb33b7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 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,7,10.0))
+ let lineLoader = LiquidLoader(frame: lineFrame, effect: .GrowLine(lineColor,7,10.0, growColor))
 
  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,10,1.0))
+ let circleLoader = LiquidLoader(frame: circleFrame, effect: .GrowCircle(circleColor,10,1.0, growColor))
 
  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,8,5.0))
+ let circleMat = LiquidLoader(frame: circleMatFrame, effect: .Circle(circleMatColor,8,5.0, growColor))
 
  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,4,1.0))
+ let lineMat = LiquidLoader(frame: lineMatFrame, effect: .Line(lineMatColor,4,1.0, growColor))
 
  view.addSubview(lineLoader)
  view.addSubview(circleLoader)

diff --git a/Pod/Classes/LiquidLoadEffect.swift b/Pod/Classes/LiquidLoadEffect.swift
@@ -42,7 +42,7 @@ class LiquidLoadEffect : NSObject {
  }
  }
 
- init(loader: LiquidLoader, color: UIColor, growColor: UIColor? = UIColor.redColor(), circleCount: Int, duration: CGFloat) {
+ init(loader: LiquidLoader, color: UIColor, circleCount: Int, duration: CGFloat, growColor: UIColor? = UIColor.redColor()) {
  self.numberOfCircles = circleCount
  self.duration = duration
  self.circleRadius = loader.frame.width * 0.05

diff --git a/Pod/Classes/LiquidLoader.swift b/Pod/Classes/LiquidLoader.swift
@@ -10,23 +10,23 @@ import Foundation
 import UIKit
 
 public enum Effect {
- case Line(UIColor, UIColor?, Int, CGFloat)
- case Circle(UIColor, UIColor?, Int, CGFloat)
- case GrowLine(UIColor, UIColor?, Int, CGFloat)
- case GrowCircle(UIColor, UIColor?, Int, CGFloat)
+ case Line(UIColor, Int, CGFloat, UIColor?)
+ case Circle(UIColor, Int, CGFloat, UIColor?)
+ case GrowLine(UIColor, Int, CGFloat, UIColor?)
+ case GrowCircle(UIColor, Int, CGFloat, UIColor?)
 
  func setup(loader: LiquidLoader) -> LiquidLoadEffect {
  switch self {
- 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)
+ case .Line(let color, let count, let duration, let growColor):
+ return LiquidLineEffect(loader: loader, color: color, circleCount: count, duration: duration, growColor: growColor)
+ case .Circle(let color, let count, let duration, let growColor):
+ return LiquidCircleEffect(loader: loader, color: color, circleCount: count, duration: duration, growColor: growColor)
+ case .GrowLine(let color, let count, let duration, let growColor):
+ let line = LiquidLineEffect(loader: loader, color: color, circleCount: count, duration: duration, growColor: growColor)
  line.isGrow = true
  return line
- case .GrowCircle(let color, let growColor,let count, let duration):
- let circle = LiquidCircleEffect(loader: loader, color: color, growColor: growColor, circleCount: count, duration: duration)
+ case .GrowCircle(let color,let count, let duration, let growColor):
+ let circle = LiquidCircleEffect(loader: loader, color: color, circleCount: count, duration: duration, growColor: growColor)
  circle.isGrow = true
  return circle
  }
@@ -45,7 +45,7 @@ public class LiquidLoader : UIView {
  }
 
  public required init?(coder aDecoder: NSCoder) {
- self.effect = .Circle(UIColor.whiteColor(), UIColor.redColor(), 5, 3.0)
+ self.effect = .Circle(UIColor.whiteColor(), 5, 3.0, UIColor.redColor())
  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(), numberOfCircle: Int, duration: CGFloat) {
+ @objc public convenience init(frame: CGRect, effect: ObjCEffect, color: UIColor, numberOfCircle: Int, duration: CGFloat, growColor: UIColor? = UIColor.redColor()) {
  var s: Effect
 
  if effect == .Line {
- s = Effect.Line(color, growColor, numberOfCircle, duration)
+ s = Effect.Line(color, numberOfCircle, duration, growColor)
  } else if effect == .Circle {
- s = Effect.Circle(color, growColor, numberOfCircle, duration)
+ s = Effect.Circle(color, numberOfCircle, duration, growColor)
  } else if effect == .GrowLine {
- s = Effect.GrowLine(color, growColor, numberOfCircle, duration)
+ s = Effect.GrowLine(color, numberOfCircle, duration, growColor)
  } else { //if effect == .GrowCircle {
- s = Effect.GrowCircle(color, growColor, numberOfCircle, duration)
+ s = Effect.GrowCircle(color, numberOfCircle, duration, growColor)
  }
 
  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, growColor, 10, 1.0)) //color, growColor, number of circles, duration.
+let loader = LiquidLoader(frame: loaderFrame, effect: .GrowCircle(circleColor, 10, 1.0, , growColor)) //color, number of circles, duration, growColor.
 view.addSubview(loader)
 ```