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

Added ability to customize grow color #13

Merged
merged 5 commits into from
Feb 16, 2016
Merged

Added ability to customize grow color #13

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24ebdbe
Added ability to customize grow color
alupattelli Feb 15, 2016
a20b787
Updated test ViewController to the new feature
alupattelli Feb 15, 2016
c261b2d
Merge branch 'swift-2.0' of https://github.com/yoavlt/LiquidLoader in…
alupattelli Feb 15, 2016
2b48ee5
Fixed a missing parentesis
alupattelli Feb 15, 2016
abb33b7
Moved growColor at the end of initializer
alupattelli Feb 15, 2016
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
Next Next commit
Added ability to customize grow color
  • Loading branch information
@alupattelli
alupattelli committed Feb 15, 2016
commit 24ebdbefa44d90b485af1b54bd70519253ffb279
9 changes: 5 additions & 4 deletions Pod/Classes/LiquidCircleEffect.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class LiquidCircleEffect : LiquidLoadEffect {
}
let NumberOfCircles = 8

internal override init(loader: LiquidLoader, color: UIColor) {
super.init(loader: loader, color: color)
internal override init(loader: LiquidLoader, color: UIColor, growColor: UIColor? = UIColor.redColor()) {
super.init(loader: loader, color: color, growColor: growColor)
}

override func setupShape() -> [LiquittableCircle] {
Expand All @@ -30,7 +30,8 @@ class LiquidCircleEffect : LiquidLoadEffect {
return LiquittableCircle(
center: center,
radius: self.circleRadius,
color: self.color
color: self.color,
growColor: self.growColor
)
}
}
Expand Down Expand Up @@ -60,7 +61,7 @@ class LiquidCircleEffect : LiquidLoadEffect {
self.circleScale = 1.10
self.engine = SimpleCircleLiquidEngine(radiusThresh: self.circleRadius * 0.85, angleThresh: 0.5)
let moveCircleRadius = circleRadius * moveScale
moveCircle = LiquittableCircle(center: movePosition(0.0), radius: moveCircleRadius, color: self.color)
moveCircle = LiquittableCircle(center: movePosition(0.0), radius: moveCircleRadius, color: self.color, growColor: self.growColor)
}

override func resize() {
Expand Down
5 changes: 3 additions & 2 deletions Pod/Classes/LiquidLineEffect.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ class LiquidLineEffect : LiquidLoadEffect {
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,
color: self.color
color: self.color,
growColor: self.growColor
)
}
}
Expand Down Expand Up @@ -55,7 +56,7 @@ class LiquidLineEffect : LiquidLoadEffect {
self.circleInter = (loader.frame.width - 2 * circleRadius * 5) / 6
self.engine = SimpleCircleLiquidEngine(radiusThresh: self.circleRadius, angleThresh: 0.2)
let moveCircleRadius = circleRadius * moveScale
self.moveCircle = LiquittableCircle(center: CGPoint(x: 0, y: loader.frame.height * 0.5), radius: moveCircleRadius, color: color)
self.moveCircle = LiquittableCircle(center: CGPoint(x: 0, y: loader.frame.height * 0.5), radius: moveCircleRadius, color: color, growColor: growColor)
}

