Merge pull request #1 from SlaunchaMan/master

Use associated types on the enum for image.
sudeepag · Mar 6, 2016 · abe9d68 · abe9d68
2 parents ecf5ee1 + bd6dbfb
commit abe9d68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Example/SAConfettiView/ViewController.swift b/Example/SAConfettiView/ViewController.swift
@@ -39,8 +39,7 @@ class ViewController: UIViewController {
         confettiView.type = .Diamond
 
         // For custom image
-        // confettiView.type = .Custom
-        // confettiView.customImage = UIImage(named: "diamond")
+        // confettiView.type = .Image(UIImage(named: "diamond")!)
 
         // Add subview
         view.addSubview(confettiView)

diff --git a/Pod/Classes/SAConfettiView.swift b/Pod/Classes/SAConfettiView.swift
@@ -16,14 +16,13 @@ public class SAConfettiView: UIView {
         case Triangle
         case Star
         case Diamond
-        case Custom
+        case Image(UIImage)
     }
 
     var emitter: CAEmitterLayer!
     public var colors: [UIColor]!
     public var intensity: Float!
     public var type: ConfettiType!
-    public var customImage: UIImage?
 
     required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
@@ -73,7 +72,7 @@ public class SAConfettiView: UIView {
             fileName = "star"
         case .Diamond:
             fileName = "diamond"
-        case .Custom:
+        case let .Image(customImage):
             return customImage
         }