Makes line chart fade animation optional

Emma Makinson
Commit 1d3158c459ee149c407688aa23f5b59c30e62b09 1d3158c4 1 parent d1fd080c
Showing 2 changed files with 10 additions and 11 deletions
PNChart/PNBar.m
PNChart/PNLineChart.m
--- a/PNChart/PNBar.m
View file @1d3158c
+++ b/PNChart/PNBar.m
View file @1d3158c
@@ -232,17 +232,14 @@
 -(CABasicAnimation*)fadeAnimation
 {
+    CABasicAnimation* fadeAnimation = nil;
     if (self.displayAnimated) {
-        CABasicAnimation* fadeAnimation = [CABasicAnimation animationWithKeyPath:@"opacity"];
+        fadeAnimation = [CABasicAnimation animationWithKeyPath:@"opacity"];
         fadeAnimation.fromValue = [NSNumber numberWithFloat:0.0];
         fadeAnimation.toValue = [NSNumber numberWithFloat:1.0];
         fadeAnimation.duration = 2.0;
-        
-        return fadeAnimation;
-    }
-    else {
-        return nil;
     }
+    return fadeAnimation;
 }
 -(void)addAnimationIfNeededWithProgressLine:(UIBezierPath *)progressline
--- a/PNChart/PNLineChart.m
View file @1d3158c
+++ b/PNChart/PNLineChart.m
View file @1d3158c
@@ -1041,11 +1041,13 @@
 -(CABasicAnimation*)fadeAnimation
 {
-    CABasicAnimation* fadeAnimation = [CABasicAnimation animationWithKeyPath:@"opacity"];
+    CABasicAnimation *fadeAnimation = nil;
-    fadeAnimation.fromValue = [NSNumber numberWithFloat:0.0];
+    if (self.displayAnimated) {
-    fadeAnimation.toValue = [NSNumber numberWithFloat:1.0];
+        fadeAnimation = [CABasicAnimation animationWithKeyPath:@"opacity"];
-    fadeAnimation.duration = 2.0;
+        fadeAnimation.fromValue = [NSNumber numberWithFloat:0.0];
-    
+        fadeAnimation.toValue = [NSNumber numberWithFloat:1.0];
+        fadeAnimation.duration = 2.0;
+    }
     return fadeAnimation;
 }