override func resize() {
Expand Down
8 changes: 6 additions & 2 deletions Pod/Classes/LiquidLoadEffect.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class LiquidLoadEffect : NSObject {
var circleScale: CGFloat = 1.17
var moveScale: CGFloat = 0.80
var color = UIColor.whiteColor()
var growColor = UIColor.redColor()

var engine: SimpleCircleLiquidEngine?
var moveCircle: LiquittableCircle?
Expand All @@ -39,10 +40,13 @@ class LiquidLoadEffect : NSObject {
}
}

init(loader: LiquidLoader, color: UIColor) {
init(loader: LiquidLoader, color: UIColor, growColor: UIColor? = UIColor.redColor()) {
self.circleRadius = loader.frame.width * 0.05
self.loader = loader
self.color = color
if growColor != nil {
self.growColor = growColor!
}
super.init()
setup()
}
Expand Down Expand Up @@ -111,7 +115,7 @@ class LiquidLoadEffect : NSObject {

func grow(isGrow: Bool) {
if isGrow {
shadowCircle = LiquittableCircle(center: self.moveCircle!.center, radius: self.moveCircle!.radius * 1.0, color: self.color)
shadowCircle = LiquittableCircle(center: self.moveCircle!.center, radius: self.moveCircle!.radius * 1.0, color: self.color, growColor: growColor)
shadowCircle?.isGrow = isGrow
loader?.addSubview(shadowCircle!)
} else {
Expand Down
26 changes: 13 additions & 13 deletions Pod/Classes/LiquidLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ import Foundation
import UIKit

public enum Effect {
case Line(UIColor)
case Circle(UIColor)
case GrowLine(UIColor)
case GrowCircle(UIColor)
case Line(UIColor, UIColor?)
case Circle(UIColor, UIColor?)
case GrowLine(UIColor, UIColor?)
case GrowCircle(UIColor, UIColor?)

func setup(loader: LiquidLoader) -> LiquidLoadEffect {
switch self {
case .Line(let color):
return LiquidLineEffect(loader: loader, color: color)
case .Circle(let color):
return LiquidCircleEffect(loader: loader, color: color)
case .GrowLine(let color):
let line = LiquidLineEffect(loader: loader, color: color)
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)
line.isGrow = true
return line
case .GrowCircle(let color):
let circle = LiquidCircleEffect(loader: loader, color: color)
case .GrowCircle(let color, let growColor):
let circle = LiquidCircleEffect(loader: loader, color: color, growColor: growColor)
circle.isGrow = true
return circle
}
Expand All @@ -44,7 +44,7 @@ public class LiquidLoader : UIView {
}

public required init?(coder aDecoder: NSCoder) {
self.effect = .Circle(UIColor.whiteColor())
self.effect = .Circle(UIColor.whiteColor(), UIColor.redColor())
super.init(coder: aDecoder)
self.effectDelegate = self.effect.setup(self)
}
Expand Down
8 changes: 6 additions & 2 deletions Pod/Classes/LiquittableCircle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,15 @@ class LiquittableCircle : UIView {
}
}
var color: UIColor = UIColor.redColor()
var growColor: UIColor = UIColor.whiteColor()

init(center: CGPoint, radius: CGFloat, color: UIColor) {
init(center: CGPoint, radius: CGFloat, color: UIColor, growColor: UIColor?) {
let frame = CGRect(x: center.x - radius, y: center.y - radius, width: 2 * radius, height: 2 * radius)
self.radius = radius
self.color = color
if growColor != nil {
self.growColor = growColor!
}
super.init(frame: frame)
setup()
}
Expand Down Expand Up @@ -61,7 +65,7 @@ class LiquittableCircle : UIView {

func grow(isGrow: Bool) {
if isGrow {
grow(self.color, radius: self.radius, shininess: 1.6)
grow(self.growColor, radius: self.radius, shininess: 1.6)
} else {
self.layer.shadowRadius = 0
self.layer.shadowOpacity = 0
Expand Down
10 changes: 5 additions & 5 deletions Pod/Classes/ObjC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ import UIKit

extension LiquidLoader {

@objc public convenience init(frame: CGRect, effect: ObjCEffect, color: UIColor) {
@objc public convenience init(frame: CGRect, effect: ObjCEffect, color: UIColor, growColor: UIColor? = UIColor.redColor()) {
var s: Effect

if effect == .Line {
s = Effect.Line(color)
s = Effect.Line(color, growColor)
} else if effect == .Circle {
s = Effect.Circle(color)
s = Effect.Circle(color, growColor)
} else if effect == .GrowLine {
s = Effect.GrowLine(color)
s = Effect.GrowLine(color, growColor)
} else { //if effect == .GrowCircle {
s = Effect.GrowCircle(color)
s = Effect.GrowCircle(color, growColor)
}

self.init(frame: frame, effect: s)
Expand Down
2 changes: 1 addition & 1 deletion Pod/Classes/UIView+Grow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import UIKit

extension UIView {
func grow(baseColor: UIColor, radius: CGFloat, shininess: CGFloat) {
let growColor = UIColor(red: 0 / 255.0, green: 1, blue: 1, alpha: 1.0)
let growColor = baseColor//UIColor(red: 0 / 255.0, green: 1, blue: 1, alpha: 1.0)
growShadow(radius, growColor: growColor, shininess: shininess)
let circle = CAShapeLayer()
circle.path = UIBezierPath(ovalInRect: CGRect(x: 0, y: 0, width: radius * 2.0, height: radius * 2.0)).CGPath
Expand Down