Merge pull request #72 from trunglee/master

Corner radius for progress view

Author: Marxon13

Classes/ProgressViews/M13ProgressViewBar.h

@@ -35,6 +35,8 @@ typedef enum {
 @property (nonatomic, assign) M13ProgressViewBarProgressDirection progressDirection;
 /**The thickness of the progress bar.*/
 @property (nonatomic, assign) CGFloat progressBarThickness;
+/**The corner radius of the progress bar.*/
+@property (nonatomic, assign) CGFloat progressBarCornerRadius;
 /**@name Actions*/
 /**The color the bar changes to for the success action.*/
 @property (nonatomic, retain) UIColor *successColor;

Classes/ProgressViews/M13ProgressViewBar.m

@@ -76,6 +76,7 @@ - (void)setup
     self.animationDuration = .3;
     _progressDirection = M13ProgressViewBarProgressDirectionLeftToRight;
     _progressBarThickness = 2;
+    _progressBarCornerRadius = _progressBarThickness / 2.0;
     _percentagePosition = M13ProgressViewBarPercentagePositionRight;
     _showPercentage = YES;
 
@@ -92,7 +93,7 @@ - (void)setup
     //Progress View
     _progressBar = [[UIView alloc] init];
     _progressBar.backgroundColor = self.secondaryColor;
-    _progressBar.layer.cornerRadius = _progressBarThickness / 2.0;
+    _progressBar.layer.cornerRadius = _progressBarCornerRadius;
     _progressBar.clipsToBounds = YES;
     [self addSubview:_progressBar];
 
@@ -115,7 +116,7 @@ - (void)setup
     //IndeterminateLayer
     _indeterminateLayer = [CALayer layer];
     _indeterminateLayer.backgroundColor = self.primaryColor.CGColor;
-    _indeterminateLayer.cornerRadius = _progressBarThickness / 2.0;
+    _indeterminateLayer.cornerRadius = _progressBarCornerRadius;
     _indeterminateLayer.opacity = 0;
     [_progressBar.layer addSublayer:_indeterminateLayer];
 
@@ -185,6 +186,19 @@ - (void)setProgressBarThickness:(CGFloat)progressBarThickness
     [self invalidateIntrinsicContentSize];
 }
 
+- (void)setProgressBarCornerRadius:(CGFloat)progressBarCornerRadius
+{
+    _progressBarCornerRadius = progressBarCornerRadius;
+    
+    // Update the layer size
+    [self setNeedsDisplay];
+    
+    // Update corner radius for layers
+    _progressBar.layer.cornerRadius = _progressBarCornerRadius;
+    _indeterminateLayer.cornerRadius = _progressBarCornerRadius;
+    [self invalidateIntrinsicContentSize];
+}
+
 #pragma mark Actions
 
 - (void)setProgress:(CGFloat)progress animated:(BOOL)animated

M13ProgressSuite/BarViewController.h

@@ -23,6 +23,7 @@
 @property (nonatomic, retain) IBOutlet UIButton *animateButton;
 @property (nonatomic, retain) IBOutlet UISegmentedControl *iconControl;
 @property (nonatomic, retain) IBOutlet UISwitch *indeterminateSwitch;
+@property (nonatomic, retain) IBOutlet UISwitch *cornerRadiusSwitch;
 @property (nonatomic, retain) IBOutlet UISwitch *showPercentageSwitch;
 @property (nonatomic, retain) IBOutlet UISegmentedControl *positionControl;
 @property (nonatomic, retain) IBOutlet UISegmentedControl *directionControl;
@@ -31,6 +32,7 @@
 - (IBAction)progressChanged:(id)sender;
 - (IBAction)iconChanged:(id)sender;
 - (IBAction)indeterminateChanged:(id)sender;
+- (IBAction)cornerRadiusChanged:(id)sender;
 - (IBAction)showPercentage:(id)sender;
 - (IBAction)percentagePositionChangeed:(id)sender;
 - (IBAction)directioChanged:(id)sender;

M13ProgressSuite/BarViewController.m

@@ -38,6 +38,10 @@ - (void)viewDidLoad
     //Set the percentage position
     _progressViewVertical.percentagePosition = M13ProgressViewBarPercentagePositionTop;
     _progressViewHorizontal.percentagePosition = M13ProgressViewBarPercentagePositionTop;
+    
+    // Remove corner radius
+    _progressViewVertical.progressBarCornerRadius = 0.0;
+    _progressViewHorizontal.progressBarCornerRadius = 0.0;
 }
 
 - (void)didReceiveMemoryWarning
@@ -92,6 +96,12 @@ - (void)indeterminateChanged:(id)sender
     [_progressViewVertical setIndeterminate:_indeterminateSwitch.on];
 }
 
+- (IBAction)cornerRadiusChanged:(id)sender
+{
+    [_progressViewHorizontal setProgressBarCornerRadius:_cornerRadiusSwitch.on ? _progressViewHorizontal.progressBarThickness / 2.0 : 0.0];
+    [_progressViewVertical setProgressBarCornerRadius:_cornerRadiusSwitch.on ? _progressViewVertical.progressBarThickness / 2.0 : 0.0];
+}
+
 - (void)animateProgress:(id)sender
 {
     //Disable other controls