added delegate pattern

MitchellMalleo · Jan 13, 2016 · e20adac · e20adac
1 parent d15f480
commit e20adac
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 4 deletions.
diff --git a/Classes/VAProgressCircle.h b/Classes/VAProgressCircle.h
@@ -11,6 +11,15 @@
 #define VADefaultGreen [UIColor colorWithRed:35.0/255.0 green:177.0/255.0 blue:70.0/255.0 alpha:1.0f]
 #define VADefaultBlue [UIColor colorWithRed:32.0/255.0 green:149.0/255.0 blue:242.0/255.0 alpha:1.0f]
 
+@class VAProgressCircle;
+
+@protocol VAProgressCircleDelegate <NSObject>
+
+- (void)progressCircle:(VAProgressCircle *)circle willAnimateToProgress:(int)progress;
+- (void)progressCircle:(VAProgressCircle *)circle didAnimateToProgress:(int)progress;
+
+@end
+
 typedef void (^VAProgressCircleProgressCompletionBlock)(int progress, BOOL isAnimationCompleteForProgress);
 
 typedef NS_ENUM(NSInteger, VAProgressCircleColorTransitionType){
@@ -39,7 +48,7 @@ typedef NS_ENUM(NSInteger, VAProgressCircleRotationDirection){
 @property (strong, nonatomic) UIColor *accentLineColor;
 @property (strong, nonatomic) UIColor *numberLabelColor;
 @property (strong, nonatomic) UIColor *circleHighlightColor;
-
+                        
 @property (strong, nonatomic) UIColor *circleTransitionColor;
 @property (strong, nonatomic) UIColor *accentLineTransitionColor;
 @property (strong, nonatomic) UIColor *numberLabelTransitionColor;
@@ -55,4 +64,6 @@ typedef NS_ENUM(NSInteger, VAProgressCircleRotationDirection){
 
 @property (copy, nonatomic) VAProgressCircleProgressCompletionBlock progressBlock;
 
+@property (weak, nonatomic) id<VAProgressCircleDelegate> delegate;
+
 @end
diff --git a/Classes/VAProgressCircle.m b/Classes/VAProgressCircle.m
@@ -234,6 +234,10 @@ - (void)setProgress:(int)progress
     {
         self.progressBlock(progress, NO);
     }
+    else if(self.delegate)
+    {
+        [self.delegate progressCircle:self willAnimateToProgress:progress];
+    }
 
     CAShapeLayer *progressPieceLine = [CAShapeLayer layer];
     progressPieceLine.path = self.innerBackgroundPath.CGPath;
@@ -491,10 +495,14 @@ - (void)addProgressPieceLine:(CAShapeLayer *)progressPieceLine withCurrent:(floa
         [lineIsFinishedRetractAnimation setValue:progressPieceLine forKey:kLayer];
         [lineIsFinishedRetractAnimation setValue:kProgressPieceLineIsFinishedRetractAnimation forKey:kName];
     }
-    else if(progressCircleIsComplete)
+    else if(progressCircleIsComplete && self.progressBlock)
     {
         self.progressBlock(current, YES);
     }
+    else if (progressCircleIsComplete && self.delegate)
+    {
+        [self.delegate progressCircle:self didAnimateToProgress:current];
+    }
 
     [self.progressPieceView.layer addSublayer:progressPieceLine];
 
@@ -628,13 +636,21 @@ - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
         {
             self.progressBlock([current  intValue], YES);
         }
+        else if(self.delegate)
+        {
+            [self.delegate progressCircle:self didAnimateToProgress:[current intValue]];
+        }
     }
     else if(([name isEqualToString:kProgressPieceInnerToOuterMoveAnimation] && !self.shouldHighlightProgress && !self.shouldShowAccentLine) || ([name isEqualToString:kProgressPieceFlashFadeAnimation] && !self.shouldShowAccentLine) || ([name isEqualToString:kProgressPieceLineFadeAnimation]))
     {
         if(self.progressBlock)
         {
             self.progressBlock([current  intValue], YES);
         }
+        else if(self.delegate)
+        {
+            [self.delegate progressCircle:self didAnimateToProgress:[current intValue]];
+        }
     }
 }
 

diff --git a/README.md b/README.md
@@ -49,6 +49,25 @@ Use the progessBlock to add functionality to execute before or after a progress
         //Add custom block functionality here
 
     };
+
+If you need the delegate pattern, do not implement the block and set your delegate and they will get called insead
+
+	- (void)viewDidLoad
+	{
+    	self.progressCircle.delegate = self;
+	}
+
+	#pragma mark - VAProgressCircleDelegate
+
+    - (void)progressCircle:(VAProgressCircle *)circle willAnimateToProgress:(int)progress
+	{
+    	//Add custom delegate functionality here
+	}
+
+	- (void)progressCircle:(VAProgressCircle *)circle didAnimateToProgress:(int)progress
+	{
+    	//Add custom delegate functionality here
+	}
 
 Toggle animation features of the VAProgressCircle.
 

diff --git a/...odeproj/project.xcworkspace/xcuserdata/mmalleo.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/mmalleo.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/VAProgressCircleExample/VAProgressCircleExample/MainViewController.h b/VAProgressCircleExample/VAProgressCircleExample/MainViewController.h
@@ -9,6 +9,6 @@
 #import <UIKit/UIKit.h>
 #import "VAProgressCircle.h"
 
-@interface MainViewController : UIViewController
+@interface MainViewController : UIViewController <VAProgressCircleDelegate>
 
 @end
diff --git a/VAProgressCircleExample/VAProgressCircleExample/MainViewController.m b/VAProgressCircleExample/VAProgressCircleExample/MainViewController.m
@@ -63,7 +63,8 @@ - (void)addChart
     [self setPrimaryColorForChart];
     [self setTransitionColorForChart];
     [self setTransitionTypeForChart];
-    [self setBlocksForChart];
+    //self.circleChart.delegate = self;
+    //[self setBlocksForChart];
 
     [self.view addSubview:self.circleChart];
 }
@@ -244,4 +245,16 @@ - (IBAction)progressChartTransitionTypeSegmentedControlWasTouched:(id)sender
     [self setTransitionTypeForChart];
 }
 
+#pragma mark - VAProgressCircleDelegate
+
+- (void)progressCircle:(VAProgressCircle *)circle willAnimateToProgress:(int)progress
+{
+    NSLog(@"will animate to progress %i", progress);
+}
+
+- (void)progressCircle:(VAProgressCircle *)circle didAnimateToProgress:(int)progress
+{
+    NSLog(@"did animate to progress %i", progress);
+}
+
 @end