Skip to content

Commit

Permalink
[ci skip] Confirm to SwiftLint.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lexrus
lexrus committed Dec 21, 2015
1 parent f585084 commit 53a8e9e
Show file tree
Hide file tree
Showing 10 changed files with 106 additions and 54 deletions.
4 changes: 2 additions & 2 deletions LTMorphingLabel/LTEmitterView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public struct LTEmitter {

let layer: CAEmitterLayer = {
let layer = CAEmitterLayer()
layer.emitterPosition = CGPointMake(10, 10)
layer.emitterSize = CGSizeMake(10, 1)
layer.emitterPosition = CGPoint(x: 10, y: 10)
layer.emitterSize = CGSize(width: 10, height: 1)
layer.renderMode = kCAEmitterLayerOutline
layer.emitterShape = kCAEmitterLayerLine
return layer
Expand Down
52 changes: 31 additions & 21 deletions LTMorphingLabel/LTMorphingLabel+Anvil.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ extension LTMorphingLabel {
particleName: "Smoke",
duration: 0.6
) { (layer, cell) in
layer.emitterSize = CGSizeMake(1, 1)
layer.emitterPosition = CGPointMake(
centerRect.origin.x,
centerRect.origin.y + centerRect.size.height / 1.3)
layer.emitterSize = CGSize(width: 1, height: 1)
layer.emitterPosition = CGPoint(
x: centerRect.origin.x,
y: centerRect.origin.y + centerRect.size.height / 1.3)
layer.renderMode = kCAEmitterLayerSurface
cell.emissionLongitude = CGFloat(M_PI / 2.0)
cell.scale = self.font.pointSize / 90.0
Expand All @@ -69,10 +69,10 @@ extension LTMorphingLabel {
particleName: "Smoke",
duration: 0.6
) { (layer, cell) in
layer.emitterSize = CGSizeMake(1, 1)
layer.emitterPosition = CGPointMake(
centerRect.origin.x,
centerRect.origin.y + centerRect.size.height / 1.3)
layer.emitterSize = CGSize(width: 1, height: 1)
layer.emitterPosition = CGPoint(
x: centerRect.origin.x,
y: centerRect.origin.y + centerRect.size.height / 1.3)
layer.renderMode = kCAEmitterLayerSurface
cell.emissionLongitude = CGFloat(M_PI / 2.0)
cell.scale = self.font.pointSize / 90.0
Expand All @@ -94,10 +94,14 @@ extension LTMorphingLabel {
particleName: "Fragment",
duration: 0.6
) { (layer, cell) in
layer.emitterSize = CGSizeMake(self.font.pointSize, 1)
layer.emitterPosition = CGPointMake(
centerRect.origin.x,
centerRect.origin.y + centerRect.size.height / 1.3)
layer.emitterSize = CGSize(
width: self.font.pointSize,
height: 1
)
layer.emitterPosition = CGPoint(
x: centerRect.origin.x,
y: centerRect.origin.y + centerRect.size.height / 1.3
)
cell.scale = self.font.pointSize / 90.0
cell.scaleSpeed = self.font.pointSize / 40.0
cell.color = self.textColor.CGColor
Expand All @@ -116,10 +120,13 @@ extension LTMorphingLabel {
particleName: "Fragment",
duration: 0.6
) { (layer, cell) in
layer.emitterSize = CGSizeMake(self.font.pointSize, 1)
layer.emitterPosition = CGPointMake(
centerRect.origin.x,
centerRect.origin.y + centerRect.size.height / 1.3)
layer.emitterSize = CGSize(
width: self.font.pointSize,
height: 1
)
layer.emitterPosition = CGPoint(
x: centerRect.origin.x,
y: centerRect.origin.y + centerRect.size.height / 1.3)
cell.scale = self.font.pointSize / 90.0
cell.scaleSpeed = self.font.pointSize / 40.0
cell.color = self.textColor.CGColor
Expand All @@ -138,10 +145,13 @@ extension LTMorphingLabel {
particleName: "Fragment",
duration: 0.6
) { (layer, cell) in
layer.emitterSize = CGSizeMake(self.font.pointSize, 1)
layer.emitterPosition = CGPointMake(
centerRect.origin.x,
centerRect.origin.y + centerRect.size.height / 1.3)
layer.emitterSize = CGSize(
width: self.font.pointSize,
height: 1
)
layer.emitterPosition = CGPoint(
x: centerRect.origin.x,
y: centerRect.origin.y + centerRect.size.height / 1.3)
cell.scale = self.font.pointSize / 90.0
cell.scaleSpeed = self.font.pointSize / 40.0
cell.color = self.textColor.CGColor
Expand Down Expand Up @@ -185,7 +195,7 @@ extension LTMorphingLabel {
var rect = self.newRects[index]

if progress < 1.0 {
let easingValue: Float = LTEasing.easeOutBounce(progress, 0.0, 1.0)
let easingValue = LTEasing.easeOutBounce(progress, 0.0, 1.0)
rect.origin.y = CGFloat(Float(rect.origin.y) * easingValue)
}

Expand Down
40 changes: 28 additions & 12 deletions LTMorphingLabel/LTMorphingLabel+Burn.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,33 @@ extension LTMorphingLabel {
withProgress progress: CGFloat
) -> (UIImage, CGRect) {
let maskedHeight = charLimbo.rect.size.height * max(0.01, progress)
let maskedSize = CGSizeMake( charLimbo.rect.size.width, maskedHeight)
let maskedSize = CGSize(
width: charLimbo.rect.size.width,
height: maskedHeight
)
UIGraphicsBeginImageContextWithOptions(
maskedSize,
false,
UIScreen.mainScreen().scale
)
let rect = CGRectMake(0, 0, charLimbo.rect.size.width, maskedHeight)
let rect = CGRect(
x: 0,
y: 0,
width: charLimbo.rect.size.width,
height: maskedHeight
)
String(charLimbo.char).drawInRect(rect, withAttributes: [
NSFontAttributeName: self.font,
NSForegroundColorAttributeName: self.textColor
])
let newImage = UIGraphicsGetImageFromCurrentImageContext()
UIGraphicsEndImageContext()
let newRect = CGRectMake(
charLimbo.rect.origin.x,
charLimbo.rect.origin.y,
charLimbo.rect.size.width,
maskedHeight)
let newRect = CGRect(
x: charLimbo.rect.origin.x,
y: charLimbo.rect.origin.y,
width: charLimbo.rect.size.width,
height: maskedHeight
)
return (newImage, newRect)
}

Expand Down Expand Up @@ -91,16 +100,20 @@ extension LTMorphingLabel {

if char != " " {
let rect = self.newRects[index]
let emitterPosition = CGPointMake(
rect.origin.x + rect.size.width / 2.0,
CGFloat(progress) * rect.size.height / 1.2 + rect.origin.y)
let emitterPosition = CGPoint(
x: rect.origin.x + rect.size.width / 2.0,
y: CGFloat(progress) * rect.size.height / 1.2 + rect.origin.y
)

self.emitterView.createEmitter(
"c\(index)",
particleName: "Fire",
duration: self.morphingDuration
) { (layer, cell) in
layer.emitterSize = CGSizeMake(rect.size.width, 1)
layer.emitterSize = CGSize(
width: rect.size.width,
height: 1
)
layer.renderMode = kCAEmitterLayerAdditive
layer.emitterMode = kCAEmitterLayerOutline
cell.emissionLongitude = CGFloat(M_PI / 2.0)
Expand All @@ -126,7 +139,10 @@ extension LTMorphingLabel {
particleName: "Smoke",
duration: self.morphingDuration
) { (layer, cell) in
layer.emitterSize = CGSizeMake(rect.size.width, 10)
layer.emitterSize = CGSize(
width: rect.size.width,
height: 10
)
layer.renderMode = kCAEmitterLayerAdditive
layer.emitterMode = kCAEmitterLayerVolume
cell.emissionLongitude = CGFloat(M_PI / 2.0)
Expand Down
10 changes: 5 additions & 5 deletions LTMorphingLabel/LTMorphingLabel+Fall.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ extension LTMorphingLabel {
charColor = self.textColor.colorWithAlphaComponent(fadeOutAlpha)
}

charRect = CGRectMake(
charRect.size.width / -2.0,
charRect.size.height * -1.0 + self.font.pointSize / 6,
charRect.size.width,
charRect.size.height)
charRect = CGRect(
x: charRect.size.width / -2.0,
y: charRect.size.height * -1.0 + self.font.pointSize / 6,
width: charRect.size.width,
height: charRect.size.height)
CGContextTranslateCTM(context, charCenterX, charBottomY)

let angle = Float(sin(Double(charLimbo.rect.origin.x)) > 0.5 ? 168 : -168)
Expand Down
7 changes: 6 additions & 1 deletion LTMorphingLabel/LTMorphingLabel+Pixelate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ extension LTMorphingLabel {
let scale = min(UIScreen.mainScreen().scale, 1.0 / blurRadius)
UIGraphicsBeginImageContextWithOptions(charLimbo.rect.size, false, scale)
let fadeOutAlpha = min(1.0, max(0.0, charLimbo.drawingProgress * -2.0 + 2.0 + 0.01))
let rect = CGRectMake(0, 0, charLimbo.rect.size.width, charLimbo.rect.size.height)
let rect = CGRect(
x: 0,
y: 0,
width: charLimbo.rect.size.width,
height: charLimbo.rect.size.height
)
String(charLimbo.char).drawInRect(rect, withAttributes: [
NSFontAttributeName:
self.font,
Expand Down
35 changes: 24 additions & 11 deletions LTMorphingLabel/LTMorphingLabel+Sparkle.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,33 @@ extension LTMorphingLabel {
withProgress progress: CGFloat
) -> (UIImage, CGRect) {
let maskedHeight = charLimbo.rect.size.height * max(0.01, progress)
let maskedSize = CGSizeMake(charLimbo.rect.size.width, maskedHeight)
let maskedSize = CGSize(
width: charLimbo.rect.size.width,
height: maskedHeight
)
UIGraphicsBeginImageContextWithOptions(
maskedSize,
false,
UIScreen.mainScreen().scale
)
let rect = CGRectMake(0, 0, charLimbo.rect.size.width, maskedHeight)
let rect = CGRect(
x: 0,
y: 0,
width: charLimbo.rect.size.width,
height: maskedHeight
)
String(charLimbo.char).drawInRect(rect, withAttributes: [
NSFontAttributeName: self.font,
NSForegroundColorAttributeName: self.textColor
])
let newImage = UIGraphicsGetImageFromCurrentImageContext()
UIGraphicsEndImageContext()
let newRect = CGRectMake(
charLimbo.rect.origin.x,
charLimbo.rect.origin.y,
charLimbo.rect.size.width,
maskedHeight)
let newRect = CGRect(
x: charLimbo.rect.origin.x,
y: charLimbo.rect.origin.y,
width: charLimbo.rect.size.width,
height: maskedHeight
)
return (newImage, newRect)
}

Expand Down Expand Up @@ -96,16 +105,20 @@ extension LTMorphingLabel {

if char != " " {
let rect = self.newRects[index]
let emitterPosition = CGPointMake(
rect.origin.x + rect.size.width / 2.0,
CGFloat(progress) * rect.size.height * 0.9 + rect.origin.y)
let emitterPosition = CGPoint(
x: rect.origin.x + rect.size.width / 2.0,
y: CGFloat(progress) * rect.size.height * 0.9 + rect.origin.y
)

self.emitterView.createEmitter(
"c\(index)",
particleName: "Sparkle",
duration: self.morphingDuration
) { (layer, cell) in
layer.emitterSize = CGSizeMake(rect.size.width, 1)
layer.emitterSize = CGSize(
width: rect.size.width,
height: 1
)
layer.renderMode = kCAEmitterLayerOutline
cell.emissionLongitude = CGFloat(M_PI / 2.0)
cell.scale = self.font.pointSize / 300.0
Expand Down
5 changes: 4 additions & 1 deletion LTMorphingLabel/LTMorphingLabel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,10 @@ extension LTMorphingLabel {
let charSize = String(char).sizeWithAttributes([NSFontAttributeName: font])
charRects.append(
CGRect(
origin: CGPointMake(leftOffset, topOffset),
origin: CGPoint(
x: leftOffset,
y: topOffset
),
size: charSize
)
)
Expand Down
2 changes: 1 addition & 1 deletion LTMorphingLabel/NSString+LTMorphingLabel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public struct LTCharacterDiffResult : CustomDebugStringConvertible {
}


public func >>(lhs: String, rhs: String) -> [LTCharacterDiffResult] {
public func >> (lhs: String, rhs: String) -> [LTCharacterDiffResult] {

let newChars = rhs.characters.enumerate()
let lhsLength = lhs.characters.count
Expand Down
Binary file modified ...o.xcodeproj/project.xcworkspace/xcuserdata/lex.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions LTMorphingLabelDemo/Images.xcassets/AppIcon.appiconset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@
"idiom" : "ipad",
"filename" : "Icon-76@2x.png",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
}
],
"info" : {
Expand Down

0 comments on commit 53a8e9e

Please sign in to comment.