Merge pull request #1 from iBluemind/master

cruisediary · web-flow · commit aaf03581f20e · 2017-05-06T03:02:50.000+09:00
Fix the issue that can't use PastelView
diff --git a/Example/Pastel.xcodeproj/project.pbxproj b/Example/Pastel.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		4CE239CC1EBC411100E3E667 /* PastelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE239CB1EBC411100E3E667 /* PastelView.swift */; };
 		607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
 		607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; };
 		607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
@@ -30,7 +29,6 @@
 
 /* Begin PBXFileReference section */
 		02084496218A3F315699AE29 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
-		4CE239CB1EBC411100E3E667 /* PastelView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PastelView.swift; sourceTree = "<group>"; };
 		5332691F504AAFEDF6EE106C /* Pods_Pastel_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Pastel_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5E01E37F1C25FDCAFB746FF8 /* Pods-Pastel_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Pastel_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example.release.xcconfig"; sourceTree = "<group>"; };
 		607FACD01AFB9204008FA782 /* Pastel_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Pastel_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -106,7 +104,6 @@
 			children = (
 				607FACD51AFB9204008FA782 /* AppDelegate.swift */,
 				607FACD71AFB9204008FA782 /* ViewController.swift */,
-				4CE239CB1EBC411100E3E667 /* PastelView.swift */,
 				607FACD91AFB9204008FA782 /* Main.storyboard */,
 				607FACDC1AFB9204008FA782 /* Images.xcassets */,
 				607FACDE1AFB9204008FA782 /* LaunchScreen.xib */,
