Merge branch 'master' into pr/12

Conflicts: NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallPulse Rise.swift NVActivityIndicatorViewDemo.xcodeproj/project.pbxproj
ninjaprox · Sep 18, 2015 · 7d92635 · 7d92635
2 parents bf31a29 + f00845b
commit 7d92635
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallPulseRise.swift b/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallPulseRise.swift
@@ -66,7 +66,7 @@ class NVActivityIndicatorAnimationBallPulseRise: NVActivityIndicatorAnimationDel
         return animation
     }
 
-    func evenAnimation(duration duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {
+    func evenAnimation(duration  duration: CFTimeInterval, deltaY: CGFloat, timingFunction: CAMediaTimingFunction) -> CAAnimation {
         // Scale animation
         let scaleAnimation = CAKeyframeAnimation(keyPath: "transform.scale")
 

diff --git a/NVActivityIndicatorView/NVActivityIndicatorView.swift b/NVActivityIndicatorView/NVActivityIndicatorView.swift
@@ -123,9 +123,9 @@ public class NVActivityIndicatorView: UIView {
         - Default color is white\n
         - Default size is 40
 
-        :param: decoder
+        - parameter decoder:
 
-        :returns: The activity indicator view
+        - returns: The activity indicator view
     */
     required public init?(coder aDecoder: NSCoder) {
         self.type = NVActivityIndicatorView.DEFAULT_TYPE
@@ -137,12 +137,12 @@ public class NVActivityIndicatorView: UIView {
     /**
         Create a activity indicator view with specified type, color, size and size
 
-        :param: frame view's frame
-        :param: type animation type, value of NVActivityIndicatorType enum. Default type is pacman.
-        :param: color color of activity indicator view. Default color is white.
-        :param: size actual size of animation in view. Default size is 40
+        - parameter frame: view's frame
+        - parameter type: animation type, value of NVActivityIndicatorType enum. Default type is pacman.
+        - parameter color: color of activity indicator view. Default color is white.
+        - parameter size: actual size of animation in view. Default size is 40
 
-        :returns: The activity indicator view
+        - returns: The activity indicator view
     */
     public init(frame: CGRect, type: NVActivityIndicatorType = DEFAULT_TYPE, color: UIColor = DEFAULT_COLOR, size: CGSize = DEFAULT_SIZE) {
         self.type = type

diff --git a/NVActivityIndicatorViewDemo.xcodeproj/project.pbxproj b/NVActivityIndicatorViewDemo.xcodeproj/project.pbxproj
@@ -268,6 +268,7 @@
 		239CAB181B5EBB2E0051DC06 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Nguyen Vinh";