Makes animation optional on Circle Chart

@@ -64,11 +64,13 @@ displayCountingLabel:(BOOL)displayCountingLabel
 @property (nonatomic) NSTimeInterval duration;
 @property (nonatomic) NSTimeInterval duration;
 @property (nonatomic) PNChartFormatType chartType;
 @property (nonatomic) PNChartFormatType chartType;
 
 
-
 @property (nonatomic) CAShapeLayer *circle;
 @property (nonatomic) CAShapeLayer *circle;
 @property (nonatomic) CAShapeLayer *gradientMask;
 @property (nonatomic) CAShapeLayer *gradientMask;
 @property (nonatomic) CAShapeLayer *circleBackground;
 @property (nonatomic) CAShapeLayer *circleBackground;
 
 
 @property (nonatomic) BOOL displayCountingLabel;
 @property (nonatomic) BOOL displayCountingLabel;
 
 
+/** Display the circle chart with or without animation. Default is YES. **/
+@property (nonatomic) BOOL displayAnimated;
+
 @end
 @end

@@ -69,6 +69,7 @@ displayCountingLabel:(BOOL)displayCountingLabel
         _strokeColor = PNFreshGreen;
         _strokeColor = PNFreshGreen;
         _duration = 1.0;
         _duration = 1.0;
         _chartType = PNChartFormatTypePercent;
         _chartType = PNChartFormatTypePercent;
+        _displayAnimated = YES;
         
         
         _displayCountingLabel = displayCountingLabel;
         _displayCountingLabel = displayCountingLabel;
 
 
@@ -153,19 +154,8 @@ displayCountingLabel:(BOOL)displayCountingLabel
     _circleBackground.lineWidth = [_lineWidth floatValue];
     _circleBackground.lineWidth = [_lineWidth floatValue];
     _circleBackground.strokeEnd = 1.0;
     _circleBackground.strokeEnd = 1.0;
     _circle.strokeColor = _strokeColor.CGColor;
     _circle.strokeColor = _strokeColor.CGColor;
-
-    // Add Animation
-    CABasicAnimation *pathAnimation = [CABasicAnimation animationWithKeyPath:@"strokeEnd"];
-    pathAnimation.duration = self.duration;
-    pathAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
-    pathAnimation.fromValue = @0.0f;
-    pathAnimation.toValue = @([_current floatValue] / [_total floatValue]);
-    [_circle addAnimation:pathAnimation forKey:@"strokeEndAnimation"];
     _circle.strokeEnd   = [_current floatValue] / [_total floatValue];
     _circle.strokeEnd   = [_current floatValue] / [_total floatValue];
 
 
-    [_countingLabel countFrom:0 to:[_current floatValue]/([_total floatValue]/100.0) withDuration:self.duration];
-
-
     // Check if user wants to add a gradient from the start color to the bar color
     // Check if user wants to add a gradient from the start color to the bar color
     if (_strokeColorGradientStart) {
     if (_strokeColorGradientStart) {
 
 
@@ -195,9 +185,9 @@ displayCountingLabel:(BOOL)displayCountingLabel
         [_circle addSublayer:gradientLayer];
         [_circle addSublayer:gradientLayer];
 
 
         self.gradientMask.strokeEnd = [_current floatValue] / [_total floatValue];
         self.gradientMask.strokeEnd = [_current floatValue] / [_total floatValue];
-
-        [self.gradientMask addAnimation:pathAnimation forKey:@"strokeEndAnimation"];
     }
     }
+    
+    [self addAnimationIfNeeded];
 }
 }
 
 
 
 
@@ -241,4 +231,26 @@ displayCountingLabel:(BOOL)displayCountingLabel
     _total = total;
     _total = total;
 }
 }
 
 
+- (void)addAnimationIfNeeded
+{
+    double percentageValue = [_current floatValue]/([_total floatValue]/100.0);
+    
+    if (_displayAnimated) {
+        CABasicAnimation *pathAnimation = [CABasicAnimation animationWithKeyPath:@"strokeEnd"];
+        pathAnimation.duration = self.duration;
+        pathAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+        pathAnimation.fromValue = @(0.0f);
+        pathAnimation.toValue = @([_current floatValue] / [_total floatValue]);
+        [_circle addAnimation:pathAnimation forKey:@"strokeEndAnimation"];
+        [_countingLabel countFrom:0 to:percentageValue withDuration:self.duration];
+        
+        if (self.gradientMask && _strokeColorGradientStart) {
+            [self.gradientMask addAnimation:pathAnimation forKey:@"strokeEndAnimation"];
+        }
+    }
+    else {
+        [_countingLabel countFrom:percentageValue to:percentageValue withDuration:self.duration];
+    }
+}
+
 @end
 @end

@@ -52,7 +52,6 @@
 
 
 @property (nonatomic, weak) id<PNChartDelegate> delegate;
 @property (nonatomic, weak) id<PNChartDelegate> delegate;
 
 
-
 /** Display the pie chart with or without animation. Default is YES. **/
 /** Display the pie chart with or without animation. Default is YES. **/
 @property (nonatomic) BOOL displayAnimated;
 @property (nonatomic) BOOL displayAnimated;