@@ -368,7 +365,6 @@
 			files = (
 				607FACD81AFB9204008FA782 /* ViewController.swift in Sources */,
 				607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */,
-				4CE239CC1EBC411100E3E667 /* PastelView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Example/Pastel/PastelView.swift b/Example/Pastel/PastelView.swift
diff --git a/Example/Pastel/ViewController.swift b/Example/Pastel/ViewController.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Pastel
 
 class ViewController: UIViewController {
     @IBOutlet weak var loginButton: UIButton! {
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -11,7 +11,7 @@ PODS:
     - FBSnapshotTestCase (~> 2.0)
     - Nimble
     - Quick
-  - Pastel (0.1.0)
+  - Pastel (0.1.1)
   - Quick (1.0.0)
 
 DEPENDENCIES:
@@ -26,10 +26,10 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  FBSnapshotTestCase: '094f9f314decbabe373b87cc339bea235a63e07a'
+  FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
   Nimble: 415e3aa3267e7bc2c96b05fa814ddea7bb686a29
   Nimble-Snapshots: e743439f26c2fa99d8f7e0d7c01c99bcb40aa6f2
-  Pastel: 2ed588cb2c5280a6127b615d259d70945610d258
+  Pastel: 06c43ba58f11d0ced363a310f70f4f254d70abee
   Quick: 8024e4a47e6cc03a9d5245ef0948264fc6d27cff
 
 PODFILE CHECKSUM: 4b3b84bc6975347b7d6bb632580cfb849aeec4fc
diff --git a/Pastel.podspec b/Pastel.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Pastel'
-  s.version          = '0.1.0'
+  s.version          = '0.1.1'
   s.summary          = 'Instagram like gradient background animation'
 
 # This description is used to generate tags and improve search results.
diff --git a/Pastel/Classes/PastelView.swift b/Pastel/Classes/PastelView.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class PastelView: UIView {
+public class PastelView: UIView {
 
     struct Animation {
         static let keyPath = "colors"
@@ -34,19 +34,19 @@ class PastelView: UIView {
     }
     */
     
-    override init(frame: CGRect) {
+    public override init(frame: CGRect) {
         super.init(frame: frame)
     }
     
-    required init?(coder aDecoder: NSCoder) {
+    public required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
     }
     
-    override func awakeFromNib() {
+    public override func awakeFromNib() {
         super.awakeFromNib()
     }
     
-    func startAnimation() {
+    public func startAnimation() {
         gradient.removeAllAnimations()
         setup()
         animateGradient()
@@ -68,12 +68,12 @@ class PastelView: UIView {
                 colors[(currentGradient + 1) % colors.count].cgColor]
     }
     
-    func setColors(colors: [UIColor]) {
+    public func setColors(colors: [UIColor]) {
         guard colors.count > 0 else { return }
         self.colors = colors
     }
     
-    func addColor(color: UIColor) {
+    public func addColor(color: UIColor) {
         self.colors.append(color)
     }
     
@@ -88,15 +88,15 @@ class PastelView: UIView {
         gradient.add(animation, forKey: Animation.key)
     }
     
-    override func removeFromSuperview() {
+    public override func removeFromSuperview() {
         super.removeFromSuperview()
         gradient.removeAllAnimations()
         gradient.removeFromSuperlayer()
     }
 }
 
 extension PastelView: CAAnimationDelegate {
-    func animationDidStop(_ anim: CAAnimation, finished flag: Bool) {
+    public func animationDidStop(_ anim: CAAnimation, finished flag: Bool) {
         if flag {
             gradient.colors = currentGradientSet()
             animateGradient()

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`import UIKit`
`10`	`10`
`11`		`-class PastelView: UIView {`
	`11`	`+public class PastelView: UIView {`
`12`	`12`
`13`	`13`	`struct Animation {`
`14`	`14`	`static let keyPath = "colors"`
`@@ -34,19 +34,19 @@ class PastelView: UIView {`
`34`	`34`	`}`
`35`	`35`	`*/`
`36`	`36`
`37`		`- override init(frame: CGRect) {`
	`37`	`+ public override init(frame: CGRect) {`
`38`	`38`	`super.init(frame: frame)`
`39`	`39`	`}`
`40`	`40`
`41`		`- required init?(coder aDecoder: NSCoder) {`
	`41`	`+ public required init?(coder aDecoder: NSCoder) {`
`42`	`42`	`super.init(coder: aDecoder)`
`43`	`43`	`}`
`44`	`44`
`45`		`- override func awakeFromNib() {`
	`45`	`+ public override func awakeFromNib() {`
`46`	`46`	`super.awakeFromNib()`
`47`	`47`	`}`
`48`	`48`
`49`		`- func startAnimation() {`
	`49`	`+ public func startAnimation() {`
`50`	`50`	`gradient.removeAllAnimations()`
`51`	`51`	`setup()`
`52`	`52`	`animateGradient()`
`@@ -68,12 +68,12 @@ class PastelView: UIView {`
`68`	`68`	`colors[(currentGradient + 1) % colors.count].cgColor]`
`69`	`69`	`}`
`70`	`70`
`71`		`- func setColors(colors: [UIColor]) {`
	`71`	`+ public func setColors(colors: [UIColor]) {`
`72`	`72`	`guard colors.count > 0 else { return }`
`73`	`73`	`self.colors = colors`
`74`	`74`	`}`
`75`	`75`
`76`		`- func addColor(color: UIColor) {`
	`76`	`+ public func addColor(color: UIColor) {`
`77`	`77`	`self.colors.append(color)`
`78`	`78`	`}`
`79`	`79`
`@@ -88,15 +88,15 @@ class PastelView: UIView {`
`88`	`88`	`gradient.add(animation, forKey: Animation.key)`
`89`	`89`	`}`
`90`	`90`
`91`		`- override func removeFromSuperview() {`
	`91`	`+ public override func removeFromSuperview() {`
`92`	`92`	`super.removeFromSuperview()`
`93`	`93`	`gradient.removeAllAnimations()`
`94`	`94`	`gradient.removeFromSuperlayer()`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`extension PastelView: CAAnimationDelegate {`
`99`		`- func animationDidStop(_ anim: CAAnimation, finished flag: Bool) {`
	`99`	`+ public func animationDidStop(_ anim: CAAnimation, finished flag: Bool) {`
`100`	`100`	`if flag {`
`101`	`101`	`gradient.colors = currentGradientSet()`
`102`	`102`	`animateGradient()`