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

Updated to Swift 4.2 #49

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated to Swift 4.2 #49

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a7ac82
Updated to Swift 4.2
ChadGarrett Sep 26, 2018
1bd527f
Review changes
ChadGarrett Oct 17, 2018
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
7 changes: 7 additions & 0 deletions Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Example/Pods/Pods.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 21 additions & 23 deletions Pod/Classes/SAConfettiView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import QuartzCore
public class SAConfettiView: UIView {

public enum ConfettiType {
case confetti
case triangle
case star
case diamond
case image(UIImage)
case Confetti
ChadGarrett marked this conversation as resolved.
Show resolved Hide resolved
case Triangle
case Star
case Diamond
case Image(UIImage)
}

var emitter: CAEmitterLayer!
Expand All @@ -37,12 +37,12 @@ public class SAConfettiView: UIView {

func setup() {
colors = [UIColor(red:0.95, green:0.40, blue:0.27, alpha:1.0),
UIColor(red:1.00, green:0.78, blue:0.36, alpha:1.0),
UIColor(red:0.48, green:0.78, blue:0.64, alpha:1.0),
UIColor(red:0.30, green:0.76, blue:0.85, alpha:1.0),
UIColor(red:0.58, green:0.39, blue:0.55, alpha:1.0)]
UIColor(red:1.00, green:0.78, blue:0.36, alpha:1.0),
UIColor(red:0.48, green:0.78, blue:0.64, alpha:1.0),
UIColor(red:0.30, green:0.76, blue:0.85, alpha:1.0),
UIColor(red:0.58, green:0.39, blue:0.55, alpha:1.0)]
intensity = 0.5
type = .confetti
type = .Confetti
active = false
}

Expand Down Expand Up @@ -73,27 +73,25 @@ public class SAConfettiView: UIView {
var fileName: String!

switch type {
case .confetti:
case .Confetti:
fileName = "confetti"
case .triangle:
case .Triangle:
fileName = "triangle"
case .star:
case .Star:
fileName = "star"
case .diamond:
case .Diamond:
fileName = "diamond"
case let .image(customImage):
case let .Image(customImage):
return customImage
}

let path = Bundle(for: SAConfettiView.self).path(forResource: "SAConfettiView", ofType: "bundle")
let bundle = Bundle(path: path!)
let imagePath = bundle?.path(forResource: fileName, ofType: "png")
let url = URL(fileURLWithPath: imagePath!)
do {
let data = try Data(contentsOf: url)
let url = NSURL(fileURLWithPath: imagePath!)
let data = NSData(contentsOf: url as URL)
ChadGarrett marked this conversation as resolved.
Show resolved Hide resolved
if let data = data as Data? {
return UIImage(data: data)
} catch {
print(error)
}
return nil
}
Expand All @@ -106,8 +104,8 @@ public class SAConfettiView: UIView {
confetti.color = color.cgColor
confetti.velocity = CGFloat(350.0 * intensity)
confetti.velocityRange = CGFloat(80.0 * intensity)
confetti.emissionLongitude = CGFloat(Double.pi)
confetti.emissionRange = CGFloat(Double.pi)
confetti.emissionLongitude = CGFloat(CGFloat.pi)
ChadGarrett marked this conversation as resolved.
Show resolved Hide resolved
confetti.emissionRange = CGFloat(CGFloat.pi / 4)
confetti.spin = CGFloat(3.5 * intensity)
confetti.spinRange = CGFloat(4.0 * intensity)
confetti.scaleRange = CGFloat(intensity)
Expand All @@ -117,6 +115,6 @@ public class SAConfettiView: UIView {
}

public func isActive() -> Bool {
return self.active
return self.active
}
}