Merge pull request #209 from loumoore/master

Handle NaN line slope in line chart selection code.

CHANGELOG.md

@@ -1,5 +1,85 @@
 # Change Log
 
+## [v3.0.10](https://github.com/Jawbone/JBChartView/tree/v3.0.10) (2016-05-31)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.9...v3.0.10)
+
+## [v3.0.9](https://github.com/Jawbone/JBChartView/tree/v3.0.9) (2016-04-28)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.8...v3.0.9)
+
+**Implemented enhancements:**
+
+- ability to set line chart view padding [\#205](https://github.com/Jawbone/JBChartView/issues/205)
+
+**Fixed bugs:**
+
+- old gradient fill shows if chart is scrolled offscreen [\#204](https://github.com/Jawbone/JBChartView/issues/204)
+
+**Closed issues:**
+
+- example of using gradient for fills [\#202](https://github.com/Jawbone/JBChartView/issues/202)
+
+## [v3.0.8](https://github.com/Jawbone/JBChartView/tree/v3.0.8) (2016-02-29)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.7...v3.0.8)
+
+**Fixed bugs:**
+
+- Cannot change bar colors after initial load [\#201](https://github.com/Jawbone/JBChartView/issues/201)
+
+## [v3.0.7](https://github.com/Jawbone/JBChartView/tree/v3.0.7) (2016-02-26)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.6...v3.0.7)
+
+**Closed issues:**
+
+- Directions not set in UIViewController [\#199](https://github.com/Jawbone/JBChartView/issues/199)
+- Many Line Charts in Table View [\#198](https://github.com/Jawbone/JBChartView/issues/198)
+
+## [v3.0.6](https://github.com/Jawbone/JBChartView/tree/v3.0.6) (2016-01-21)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.5...v3.0.6)
+
+## [v3.0.5](https://github.com/Jawbone/JBChartView/tree/v3.0.5) (2016-01-20)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.4...v3.0.5)
+
+## [v3.0.4](https://github.com/Jawbone/JBChartView/tree/v3.0.4) (2016-01-20)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.3...v3.0.4)
+
+## [v3.0.3](https://github.com/Jawbone/JBChartView/tree/v3.0.3) (2016-01-20)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.2...v3.0.3)
+
+**Closed issues:**
+
+- Dot alpha doesn't return after unselection [\#197](https://github.com/Jawbone/JBChartView/issues/197)
+
+## [v3.0.2](https://github.com/Jawbone/JBChartView/tree/v3.0.2) (2016-01-19)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.1...v3.0.2)
+
+**Merged pull requests:**
+
+- Make sure to import dependent framework header explicitly [\#196](https://github.com/Jawbone/JBChartView/pull/196) ([yasuoza](https://github.com/yasuoza))
+
+## [v3.0.1](https://github.com/Jawbone/JBChartView/tree/v3.0.1) (2016-01-16)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.0...v3.0.1)
+
+## [v3.0.0](https://github.com/Jawbone/JBChartView/tree/v3.0.0) (2016-01-14)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.9.1...v3.0.0)
+
+**Closed issues:**
+
+- Show data above each column   [\#194](https://github.com/Jawbone/JBChartView/issues/194)
+
+**Merged pull requests:**
+
+- JBChartView 3.0 [\#195](https://github.com/Jawbone/JBChartView/pull/195) ([terryworona](https://github.com/terryworona))
+
+## [v2.9.1](https://github.com/Jawbone/JBChartView/tree/v2.9.1) (2015-12-17)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.9.0...v2.9.1)
+
+**Implemented enhancements:**
+
+- Min bars shouldn't animate bars when animating setState [\#192](https://github.com/Jawbone/JBChartView/issues/192)
+
+## [v2.9.0](https://github.com/Jawbone/JBChartView/tree/v2.9.0) (2015-12-04)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.19...v2.9.0)
+
 ## [v2.8.19](https://github.com/Jawbone/JBChartView/tree/v2.8.19) (2015-11-23)
 [Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.18...v2.8.19)
 
@@ -69,6 +149,7 @@
 **Merged pull requests:**
 
 - Return the available height instead of 0 [\#183](https://github.com/Jawbone/JBChartView/pull/183) ([0xPr0xy](https://github.com/0xPr0xy))
+- Adds support for gradients to line charts [\#175](https://github.com/Jawbone/JBChartView/pull/175) ([benjaminsnorris](https://github.com/benjaminsnorris))
 
 ## [v2.8.14](https://github.com/Jawbone/JBChartView/tree/v2.8.14) (2015-04-30)
 [Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.13...v2.8.14)

Classes/Additions/NSMutableArray+JBStack.h

@@ -0,0 +1,16 @@
+//
+//  NSMutableArray+JBStack.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSMutableArray (JBStack)
+
+- (void)jb_push:(id)object;
+- (id)jb_pop;
+
+@end

Classes/Additions/NSMutableArray+JBStack.m

@@ -0,0 +1,34 @@
+//
+//  NSMutableArray+JBStack.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "NSMutableArray+JBStack.h"
+
+@implementation NSMutableArray (JBStack)
+
+#pragma mark - Operations
+
+- (void)jb_push:(id)object
+{
+	if (object != nil)
+	{
+		[self insertObject:object atIndex:0];
+	}
+}
+
+- (id)jb_pop
+{
+	id object = [self firstObject];
+	if (object != nil)
+	{
+		[self removeObjectAtIndex:0];
+		return object;
+	}
+	return nil;
+}
+
+@end

Classes/Bar/JBBarChartView.h

@@ -133,13 +133,6 @@
 @property (nonatomic, weak) id<JBBarChartViewDataSource> dataSource;
 @property (nonatomic, weak) id<JBBarChartViewDelegate> delegate;
 
-/**
- *  Vertical highlight overlayed on bar during touch events.
- *
- *  Default: YES.
- */
-@property (nonatomic, assign) BOOL showsVerticalSelection;
-
 /*
  *  Bars can be (vertically) positoned top to bottom instead of bottom up.
  *  If this property is set to YES, both the bar and the selection view will be inverted.
@@ -149,6 +142,34 @@
  */
 @property (nonatomic, assign, getter=isInverted) BOOL inverted;
 
+/*
+ *  Reloads the bar chart with a custom animation.
+ *  Adding, removing or modifying existing bars will be animated (collapsing, expanding, etc) if animated = YES.
+ *  Reloading (animated) data is thread safe and can be executed any number of times in succession.
+ *
+ *  Default: a non-animated reload (via reloadData).
+ */
+- (void)reloadDataAnimated:(BOOL)animated;
+
+/*
+ *  When reloadData or reloadDataAnimated: is called, the reloading bit is turned on.
+ *  State changes during a reload will be ignored. As well, subsequent calls to reloadData:
+ *  or reloadDataAnimated: before any previous reloads are complete, will also be ignored.
+ *  Lastly, all touch events will be ignored until a reload has compeleted.
+ *
+ *  Note: the above restrictions apply only to animated reloads, as non-animated reloads are synchronous.
+ *
+ *  Default: NO.
+ */
+@property (nonatomic, readonly) BOOL reloading;
+
+/**
+ *  Vertical highlight overlayed on bar during touch events.
+ *
+ *  Default: YES.
+ */
+@property (nonatomic, assign) BOOL showsVerticalSelection;
+
 /**
  *  The bar view at a particular index.
  *

Classes/Bar/JBBarChartView.m

@@ -0,0 +1,940 @@
+//
+//  JBBarChartView.m
+//  Nudge
+//
+//  Created by Terry Worona on 9/3/13.
+//  Copyright (c) 2013 Jawbone. All rights reserved.
+//
+
+#import "JBBarChartView.h"
+
+// Views
+#import "JBGradientBarView.h"
+
+// Numerics
+static CGFloat const kJBBarChartViewBarBasePaddingMutliplier = 50.0f;
+static CGFloat const kJBBarChartViewUndefinedCachedHeight = -1.0f;
+static CGFloat const kJBBarChartViewStateAnimationDuration = 0.05f;
+static CGFloat const kJBBarChartViewReloadDataAnimationDuration = 0.15f;
+static CGFloat const kJBBarChartViewStatePopOffset = 10.0f;
+static NSInteger const kJBBarChartViewUndefinedBarIndex = -1;
+
+// Colors (JBChartView)
+static UIColor *kJBBarChartViewDefaultBarColor = nil;
+
+@interface JBChartView (Private)
+
+- (BOOL)hasMaximumValue;
+- (BOOL)hasMinimumValue;
+
+@end
+
+@interface JBBarChartView () <JBGradientBarViewDataSource>
+
+@property (nonatomic, strong) NSArray *chartData; // index = column, value = height
+@property (nonatomic, strong) NSArray *barViews;
+@property (nonatomic, strong) NSArray *cachedBarViewHeights;
+@property (nonatomic, assign) CGFloat barPadding;
+@property (nonatomic, assign) CGFloat cachedMaxHeight;
+@property (nonatomic, assign) CGFloat cachedMinHeight;
+@property (nonatomic, strong) JBChartVerticalSelectionView *verticalSelectionView;
+@property (nonatomic, assign) BOOL verticalSelectionViewVisible;
+@property (nonatomic, assign) BOOL reloading;
+
+// Initialization
+- (void)construct;
+
+// View quick accessors
+- (CGFloat)availableHeight;
+- (CGFloat)normalizedHeightForRawHeight:(NSNumber *)rawHeight;
+- (CGFloat)barWidth;
+
+// Touch helpers
+- (NSInteger)barViewIndexForPoint:(CGPoint)point;
+- (UIView *)barViewForForPoint:(CGPoint)point;
+- (void)touchesBeganOrMovedWithTouches:(NSSet *)touches;
+- (void)touchesEndedOrCancelledWithTouches:(NSSet *)touches;
+
+// Setters
+- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible animated:(BOOL)animated;
+
+// Helpers
+- (UIView *)createBarViewForIndex:(NSUInteger)index;
+- (void)insertBarView:(UIView *)barView;
+
+@end
+
+@implementation JBBarChartView
+
+@dynamic dataSource;
+@dynamic delegate;
+
+#pragma mark - Alloc/Init
+
++ (void)initialize
+{
+	if (self == [JBBarChartView class])
+	{
+		kJBBarChartViewDefaultBarColor = [UIColor blackColor];
+	}
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+	self = [super initWithCoder:aDecoder];
+	if (self)
+	{
+		[self construct];
+	}
+	return self;
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		[self construct];
+	}
+	return self;
+}
+
+- (id)init
+{
+	self = [super init];
+	if (self)
+	{
+		[self construct];
+	}
+	return self;
+}
+
+- (void)construct
+{
+	_chartData = [NSArray array];
+	_barViews = [NSArray array];
+	_cachedBarViewHeights = [NSArray array];
+
+	_showsVerticalSelection = YES;
+	_cachedMinHeight = kJBBarChartViewUndefinedCachedHeight;
+	_cachedMaxHeight = kJBBarChartViewUndefinedCachedHeight;
+}
+
+#pragma mark - Memory Management
+
+- (void)dealloc
+{
+	[NSObject cancelPreviousPerformRequestsWithTarget:self];
+}
+
+#pragma mark - Data
+
+- (void)reloadDataAnimated:(BOOL)animated
+{
+	if (self.reloading)
+	{
+		return;
+	}
+	
+	self.reloading = YES;
+	
+	// Reset cached max height
+	self.cachedMinHeight = kJBBarChartViewUndefinedCachedHeight;
+	self.cachedMaxHeight = kJBBarChartViewUndefinedCachedHeight;
+	
+	// Animation check
+	BOOL shouldAnimate = (animated && self.state == JBChartViewStateExpanded);
+	
+	/*
+	 * Final block to refresh state and turn off reloading bit
+	 */
+	dispatch_block_t completionBlock = ^{
+		
+		if (animated)
+		{
+			[self.chartData enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger index, BOOL * _Nonnull stop) {
+				// Grab old bar
+				UIView *oldBarView = [self.barViews objectAtIndex:index];
+				
+				// Update bar instance
+				UIView *barView = [self createBarViewForIndex:index];
+				barView.frame = oldBarView.frame;
+				
+				// Swap subviews
+				[oldBarView removeFromSuperview];
+				[self insertBarView:barView];
+				
+				// Update bar colection
+				NSMutableArray *mutableBarViews = [NSMutableArray arrayWithArray:self.barViews];
+				[mutableBarViews replaceObjectAtIndex:index withObject:barView];
+				self.barViews = [NSArray arrayWithArray:mutableBarViews];
+			}];
+		}
+		
+		self.reloading = NO;
+		[self setState:self.state animated:NO force:YES callback:nil];
+	};
+	
+	/*
+	 * The data collection holds all position information:
+	 * constructed via datasource and delegate functions
+	 */
+	dispatch_block_t createDataDictionariesBlock = ^{
+		
+		// Grab the count
+		NSAssert([self.dataSource respondsToSelector:@selector(numberOfBarsInBarChartView:)], @"JBBarChartView // datasource must implement - (NSUInteger)numberOfBarsInBarChartView:(JBBarChartView *)barChartView");
+		NSUInteger dataCount = [self.dataSource numberOfBarsInBarChartView:self];
+		
+		// Build up the data collection
+		NSAssert([self.delegate respondsToSelector:@selector(barChartView:heightForBarViewAtIndex:)], @"JBBarChartView // delegate must implement - (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtIndex:(NSUInteger)index");
+		NSMutableArray *mutableChartData = [NSMutableArray array];
+		for (NSUInteger index=0; index<dataCount; index++)
+		{
+			CGFloat height = [self.delegate barChartView:self heightForBarViewAtIndex:index];
+			NSAssert(height >= 0, @"JBBarChartView // datasource function - (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtIndex:(NSUInteger)index must return a CGFloat >= 0");
+			[mutableChartData addObject:[NSNumber numberWithFloat:height]];
+		}
+		self.chartData = [NSArray arrayWithArray:mutableChartData];
+	};
+	
+	/*
+	 * Determines the padding between bars as a function of # of bars
+	 */
+	dispatch_block_t createBarPaddingBlock = ^{
+		if ([self.delegate respondsToSelector:@selector(barPaddingForBarChartView:)])
+		{
+			self.barPadding = [self.delegate barPaddingForBarChartView:self];
+		}
+		else
+		{
+			NSUInteger totalBars = [self.chartData count];
+			self.barPadding = (1/(float)totalBars) * kJBBarChartViewBarBasePaddingMutliplier;
+		}
+	};
+	
+	/*
+	 * Creates a vertical selection view for touch events
+	 */
+	dispatch_block_t createSelectionViewBlock = ^{
+		
+		// Remove old selection bar
+		if (self.verticalSelectionView)
+		{
+			[self.verticalSelectionView removeFromSuperview];
+			self.verticalSelectionView = nil;
+		}
+		
+		CGFloat verticalSelectionViewHeight = self.bounds.size.height - self.headerView.frame.size.height - self.footerView.frame.size.height - self.headerPadding - self.footerPadding;
+		
+		if ([self.dataSource respondsToSelector:@selector(shouldExtendSelectionViewIntoHeaderPaddingForChartView:)])
+		{
+			if ([self.dataSource shouldExtendSelectionViewIntoHeaderPaddingForChartView:self])
+			{
+				verticalSelectionViewHeight += self.headerPadding;
+			}
+		}
+		
+		if ([self.dataSource respondsToSelector:@selector(shouldExtendSelectionViewIntoFooterPaddingForChartView:)])
+		{
+			if ([self.dataSource shouldExtendSelectionViewIntoFooterPaddingForChartView:self])
+			{
+				verticalSelectionViewHeight += self.footerPadding;
+			}
+		}
+		
+		self.verticalSelectionView = [[JBChartVerticalSelectionView alloc] initWithFrame:CGRectMake(0, 0, [self barWidth], verticalSelectionViewHeight)];
+		self.verticalSelectionView.alpha = 0.0;
+		self.verticalSelectionView.hidden = !self.showsVerticalSelection;
+		if ([self.delegate respondsToSelector:@selector(barSelectionColorForBarChartView:)])
+		{
+			UIColor *selectionViewBackgroundColor = [self.delegate barSelectionColorForBarChartView:self];
+			NSAssert(selectionViewBackgroundColor != nil, @"JBBarChartView // delegate function - (UIColor *)barSelectionColorForBarChartView:(JBBarChartView *)barChartView must return a non-nil UIColor");
+			self.verticalSelectionView.bgColor = selectionViewBackgroundColor;
+		}
+		
+		// Add new selection bar
+		if (self.footerView)
+		{
+			[self insertSubview:self.verticalSelectionView belowSubview:self.footerView];
+		}
+		else
+		{
+			[self addSubview:self.verticalSelectionView];
+		}
+		
+		self.verticalSelectionView.transform = self.inverted ? CGAffineTransformMakeScale(1.0, -1.0) : CGAffineTransformIdentity;
+	};
+	
+	/*
+	 * Creates a new bar graph view using the previously calculated data model
+	 */
+	dispatch_block_t createBarViewsBlock = ^{
+		
+		__weak JBBarChartView* weakSelf = self;
+		
+		if (shouldAnimate)
+		{
+			self.cachedBarViewHeights = nil;
+			__block NSUInteger barViewsCount = [self.barViews count];
+			
+			dispatch_block_t updateExistingBarViewsBlock = ^{
+				__block CGFloat xOffset = 0;
+				[weakSelf.chartData enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger index, BOOL * _Nonnull stop) {
+					CGFloat height = [weakSelf normalizedHeightForRawHeight:(NSNumber *)obj];
+					if (index < [weakSelf.barViews count])
+					{
+						// Update bar
+						UIView *barView = [weakSelf.barViews objectAtIndex:index];
+						if (weakSelf.inverted)
+						{
+							barView.frame = CGRectMake(xOffset, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, [weakSelf barWidth], height);
+						}
+						else
+						{
+							barView.frame = CGRectMake(xOffset, weakSelf.bounds.size.height - height - weakSelf.footerView.frame.size.height, [weakSelf barWidth], height);
+						}
+						xOffset += ([weakSelf barWidth] + weakSelf.barPadding);
+					}
+				}];
+			};
+			
+			dispatch_block_t preAddBarViewsBlock = ^{
+				__block CGFloat xOffset = 0;
+				[self.chartData enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger index, BOOL * _Nonnull stop) {
+					if (index >= barViewsCount)
+					{
+						// Create bar
+						UIView *barView = [weakSelf createBarViewForIndex:index];
+						if (weakSelf.inverted)
+						{
+							barView.frame = CGRectMake(xOffset, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, [weakSelf barWidth], 0.0f);
+						}
+						else
+						{
+							barView.frame = CGRectMake(xOffset, self.bounds.size.height, [weakSelf barWidth], 0.0f);
+						}
+						
+						// Update stored view
+						weakSelf.barViews = [NSArray arrayWithArray:[weakSelf.barViews arrayByAddingObject:barView]];
+						
+						// Add bar to view
+						[weakSelf insertBarView:barView];
+					}
+					xOffset += ([weakSelf barWidth] + weakSelf.barPadding);
+				}];
+			};
+			
+			dispatch_block_t postAddBarViewsBlock = ^{
+				[self.chartData enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger index, BOOL * _Nonnull stop) {
+					if (index >= barViewsCount)
+					{
+						CGFloat height = [weakSelf normalizedHeightForRawHeight:(NSNumber *)obj];
+						UIView *barView = [weakSelf.barViews objectAtIndex:index];
+						if (weakSelf.inverted)
+						{
+							barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, [weakSelf barWidth], height);
+						}
+						else
+						{
+							barView.frame = CGRectMake(barView.frame.origin.x, self.bounds.size.height - height - weakSelf.footerView.frame.size.height, [weakSelf barWidth], height);
+						}
+					}
+				}];
+			};
+			
+			dispatch_block_t preRemoveBarViewsBlock = ^{
+				
+				// Move existing (removed) bars down
+				for (NSUInteger index=[weakSelf.chartData count]; index<[weakSelf.barViews count]; index++)
+				{
+					UIView *barView = [weakSelf.barViews objectAtIndex:index];
+					if (weakSelf.inverted)
+					{
+						barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, 0.0f);
+					}
+					else
+					{
+						barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height, barView.frame.size.width, barView.frame.size.height);
+					}
+				}
+			};
+			
+			dispatch_block_t postRemoveBarViewsBlock = ^{
+				
+				// Remove existing (removed) bars
+				for (NSUInteger index=[weakSelf.chartData count]; index<[weakSelf.barViews count]; index++)
+				{
+					UIView *barView = [weakSelf.barViews objectAtIndex:index];
+					[barView removeFromSuperview];
+				}
+				
+				// Update bar view collection
+				NSMutableArray *mutableBarViews = [NSMutableArray arrayWithArray:weakSelf.barViews];
+				[mutableBarViews removeObjectsInRange:(NSRange){[weakSelf.chartData count], [weakSelf.barViews count] - [weakSelf.chartData count]}];
+				weakSelf.barViews = [NSArray arrayWithArray:mutableBarViews];
+			};
+			
+			dispatch_block_t refreshedCachedBarViewHeightsBlock = ^{
+				NSMutableArray *mutableCachedBarViewHeights = [NSMutableArray arrayWithArray:weakSelf.cachedBarViewHeights];
+				for (UIView *barView in weakSelf.barViews)
+				{
+					[mutableCachedBarViewHeights addObject:[NSNumber numberWithFloat:barView.frame.size.height]];
+				}
+				weakSelf.cachedBarViewHeights = [NSArray arrayWithArray:mutableCachedBarViewHeights];
+			};
+			
+			/*
+			 * New data model equal;
+			 * Update existing bars to accomodate new model.
+			 */
+			if ([self.chartData count] == [self.barViews count])
+			{
+				[UIView animateWithDuration:kJBBarChartViewReloadDataAnimationDuration animations:^{
+					updateExistingBarViewsBlock();
+				} completion:^(BOOL finished) {
+					refreshedCachedBarViewHeightsBlock();
+					completionBlock();
+				}];
+			}
+			
+			/*
+			 * New data model greater;
+			 * Update existing bars to accomodate new model & add new bars.
+			 */
+			else if ([self.chartData count] > [self.barViews count])
+			{
+				[UIView animateWithDuration:kJBBarChartViewReloadDataAnimationDuration animations:^{
+					updateExistingBarViewsBlock();
+				} completion:^(BOOL finished) {
+					preAddBarViewsBlock();
+					[UIView animateWithDuration:kJBBarChartViewReloadDataAnimationDuration delay:0 options:UIViewAnimationOptionTransitionNone animations:^{
+						postAddBarViewsBlock();
+					} completion:^(BOOL finished2) {
+						refreshedCachedBarViewHeightsBlock();
+						completionBlock();
+					}];
+				}];
+			}
+			
+			/*
+			 * New data model less;
+			 * Update existing bars to accomodate new model & remove legacy bars.
+			 */
+			else if ([self.chartData count] < [self.barViews count])
+			{
+				[UIView animateWithDuration:kJBBarChartViewReloadDataAnimationDuration animations:^{
+					preRemoveBarViewsBlock();
+				} completion:^(BOOL finished) {
+					postRemoveBarViewsBlock();
+					[UIView animateWithDuration:kJBBarChartViewReloadDataAnimationDuration delay:0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
+						updateExistingBarViewsBlock();
+					} completion:^(BOOL finished2) {
+						refreshedCachedBarViewHeightsBlock();
+						completionBlock();
+					}];
+				}];
+			}
+		}
+		else
+		{
+			// Remove old bars
+			for (UIView *barView in self.barViews)
+			{
+				[barView removeFromSuperview];
+			}
+			
+			self.cachedBarViewHeights = nil;
+			
+			__block CGFloat xOffset = 0;
+			__block NSMutableArray *mutableBarViews = [NSMutableArray array];
+			__block NSMutableArray *mutableCachedBarViewHeights = [NSMutableArray array];
+			[self.chartData enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger index, BOOL * _Nonnull stop) {
+				UIView *barView = [weakSelf createBarViewForIndex:index];
+				
+				CGFloat height = [weakSelf normalizedHeightForRawHeight:(NSNumber *)obj];
+				barView.frame = CGRectMake(xOffset, self.bounds.size.height - height - weakSelf.footerView.frame.size.height, [weakSelf barWidth], height);
+				[mutableBarViews addObject:barView];
+				[mutableCachedBarViewHeights addObject:[NSNumber numberWithFloat:height]];
+				
+				[weakSelf insertBarView:barView];
+				
+				xOffset += ([weakSelf barWidth] + weakSelf.barPadding);
+				index++;
+			}];
+			self.barViews = [NSArray arrayWithArray:mutableBarViews];
+			self.cachedBarViewHeights = [NSArray arrayWithArray:mutableCachedBarViewHeights];
+		}
+	};
+	
+	dispatch_block_t layoutHeaderAndFooterBlock = ^{
+		self.headerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.origin.y, self.bounds.size.width, self.headerView.frame.size.height);
+		self.footerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.size.height - self.footerView.frame.size.height, self.bounds.size.width, self.footerView.frame.size.height);
+	};
+	
+	/*
+	 * Reload data is broken down into various smaller units of work:
+	 *
+	 * 1. Create a data model
+	 * 2. Fetch the bar padding
+	 * 3. Create a (vertical) selection view
+	 * 4. Create and position bar view(s)
+	 * 5. Layout header & footer
+	 * 6. Refresh chart state
+	 *
+	 */
+	createDataDictionariesBlock();
+	createBarPaddingBlock();
+	createSelectionViewBlock();
+	createBarViewsBlock();
+	layoutHeaderAndFooterBlock();
+	
+	if (!shouldAnimate)
+	{
+		completionBlock(); // animated versions call this internally
+	}
+}
+
+- (void)reloadData
+{
+	[self reloadDataAnimated:NO];
+}
+
+#pragma mark - View Quick Accessors
+
+- (CGFloat)availableHeight
+{
+	return self.bounds.size.height - self.headerView.frame.size.height - self.footerView.frame.size.height - self.headerPadding - self.footerPadding;
+}
+
+- (CGFloat)normalizedHeightForRawHeight:(NSNumber *)rawHeight
+{
+	CGFloat minHeight = [self minimumValue];
+	CGFloat maxHeight = [self maximumValue];
+	CGFloat value = [rawHeight floatValue];
+	
+	if ((maxHeight - minHeight) <= 0)
+	{
+		return [self availableHeight];
+	}
+	
+	return ((value - minHeight) / (maxHeight - minHeight)) * [self availableHeight];
+}
+
+- (CGFloat)barWidth
+{
+	NSUInteger barCount = [self.chartData count];
+	if (barCount > 0)
+	{
+		CGFloat totalPadding = (barCount - 1) * self.barPadding;
+		CGFloat availableWidth = self.bounds.size.width - totalPadding;
+		return availableWidth / barCount;
+	}
+	return 0;
+}
+
+#pragma mark - Setters
+
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)())callback
+{
+	if (self.reloading)
+	{
+		if (callback)
+		{
+			callback();
+		}
+		return; // ignore state changes when reloading
+	}
+	
+	[super setState:state animated:animated force:force callback:callback];
+	
+	__weak JBBarChartView* weakSelf = self;
+	
+	void (^updateBarView)(UIView *barView, BOOL popBar);
+	
+	updateBarView = ^(UIView *barView, BOOL popBar) {
+		if (weakSelf.inverted)
+		{
+			if (weakSelf.state == JBChartViewStateExpanded)
+			{
+				if (popBar)
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] + kJBBarChartViewStatePopOffset);
+				}
+				else
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue]);
+				}
+			}
+			else if (weakSelf.state == JBChartViewStateCollapsed)
+			{
+				if (popBar)
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] + kJBBarChartViewStatePopOffset);
+				}
+				else
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, 0.0f);
+				}
+			}
+		}
+		else
+		{
+			if (weakSelf.state == JBChartViewStateExpanded)
+			{
+				if (popBar)
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height - weakSelf.footerView.frame.size.height - weakSelf.footerPadding - [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] - kJBBarChartViewStatePopOffset, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] + kJBBarChartViewStatePopOffset);
+				}
+				else
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height - weakSelf.footerView.frame.size.height - weakSelf.footerPadding - [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue], barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue]);
+				}
+			}
+			else if (weakSelf.state == JBChartViewStateCollapsed)
+			{
+				if (popBar)
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height - weakSelf.footerView.frame.size.height - weakSelf.footerPadding - [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] - kJBBarChartViewStatePopOffset, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] + kJBBarChartViewStatePopOffset);
+				}
+				else
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height, barView.frame.size.width, 0.0f);
+				}
+			}
+		}
+	};
+	
+	dispatch_block_t callbackCopy = [callback copy];
+	
+	if ([self.barViews count] > 0)
+	{
+		if (animated)
+		{
+			dispatch_block_t animationCompletionBlock = ^{
+				if (callbackCopy)
+				{
+					callbackCopy();
+				}
+			};
+			
+			NSUInteger animationDelayIndex = 0;
+			for (UIView *barView in self.barViews)
+			{
+				BOOL lastIndex = ((NSUInteger)barView.tag == [self.barViews count] - 1);
+				if ([[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] > [self minimumValue])
+				{
+					[UIView animateWithDuration:kJBBarChartViewStateAnimationDuration delay:(kJBBarChartViewStateAnimationDuration * 0.5) * animationDelayIndex options:UIViewAnimationOptionBeginFromCurrentState animations:^{
+						updateBarView(barView, YES);
+					} completion:^(BOOL finished) {
+						[UIView animateWithDuration:kJBBarChartViewStateAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
+							updateBarView(barView, NO);
+						} completion:^(BOOL lastBarFinished) {
+							if (lastIndex)
+							{
+								animationCompletionBlock();
+							}
+						}];
+					}];
+					animationDelayIndex++;
+				}
+				else if (lastIndex)
+				{
+					animationCompletionBlock();
+				}
+			}
+		}
+		else
+		{
+			for (UIView *barView in self.barViews)
+			{
+				updateBarView(barView, NO);
+			}
+			if (callbackCopy)
+			{
+				callbackCopy();
+			}
+		}
+	}
+	else
+	{
+		if (callbackCopy)
+		{
+			callbackCopy();
+		}
+	}
+}
+
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+{
+	[self setState:state animated:animated force:NO callback:callback];
+}
+
+- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible animated:(BOOL)animated
+{
+	_verticalSelectionViewVisible = verticalSelectionViewVisible;
+	
+	if (animated)
+	{
+		[UIView animateWithDuration:kJBChartViewDefaultAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
+			self.verticalSelectionView.alpha = self.verticalSelectionViewVisible ? 1.0 : 0.0;
+		} completion:nil];
+	}
+	else
+	{
+		self.verticalSelectionView.alpha = _verticalSelectionViewVisible ? 1.0 : 0.0;
+	}
+}
+
+- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible
+{
+	[self setVerticalSelectionViewVisible:verticalSelectionViewVisible animated:NO];
+}
+
+- (void)setShowsVerticalSelection:(BOOL)showsVerticalSelection
+{
+	_showsVerticalSelection = showsVerticalSelection;
+	self.verticalSelectionView.hidden = _showsVerticalSelection ? NO : YES;
+}
+
+#pragma mark - Getters
+
+- (CGFloat)cachedMinHeight
+{
+	if(_cachedMinHeight == kJBBarChartViewUndefinedCachedHeight)
+	{
+		NSArray *chartValues = [self.chartData sortedArrayUsingSelector:@selector(compare:)];
+		_cachedMinHeight =  [[chartValues firstObject] floatValue];
+	}
+	return _cachedMinHeight;
+}
+
+- (CGFloat)cachedMaxHeight
+{
+	if (_cachedMaxHeight == kJBBarChartViewUndefinedCachedHeight)
+	{
+		NSArray *chartValues = [self.chartData sortedArrayUsingSelector:@selector(compare:)];
+		_cachedMaxHeight =  [[chartValues lastObject] floatValue];
+	}
+	return _cachedMaxHeight;
+}
+
+- (CGFloat)minimumValue
+{
+	if ([self hasMinimumValue])
+	{
+		return fminf(self.cachedMinHeight, [super minimumValue]);
+	}
+	return self.cachedMinHeight;
+}
+
+- (CGFloat)maximumValue
+{
+	if ([self hasMaximumValue])
+	{
+		return fmaxf(self.cachedMaxHeight, [super maximumValue]);
+	}
+	return self.cachedMaxHeight;
+}
+
+- (UIView *)barViewAtIndex:(NSUInteger)index
+{
+	if (index < [self.barViews count])
+	{
+		return [self.barViews objectAtIndex:index];
+	}
+	return nil;
+}
+
+#pragma mark - Helpers
+
+- (UIView *)createBarViewForIndex:(NSUInteger)index
+{
+	UIView *barView = nil;
+	{
+		// Custom bar
+		if ([self.dataSource respondsToSelector:@selector(barChartView:barViewAtIndex:)])
+		{
+			UIView *customBarView = [self.dataSource barChartView:self barViewAtIndex:index];
+			if (customBarView != nil)
+			{
+				barView = customBarView;
+			}
+		}
+		
+		// Color bar
+		if ([self.delegate respondsToSelector:@selector(barChartView:colorForBarViewAtIndex:)] && barView == nil)
+		{
+			UIColor *backgroundColor = [self.delegate barChartView:self colorForBarViewAtIndex:index];
+			if (backgroundColor != nil)
+			{
+				barView = [[UIView alloc] init];
+				barView.backgroundColor = backgroundColor;
+			}
+		}
+		
+		// Gradient
+		if ([self.delegate respondsToSelector:@selector(barGradientForBarChartView:)] && barView == nil)
+		{
+			CAGradientLayer *gradientLayer = [self.delegate barGradientForBarChartView:self];
+			if (gradientLayer != nil)
+			{
+				barView = [[JBGradientBarView alloc] init];
+				((JBGradientBarView *)barView).dataSource = self;
+				((JBGradientBarView *)barView).gradientLayer = gradientLayer;
+			}
+		}
+		
+		// Default
+		if (barView == nil)
+		{
+			barView = [[UIView alloc] init];
+			barView.backgroundColor = kJBBarChartViewDefaultBarColor;
+		}
+	}
+	
+	barView.tag = index;
+	
+	return barView;
+}
+
+- (void)insertBarView:(UIView *)barView
+{
+	(self.footerView != nil) ? [self insertSubview:barView belowSubview:self.footerView] : [self addSubview:barView];
+	[self bringSubviewToFront:self.verticalSelectionView];
+	[self bringSubviewToFront:self.footerView];
+}
+
+#pragma mark - Touch Helpers
+
+- (NSInteger)barViewIndexForPoint:(CGPoint)point
+{
+	NSUInteger index = 0;
+	NSUInteger selectedIndex = kJBBarChartViewUndefinedBarIndex;
+	
+	if (point.x < 0 || point.x > self.bounds.size.width)
+	{
+		return selectedIndex;
+	}
+	
+	CGFloat padding = ceil(self.barPadding * 0.5);
+	for (UIView *barView in self.barViews)
+	{
+		CGFloat minX = CGRectGetMinX(barView.frame) - padding;
+		CGFloat maxX = CGRectGetMaxX(barView.frame) + padding;
+		if ((point.x >= minX) && (point.x <= maxX))
+		{
+			selectedIndex = index;
+			break;
+		}
+		index++;
+	}
+	return selectedIndex;
+}
+
+- (UIView *)barViewForForPoint:(CGPoint)point
+{
+	UIView *barView = nil;
+	NSInteger selectedIndex = [self barViewIndexForPoint:point];
+	if (selectedIndex >= 0)
+	{
+		return [self.barViews objectAtIndex:[self barViewIndexForPoint:point]];
+	}
+	return barView;
+}
+
+- (void)touchesBeganOrMovedWithTouches:(NSSet *)touches
+{
+	if (self.state == JBChartViewStateCollapsed || [self.chartData count] <= 0 || self.reloading)
+	{
+		return;
+	}
+	
+	UITouch *touch = [touches anyObject];
+	CGPoint touchPoint = [touch locationInView:self];
+	UIView *barView = [self barViewForForPoint:touchPoint];
+	if (barView == nil)
+	{
+		[self setVerticalSelectionViewVisible:NO animated:YES];
+		return;
+	}
+	CGRect barViewFrame = barView.frame;
+	CGRect selectionViewFrame = self.verticalSelectionView.frame;
+	selectionViewFrame.origin.x = barViewFrame.origin.x;
+	selectionViewFrame.size.width = barViewFrame.size.width;
+	
+	if ([self.dataSource respondsToSelector:@selector(shouldExtendSelectionViewIntoHeaderPaddingForChartView:)])
+	{
+		if ([self.dataSource shouldExtendSelectionViewIntoHeaderPaddingForChartView:self])
+		{
+			selectionViewFrame.origin.y = self.headerView.frame.size.height;
+		}
+		else
+		{
+			selectionViewFrame.origin.y = self.headerView.frame.size.height + self.headerPadding;
+		}
+	}
+	else
+	{
+		selectionViewFrame.origin.y = self.headerView.frame.size.height + self.headerPadding;
+	}
+	
+	self.verticalSelectionView.frame = selectionViewFrame;
+	[self setVerticalSelectionViewVisible:YES animated:YES];
+	
+	if ([self.delegate respondsToSelector:@selector(barChartView:didSelectBarAtIndex:touchPoint:)])
+	{
+		[self.delegate barChartView:self didSelectBarAtIndex:[self barViewIndexForPoint:touchPoint] touchPoint:touchPoint];
+	}
+	
+	if ([self.delegate respondsToSelector:@selector(barChartView:didSelectBarAtIndex:)])
+	{
+		[self.delegate barChartView:self didSelectBarAtIndex:[self barViewIndexForPoint:touchPoint]];
+	}
+}
+
+- (void)touchesEndedOrCancelledWithTouches:(NSSet *)touches
+{
+	if (self.state == JBChartViewStateCollapsed || [self.chartData count] <= 0 || self.reloading)
+	{
+		return;
+	}
+	
+	[self setVerticalSelectionViewVisible:NO animated:YES];
+	
+	if ([self.delegate respondsToSelector:@selector(didDeselectBarChartView:)])
+	{
+		[self.delegate didDeselectBarChartView:self];
+	}
+}
+
+#pragma mark - Touches
+
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
+	[self setVerticalSelectionViewVisible:NO animated:NO];
+	[self touchesBeganOrMovedWithTouches:touches];
+}
+
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
+{
+	[self touchesBeganOrMovedWithTouches:touches];
+}
+
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
+{
+	[self touchesEndedOrCancelledWithTouches:touches];
+}
+
+- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
+{
+	[self touchesEndedOrCancelledWithTouches:touches];
+}
+
+#pragma mark - JBGradientBarViewDataSource
+
+- (CGRect)chartViewBoundsForGradientBarView:(JBGradientBarView *)gradientBarView
+{
+	return self.bounds;
+}
+
+@end

Classes/Bar/Views/JBGradientBarView.h

@@ -0,0 +1,29 @@
+//
+//  JBGradientBarView.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@class JBGradientBarView;
+
+@protocol JBGradientBarViewDataSource;
+
+@protocol JBGradientBarViewDataSource <NSObject>
+
+@optional
+
+- (CGRect)chartViewBoundsForGradientBarView:(JBGradientBarView *)gradientBarView;
+
+@end
+
+@interface JBGradientBarView: UIView
+
+@property (nonatomic, weak) id<JBGradientBarViewDataSource> dataSource;
+@property (nonatomic, strong) CAGradientLayer *gradientLayer;
+
+@end

Classes/Bar/Views/JBGradientBarView.m

@@ -0,0 +1,80 @@
+//
+//  JBGradientBarView.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBGradientBarView.h"
+
+@interface JBGradientBarView ()
+
+- (void)construct;
+
+@end
+
+@implementation JBGradientBarView
+
+#pragma mark - Alloc/Init
+
+- (instancetype)init
+{
+	self = [super init];
+	if (self)
+	{
+		[self construct];
+	}
+	return self;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		[self construct];
+	}
+	return self;
+}
+
+#pragma mark - Setters
+
+- (void)setGradientLayer:(CAGradientLayer *)gradientLayer
+{
+	if (_gradientLayer != nil)
+	{
+		[_gradientLayer removeFromSuperlayer];
+		_gradientLayer = nil;
+	}
+	
+	_gradientLayer = gradientLayer;
+	_gradientLayer.masksToBounds = YES;
+	[self.layer insertSublayer:_gradientLayer atIndex:0];
+}
+
+#pragma mark - Construction
+
+- (void)construct
+{
+	self.clipsToBounds = YES;
+}
+
+#pragma mark - Setters
+
+- (void)setFrame:(CGRect)frame
+{
+	[super setFrame:frame];
+	
+	if ([self.dataSource respondsToSelector:@selector(chartViewBoundsForGradientBarView:)])
+	{
+		_gradientLayer.frame = [self.dataSource chartViewBoundsForGradientBarView:self]; // gradient is as large as the chart
+		_gradientLayer.frame = CGRectOffset(_gradientLayer.frame, -CGRectGetMinX(frame), 0);
+	}
+	else
+	{
+		_gradientLayer.frame = self.bounds;
+	}
+}
+
+@end

Classes/Base/JBChartView.h

@@ -17,14 +17,14 @@ extern CGFloat const kJBChartViewDefaultAnimationDuration;
  * At a minimum, a chart can support two states, along with animations to-and-from.
  */
 typedef NS_ENUM(NSInteger, JBChartViewState){
-    /**
-     *  Expanded state: chart supports touches, interaction, etc.
-     */
-    JBChartViewStateExpanded,
-    /**
-     *  Collapse state: chart is more-or-less disabled at this point.
-     */
-    JBChartViewStateCollapsed
+	/**
+	 *  Expanded state: chart supports touches, interaction, etc.
+	 */
+	JBChartViewStateExpanded,
+	/**
+	 *  Collapse state: chart is more-or-less disabled at this point.
+	 */
+	JBChartViewStateCollapsed
 };
 
 @protocol JBChartViewDataSource <NSObject>
@@ -64,7 +64,7 @@ typedef NS_ENUM(NSInteger, JBChartViewState){
 @interface JBChartView : UIView
 
 /*
- * Base dataSource and delegate protocols. 
+ * Base dataSource and delegate protocols.
  */
 @property (nonatomic, weak) id<JBChartViewDataSource> dataSource;
 @property (nonatomic, weak) id<JBChartViewDelegate> delegate;
@@ -72,7 +72,7 @@ typedef NS_ENUM(NSInteger, JBChartViewState){
 /**
  *  Header and footer views are shown above and below the chart respectively.
  *  Each view will be stretched horizontally to fill width of chart.
- *  Each view's bounds are clipped to support chart state animations. 
+ *  Each view's bounds are clipped to support chart state animations.
  */
 @property (nonatomic, strong) UIView *footerView;
 @property (nonatomic, strong) UIView *headerView;
@@ -92,13 +92,13 @@ typedef NS_ENUM(NSInteger, JBChartViewState){
 @property (nonatomic, assign) CGFloat footerPadding;
 
 /**
- *  The minimum and maxmimum values of the chart. 
+ *  The minimum and maxmimum values of the chart.
  *  If no value(s) are supplied:
- *  
- *  minimumValue = chart's data source min value. 
+ *
+ *  minimumValue = chart's data source min value.
  *  maxmimumValue = chart's data source max value.
  *
- *  If value(s) are supplied, they must be >= 0, otherwise an assertion will be thrown. 
+ *  If value(s) are supplied, they must be >= 0, otherwise an assertion will be thrown.
  *  The min/max values are clamped to the ceiling and floor of the actual min/max values of the chart's data source;
  *  for example, if a maximumValue of 20 is supplied & the chart's actual max is 100, then 100 will be used.
  *
@@ -112,7 +112,7 @@ typedef NS_ENUM(NSInteger, JBChartViewState){
 - (void)resetMaximumValue;
 
 /**
- *  Charts can either be expanded or contracted. 
+ *  Charts can either be expanded or contracted.
  *  By default, a chart should be expanded on initialization.
  */
 @property (nonatomic, assign) JBChartViewState state;

Classes/Base/JBChartView.m

@@ -0,0 +1,235 @@
+//
+//  JBChartView.m
+//  Nudge
+//
+//  Created by Terry Worona on 9/4/13.
+//  Copyright (c) 2013 Jawbone. All rights reserved.
+//
+
+#import "JBChartView.h"
+
+// Numerics
+CGFloat const kJBChartViewDefaultAnimationDuration = 0.25f;
+
+// Color (JBChartSelectionView)
+static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
+
+@interface JBChartView ()
+
+@property (nonatomic, assign) BOOL hasMaximumValue;
+@property (nonatomic, assign) BOOL hasMinimumValue;
+
+// Construction
+- (void)constructChartView;
+
+// Validation
+- (void)validateHeaderAndFooterHeights;
+
+@end
+
+@implementation JBChartView
+
+#pragma mark - Alloc/Init
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+	self = [super initWithCoder:aDecoder];
+	if (self)
+	{
+		[self constructChartView];
+	}
+	return self;
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		[self constructChartView];
+	}
+	return self;
+}
+
+- (id)init
+{
+	return [self initWithFrame:CGRectZero];
+}
+
+#pragma mark - Construction
+
+- (void)constructChartView
+{
+	self.clipsToBounds = YES;
+}
+
+#pragma mark - Public
+
+- (void)reloadData
+{
+	// Override
+}
+
+#pragma mark - Validation
+
+- (void)validateHeaderAndFooterHeights
+{
+	NSAssert((self.headerView.bounds.size.height + self.footerView.bounds.size.height) <= self.bounds.size.height, @"JBChartView // the combined height of the footer and header can not be greater than the total height of the chart.");
+}
+
+#pragma mark - Setters
+
+- (void)setHeaderView:(UIView *)headerView
+{
+	if (_headerView)
+	{
+		[_headerView removeFromSuperview];
+		_headerView = nil;
+	}
+	_headerView = headerView;
+	_headerView.clipsToBounds = YES;
+	
+	[self validateHeaderAndFooterHeights];
+	
+	[self addSubview:_headerView];
+	[self reloadData];
+}
+
+- (void)setFooterView:(UIView *)footerView
+{
+	if (_footerView)
+	{
+		[_footerView removeFromSuperview];
+		_footerView = nil;
+	}
+	_footerView = footerView;
+	_footerView.clipsToBounds = YES;
+	
+	[self validateHeaderAndFooterHeights];
+	
+	[self addSubview:_footerView];
+	[self reloadData];
+}
+
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)())callback
+{
+	if ((_state == state) && !force)
+	{
+		return;
+	}
+	
+	_state = state;
+	
+	// Override
+}
+
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+{
+	[self setState:state animated:animated force:NO callback:callback];
+}
+
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated
+{
+	[self setState:state animated:animated callback:nil];
+}
+
+- (void)setState:(JBChartViewState)state
+{
+	[self setState:state animated:NO];
+}
+
+- (void)setMinimumValue:(CGFloat)minimumValue
+{
+	NSAssert(minimumValue >= 0, @"JBChartView // the minimumValue must be >= 0.");
+	_minimumValue = minimumValue;
+	_hasMinimumValue = YES;
+}
+
+- (void)setMaximumValue:(CGFloat)maximumValue
+{
+	NSAssert(maximumValue >= 0, @"JBChartView // the maximumValue must be >= 0.");
+	_maximumValue = maximumValue;
+	_hasMaximumValue = YES;
+}
+
+- (void)resetMinimumValue
+{
+	_hasMinimumValue = NO; // clears min
+}
+
+- (void)resetMaximumValue
+{
+	_hasMaximumValue = NO; // clears max
+}
+
+@end
+
+@implementation JBChartVerticalSelectionView
+
+#pragma mark - Alloc/Init
+
++ (void)initialize
+{
+	if (self == [JBChartVerticalSelectionView class])
+	{
+		kJBChartVerticalSelectionViewDefaultBgColor = [UIColor whiteColor];
+	}
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		self.backgroundColor = [UIColor clearColor];
+	}
+	return self;
+}
+
+#pragma mark - Drawing
+
+- (void)drawRect:(CGRect)rect
+{
+	CGContextRef context = UIGraphicsGetCurrentContext();
+	[[UIColor clearColor] set];
+	CGContextFillRect(context, rect);
+	
+	CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+	CGFloat locations[] = { 0.0, 1.0 };
+	
+	NSArray *colors = nil;
+	if (self.bgColor != nil)
+	{
+		colors = @[(__bridge id)self.bgColor.CGColor, (__bridge id)[self.bgColor colorWithAlphaComponent:0.0].CGColor];
+	}
+	else
+	{
+		colors = @[(__bridge id)kJBChartVerticalSelectionViewDefaultBgColor.CGColor, (__bridge id)[kJBChartVerticalSelectionViewDefaultBgColor colorWithAlphaComponent:0.0].CGColor];
+	}
+	
+	CGGradientRef gradient = CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef) colors, locations);
+	
+	CGPoint startPoint = CGPointMake(CGRectGetMidX(rect), CGRectGetMaxY(rect));
+	CGPoint endPoint = CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect));
+	
+	CGContextSaveGState(context);
+	{
+		CGContextAddRect(context, rect);
+		CGContextClip(context);
+		CGContextDrawLinearGradient(context, gradient, startPoint, endPoint, 0);
+	}
+	CGContextRestoreGState(context);
+	
+	CGGradientRelease(gradient);
+	CGColorSpaceRelease(colorSpace);
+}
+
+#pragma mark - Setters
+
+- (void)setBgColor:(UIColor *)bgColor
+{
+	_bgColor = bgColor;
+	[self setNeedsDisplay];
+}
+
+@end

Classes/JBBarChartView.m

@@ -1,756 +0,0 @@
-//
-//  JBBarChartView.m
-//  Nudge
-//
-//  Created by Terry Worona on 9/3/13.
-//  Copyright (c) 2013 Jawbone. All rights reserved.
-//
-
-#import "JBBarChartView.h"
-
-// Numerics
-CGFloat static const kJBBarChartViewBarBasePaddingMutliplier = 50.0f;
-CGFloat static const kJBBarChartViewUndefinedCachedHeight = -1.0f;
-CGFloat static const kJBBarChartViewStateAnimationDuration = 0.05f;
-CGFloat static const kJBBarChartViewStatePopOffset = 10.0f;
-NSInteger static const kJBBarChartViewUndefinedBarIndex = -1;
-
-// Colors (JBChartView)
-static UIColor *kJBBarChartViewDefaultBarColor = nil;
-
-@interface JBChartView (Private)
-
-- (BOOL)hasMaximumValue;
-- (BOOL)hasMinimumValue;
-
-@end
-
-@protocol JBGradientBarViewDelegate;
-
-@interface JBGradientBarView: UIView
-
-@property (nonatomic, strong) CAGradientLayer *gradientLayer;
-@property (nonatomic, weak) id<JBGradientBarViewDelegate> delegate;
-
-// Initialization
-- (void)construct;
-
-@end
-
-@protocol JBGradientBarViewDelegate <NSObject>
-
-@optional
-
-- (CGRect)chartViewBoundsForGradientBarView:(JBGradientBarView *)gradientBarView;
-
-@end
-
-@interface JBBarChartView () <JBGradientBarViewDelegate>
-
-@property (nonatomic, strong) NSDictionary *chartDataDictionary; // key = column, value = height
-@property (nonatomic, strong) NSArray *barViews;
-@property (nonatomic, strong) NSArray *cachedBarViewHeights;
-@property (nonatomic, assign) CGFloat barPadding;
-@property (nonatomic, assign) CGFloat cachedMaxHeight;
-@property (nonatomic, assign) CGFloat cachedMinHeight;
-@property (nonatomic, strong) JBChartVerticalSelectionView *verticalSelectionView;
-@property (nonatomic, assign) BOOL verticalSelectionViewVisible;
-
-// Initialization
-- (void)construct;
-
-// View quick accessors
-- (CGFloat)availableHeight;
-- (CGFloat)normalizedHeightForRawHeight:(NSNumber *)rawHeight;
-- (CGFloat)barWidth;
-
-// Touch helpers
-- (NSInteger)barViewIndexForPoint:(CGPoint)point;
-- (UIView *)barViewForForPoint:(CGPoint)point;
-- (void)touchesBeganOrMovedWithTouches:(NSSet *)touches;
-- (void)touchesEndedOrCancelledWithTouches:(NSSet *)touches;
-
-// Setters
-- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible animated:(BOOL)animated;
-
-@end
-
-@implementation JBBarChartView
-
-@dynamic dataSource;
-@dynamic delegate;
-
-#pragma mark - Alloc/Init
-
-+ (void)initialize
-{
-	if (self == [JBBarChartView class])
-	{
-		kJBBarChartViewDefaultBarColor = [UIColor blackColor];
-	}
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        [self construct];
-    }
-    return self;
-}
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {
-        [self construct];
-    }
-    return self;
-}
-
-- (id)init
-{
-    self = [super init];
-    if (self)
-    {
-        [self construct];
-    }
-    return self;
-}
-
-- (void)construct
-{
-    _showsVerticalSelection = YES;
-    _cachedMinHeight = kJBBarChartViewUndefinedCachedHeight;
-    _cachedMaxHeight = kJBBarChartViewUndefinedCachedHeight;
-}
-
-#pragma mark - Memory Management
-
-- (void)dealloc
-{
-    [NSObject cancelPreviousPerformRequestsWithTarget:self];
-}
-
-#pragma mark - Data
-
-- (void)reloadData
-{
-    // reset cached max height
-    self.cachedMinHeight = kJBBarChartViewUndefinedCachedHeight;
-    self.cachedMaxHeight = kJBBarChartViewUndefinedCachedHeight;
-    
-    /*
-     * The data collection holds all position information:
-     * constructed via datasource and delegate functions
-     */
-    dispatch_block_t createDataDictionaries = ^{
-        
-        // Grab the count
-        NSAssert([self.dataSource respondsToSelector:@selector(numberOfBarsInBarChartView:)], @"JBBarChartView // datasource must implement - (NSUInteger)numberOfBarsInBarChartView:(JBBarChartView *)barChartView");
-        NSUInteger dataCount = [self.dataSource numberOfBarsInBarChartView:self];
-
-        // Build up the data collection
-        NSAssert([self.delegate respondsToSelector:@selector(barChartView:heightForBarViewAtIndex:)], @"JBBarChartView // delegate must implement - (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtIndex:(NSUInteger)index");
-        NSMutableDictionary *dataDictionary = [NSMutableDictionary dictionary];
-        for (NSUInteger index=0; index<dataCount; index++)
-        {
-            CGFloat height = [self.delegate barChartView:self heightForBarViewAtIndex:index];
-            NSAssert(height >= 0, @"JBBarChartView // datasource function - (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtIndex:(NSUInteger)index must return a CGFloat >= 0");
-            [dataDictionary setObject:[NSNumber numberWithFloat:height] forKey:[NSNumber numberWithInt:(int)index]];
-        }
-        self.chartDataDictionary = [NSDictionary dictionaryWithDictionary:dataDictionary];
-	};
-    
-    /*
-     * Determines the padding between bars as a function of # of bars
-     */
-    dispatch_block_t createBarPadding = ^{
-        if ([self.delegate respondsToSelector:@selector(barPaddingForBarChartView:)])
-        {
-            self.barPadding = [self.delegate barPaddingForBarChartView:self];
-        }
-        else
-        {
-            NSUInteger totalBars = [[self.chartDataDictionary allKeys] count];
-            self.barPadding = (1/(float)totalBars) * kJBBarChartViewBarBasePaddingMutliplier;
-        }
-    };
-    
-    /*
-     * Creates a new bar graph view using the previously calculated data model
-     */
-    dispatch_block_t createBars = ^{
-        
-        // Remove old bars
-        for (UIView *barView in self.barViews)
-        {
-            [barView removeFromSuperview];
-        }
-        
-        self.cachedBarViewHeights = nil;
-        
-        CGFloat xOffset = 0;
-        NSUInteger index = 0;
-        NSMutableArray *mutableBarViews = [NSMutableArray array];
-        NSMutableArray *mutableCachedBarViewHeights = [NSMutableArray array];
-        for (NSNumber *key in [[self.chartDataDictionary allKeys] sortedArrayUsingSelector:@selector(compare:)])
-        {
-			UIView *barView = nil;
-			{
-				// Custom bar
-				if ([self.dataSource respondsToSelector:@selector(barChartView:barViewAtIndex:)])
-				{
-					UIView *customBarView = [self.dataSource barChartView:self barViewAtIndex:index];
-					if (customBarView != nil)
-					{
-						barView = customBarView;
-					}
-				}
-				
-				// Color bar
-				if ([self.delegate respondsToSelector:@selector(barChartView:colorForBarViewAtIndex:)] && barView == nil)
-				{
-					UIColor *backgroundColor = [self.delegate barChartView:self colorForBarViewAtIndex:index];
-					if (backgroundColor != nil)
-					{
-						barView = [[UIView alloc] init];
-						barView.backgroundColor = backgroundColor;
-					}
-				}
-				
-				// Gradient
-				if ([self.delegate respondsToSelector:@selector(barGradientForBarChartView:)] && barView == nil)
-				{
-					CAGradientLayer *gradientLayer = [self.delegate barGradientForBarChartView:self];
-					if (gradientLayer != nil)
-					{
-						barView = [[JBGradientBarView alloc] init];
-						((JBGradientBarView *)barView).delegate = self;
-						((JBGradientBarView *)barView).gradientLayer = gradientLayer;
-					}
-				}
-				
-				// Default
-				if (barView == nil)
-				{
-					barView = [[UIView alloc] init];
-					barView.backgroundColor = kJBBarChartViewDefaultBarColor;
-				}
-			}
-            barView.tag = index;
-			
-            // Add new bar
-            if (self.footerView)
-			{
-				[self insertSubview:barView belowSubview:self.footerView];
-			}
-			else
-			{
-				[self addSubview:barView];
-			}
-			
-			CGFloat height = [self normalizedHeightForRawHeight:[self.chartDataDictionary objectForKey:key]];
-			barView.frame = CGRectMake(xOffset, self.bounds.size.height - height - self.footerView.frame.size.height, [self barWidth], height);
-			[mutableBarViews addObject:barView];
-			[mutableCachedBarViewHeights addObject:[NSNumber numberWithFloat:height]];
-			
-            xOffset += ([self barWidth] + self.barPadding);
-            index++;
-        }
-        self.barViews = [NSArray arrayWithArray:mutableBarViews];
-        self.cachedBarViewHeights = [NSArray arrayWithArray:mutableCachedBarViewHeights];
-    };
-    
-    /*
-     * Creates a vertical selection view for touch events
-     */
-    dispatch_block_t createSelectionView = ^{
-        
-        // Remove old selection bar
-        if (self.verticalSelectionView)
-        {
-            [self.verticalSelectionView removeFromSuperview];
-            self.verticalSelectionView = nil;
-        }
-        
-        CGFloat verticalSelectionViewHeight = self.bounds.size.height - self.headerView.frame.size.height - self.footerView.frame.size.height - self.headerPadding - self.footerPadding;
-        
-        if ([self.dataSource respondsToSelector:@selector(shouldExtendSelectionViewIntoHeaderPaddingForChartView:)])
-        {
-            if ([self.dataSource shouldExtendSelectionViewIntoHeaderPaddingForChartView:self])
-            {
-                verticalSelectionViewHeight += self.headerPadding;
-            }
-        }
-        
-        if ([self.dataSource respondsToSelector:@selector(shouldExtendSelectionViewIntoFooterPaddingForChartView:)])
-        {
-            if ([self.dataSource shouldExtendSelectionViewIntoFooterPaddingForChartView:self])
-            {
-                verticalSelectionViewHeight += self.footerPadding;
-            }
-        }
-
-        self.verticalSelectionView = [[JBChartVerticalSelectionView alloc] initWithFrame:CGRectMake(0, 0, [self barWidth], verticalSelectionViewHeight)];
-        self.verticalSelectionView.alpha = 0.0;
-        self.verticalSelectionView.hidden = !self.showsVerticalSelection;
-        if ([self.delegate respondsToSelector:@selector(barSelectionColorForBarChartView:)])
-        {
-            UIColor *selectionViewBackgroundColor = [self.delegate barSelectionColorForBarChartView:self];
-            NSAssert(selectionViewBackgroundColor != nil, @"JBBarChartView // delegate function - (UIColor *)barSelectionColorForBarChartView:(JBBarChartView *)barChartView must return a non-nil UIColor");
-            self.verticalSelectionView.bgColor = selectionViewBackgroundColor;
-        }
-        
-        // Add new selection bar
-        if (self.footerView)
-        {
-            [self insertSubview:self.verticalSelectionView belowSubview:self.footerView];
-        }
-        else
-        {
-            [self addSubview:self.verticalSelectionView];
-        }
-        
-        self.verticalSelectionView.transform = self.inverted ? CGAffineTransformMakeScale(1.0, -1.0) : CGAffineTransformIdentity;
-    };
-    
-    createDataDictionaries();
-    createBarPadding();
-    createBars();
-    createSelectionView();
-    
-    // Position header and footer
-    self.headerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.origin.y, self.bounds.size.width, self.headerView.frame.size.height);
-    self.footerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.size.height - self.footerView.frame.size.height, self.bounds.size.width, self.footerView.frame.size.height);
-
-    // Refresh state
-    [self setState:self.state animated:NO force:YES callback:nil];
-}
-
-#pragma mark - View Quick Accessors
-
-- (CGFloat)availableHeight
-{
-    return self.bounds.size.height - self.headerView.frame.size.height - self.footerView.frame.size.height - self.headerPadding - self.footerPadding;
-}
-
-- (CGFloat)normalizedHeightForRawHeight:(NSNumber *)rawHeight
-{
-    CGFloat minHeight = [self minimumValue];
-    CGFloat maxHeight = [self maximumValue];
-    CGFloat value = [rawHeight floatValue];
-    
-    if ((maxHeight - minHeight) <= 0)
-    {
-        return [self availableHeight];
-    }
-    
-    return ((value - minHeight) / (maxHeight - minHeight)) * [self availableHeight];
-}
-
-- (CGFloat)barWidth
-{
-    NSUInteger barCount = [[self.chartDataDictionary allKeys] count];
-    if (barCount > 0)
-    {
-        CGFloat totalPadding = (barCount - 1) * self.barPadding;
-        CGFloat availableWidth = self.bounds.size.width - totalPadding;
-        return availableWidth / barCount;
-    }
-    return 0;
-}
-
-#pragma mark - Setters
-
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)())callback
-{
-    [super setState:state animated:animated force:force callback:callback];
-    
-    __weak JBBarChartView* weakSelf = self;
-    
-    void (^updateBarView)(UIView *barView, BOOL popBar);
-    
-    updateBarView = ^(UIView *barView, BOOL popBar) {
-        if (weakSelf.inverted)
-        {
-            if (weakSelf.state == JBChartViewStateExpanded)
-            {
-                if (popBar)
-                {
-                    barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] + kJBBarChartViewStatePopOffset);
-                }
-                else
-                {
-                    barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue]);
-                }
-            }
-            else if (weakSelf.state == JBChartViewStateCollapsed)
-            {
-                if (popBar)
-                {
-                    barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] + kJBBarChartViewStatePopOffset);
-                }
-                else
-                {
-                    barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, 0.0f);
-                }
-            }
-        }
-        else
-        {
-            if (weakSelf.state == JBChartViewStateExpanded)
-            {
-                if (popBar)
-                {
-                    barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height - weakSelf.footerView.frame.size.height - weakSelf.footerPadding - [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] - kJBBarChartViewStatePopOffset, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] + kJBBarChartViewStatePopOffset);
-                }
-                else
-                {
-                    barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height - weakSelf.footerView.frame.size.height - weakSelf.footerPadding - [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue], barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue]);
-                }
-            }
-            else if (weakSelf.state == JBChartViewStateCollapsed)
-            {
-                if (popBar)
-                {
-                    barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height - weakSelf.footerView.frame.size.height - weakSelf.footerPadding - [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] - kJBBarChartViewStatePopOffset, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] + kJBBarChartViewStatePopOffset);
-                }
-                else
-                {
-                    barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height, barView.frame.size.width, 0.0f);
-                }
-            }
-        }
-    };
-    
-    dispatch_block_t callbackCopy = [callback copy];
-    
-    if ([self.barViews count] > 0)
-    {
-        if (animated)
-        {
-            NSUInteger index = 0;
-            for (UIView *barView in self.barViews)
-            {
-                [UIView animateWithDuration:kJBBarChartViewStateAnimationDuration delay:(kJBBarChartViewStateAnimationDuration * 0.5) * index options:UIViewAnimationOptionBeginFromCurrentState animations:^{
-                    updateBarView(barView, YES);
-                } completion:^(BOOL finished) {
-                    [UIView animateWithDuration:kJBBarChartViewStateAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
-                        updateBarView(barView, NO);
-                    } completion:^(BOOL lastBarFinished) {
-                        if ((NSUInteger)barView.tag == [self.barViews count] - 1)
-                        {
-                            if (callbackCopy)
-                            {
-                                callbackCopy();
-                            }
-                        }
-                    }];
-                }];
-                index++;
-            }
-        }
-        else
-        {
-            for (UIView *barView in self.barViews)
-            {
-                updateBarView(barView, NO);
-            }
-            if (callbackCopy)
-            {
-                callbackCopy();
-            }
-        }
-    }
-    else
-    {
-        if (callbackCopy)
-        {
-            callbackCopy();
-        }
-    }
-}
-
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
-{
-    [self setState:state animated:animated force:NO callback:callback];
-}
-
-- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible animated:(BOOL)animated
-{
-	_verticalSelectionViewVisible = verticalSelectionViewVisible;
-	
-	if (animated)
-	{
-		[UIView animateWithDuration:kJBChartViewDefaultAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
-			self.verticalSelectionView.alpha = self.verticalSelectionViewVisible ? 1.0 : 0.0;
-		} completion:nil];
-	}
-	else
-	{
-		self.verticalSelectionView.alpha = _verticalSelectionViewVisible ? 1.0 : 0.0;
-	}
-}
-
-- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible
-{
-	[self setVerticalSelectionViewVisible:verticalSelectionViewVisible animated:NO];
-}
-
-- (void)setShowsVerticalSelection:(BOOL)showsVerticalSelection
-{
-	_showsVerticalSelection = showsVerticalSelection;
-	self.verticalSelectionView.hidden = _showsVerticalSelection ? NO : YES;
-}
-
-#pragma mark - Getters
-
-- (CGFloat)cachedMinHeight
-{
-    if(_cachedMinHeight == kJBBarChartViewUndefinedCachedHeight)
-    {
-        NSArray *chartValues = [[NSMutableArray arrayWithArray:[self.chartDataDictionary allValues]] sortedArrayUsingSelector:@selector(compare:)];
-        _cachedMinHeight =  [[chartValues firstObject] floatValue];
-    }
-    return _cachedMinHeight;
-}
-
-- (CGFloat)cachedMaxHeight
-{
-    if (_cachedMaxHeight == kJBBarChartViewUndefinedCachedHeight)
-    {
-        NSArray *chartValues = [[NSMutableArray arrayWithArray:[self.chartDataDictionary allValues]] sortedArrayUsingSelector:@selector(compare:)];
-        _cachedMaxHeight =  [[chartValues lastObject] floatValue];
-    }
-    return _cachedMaxHeight;
-}
-
-- (CGFloat)minimumValue
-{
-    if ([self hasMinimumValue])
-    {
-        return fminf(self.cachedMinHeight, [super minimumValue]);
-    }
-    return self.cachedMinHeight;
-}
-
-- (CGFloat)maximumValue
-{
-    if ([self hasMaximumValue])
-    {
-        return fmaxf(self.cachedMaxHeight, [super maximumValue]);
-    }
-    return self.cachedMaxHeight;    
-}
-
-- (UIView *)barViewAtIndex:(NSUInteger)index
-{
-	if (index < [self.barViews count])
-	{
-		return [self.barViews objectAtIndex:index];
-	}
-	return nil;
-}
-
-#pragma mark - Touch Helpers
-
-- (NSInteger)barViewIndexForPoint:(CGPoint)point
-{
-    NSUInteger index = 0;
-    NSUInteger selectedIndex = kJBBarChartViewUndefinedBarIndex;
-    
-    if (point.x < 0 || point.x > self.bounds.size.width)
-    {
-        return selectedIndex;
-    }
-    
-    CGFloat padding = ceil(self.barPadding * 0.5);
-    for (UIView *barView in self.barViews)
-    {
-        CGFloat minX = CGRectGetMinX(barView.frame) - padding;
-        CGFloat maxX = CGRectGetMaxX(barView.frame) + padding;
-        if ((point.x >= minX) && (point.x <= maxX))
-        {
-            selectedIndex = index;
-            break;
-        }
-        index++;
-    }
-    return selectedIndex;
-}
-
-- (UIView *)barViewForForPoint:(CGPoint)point
-{
-    UIView *barView = nil;
-    NSInteger selectedIndex = [self barViewIndexForPoint:point];
-    if (selectedIndex >= 0)
-    {
-        return [self.barViews objectAtIndex:[self barViewIndexForPoint:point]];
-    }
-    return barView;
-}
-
-- (void)touchesBeganOrMovedWithTouches:(NSSet *)touches
-{
-    if (self.state == JBChartViewStateCollapsed || [[self.chartDataDictionary allKeys] count] <= 0)
-    {
-        return;
-    }
-	
-    UITouch *touch = [touches anyObject];
-    CGPoint touchPoint = [touch locationInView:self];
-    UIView *barView = [self barViewForForPoint:touchPoint];
-    if (barView == nil)
-    {
-        [self setVerticalSelectionViewVisible:NO animated:YES];
-        return;
-    }
-    CGRect barViewFrame = barView.frame;
-    CGRect selectionViewFrame = self.verticalSelectionView.frame;
-    selectionViewFrame.origin.x = barViewFrame.origin.x;
-    selectionViewFrame.size.width = barViewFrame.size.width;
-    
-    if ([self.dataSource respondsToSelector:@selector(shouldExtendSelectionViewIntoHeaderPaddingForChartView:)])
-    {
-        if ([self.dataSource shouldExtendSelectionViewIntoHeaderPaddingForChartView:self])
-        {
-            selectionViewFrame.origin.y = self.headerView.frame.size.height;
-        }
-        else
-        {
-            selectionViewFrame.origin.y = self.headerView.frame.size.height + self.headerPadding;
-        }
-    }
-    else
-    {
-        selectionViewFrame.origin.y = self.headerView.frame.size.height + self.headerPadding;
-    }
-    
-    self.verticalSelectionView.frame = selectionViewFrame;
-    [self setVerticalSelectionViewVisible:YES animated:YES];
-    
-    if ([self.delegate respondsToSelector:@selector(barChartView:didSelectBarAtIndex:touchPoint:)])
-    {
-        [self.delegate barChartView:self didSelectBarAtIndex:[self barViewIndexForPoint:touchPoint] touchPoint:touchPoint];
-    }
-    
-    if ([self.delegate respondsToSelector:@selector(barChartView:didSelectBarAtIndex:)])
-    {
-        [self.delegate barChartView:self didSelectBarAtIndex:[self barViewIndexForPoint:touchPoint]];
-    }
-}
-
-- (void)touchesEndedOrCancelledWithTouches:(NSSet *)touches
-{
-    if (self.state == JBChartViewStateCollapsed || [[self.chartDataDictionary allKeys] count] <= 0)
-    {
-        return;
-    }
-    
-    [self setVerticalSelectionViewVisible:NO animated:YES];
-    
-    if ([self.delegate respondsToSelector:@selector(didDeselectBarChartView:)])
-    {
-        [self.delegate didDeselectBarChartView:self];
-    }
-}
-
-#pragma mark - Touches
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-	[self setVerticalSelectionViewVisible:NO animated:NO];
-    [self touchesBeganOrMovedWithTouches:touches];
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self touchesBeganOrMovedWithTouches:touches];
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self touchesEndedOrCancelledWithTouches:touches];
-}
-
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self touchesEndedOrCancelledWithTouches:touches];
-}
-
-#pragma mark - JBGradientBarViewDelegate
-
-- (CGRect)chartViewBoundsForGradientBarView:(JBGradientBarView *)gradientBarView
-{
-	return self.bounds;
-}
-
-@end
-
-@implementation JBGradientBarView
-
-#pragma mark - Alloc/Init
-
-- (instancetype)init
-{
-	self = [super init];
-	if (self)
-	{
-		[self construct];
-	}
-	return self;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-	self = [super initWithFrame:frame];
-	if (self)
-	{
-		[self construct];
-	}
-	return self;
-}
-
-#pragma mark - Setters
-
-- (void)setGradientLayer:(CAGradientLayer *)gradientLayer
-{
-	if (_gradientLayer != nil)
-	{
-		[_gradientLayer removeFromSuperlayer];
-		_gradientLayer = nil;
-	}
-	
-	_gradientLayer = gradientLayer;
-	_gradientLayer.masksToBounds = YES;
-	[self.layer insertSublayer:_gradientLayer atIndex:0];
-}
-
-#pragma mark - Construction
-
-- (void)construct
-{
-	self.clipsToBounds = YES;
-}
-
-#pragma mark - Setters
-
-- (void)setFrame:(CGRect)frame
-{
-	[super setFrame:frame];
-	
-	if ([self.delegate respondsToSelector:@selector(chartViewBoundsForGradientBarView:)])
-	{
-		_gradientLayer.frame = [self.delegate chartViewBoundsForGradientBarView:self]; // gradient is as large as the chart
-		_gradientLayer.frame = CGRectOffset(_gradientLayer.frame, -CGRectGetMinX(frame), 0);
-	}
-	else
-	{
-		_gradientLayer.frame = self.bounds;
-	}
-}
-
-@end

Classes/JBChartView.m

@@ -1,235 +0,0 @@
-//
-//  JBChartView.m
-//  Nudge
-//
-//  Created by Terry Worona on 9/4/13.
-//  Copyright (c) 2013 Jawbone. All rights reserved.
-//
-
-#import "JBChartView.h"
-
-// Numerics
-CGFloat const kJBChartViewDefaultAnimationDuration = 0.25f;
-
-// Color (JBChartSelectionView)
-static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
-
-@interface JBChartView ()
-
-@property (nonatomic, assign) BOOL hasMaximumValue;
-@property (nonatomic, assign) BOOL hasMinimumValue;
-
-// Construction
-- (void)constructChartView;
-
-// Validation
-- (void)validateHeaderAndFooterHeights;
-
-@end
-
-@implementation JBChartView
-
-#pragma mark - Alloc/Init
-
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        [self constructChartView];
-    }
-    return self;
-}
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {
-        [self constructChartView];
-    }
-    return self;
-}
-
-- (id)init
-{
-    return [self initWithFrame:CGRectZero];
-}
-
-#pragma mark - Construction
-
-- (void)constructChartView
-{
-    self.clipsToBounds = YES;
-}
-
-#pragma mark - Public
-
-- (void)reloadData
-{
-    // Override
-}
-
-#pragma mark - Validation
-
-- (void)validateHeaderAndFooterHeights
-{
-    NSAssert((self.headerView.bounds.size.height + self.footerView.bounds.size.height) <= self.bounds.size.height, @"JBChartView // the combined height of the footer and header can not be greater than the total height of the chart.");
-}
-
-#pragma mark - Setters
-
-- (void)setHeaderView:(UIView *)headerView
-{
-    if (_headerView)
-    {
-        [_headerView removeFromSuperview];
-        _headerView = nil;
-    }
-    _headerView = headerView;
-    _headerView.clipsToBounds = YES;
-    
-    [self validateHeaderAndFooterHeights];
-    
-    [self addSubview:_headerView];
-    [self reloadData];
-}
-
-- (void)setFooterView:(UIView *)footerView
-{
-    if (_footerView)
-    {
-        [_footerView removeFromSuperview];
-        _footerView = nil;
-    }
-    _footerView = footerView;
-    _footerView.clipsToBounds = YES;
-    
-    [self validateHeaderAndFooterHeights];
-    
-    [self addSubview:_footerView];
-    [self reloadData];
-}
-
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)())callback
-{
-    if ((_state == state) && !force)
-    {
-        return;
-    }
-    
-    _state = state;
-    
-    // Override
-}
-
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
-{
-    [self setState:state animated:animated force:NO callback:callback];
-}
-
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated
-{
-    [self setState:state animated:animated callback:nil];
-}
-
-- (void)setState:(JBChartViewState)state
-{
-    [self setState:state animated:NO];
-}
-
-- (void)setMinimumValue:(CGFloat)minimumValue
-{
-    NSAssert(minimumValue >= 0, @"JBChartView // the minimumValue must be >= 0.");
-    _minimumValue = minimumValue;
-    _hasMinimumValue = YES;
-}
-
-- (void)setMaximumValue:(CGFloat)maximumValue
-{
-    NSAssert(maximumValue >= 0, @"JBChartView // the maximumValue must be >= 0.");
-    _maximumValue = maximumValue;
-    _hasMaximumValue = YES;
-}
-
-- (void)resetMinimumValue
-{
-    _hasMinimumValue = NO; // clears min
-}
-
-- (void)resetMaximumValue
-{
-    _hasMaximumValue = NO; // clears max
-}
-
-@end
-
-@implementation JBChartVerticalSelectionView
-
-#pragma mark - Alloc/Init
-
-+ (void)initialize
-{
-	if (self == [JBChartVerticalSelectionView class])
-	{
-		kJBChartVerticalSelectionViewDefaultBgColor = [UIColor whiteColor];
-	}
-}
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {
-        self.backgroundColor = [UIColor clearColor];
-    }
-    return self;
-}
-
-#pragma mark - Drawing
-
-- (void)drawRect:(CGRect)rect
-{
-    CGContextRef context = UIGraphicsGetCurrentContext();
-    [[UIColor clearColor] set];
-    CGContextFillRect(context, rect);
-    
-    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGFloat locations[] = { 0.0, 1.0 };
-    
-    NSArray *colors = nil;
-    if (self.bgColor != nil)
-    {
-        colors = @[(__bridge id)self.bgColor.CGColor, (__bridge id)[self.bgColor colorWithAlphaComponent:0.0].CGColor];
-    }
-    else
-    {
-        colors = @[(__bridge id)kJBChartVerticalSelectionViewDefaultBgColor.CGColor, (__bridge id)[kJBChartVerticalSelectionViewDefaultBgColor colorWithAlphaComponent:0.0].CGColor];
-    }
-    
-    CGGradientRef gradient = CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef) colors, locations);
-    
-    CGPoint startPoint = CGPointMake(CGRectGetMidX(rect), CGRectGetMaxY(rect));
-    CGPoint endPoint = CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect));
-    
-    CGContextSaveGState(context);
-    {
-        CGContextAddRect(context, rect);
-        CGContextClip(context);
-        CGContextDrawLinearGradient(context, gradient, startPoint, endPoint, 0);
-    }
-    CGContextRestoreGState(context);
-    
-    CGGradientRelease(gradient);
-    CGColorSpaceRelease(colorSpace);
-}
-
-#pragma mark - Setters
-
-- (void)setBgColor:(UIColor *)bgColor
-{
-    _bgColor = bgColor;
-    [self setNeedsDisplay];
-}
-
-@end

Classes/Line/JBLineChartView.h

@@ -11,31 +11,32 @@
 @class JBLineChartView;
 
 /**
- * Current support for two line styles: solid (default) and dashed. 
+ * Indicates how a line's main path will be drawn.
  */
 typedef NS_ENUM(NSInteger, JBLineChartViewLineStyle){
-    /**
-     *  Solid line.
-     */
-    JBLineChartViewLineStyleSolid,
-    /**
-     *  Dashed line with a phase of 3:2 (3 points dashed, 2 points spaced).
-     */
+	/**
+	 *  Solid line.
+	 */
+	JBLineChartViewLineStyleSolid,
+	/**
+	 *  Dashed with a 3:2 phase (3 points dashed, 2 points spaced).
+	 */
 	JBLineChartViewLineStyleDashed
 };
 
 /**
- * Current support for two line color styles: solid (default) and gradient.
+ *  Indicates how a line's main path or fill (including selections)
+ *  will be decorated (via color options).
  */
-typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
-    /**
-     *  Solid line and fill color.
-     */
-    JBLineChartViewLineColorStyleSolid,
-    /**
-     *  Gradient line and fill color.
-     */
-    JBLineChartViewLineColorStyleGradient
+typedef NS_ENUM(NSInteger, JBLineChartViewColorStyle) {
+	/**
+	 *  A solid color (with alpha support via UIColor).
+	 */
+	JBLineChartViewColorStyleSolid,
+	/**
+	 *  a gradient (via CAGradientLayer).
+	 */
+	JBLineChartViewColorStyleGradient
 };
 
 @protocol JBLineChartViewDataSource <JBChartViewDataSource>
@@ -92,7 +93,7 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 /**
  *  Returns the opacity value to be used for dimming the line & fill during selection events.
  *  This value is applied to the line or fill's opacity anytime it's not selected (but another line is).
- *  This applies to both solid and gradient line styles.
+ *  This applies to both solid and gradient color styles.
  *
  *  Default: 0.2.
  *
@@ -103,12 +104,25 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
  */
 - (CGFloat)lineChartView:(JBLineChartView *)lineChartView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex;
 
+/**
+ *  Returns the opacity value to be used for dimming the dots during selection events.
+ *  This value is applied to all dots within a line anytime it's not selected (but another line is).
+ *
+ *  Default: 0.0.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return A value between 0.0 and 1.0 (will be clamped accordingly).
+ */
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView dimmedSelectionDotOpacityAtLineIndex:(NSUInteger)lineIndex;
+
 /**
  *  Returns a (custom) UIView instance representing a dot (x,y point) within the chart.
  *  For this value to apply, showsDotsForLineAtLineIndex: must return YES for the line at lineIndex.
  *  This protocol supercedes colorForDotAtHorizontalIndex: and dotRadiusForDotAtHorizontalIndex:.
  *  If nil is returned. the original dot protocols will take precedence. During selection events, a custom
- *  dot view will not be hidden unless lineChartView:shouldHideDotViewOnSelectionAtHorizontalIndex:atLineIndex: 
+ *  dot view will not be hidden unless lineChartView:shouldHideDotViewOnSelectionAtHorizontalIndex:atLineIndex:
  *  is implemented.
  *
  *  Default: nil.
@@ -122,7 +136,7 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 - (UIView *)lineChartView:(JBLineChartView *)lineChartView dotViewAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
 
 /**
- *  Returns whether or not a (custom) dot view should be hidden on selection events. 
+ *  Returns whether or not a (custom) dot view should be hidden on selection events.
  *
  *  Default: NO.
  *
@@ -130,7 +144,7 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
  *  @param horizontalIndex  The 0-based horizontal index of a selection point (left to right, x-axis).
  *  @param lineIndex        An index number identifying a line in the chart.
  *
- *  @return Whether or not a (custom) dot view should be hidden on selection events. 
+ *  @return Whether or not a (custom) dot view should be hidden on selection events.
  */
 - (BOOL)lineChartView:(JBLineChartView *)lineChartView shouldHideDotViewOnSelectionAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
 
@@ -143,7 +157,7 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 /**
  *  Vertical value for a line point at a given index (left to right). There is no ceiling on the the height;
  *  the chart will automatically normalize all values between the overal min and max heights.
- *  NAN may able be retuend to indicate missing values. The chart's line will begin at the first non-NAN value and end at the last non-NAN value. 
+ *  NAN may able be retuend to indicate missing values. The chart's line will begin at the first non-NAN value and end at the last non-NAN value.
  *  Furthermore, the line will interopolate any NAN values in between (ie. the line will not be interrupted).
  *
  *  @param lineChartView    The line chart object requesting this information.
@@ -160,7 +174,7 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
  *  Occurs whenever there is a touch gesture on the chart (chart must be expanded).
  *  The horizontal index is the closest index to the touch point & is clamped to it's max/min value if it moves outside of the view's bounds.
  *  The lineIndex remains constant until the line is deselected and will be highlighted using the (optional) selectionColorForLineAtLineIndex: protocol.
- *  Futhermore, all other lines that aren't selected will be dimmed to 20% opacity (default) throughout the duration of the touch/move. 
+ *  Futhermore, all other lines that aren't selected will be dimmed to 20% opacity (default) throughout the duration of the touch/move.
  *  Any dotted line that isn't the primary selection will have it's dots dimmed to hidden (to avoid transparency issues).
  *
  *  @param lineChartView    A line chart object informing the delegate about the new selection.
@@ -179,17 +193,18 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 - (void)didDeselectLineInLineChartView:(JBLineChartView *)lineChartView;
 
 /**
- *  Returns whether or not a line at a particular index responds to selection events. 
+ *  Returns whether or not a line at a particular index responds to selection events.
  *
  *  Default: YES
  *
  *  @param lineChartView    A line chart object informing the delegate about the new selection.
  *  @param lineIndex        An index number identifying the closest line in the chart to the current touch
  */
-- (BOOL)lineChartView:(JBLineChartView *)lineChartView shouldIgnoreSelectionAtIndex:(NSUInteger)lineIndex;
+- (BOOL)lineChartView:(JBLineChartView *)lineChartView shouldIgnoreSelectionAtLineIndex:(NSUInteger)lineIndex;
 
 /**
- *  Returns the color of particular line at lineIndex within the chart.
+ *  Returns the color of particular line at lineIndex.
+ *  For this to apply, lineChartView:colorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleSolid (default).
  *
  *  Default: black color.
  *
@@ -202,20 +217,24 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 
 /**
  *  Returns the gradient layer to be used for a particular line at lineIndex within the chart.
+ *  For this to apply, lineChartView:colorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleGradient.
+ *
+ *  Note: gradients do not support multiple alphas. The alpha of gradient's first color be used throughout.
  *
  *  Default: black to light gray.
  *
  *  @param lineChartView    The line chart object requesting this information.
  *  @param lineIndex        An index number identifying a line in the chart.
  *
- *  @return The gradient layer to be used as a mask for the line in the chart.
+ *  @return The gradient layer to be used to shade a line in the chart.
  */
 - (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView gradientForLineAtLineIndex:(NSUInteger)lineIndex;
 
 /**
  *  Returns the fill color of particular line at lineIndex within the chart.
+ *  For this to apply, lineChartView:fillColorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleSolid (default).
  *
- *  Default: clear color.
+ *  Default: clear color (none).
  *
  *  @param lineChartView    The line chart object requesting this information.
  *  @param lineIndex        An index number identifying a line in the chart.
@@ -226,13 +245,16 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 
 /**
  *  Returns the gradient layer to be used for a fill of a particular line at lineIndex within the chart.
+ *  For this to apply, lineChartView:fillColorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleGradient.
  *
- *  Default: white to light gray.
+ *  Note: gradients do not support multiple alphas. The alpha of gradient's first color be used throughout.
+ *
+ *  Default: clear gradient (none).
  *
  *  @param lineChartView    The line chart object requesting this information.
  *  @param lineIndex        An index number identifying a line in the chart.
  *
- *  @return The fill color to show under a line in the chart.
+ *  @return The fill gradient to show under a line in the chart.
  */
 - (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView fillGradientForLineAtLineIndex:(NSUInteger)lineIndex;
 
@@ -296,6 +318,8 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
  *  The color is automically faded to transparent (vertically). The property showsVerticalSelection
  *  must be YES for the color to apply.
  *
+ *  Default: white color.
+ *
  *  @param lineChartView    The line chart object requesting this information.
  *  @param lineIndex        An index number identifying a line in the chart.
  *
@@ -304,10 +328,11 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 - (UIColor *)lineChartView:(JBLineChartView *)lineChartView verticalSelectionColorForLineAtLineIndex:(NSUInteger)lineIndex;
 
 /**
- *  Returns the selection color to be overlayed on a line within the chart during touch events.
+ *  Returns the selection color of a line within the chart during touch events.
  *  The property showsLineSelection must be YES for the color to apply.
+ *  As well, lineChartView:colorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleSolid (default)
  *
- *  Default: white color.
+ *  Default: matches lineChartView:colorForLineAtLineIndex:.
  *
  *  @param lineChartView    The line chart object requesting this information.
  *  @param lineIndex        An index number identifying a line in the chart.
@@ -317,23 +342,27 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 - (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex;
 
 /**
- *  Returns the gradient layer to be overlayed on a line during touch events.
- *  Alpha of gradient is controlled by the color returned from lineChartView:selectionColorForLineAtLineIndex:
+ *  Returns the selection gradient layer of a line within the chart during touch events.
+ *  The property showsLineSelection must be YES for the color to apply.
+ *  As well, lineChartView:colorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleGradient.
+ *
+ *  Note: gradients do not support multiple alphas. The alpha of gradient's first color be used throughout.
  *
  *  Default: matches lineChartView:gradientForLineAtLineIndex:.
  *
  *  @param lineChartView    The line chart object requesting this information.
  *  @param lineIndex        An index number identifying a line in the chart.
  *
- *  @return The gradient layer to be used as a mask for the line in the chart.
+ *  @return The gradient layer to be used to highlight a line during chart selections.
  */
 - (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView selectionGradientForLineAtLineIndex:(NSUInteger)lineIndex;
 
 /**
- *  Returns the selection fill color to be overlayed under a line within the chart during touch events.
+ *  Returns the selection fill color under a line within the chart during touch events.
  *  The property showsLineSelection must be YES for the color to apply.
+ *  As well, lineChartView:fillColorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleSolid (default).
  *
- *  Default: clear color.
+ *  Default: matches lineChartView:fillColorForLineAtLineIndex:.
  *
  *  @param lineChartView    The line chart object requesting this information.
  *  @param lineIndex        An index number identifying a line in the chart.
@@ -343,15 +372,18 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 - (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionFillColorForLineAtLineIndex:(NSUInteger)lineIndex;
 
 /**
- *  Returns the gradient layer to be used for the selection fill to be overlayed under a line during touch events.
- *  Alpha of gradient is controlled by the color returned from lineChartView:selectionFillColorForLineAtLineIndex:
+ *  Returns the selection fill gradient layer under a line within the chart during touch events.
+ *  The property showsLineSelection must be YES for the color to apply.
+ *  As well, lineChartView:fillColorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleGrdient.
+ *
+ *  Note: gradients do not support multiple alphas. The alpha of gradient's first color be used throughout.
  *
  *  Default: matches lineChartView:fillGradientForLineAtLineIndex.
  *
  *  @param lineChartView    The line chart object requesting this information.
  *  @param lineIndex        An index number identifying a line in the chart.
  *
- *  @return The fill color to show under a line in the chart.
+ *  @return The gradient layer to be used to highlight under a line during chart selections.
  */
 - (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView selectionFillGradientForLineAtLineIndex:(NSUInteger)lineIndex;
 
@@ -359,7 +391,7 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
  *  Returns the selection color to be overlayed on a line within the chart during touch events.
  *  The property showsLineSelection must be YES for the color to apply.
  *
- *  Default: white color.
+ *  Default: matches lineChartView:colorForDotAtHorizontalIndex:atLineIndex:(NSUInteger)lineIndex.
  *
  *  @param lineChartView    The line chart object requesting this information.
  *  @param horizontalIndex  The 0-based horizontal index of a selection point (left to right, x-axis).
@@ -384,16 +416,31 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 
 /**
  *  Returns the line color style of a particular line at lineIndex within the chart.
- *  See JBLineChartViewLineColorStyle for line color style descriptions.
+ *  The line color style applies to both selected and non-selected scenarios.
+ *  See JBLineChartViewColorStyle for color style descriptions.
  *
- *  Default: JBLineChartViewLineColorStyleSolid.
+ *  Default: JBLineChartViewColorStyleSolid.
  *
  *  @param lineChartView    The line chart object requesting this information.
  *  @param lineIndex        An index number identifying a line in the chart.
  *
- *  @return The line style to be used to draw a line in the chart.
+ *  @return The color style to be used to shade a line in the chart.
  */
-- (JBLineChartViewLineColorStyle)lineChartView:(JBLineChartView *)lineChartView lineColorStyleForLineAtLineIndex:(NSUInteger)lineIndex;
+- (JBLineChartViewColorStyle)lineChartView:(JBLineChartView *)lineChartView colorStyleForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the fill color style of a particular line at lineIndex within the chart.
+ *  The fill color style applies to both selected and non-selected scenarios.
+ *  See JBLineChartViewColorStyle for color style descriptions.
+ *
+ *  Default: JBLineChartViewColorStyleSolid.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The fill color style to show under a line in the chart.
+ */
+- (JBLineChartViewColorStyle)lineChartView:(JBLineChartView *)lineChartView fillColorStyleForLineAtLineIndex:(NSUInteger)lineIndex;
 
 @end
 
@@ -402,6 +449,29 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 @property (nonatomic, weak) id<JBLineChartViewDataSource> dataSource;
 @property (nonatomic, weak) id<JBLineChartViewDelegate> delegate;
 
+/*
+ *  Reloads the line chart with a custom animation.
+ *  Adding, removing or modifying existing lines or dot views (via growing/shrinking & fading) if animated = YES;
+ *  Reloading (animated) data is thread safe and can be executed any number of times in succession.
+ *
+ *  Note: fills will not be animated (technical limitation of Apple's CG API). 
+ *
+ *  Default: a non-animated reload (via reloadData).
+ */
+- (void)reloadDataAnimated:(BOOL)animated;
+
+/*
+ *  When reloadData or reloadDataAnimated: is called, the reloading bit is turned on.
+ *  State changes during a reload will be ignored. As well, subsequent calls to reloadData:
+ *  or reloadDataAnimated: before any previous reloads are complete, will also be ignored.
+ *  Lastly, all touch events will be ignored until a reload has compeleted.
+ *
+ *  Note: the above restrictions apply only to animated reloads, as non-animated reloads are synchronous.
+ *
+ *  Default: NO.
+ */
+@property (nonatomic, readonly) BOOL reloading;
+
 /**
  *  Vertical highlight overlayed on a line graph during touch events.
  *
@@ -411,7 +481,7 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 
 /**
  *  A highlight shown on a line within the graph during touch events. The highlighted line
- *  is the closest line to the touch point and corresponds to the lineIndex delegatd back via 
+ *  is the closest line to the touch point and corresponds to the lineIndex delegatd back via
  *  didSelectChartAtHorizontalIndex:atLineIndex: and didUnSlectChartAtHorizontalIndex:atLineIndex:
  *
  *  Default: YES.
@@ -419,7 +489,7 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineColorStyle){
 @property (nonatomic, assign) BOOL showsLineSelection;
 
 /**
- *  The dot view within a particular line at a horizontalIndex. 
+ *  The dot view within a particular line at a horizontalIndex.
  *
  *  Default: nil.
  *

Classes/Line/Layers/JBGradientLineLayer.h

@@ -0,0 +1,21 @@
+//
+//  JBGradientLineLayer.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface JBGradientLineLayer : CAGradientLayer
+
+- (instancetype)initWithGradientLayer:(CAGradientLayer *)gradientLayer tag:(NSUInteger)tag filled:(BOOL)filled currentPath:(UIBezierPath *)currentPath;
+
+@property (nonatomic, readonly) NSUInteger tag;
+@property (nonatomic, readonly) BOOL filled;
+@property (nonatomic, strong) UIBezierPath *currentPath;
+@property (nonatomic, readonly) CGFloat alpha; // alpha of gradient, based on first color
+
+@end

Classes/Line/Layers/JBGradientLineLayer.m

@@ -0,0 +1,47 @@
+//
+//  JBGradientLineLayer.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBGradientLineLayer.h"
+
+// Numerics
+static CGFloat const kJBGradientLineLayerDefaultAlpha = 1.0f;
+
+@implementation JBGradientLineLayer
+
+#pragma mark - Alloc/Init
+
+- (instancetype)initWithGradientLayer:(CAGradientLayer *)gradientLayer tag:(NSUInteger)tag filled:(BOOL)filled currentPath:(UIBezierPath *)currentPath
+{
+	self = [super init];
+	if (self)
+	{
+		self.colors = gradientLayer.colors;
+		self.locations = gradientLayer.locations;
+		self.startPoint = gradientLayer.startPoint;
+		self.endPoint = gradientLayer.endPoint;
+		self.type = gradientLayer.type;
+		
+		_tag = tag;
+		_filled = filled;
+		_currentPath = [currentPath copy];
+	}
+	return self;
+}
+
+#pragma mark - Getters
+
+- (CGFloat)alpha
+{
+	if (self.colors.firstObject != nil)
+	{
+		return CGColorGetAlpha((CGColorRef)self.colors.firstObject);
+	}
+	return kJBGradientLineLayerDefaultAlpha;
+}
+
+@end

Classes/Line/Layers/JBShapeLineLayer.h

@@ -0,0 +1,22 @@
+//
+//  JBShapeLineLayer.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+// Views
+#import "JBLineChartView.h"
+
+@interface JBShapeLineLayer : CAShapeLayer
+
+- (instancetype)initWithTag:(NSUInteger)tag filled:(BOOL)filled smoothedLine:(BOOL)smoothedLine lineStyle:(JBLineChartViewLineStyle)lineStyle currentPath:(UIBezierPath *)currentPath;
+
+@property (nonatomic, readonly) NSUInteger tag;
+@property (nonatomic, readonly) BOOL filled;
+@property (nonatomic, strong) UIBezierPath *currentPath;
+
+@end

Classes/Line/Layers/JBShapeLineLayer.m

@@ -0,0 +1,92 @@
+//
+//  JBShapeLineLayer.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBShapeLineLayer.h"
+
+// Numerics
+static CGFloat const kJBShapeLineLayerDefaultLinePhase = 1.0f;
+
+// Structures
+static NSArray *kJBShapeLineLayerDefaultDashPattern = nil;
+
+@implementation JBShapeLineLayer
+
+#pragma mark - Alloc/Init
+
++ (void)initialize
+{
+	if (self == [JBShapeLineLayer class])
+	{
+		kJBShapeLineLayerDefaultDashPattern = @[@(3), @(2)];
+	}
+}
+
+- (instancetype)initWithTag:(NSUInteger)tag filled:(BOOL)filled smoothedLine:(BOOL)smoothedLine lineStyle:(JBLineChartViewLineStyle)lineStyle currentPath:(UIBezierPath *)currentPath
+{
+	self = [super init];
+	if (self)
+	{
+		_tag = tag;
+		_filled = filled;
+		_currentPath = [currentPath copy];
+		
+		// Position
+		self.zPosition = filled ? 0.0f : 0.1f;
+		self.fillColor = [UIColor clearColor].CGColor;
+		
+		// Style
+		if (lineStyle == JBLineChartViewLineStyleSolid)
+		{
+			self.lineDashPhase = 0.0;
+			self.lineDashPattern = nil;
+		}
+		else if (lineStyle == JBLineChartViewLineStyleDashed)
+		{
+			self.lineDashPhase = kJBShapeLineLayerDefaultLinePhase;
+			self.lineDashPattern = kJBShapeLineLayerDefaultDashPattern;
+		}
+		
+		// Smoothing
+		if (smoothedLine)
+		{
+			if (filled)
+			{
+				self.lineCap = kCALineCapRound;
+				self.lineJoin = kCALineJoinRound;
+			}
+			else
+			{
+				if (lineStyle == JBLineChartViewLineStyleDashed)
+				{
+					self.lineCap = kCALineCapButt; // smoothed, dashed lines need butt caps
+				}
+				else
+				{
+					self.lineCap = kCALineCapRound;
+				}
+				self.lineJoin = kCALineJoinRound;
+			}
+		}
+		else
+		{
+			if (filled)
+			{
+				self.lineCap = kCALineCapButt;
+				self.lineJoin = kCALineJoinMiter;
+			}
+			else
+			{
+				self.lineCap = kCALineCapButt;
+				self.lineJoin = kCALineJoinMiter;
+			}
+		}
+	}
+	return self;
+}
+
+@end

Classes/Line/Models/JBLineChartLine.h

@@ -0,0 +1,22 @@
+//
+//  JBLineChartLine.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+// Charts
+#import "JBLineChartView.h"
+
+@interface JBLineChartLine : NSObject
+
+@property (nonatomic, strong) NSArray *lineChartPoints;
+@property (nonatomic, assign) BOOL smoothedLine;
+@property (nonatomic, assign) JBLineChartViewLineStyle lineStyle;
+@property (nonatomic, assign) JBLineChartViewColorStyle colorStyle;
+@property (nonatomic, assign) JBLineChartViewColorStyle fillColorStyle;
+
+@end

Classes/Line/Models/JBLineChartLine.m

@@ -0,0 +1,29 @@
+//
+//  JBLineChartLine.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBLineChartLine.h"
+
+@implementation JBLineChartLine
+
+#pragma mark - Alloc/Init
+
+- (id)init
+{
+	self = [super init];
+	if (self)
+	{
+		_lineChartPoints = [NSArray array];
+		_smoothedLine = NO;
+		_lineStyle = JBLineChartViewLineStyleSolid;
+		_colorStyle = JBLineChartViewColorStyleSolid;
+		_fillColorStyle = JBLineChartViewColorStyleSolid;
+	}
+	return self;
+}
+
+@end

Classes/Line/Models/JBLineChartPoint.h

@@ -0,0 +1,17 @@
+//
+//  JBLineChartPoint.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
+
+@interface JBLineChartPoint : NSObject
+
+@property (nonatomic, assign) CGPoint position;
+@property (nonatomic, assign) BOOL hidden;
+
+@end

Classes/Line/Models/JBLineChartPoint.m

@@ -0,0 +1,32 @@
+//
+//  JBLineChartPoint.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBLineChartPoint.h"
+
+@implementation JBLineChartPoint
+
+#pragma mark - Alloc/Init
+
+- (id)init
+{
+	self = [super init];
+	if (self)
+	{
+		_position = CGPointZero;
+	}
+	return self;
+}
+
+#pragma mark - Compare
+
+- (NSComparisonResult)compare:(JBLineChartPoint *)otherObject
+{
+	return self.position.x > otherObject.position.x;
+}
+
+@end

Classes/Line/Views/JBLineChartDotView.h

@@ -0,0 +1,16 @@
+//
+//  JBLineChartDotView.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface JBLineChartDotView : UIView
+
+- (id)initWithRadius:(CGFloat)radius;
+
+@end

Classes/Line/Views/JBLineChartDotView.m

@@ -0,0 +1,26 @@
+//
+//  JBLineChartDotView.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBLineChartDotView.h"
+
+@implementation JBLineChartDotView
+
+#pragma mark - Alloc/Init
+
+- (id)initWithRadius:(CGFloat)radius
+{
+	self = [super initWithFrame:CGRectMake(0, 0, (radius * 2.0f), (radius * 2.0f))];
+	if (self)
+	{
+		self.clipsToBounds = YES;
+		self.layer.cornerRadius = ((radius * 2.0f) * 0.5f);
+	}
+	return self;
+}
+
+@end

Classes/Line/Views/JBLineChartDotsView.h

@@ -0,0 +1,47 @@
+//
+//  JBLineChartDotsView.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+// Numerics
+extern NSInteger const kJBLineChartDotsViewUnselectedLineIndex;
+
+@protocol JBLineChartDotsViewDataSource;
+
+@interface JBLineChartDotsView : UIView
+
+@property (nonatomic, assign) id<JBLineChartDotsViewDataSource> dataSource;
+@property (nonatomic, assign) NSInteger selectedLineIndex;
+@property (nonatomic, strong) NSDictionary *dotViewsDict;
+
+// Data
+- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)())callback;
+- (void)reloadDataAnimated:(BOOL)animated;
+- (void)reloadData;
+
+// Setters
+- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex animated:(BOOL)animated;
+
+// Getters
+- (UIView *)dotViewForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+
+@end
+
+@protocol JBLineChartDotsViewDataSource <NSObject>
+
+- (NSArray *)lineChartLinesForLineChartDotsView:(JBLineChartDotsView*)lineChartDotsView;
+- (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+- (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView selectedColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+- (CGFloat)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dotRadiusForLineAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+- (UIView *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dotViewAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+- (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView shouldHideDotViewOnSelectionAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+- (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex;
+- (CGFloat)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dimmedSelectionDotOpacityAtLineIndex:(NSUInteger)lineIndex;
+
+@end

Classes/Line/Views/JBLineChartDotsView.m

@@ -0,0 +1,239 @@
+//
+//  JBLineChartDotsView.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBLineChartDotsView.h"
+
+// Additions
+#import "NSMutableArray+JBStack.h"
+
+// Models
+#import "JBLineChartLine.h"
+#import "JBLineChartPoint.h"
+
+// Views
+#import "JBLineChartDotView.h"
+#import "JBLineChartView.h"
+
+// Numerics
+static CGFloat const kJBLineChartDotsViewReloadDataAnimationDuration = 0.15f;
+NSInteger const kJBLineChartDotsViewUnselectedLineIndex = -1;
+
+@implementation JBLineChartDotsView
+
+#pragma mark - Alloc/Init
+
+- (id)initWithFrame:(CGRect)frame
+{
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		self.backgroundColor = [UIColor clearColor];
+	}
+	return self;
+}
+
+#pragma mark - Data
+
+- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)())callback
+{
+	NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesForLineChartDotsView:)], @"JBLineChartDotsView // dataSource must implement - (NSArray *)lineChartLinesForLineChartDotsView:(JBLineChartDotsView *)lineChartDotsView");
+	NSArray *lineChartLines = [self.dataSource lineChartLinesForLineChartDotsView:self];
+	
+	if (animated)
+	{
+		// Reusable dot views
+		__block NSMutableArray *mutableReusableDotViews = [NSMutableArray array];
+		for (id key in [[self.dotViewsDict allKeys] sortedArrayUsingSelector:@selector(compare:)])
+		{
+			NSArray *dotViews = [self.dotViewsDict objectForKey:key];
+			[mutableReusableDotViews addObjectsFromArray:dotViews];
+		}
+		
+		NSUInteger lineIndex = 0;
+		for (JBLineChartLine *lineChartLine in lineChartLines)
+		{
+			NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:showsDotsForLineAtLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex");
+			if ([self.dataSource lineChartDotsView:self showsDotsForLineAtLineIndex:lineIndex]) // line at index contains dots
+			{
+				NSArray *sortedLineChartPoints = [lineChartLine.lineChartPoints sortedArrayUsingSelector:@selector(compare:)];
+				for (NSUInteger horizontalIndex = 0; horizontalIndex < [sortedLineChartPoints count]; horizontalIndex++)
+				{
+					JBLineChartPoint *lineChartPoint = [sortedLineChartPoints objectAtIndex:horizontalIndex];
+					if(lineChartPoint.hidden)
+					{
+						continue;
+					}
+					
+					__block UIView *dotView = [mutableReusableDotViews jb_pop];
+					if (dotView != nil)
+					{
+						[UIView animateWithDuration:kJBLineChartDotsViewReloadDataAnimationDuration animations:^{
+							dotView.center = CGPointMake(lineChartPoint.position.x, lineChartPoint.position.y); // animate move
+						} completion:nil];
+					}
+					
+				}
+			}
+			lineIndex++;
+		}
+		
+		dispatch_after(dispatch_time(DISPATCH_TIME_NOW, kJBLineChartDotsViewReloadDataAnimationDuration * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+			if (callback)
+			{
+				callback();
+			}
+		});
+	}
+	else
+	{
+		// Remove legacy dots
+		for (JBLineChartDotView *dotView in self.subviews)
+		{
+			[dotView removeFromSuperview];
+		}
+		
+		// Create new dots
+		NSUInteger lineIndex = 0;
+		NSMutableDictionary *mutableDotViewsDict = [NSMutableDictionary dictionary];
+		for (JBLineChartLine *lineChartLine in lineChartLines)
+		{
+			NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:showsDotsForLineAtLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex");
+			if ([self.dataSource lineChartDotsView:self showsDotsForLineAtLineIndex:lineIndex]) // line at index contains dots
+			{
+				NSMutableArray *mutableDotViews = [NSMutableArray array];
+				NSArray *sortedLineChartPoints = [lineChartLine.lineChartPoints sortedArrayUsingSelector:@selector(compare:)];
+				for (NSUInteger horizontalIndex = 0; horizontalIndex < [sortedLineChartPoints count]; horizontalIndex++)
+				{
+					JBLineChartPoint *lineChartPoint = [sortedLineChartPoints objectAtIndex:horizontalIndex];
+					if(lineChartPoint.hidden)
+					{
+						continue;
+					}
+					
+					UIView *dotView = [self dotViewForHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+					dotView.center = CGPointMake(lineChartPoint.position.x, lineChartPoint.position.y);
+					[mutableDotViews addObject:dotView];
+					[self addSubview:dotView];
+				}
+				[mutableDotViewsDict setObject:[NSArray arrayWithArray:mutableDotViews] forKey:[NSNumber numberWithInteger:lineIndex]];
+			}
+			lineIndex++;
+		}
+		self.dotViewsDict = [NSDictionary dictionaryWithDictionary:mutableDotViewsDict];
+		if (callback)
+		{
+			callback();
+		}
+	}
+}
+
+- (void)reloadDataAnimated:(BOOL)animated
+{
+	[self reloadDataAnimated:animated callback:nil];
+}
+
+- (void)reloadData
+{
+	[self reloadDataAnimated:NO];
+}
+
+#pragma mark - Setters
+
+- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex animated:(BOOL)animated
+{
+	_selectedLineIndex = selectedLineIndex;
+	
+	__weak JBLineChartDotsView* weakSelf = self;
+	
+	dispatch_block_t adjustDots = ^{
+		[weakSelf.dotViewsDict enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+			NSUInteger horizontalIndex = 0;
+			for (UIView *dotView in (NSArray *)obj)
+			{
+				if ([key isKindOfClass:[NSNumber class]])
+				{
+					NSInteger lineIndex = [((NSNumber *)key) intValue];
+					
+					// Internal dot
+					if ([dotView isKindOfClass:[JBLineChartDotView class]])
+					{
+						if (weakSelf.selectedLineIndex == lineIndex)
+						{
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:selectedColorForDotAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView selectedColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+							dotView.backgroundColor = [self.dataSource lineChartDotsView:self selectedColorForDotAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+						}
+						else
+						{
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:colorForDotAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+							dotView.backgroundColor = [self.dataSource lineChartDotsView:self colorForDotAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:dimmedSelectionDotOpacityAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CGFloat)lineChartDotsView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionDotOpacityAtLineIndex:(NSUInteger)lineIndex");
+							dotView.alpha = (weakSelf.selectedLineIndex == kJBLineChartDotsViewUnselectedLineIndex) ? 1.0f : [self.dataSource lineChartDotsView:self dimmedSelectionDotOpacityAtLineIndex:lineIndex];
+						}
+					}
+					// Custom dot
+					else
+					{
+						NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:shouldHideDotViewOnSelectionAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView shouldHideDotViewOnSelectionAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+						BOOL hideDotView = [self.dataSource lineChartDotsView:self shouldHideDotViewOnSelectionAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+						if (weakSelf.selectedLineIndex == lineIndex)
+						{
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:dimmedSelectionDotOpacityAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CGFloat)lineChartDotsView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionDotOpacityAtLineIndex:(NSUInteger)lineIndex");
+							dotView.alpha = hideDotView ? [self.dataSource lineChartDotsView:self dimmedSelectionDotOpacityAtLineIndex:lineIndex] : 1.0f;
+						}
+						else
+						{
+							dotView.alpha = 1.0;
+						}
+					}
+				}
+				horizontalIndex++;
+			}
+		}];
+	};
+	
+	if (animated)
+	{
+		[UIView animateWithDuration:kJBChartViewDefaultAnimationDuration animations:^{
+			adjustDots();
+		}];
+	}
+	else
+	{
+		adjustDots();
+	}
+}
+
+- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex
+{
+	[self setSelectedLineIndex:selectedLineIndex animated:NO];
+}
+
+#pragma mark - Getters
+
+- (UIView *)dotViewForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+{
+	NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:dotViewAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (UIView *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dotViewAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+	UIView *dotView = [self.dataSource lineChartDotsView:self dotViewAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+	
+	// System dot
+	if (dotView == nil)
+	{
+		NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:dotRadiusForLineAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (CGFloat)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dotRadiusForLineAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+		CGFloat dotRadius = [self.dataSource lineChartDotsView:self dotRadiusForLineAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+		
+		dotView = [[JBLineChartDotView alloc] initWithRadius:dotRadius];
+		
+		NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:colorForDotAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+		dotView.backgroundColor = [self.dataSource lineChartDotsView:self colorForDotAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+	}
+	
+	return dotView;
+}
+
+@end

Classes/Line/Views/JBLineChartLinesView.h

@@ -0,0 +1,49 @@
+//
+//  JBLineChartLinesView.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/26/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+// Numerics
+extern NSInteger const kJBLineChartLinesViewUnselectedLineIndex;
+
+@protocol JBLineChartLinesViewDataSource;
+
+@interface JBLineChartLinesView : UIView
+
+@property (nonatomic, assign) id<JBLineChartLinesViewDataSource> dataSource;
+@property (nonatomic, assign) NSInteger selectedLineIndex; // -1 to unselect
+
+// Data
+- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)())callback;
+- (void)reloadDataAnimated:(BOOL)animated;
+- (void)reloadData;
+
+// Setters
+- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex animated:(BOOL)animated;
+
+// Callback helpers
+- (void)fireCallback:(void (^)())callback;
+
+@end
+
+@protocol JBLineChartLinesViewDataSource <NSObject>
+
+- (NSArray *)lineChartLinesForLineChartLinesView:(JBLineChartLinesView *)lineChartLinesView;
+- (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex;
+- (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView colorForLineAtLineIndex:(NSUInteger)lineIndex;
+- (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView gradientForLineAtLineIndex:(NSUInteger)lineIndex;
+- (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView fillColorForLineAtLineIndex:(NSUInteger)lineIndex;
+- (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView fillGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+- (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView widthForLineAtLineIndex:(NSUInteger)lineIndex;
+- (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex;
+- (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+- (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionFillColorForLineAtLineIndex:(NSUInteger)lineIndex;
+- (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionFillGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+
+@end

Classes/Line/Views/JBLineChartLinesView.m

@@ -0,0 +1,597 @@
+//
+//  JBLineChartLinesView.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/26/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBLineChartLinesView.h"
+
+// Layers
+#import "JBGradientLineLayer.h"
+#import "JBShapeLineLayer.h"
+
+// Models
+#import "JBLineChartLine.h"
+#import "JBLineChartPoint.h"
+
+// Numerics
+static CGFloat const kJBLineChartLinesViewMiterLimit = -5.0;
+static CGFloat const kJBLineChartLinesViewSmoothThresholdSlope = 0.01f;
+static CGFloat const kJBLineChartLinesViewReloadDataAnimationDuration = 0.15f;
+static NSInteger const kJBLineChartLinesViewSmoothThresholdVertical = 1;
+NSInteger const kJBLineChartLinesViewUnselectedLineIndex = -1;
+
+@interface JBLineChartLinesView ()
+
+@property (nonatomic, assign) BOOL animated; // for reload
+
+// Getters
+- (UIBezierPath *)bezierPathForLineChartLine:(JBLineChartLine *)lineChartLine filled:(BOOL)filled;
+- (JBShapeLineLayer *)shapeLineLayerForLineIndex:(NSUInteger)lineIndex filled:(BOOL)filled;
+- (JBGradientLineLayer *)gradientLineLayerForLineIndex:(NSUInteger)lineIndex filled:(BOOL)filled;
+- (CABasicAnimation *)basicPathAnimationFromBezierPath:(UIBezierPath *)fromBezierPath toBezierPath:(UIBezierPath *)toBezierPath;
+
+@end
+
+@implementation JBLineChartLinesView
+
+#pragma mark - Alloc/Init
+
+- (id)initWithFrame:(CGRect)frame
+{
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		self.backgroundColor = [UIColor clearColor];
+	}
+	return self;
+}
+
+#pragma mark - Memory Management
+
+- (void)dealloc
+{
+	[NSObject cancelPreviousPerformRequestsWithTarget:self];
+}
+
+#pragma mark - Drawing
+
+- (void)drawRect:(CGRect)rect
+{
+	[super drawRect:rect];
+	
+	NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesForLineChartLinesView:)], @"JBLineChartLinesView // dataSource must implement - (NSArray *)lineChartLinesForLineChartLinesView:(JBLineChartLinesView *)lineChartLinesView");
+	NSArray *chartData = [self.dataSource lineChartLinesForLineChartLinesView:self];
+	
+	for (NSUInteger lineIndex=0; lineIndex<[chartData count]; lineIndex++)
+	{
+		JBLineChartLine *lineChartLine = [chartData objectAtIndex:lineIndex];
+		{
+			UIBezierPath *linePath = [self bezierPathForLineChartLine:lineChartLine filled:NO];
+			UIBezierPath *fillPath = [self bezierPathForLineChartLine:lineChartLine filled:YES];
+			
+			if (linePath == nil || fillPath == nil)
+			{
+				continue;
+			}
+			
+			JBShapeLineLayer *shapeLineLayer = [self shapeLineLayerForLineIndex:lineIndex filled:NO];
+			if (shapeLineLayer == nil)
+			{
+				shapeLineLayer = [[JBShapeLineLayer alloc] initWithTag:lineIndex filled:NO smoothedLine:lineChartLine.smoothedLine lineStyle:lineChartLine.lineStyle currentPath:linePath];
+			}
+			
+			JBShapeLineLayer *shapeLineFillLayer = [self shapeLineLayerForLineIndex:lineIndex filled:YES];
+			if (shapeLineFillLayer == nil)
+			{
+				shapeLineFillLayer = [[JBShapeLineLayer alloc] initWithTag:lineIndex filled:YES smoothedLine:lineChartLine.smoothedLine lineStyle:lineChartLine.lineStyle currentPath:nil]; // path not needed for fills (unsupported)
+			}
+			
+			// Width
+			NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:widthForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView widthForLineAtLineIndex:(NSUInteger)lineIndex");
+			shapeLineLayer.lineWidth = [self.dataSource lineChartLinesView:self widthForLineAtLineIndex:lineIndex];
+			
+			NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:widthForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView widthForLineAtLineIndex:(NSUInteger)lineIndex");
+			shapeLineFillLayer.lineWidth = [self.dataSource lineChartLinesView:self widthForLineAtLineIndex:lineIndex];
+			
+			// Colors
+			NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:colorForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView colorForLineAtLineIndex:(NSUInteger)lineIndex");
+			shapeLineLayer.strokeColor = [self.dataSource lineChartLinesView:self colorForLineAtLineIndex:lineIndex].CGColor;
+			
+			NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:fillColorForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView fillColorForLineAtLineIndex:(NSUInteger)lineIndex");
+			shapeLineFillLayer.fillColor = [self.dataSource lineChartLinesView:self fillColorForLineAtLineIndex:lineIndex].CGColor;
+			
+			// Bounds
+			shapeLineLayer.frame = self.bounds;
+			shapeLineFillLayer.frame = self.bounds;
+
+			// Note: fills go first because the lines must go on top
+			
+			/*
+			 * Solid fill
+			 */
+			if (lineChartLine.fillColorStyle == JBLineChartViewColorStyleSolid)
+			{
+				shapeLineFillLayer.path = fillPath.CGPath;
+				[self.layer addSublayer:shapeLineFillLayer];
+			}
+			
+			/*
+			 * Gradient fill
+			 */
+			else if (lineChartLine.fillColorStyle == JBLineChartViewColorStyleGradient)
+			{
+				JBGradientLineLayer *gradientLineFillLayer = [self gradientLineLayerForLineIndex:lineIndex filled:YES];
+				if (gradientLineFillLayer == nil)
+				{
+					NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:fillGradientForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView fillGradientForLineAtLineIndex:(NSUInteger)lineIndex");
+					gradientLineFillLayer = [[JBGradientLineLayer alloc] initWithGradientLayer:[self.dataSource lineChartLinesView:self fillGradientForLineAtLineIndex:lineIndex] tag:lineIndex filled:YES currentPath:nil];
+				}
+				gradientLineFillLayer.frame = shapeLineFillLayer.frame;
+				
+				shapeLineFillLayer.path = fillPath.CGPath;
+				CGColorRef shapeLayerStrokeColor = shapeLineLayer.strokeColor;
+				shapeLineLayer.strokeColor = [UIColor colorWithWhite:1 alpha:[gradientLineFillLayer alpha]].CGColor; // mask uses alpha only
+				shapeLineFillLayer.fillColor = [UIColor colorWithWhite:1 alpha:[gradientLineFillLayer alpha]].CGColor; // mask uses alpha only
+				gradientLineFillLayer.mask = shapeLineFillLayer;
+				[self.layer addSublayer:gradientLineFillLayer];
+				
+				// Refresh shape layer stroke (used below)
+				shapeLineLayer.strokeColor = shapeLayerStrokeColor;
+			}
+			
+			/*
+			 * Solid line
+			 */
+			if (lineChartLine.colorStyle == JBLineChartViewColorStyleSolid)
+			{
+				if (self.animated)
+				{
+					[shapeLineLayer addAnimation:[self basicPathAnimationFromBezierPath:shapeLineLayer.currentPath toBezierPath:linePath] forKey:@"shapeLayerPathAnimation"];
+				}
+				else
+				{
+					shapeLineLayer.path = linePath.CGPath;
+				}
+				
+				shapeLineLayer.currentPath = [linePath copy];
+				[self.layer addSublayer:shapeLineLayer];
+			}
+			
+			/*
+			 * Gradient line
+			 */
+			else if (lineChartLine.colorStyle == JBLineChartViewColorStyleGradient)
+			{
+				JBGradientLineLayer *gradientLineLayer = [self gradientLineLayerForLineIndex:lineIndex filled:NO];
+				if (gradientLineLayer == nil)
+				{
+					NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:gradientForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView gradientForLineAtLineIndex:(NSUInteger)lineIndex");
+					gradientLineLayer = [[JBGradientLineLayer alloc] initWithGradientLayer:[self.dataSource lineChartLinesView:self gradientForLineAtLineIndex:lineIndex] tag:lineIndex filled:NO currentPath:linePath];
+				}
+				gradientLineLayer.frame = shapeLineLayer.frame;
+
+				if (self.animated)
+				{
+					[gradientLineLayer.mask addAnimation:[self basicPathAnimationFromBezierPath:gradientLineLayer.currentPath toBezierPath:linePath] forKey:@"gradientLayerMaskAnimation"];
+				}
+				else
+				{
+					shapeLineLayer.path = linePath.CGPath;
+					shapeLineLayer.strokeColor = [UIColor colorWithWhite:1 alpha:[gradientLineLayer alpha]].CGColor; // mask uses alpha only
+					gradientLineLayer.mask = shapeLineLayer;
+				}
+				
+				gradientLineLayer.currentPath = [linePath copy];
+				[self.layer addSublayer:gradientLineLayer];
+			}
+		}
+	}
+	
+	self.animated = NO;
+}
+
+#pragma mark - Data
+
+- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)())callback
+{
+	NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesForLineChartLinesView:)], @"JBLineChartLinesView // dataSource must implement - (NSArray *)lineChartLinesForLineChartLinesView:(JBLineChartLinesView *)lineChartLinesView");
+	NSArray *chartData = [self.dataSource lineChartLinesForLineChartLinesView:self];
+	
+	NSUInteger lineCount = [chartData count];
+	
+	__weak JBLineChartLinesView* weakSelf = self;
+	
+	dispatch_block_t completionBlock = ^{
+		weakSelf.animated = animated;
+		[weakSelf setNeedsDisplay]; // re-draw layers
+		if (callback)
+		{
+			callback();
+		}
+	};
+	
+	// Mark layers for animation or removal
+	NSMutableArray *mutableRemovedLayers = [NSMutableArray array];
+	for (CALayer *layer in [self.layer sublayers])
+	{
+		BOOL removeLayer = NO;
+		
+		if ([layer isKindOfClass:[JBShapeLineLayer class]])
+		{
+			removeLayer = (((JBShapeLineLayer *)layer).tag >= lineCount);
+		}
+		else if ([layer isKindOfClass:[JBGradientLineLayer class]])
+		{
+			removeLayer = (((JBGradientLineLayer *)layer).tag >= lineCount);
+		}
+		
+		if (removeLayer)
+		{
+			[mutableRemovedLayers addObject:layer];
+		}
+	}
+	
+	// Remove legacy layers
+	NSArray *removedLayers = [NSArray arrayWithArray:mutableRemovedLayers];
+	if ([removedLayers count] > 0)
+	{
+		for (NSUInteger index=0; index<[removedLayers count]; index++)
+		{
+			CALayer *removedLayer = [removedLayers objectAtIndex:index];
+			
+			if (animated)
+			{
+				[CATransaction begin];
+				{
+					CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"opacity"];
+					animation.fromValue = [NSNumber numberWithFloat:1.0f];
+					animation.toValue = [NSNumber numberWithFloat:0.0f];
+					animation.duration = kJBLineChartLinesViewReloadDataAnimationDuration;
+					animation.timingFunction = [CAMediaTimingFunction functionWithName:@"easeInEaseOut"];
+					animation.fillMode = kCAFillModeBoth;
+					animation.removedOnCompletion = NO;
+					
+					[CATransaction setCompletionBlock:^{
+						[removedLayer removeFromSuperlayer];
+						if (index == [removedLayers count]-1)
+						{
+							completionBlock();
+						}
+					}];
+					
+					[removedLayer addAnimation:animation forKey:@"removeShapeLayerAnimation"];
+				}
+				[CATransaction commit];
+			}
+			else
+			{
+				[removedLayer removeFromSuperlayer];
+				if (index == [removedLayers count]-1)
+				{
+					completionBlock();
+				}
+			}
+		}
+	}
+	else
+	{
+		completionBlock();
+	}
+}
+
+- (void)reloadDataAnimated:(BOOL)animated
+{
+	[self reloadDataAnimated:animated callback:nil];
+}
+
+- (void)reloadData
+{
+	[self reloadDataAnimated:NO];
+}
+
+#pragma mark - Setters
+
+- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex animated:(BOOL)animated
+{
+	_selectedLineIndex = selectedLineIndex;
+	
+	__weak JBLineChartLinesView* weakSelf = self;
+	
+	dispatch_block_t adjustLines = ^{
+		NSMutableArray *layersToReplace = [NSMutableArray array];
+		
+		NSString * const oldLayerKey = @"oldLayer";
+		NSString * const newLayerKey = @"newLayer";
+		
+		for (CALayer *layer in [weakSelf.layer sublayers])
+		{
+			/*
+			 * Solid line or fill
+			 */
+			if ([layer isKindOfClass:[JBShapeLineLayer class]])
+			{
+				JBShapeLineLayer *shapeLineLayer = (JBShapeLineLayer * )layer;
+				
+				if (shapeLineLayer.filled)
+				{
+					// Selected solid fill
+					if (weakSelf.selectedLineIndex >= 0 && ((unsigned)shapeLineLayer.tag == weakSelf.selectedLineIndex))
+					{
+						NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:selectionFillColorForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionFillColorForLineAtLineIndex:(NSUInteger)lineIndex");
+						shapeLineLayer.fillColor = [self.dataSource lineChartLinesView:self selectionFillColorForLineAtLineIndex:shapeLineLayer.tag].CGColor;
+						shapeLineLayer.opacity = 1.0f;
+					}
+					// Unselected solid fill
+					else
+					{
+						NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:fillColorForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView fillColorForLineAtLineIndex:(NSUInteger)lineIndex");
+						shapeLineLayer.fillColor = [self.dataSource lineChartLinesView:self fillColorForLineAtLineIndex:shapeLineLayer.tag].CGColor;
+						
+						NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:dimmedSelectionOpacityAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex");
+						shapeLineLayer.opacity = (weakSelf.selectedLineIndex == kJBLineChartLinesViewUnselectedLineIndex) ? 1.0f : [self.dataSource lineChartLinesView:self dimmedSelectionOpacityAtLineIndex:shapeLineLayer.tag];
+					}
+				}
+				else
+				{
+					// Selected solid line
+					if (weakSelf.selectedLineIndex >= 0 && ((unsigned)shapeLineLayer.tag == weakSelf.selectedLineIndex))
+					{
+						NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:selectionColorForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex");
+						shapeLineLayer.strokeColor = [self.dataSource lineChartLinesView:self selectionColorForLineAtLineIndex:shapeLineLayer.tag].CGColor;
+						shapeLineLayer.opacity = 1.0f;
+					}
+					// Unselected solid line
+					else
+					{
+						NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:colorForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView colorForLineAtLineIndex:(NSUInteger)lineIndex");
+						shapeLineLayer.strokeColor = [self.dataSource lineChartLinesView:self colorForLineAtLineIndex:shapeLineLayer.tag].CGColor;
+						
+						NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:dimmedSelectionOpacityAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex");
+						shapeLineLayer.opacity = (weakSelf.selectedLineIndex == kJBLineChartLinesViewUnselectedLineIndex) ? 1.0f : [self.dataSource lineChartLinesView:self dimmedSelectionOpacityAtLineIndex:shapeLineLayer.tag];
+					}
+				}
+			}
+			
+			/*
+			 * Gradient line or fill
+			 */
+			else if ([layer isKindOfClass:[CAGradientLayer class]])
+			{
+				CAGradientLayer *gradientLayer = (CAGradientLayer * )layer;
+				
+				if ([gradientLayer.mask isKindOfClass:[JBShapeLineLayer class]])
+				{
+					JBShapeLineLayer *shapeLineLayer = (JBShapeLineLayer * )gradientLayer.mask;
+					
+					if (shapeLineLayer.filled)
+					{
+						// Selected gradient fill
+						if (weakSelf.selectedLineIndex >= 0 && ((unsigned)shapeLineLayer.tag == weakSelf.selectedLineIndex))
+						{
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:selectionFillGradientForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionFillGradientForLineAtLineIndex:(NSUInteger)lineIndex");
+							CAGradientLayer *selectedFillGradient = [self.dataSource lineChartLinesView:self selectionFillGradientForLineAtLineIndex:shapeLineLayer.tag];
+							selectedFillGradient.frame = layer.frame;
+							selectedFillGradient.mask = layer.mask;
+							selectedFillGradient.opacity = 1.0f;
+							[layersToReplace addObject:@{oldLayerKey: layer, newLayerKey: selectedFillGradient}];
+						}
+						// Unselected gradient fill
+						else
+						{
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:fillGradientForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView fillGradientForLineAtLineIndex:(NSUInteger)lineIndex");
+							CAGradientLayer *unselectedFillGradient = [self.dataSource lineChartLinesView:self fillGradientForLineAtLineIndex:shapeLineLayer.tag];
+							unselectedFillGradient.frame = layer.frame;
+							unselectedFillGradient.mask = layer.mask;
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:dimmedSelectionOpacityAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex");
+							unselectedFillGradient.opacity = (weakSelf.selectedLineIndex == kJBLineChartLinesViewUnselectedLineIndex) ? 1.0f : [self.dataSource lineChartLinesView:self dimmedSelectionOpacityAtLineIndex:shapeLineLayer.tag];
+							[layersToReplace addObject:@{oldLayerKey: layer, newLayerKey: unselectedFillGradient}];
+						}
+					}
+					else
+					{
+						// Selected gradient line
+						if (weakSelf.selectedLineIndex >= 0 && ((unsigned)shapeLineLayer.tag == weakSelf.selectedLineIndex))
+						{
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:selectionGradientForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionGradientForLineAtLineIndex:(NSUInteger)lineIndex");
+							CAGradientLayer *selectedGradient = [self.dataSource lineChartLinesView:self selectionGradientForLineAtLineIndex:shapeLineLayer.tag];
+							selectedGradient.frame = layer.frame;
+							selectedGradient.mask = layer.mask;
+							selectedGradient.opacity = 1.0f;
+							[layersToReplace addObject:@{oldLayerKey: layer, newLayerKey: selectedGradient}];
+						}
+						// Unselected gradient line
+						else
+						{
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:gradientForLineAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView gradientForLineAtLineIndex:(NSUInteger)lineIndex");
+							CAGradientLayer *unselectedGradient = [self.dataSource lineChartLinesView:self gradientForLineAtLineIndex:shapeLineLayer.tag];
+							unselectedGradient.frame = layer.frame;
+							unselectedGradient.mask = layer.mask;
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesView:dimmedSelectionOpacityAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex");
+							shapeLineLayer.opacity = (weakSelf.selectedLineIndex == kJBLineChartLinesViewUnselectedLineIndex) ? 1.0f : [self.dataSource lineChartLinesView:self dimmedSelectionOpacityAtLineIndex:shapeLineLayer.tag];
+							[layersToReplace addObject:@{oldLayerKey: layer, newLayerKey: unselectedGradient}];
+						}
+					}
+				}
+			}
+		}
+		
+		for (NSDictionary *layerPair in layersToReplace)
+		{
+			[weakSelf.layer replaceSublayer:layerPair[oldLayerKey] with:layerPair[newLayerKey]];
+		}
+	};
+	
+	if (animated)
+	{
+		[UIView animateWithDuration:kJBChartViewDefaultAnimationDuration animations:^{
+			adjustLines();
+		}];
+	}
+	else
+	{
+		adjustLines();
+	}
+}
+
+- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex
+{
+	[self setSelectedLineIndex:selectedLineIndex animated:NO];
+}
+
+#pragma mark - Getters
+
+- (UIBezierPath *)bezierPathForLineChartLine:(JBLineChartLine *)lineChartLine filled:(BOOL)filled
+{
+	if ([lineChartLine.lineChartPoints count] > 0)
+	{
+		UIBezierPath *bezierPath = [UIBezierPath bezierPath];
+		
+		bezierPath.miterLimit = kJBLineChartLinesViewMiterLimit;
+		
+		JBLineChartPoint *previousLineChartPoint = nil;
+		CGFloat previousSlope = 0.0f;
+		
+		BOOL visiblePointFound = NO;
+		NSArray *sortedLineChartPoints = [lineChartLine.lineChartPoints sortedArrayUsingSelector:@selector(compare:)];
+		CGFloat firstXPosition = 0.0f;
+		CGFloat firstYPosition = 0.0f;
+		CGFloat lastXPosition = 0.0f;
+		CGFloat lastYPosition = 0.0f;
+		
+		for (NSUInteger index=0; index<[sortedLineChartPoints count]; index++)
+		{
+			JBLineChartPoint *lineChartPoint = [sortedLineChartPoints objectAtIndex:index];
+			
+			if (lineChartPoint.hidden)
+			{
+				continue;
+			}
+			
+			if (!visiblePointFound)
+			{
+				[bezierPath moveToPoint:CGPointMake(lineChartPoint.position.x, lineChartPoint.position.y)];
+				firstXPosition = lineChartPoint.position.x;
+				firstYPosition = lineChartPoint.position.y;
+				visiblePointFound = YES;
+			}
+			else
+			{
+				JBLineChartPoint *nextLineChartPoint = nil;
+				if (index != ([lineChartLine.lineChartPoints count] - 1))
+				{
+					nextLineChartPoint = [sortedLineChartPoints objectAtIndex:(index + 1)];
+				}
+				
+				CGFloat nextSlope = (nextLineChartPoint != nil) ? ((nextLineChartPoint.position.y - lineChartPoint.position.y)) / ((nextLineChartPoint.position.x - lineChartPoint.position.x)) : previousSlope;
+				CGFloat currentSlope = ((lineChartPoint.position.y - previousLineChartPoint.position.y)) / (lineChartPoint.position.x-previousLineChartPoint.position.x);
+				
+				BOOL deltaFromNextSlope = ((currentSlope >= (nextSlope + kJBLineChartLinesViewSmoothThresholdSlope)) || (currentSlope <= (nextSlope - kJBLineChartLinesViewSmoothThresholdSlope)));
+				BOOL deltaFromPreviousSlope = ((currentSlope >= (previousSlope + kJBLineChartLinesViewSmoothThresholdSlope)) || (currentSlope <= (previousSlope - kJBLineChartLinesViewSmoothThresholdSlope)));
+				BOOL deltaFromPreviousY = (lineChartPoint.position.y >= previousLineChartPoint.position.y + kJBLineChartLinesViewSmoothThresholdVertical) || (lineChartPoint.position.y <= previousLineChartPoint.position.y - kJBLineChartLinesViewSmoothThresholdVertical);
+				
+				if (lineChartLine.smoothedLine && deltaFromNextSlope && deltaFromPreviousSlope && deltaFromPreviousY)
+				{
+					CGFloat deltaX = lineChartPoint.position.x - previousLineChartPoint.position.x;
+					CGFloat controlPointX = previousLineChartPoint.position.x + (deltaX / 2);
+					
+					CGPoint controlPoint1 = CGPointMake(controlPointX, previousLineChartPoint.position.y);
+					CGPoint controlPoint2 = CGPointMake(controlPointX, lineChartPoint.position.y);
+					
+					[bezierPath addCurveToPoint:CGPointMake(lineChartPoint.position.x, lineChartPoint.position.y) controlPoint1:controlPoint1 controlPoint2:controlPoint2];
+				}
+				else
+				{
+					[bezierPath addLineToPoint:CGPointMake(lineChartPoint.position.x, lineChartPoint.position.y)];
+				}
+				
+				lastXPosition = lineChartPoint.position.x;
+				lastYPosition = lineChartPoint.position.y;
+				previousSlope = currentSlope;
+			}
+			previousLineChartPoint = lineChartPoint;
+		}
+		
+		if (filled)
+		{
+			UIBezierPath *filledBezierPath = [bezierPath copy];
+			
+			if(visiblePointFound)
+			{
+				[filledBezierPath addLineToPoint:CGPointMake(lastXPosition, lastYPosition)];
+				[filledBezierPath addLineToPoint:CGPointMake(lastXPosition, self.bounds.size.height)];
+				
+				[filledBezierPath addLineToPoint:CGPointMake(firstXPosition, self.bounds.size.height)];
+				[filledBezierPath addLineToPoint:CGPointMake(firstXPosition, firstYPosition)];
+			}
+			
+			return filledBezierPath;
+		}
+		else
+		{
+			return bezierPath;
+		}
+	}
+	return nil;
+}
+
+- (JBShapeLineLayer *)shapeLineLayerForLineIndex:(NSUInteger)lineIndex filled:(BOOL)filled
+{
+	for (CALayer *layer in [self.layer sublayers])
+	{
+		if ([layer isKindOfClass:[JBShapeLineLayer class]])
+		{
+			if (((JBShapeLineLayer *)layer).tag == lineIndex && ((JBShapeLineLayer *)layer).filled == filled)
+			{
+				return (JBShapeLineLayer *)layer;
+			}
+		}
+	}
+	return nil;
+}
+
+- (JBGradientLineLayer *)gradientLineLayerForLineIndex:(NSUInteger)lineIndex filled:(BOOL)filled
+{
+	for (CALayer *layer in [self.layer sublayers])
+	{
+		if ([layer isKindOfClass:[JBGradientLineLayer class]])
+		{
+			if (((JBGradientLineLayer *)layer).tag == lineIndex && ((JBGradientLineLayer *)layer).filled == filled)
+			{
+				return (JBGradientLineLayer *)layer;
+			}
+		}
+	}
+	return nil;
+}
+
+- (CABasicAnimation *)basicPathAnimationFromBezierPath:(UIBezierPath *)fromBezierPath toBezierPath:(UIBezierPath *)toBezierPath
+{
+	CABasicAnimation *basicPathAnimation = [CABasicAnimation animationWithKeyPath:@"path"];
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-qual"
+	basicPathAnimation.fromValue = (id)fromBezierPath.CGPath;
+	basicPathAnimation.toValue = (id)toBezierPath.CGPath;
+#pragma GCC diagnostic pop
+	basicPathAnimation.duration = kJBLineChartLinesViewReloadDataAnimationDuration;
+	basicPathAnimation.timingFunction = [CAMediaTimingFunction functionWithName:@"easeInEaseOut"];
+	basicPathAnimation.fillMode = kCAFillModeBoth;
+	basicPathAnimation.removedOnCompletion = NO;
+	return basicPathAnimation;
+}
+
+#pragma mark - Callback Helpers
+
+- (void)fireCallback:(void (^)())callback
+{
+	dispatch_block_t callbackCopy = [callback copy];
+	
+	if (callbackCopy != nil)
+	{
+		callbackCopy();
+	}
+}
+
+@end

Customization.md

@@ -81,23 +81,32 @@ The color, width and style of each line in the chart can be customized via the <
 	
 	- (JBLineChartViewLineStyle)lineChartView:(JBLineChartView *)lineChartView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex
 	{
-		return ...; // style of line in chart
+		return ...; // style of line in chart (solid or dashed)
 	}
 	
-Additionally, the line style of a line can be customzized via the <i>optional</i> protocol. If a gradient is used, the color for the line and fill of the line will control the alpha value of the gradient.
+Additionally, the line and fill color style can be customzized via the <i>optional</i> protocols (below). The line & fill color style apply to both selected and non-selected scenarios, meaning, if your line has a solid style, it's selected style will also be solid. 
 
-    - (JBLineChartViewLineColorStyle)lineChartView:(JBLineChartView *)lineChartView lineColorStyleForLineAtLineIndex:(NSUInteger)lineIndex
+    - (JBLineChartViewColorStyle)lineChartView:(JBLineChartView *)lineChartView colorStyleForLineAtLineIndex:(NSUInteger)lineIndex
     {
-        return ...; // line style of line in chart
+        return ...; // color line style of a line in the chart
+    }
+    
+    - (JBLineChartViewColorStyle)lineChartView:(JBLineChartView *)lineChartView fillColorStyleForLineAtLineIndex:(NSUInteger)lineIndex
+    {
+        return ...; // color style for the area under a line in the chart
     }
 
-    - (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView gradientForLineAtLineIndex:(NSUInteger)lineIndex {
-        return ...; // gradient for line in chart
-    }
+If a solid color style is used, the following <i>optional</i> protocols can be implemented:
 
-    - (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView fillGradientForLineAtLineIndex:(NSUInteger)lineIndex {
-        return ...; // gradient for area under line in chart
-    }
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForLineAtLineIndex:(NSUInteger)lineIndex;
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView fillColorForLineAtLineIndex:(NSUInteger)lineIndex;
+ 	
+Gradient color styles require a CAGradientLayer to be returned:
+
+	- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView gradientForLineAtLineIndex:(NSUInteger)lineIndex;
+	- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView fillGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+
+**Note**: gradients do not support multiple alphas. The alpha of gradient's first color be used throughout.
 
 Defining a gradient to use is simple and flexible. For example, this would be a horizontal gradient from blue to green:
 
@@ -105,8 +114,16 @@ Defining a gradient to use is simple and flexible. For example, this would be a
     gradient.startPoint = CGPointMake(0.0, 0.0);
     gradient.endPoint = CGPointMake(1.0, 0.0);
     gradient.colors = @[(id)[UIColor blueColor].CGColor, (id)[UIColor greenColor].CGColor];
-	
-Furthermore, the color and width of the selection view along with the color of the selected line can be customized via the <i>optional</i> protocols:
+    
+As mentioned prior, the same color style is duplicated for selection events:
+
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex;
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionFillColorForLineAtLineIndex:(NSUInteger)lineIndex;
+
+	- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView selectionGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+	- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView selectionFillGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+  
+The color and width of the selection view along with the color of the selected line can be customized via the <i>optional</i> protocols:
 
 	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView verticalSelectionColorForLineAtLineIndex:(NSUInteger)lineIndex
 	{
@@ -151,7 +168,6 @@ To the radius of each dot (default is 6x the line width, or 3x the diameter), im
 To customize the color of each dot during selection and non-selection events (default is white and black respectively), implement:
 
 	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;	
-
 	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
 	
 Alternatively, you can supply your own UIView instead of using the default impelmentation:
@@ -182,8 +198,15 @@ Upon selection, all other lines (+ fills) will be dimmed to 20% opacity (default
 
     - (CGFloat)lineChartView:(JBLineChartView *)lineChartView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex
     {
-        // Return new opacity (0.0 to hide completely, and 1.0 to have no effect)
+        // Return unselected line opacity (0.0 to hide completely, and 1.0 to have no effect)
     }
+
+The dot selection opacity (default 0%) can also be modified via:
+
+	- (CGFloat)lineChartView:(JBLineChartView *)lineChartView dimmedSelectionDotOpacityAtLineIndex:(NSUInteger)lineIndex
+	{
+		// Return unselected dot opacity (0.0 to hide completely and 1.0 to have no effect)
+	}
 	
 If you don't want a line to be selectable:
 

JBChartView.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "JBChartView"
-  s.version      = "2.8.19"
+  s.version      = "3.0.10"
   s.summary      = "Jawbone's iOS-based charting library for both line and bar graphs."
   s.homepage     = "https://github.com/Jawbone/JBChartView"
 
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.author       = { "Terry Worona" => "tworona@jawbone.com" }
   s.source       = { 
 	:git => "https://github.com/Jawbone/JBChartView.git",
-	:tag => "v2.8.19"
+	:tag => "v3.0.10"
   }
 
   s.platform     = :ios, '6.0'

JBChartViewDemo/JBChartViewDemo.xcodeproj/project.pbxproj

@@ -10,6 +10,18 @@
 		566C73A61C026858000EC785 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 566C73A51C026858000EC785 /* Default-568h@2x.png */; };
 		94BDFC3419F933B2007492F6 /* JBLineChartMissingPointsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 94BDFC3319F933B2007492F6 /* JBLineChartMissingPointsViewController.m */; };
 		9B0725211829822A0052109B /* JBChartListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0725201829822A0052109B /* JBChartListViewController.m */; };
+		9B13518F1C31FAB3000D4C92 /* NSMutableArray+JBStack.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351711C31FAB3000D4C92 /* NSMutableArray+JBStack.m */; };
+		9B1351901C31FAB3000D4C92 /* JBBarChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351741C31FAB3000D4C92 /* JBBarChartView.m */; };
+		9B1351911C31FAB3000D4C92 /* JBGradientBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351771C31FAB3000D4C92 /* JBGradientBarView.m */; };
+		9B1351921C31FAB3000D4C92 /* JBChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B13517A1C31FAB3000D4C92 /* JBChartView.m */; };
+		9B1351931C31FAB3000D4C92 /* JBLineChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B13517D1C31FAB3000D4C92 /* JBLineChartView.m */; };
+		9B1351941C31FAB3000D4C92 /* JBGradientLineLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351801C31FAB3000D4C92 /* JBGradientLineLayer.m */; };
+		9B1351951C31FAB3000D4C92 /* JBShapeLineLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351821C31FAB3000D4C92 /* JBShapeLineLayer.m */; };
+		9B1351961C31FAB3000D4C92 /* JBLineChartLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351851C31FAB3000D4C92 /* JBLineChartLine.m */; };
+		9B1351971C31FAB3000D4C92 /* JBLineChartPoint.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351871C31FAB3000D4C92 /* JBLineChartPoint.m */; };
+		9B1351981C31FAB3000D4C92 /* JBLineChartDotsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B13518A1C31FAB3000D4C92 /* JBLineChartDotsView.m */; };
+		9B1351991C31FAB3000D4C92 /* JBLineChartDotView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B13518C1C31FAB3000D4C92 /* JBLineChartDotView.m */; };
+		9B13519A1C31FAB3000D4C92 /* JBLineChartLinesView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B13518E1C31FAB3000D4C92 /* JBLineChartLinesView.m */; };
 		9B2E530518218CF20079B9D2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B2E530418218CF20079B9D2 /* Foundation.framework */; };
 		9B2E530718218CF20079B9D2 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B2E530618218CF20079B9D2 /* CoreGraphics.framework */; };
 		9B2E530918218CF20079B9D2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B2E530818218CF20079B9D2 /* UIKit.framework */; };
@@ -31,15 +43,12 @@
 		9B698F17182D7DAE003C135F /* icon-bar-chart@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B698F13182D7DAE003C135F /* icon-bar-chart@2x.png */; };
 		9B698F18182D7DAE003C135F /* icon-line-chart.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B698F14182D7DAE003C135F /* icon-line-chart.png */; };
 		9B698F19182D7DAE003C135F /* icon-line-chart@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B698F15182D7DAE003C135F /* icon-line-chart@2x.png */; };
-		9B6A68D31829AB9F006DB3BF /* JBChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6A68D21829AB9F006DB3BF /* JBChartView.m */; };
-		9B6A68DB1829ADE1006DB3BF /* JBBarChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6A68DA1829ADE1006DB3BF /* JBBarChartView.m */; };
 		9B6A68DE1829BE63006DB3BF /* JBBarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6A68DD1829BE63006DB3BF /* JBBarChartViewController.m */; };
 		9B6A68E11829BED5006DB3BF /* JBLineChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6A68E01829BED5006DB3BF /* JBLineChartViewController.m */; };
 		9B7967EC198313E30003A2B0 /* JBAreaChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B7967EB198313E30003A2B0 /* JBAreaChartViewController.m */; };
 		9B7967EF198317540003A2B0 /* icon-area-chart.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B7967ED198317540003A2B0 /* icon-area-chart.png */; };
 		9B7967F0198317540003A2B0 /* icon-area-chart@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B7967EE198317540003A2B0 /* icon-area-chart@2x.png */; };
 		9BD57BBC18D13D1A00ACFA52 /* JBChartTooltipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD57BBB18D13D1A00ACFA52 /* JBChartTooltipView.m */; };
-		9BE0B0AD182AD26400232023 /* JBLineChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE0B0AC182AD26400232023 /* JBLineChartView.m */; };
 		9BE0B0C7182B161000232023 /* JBChartHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE0B0C6182B161000232023 /* JBChartHeaderView.m */; };
 		9BE0B0CE182B162E00232023 /* JBBarChartFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE0B0CD182B162E00232023 /* JBBarChartFooterView.m */; };
 		9BEBE9D2183167050046E4A8 /* JBChartInformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BEBE9D1183167050046E4A8 /* JBChartInformationView.m */; };
@@ -52,6 +61,30 @@
 		94BDFC3319F933B2007492F6 /* JBLineChartMissingPointsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartMissingPointsViewController.m; sourceTree = "<group>"; };
 		9B07251F1829822A0052109B /* JBChartListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBChartListViewController.h; sourceTree = "<group>"; };
 		9B0725201829822A0052109B /* JBChartListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBChartListViewController.m; sourceTree = "<group>"; };
+		9B1351701C31FAB3000D4C92 /* NSMutableArray+JBStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+JBStack.h"; sourceTree = "<group>"; };
+		9B1351711C31FAB3000D4C92 /* NSMutableArray+JBStack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableArray+JBStack.m"; sourceTree = "<group>"; };
+		9B1351731C31FAB3000D4C92 /* JBBarChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBBarChartView.h; sourceTree = "<group>"; };
+		9B1351741C31FAB3000D4C92 /* JBBarChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBBarChartView.m; sourceTree = "<group>"; };
+		9B1351761C31FAB3000D4C92 /* JBGradientBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBGradientBarView.h; sourceTree = "<group>"; };
+		9B1351771C31FAB3000D4C92 /* JBGradientBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBGradientBarView.m; sourceTree = "<group>"; };
+		9B1351791C31FAB3000D4C92 /* JBChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBChartView.h; sourceTree = "<group>"; };
+		9B13517A1C31FAB3000D4C92 /* JBChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBChartView.m; sourceTree = "<group>"; };
+		9B13517C1C31FAB3000D4C92 /* JBLineChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartView.h; sourceTree = "<group>"; };
+		9B13517D1C31FAB3000D4C92 /* JBLineChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartView.m; sourceTree = "<group>"; };
+		9B13517F1C31FAB3000D4C92 /* JBGradientLineLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBGradientLineLayer.h; sourceTree = "<group>"; };
+		9B1351801C31FAB3000D4C92 /* JBGradientLineLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBGradientLineLayer.m; sourceTree = "<group>"; };
+		9B1351811C31FAB3000D4C92 /* JBShapeLineLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBShapeLineLayer.h; sourceTree = "<group>"; };
+		9B1351821C31FAB3000D4C92 /* JBShapeLineLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBShapeLineLayer.m; sourceTree = "<group>"; };
+		9B1351841C31FAB3000D4C92 /* JBLineChartLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartLine.h; sourceTree = "<group>"; };
+		9B1351851C31FAB3000D4C92 /* JBLineChartLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartLine.m; sourceTree = "<group>"; };
+		9B1351861C31FAB3000D4C92 /* JBLineChartPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartPoint.h; sourceTree = "<group>"; };
+		9B1351871C31FAB3000D4C92 /* JBLineChartPoint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartPoint.m; sourceTree = "<group>"; };
+		9B1351891C31FAB3000D4C92 /* JBLineChartDotsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartDotsView.h; sourceTree = "<group>"; };
+		9B13518A1C31FAB3000D4C92 /* JBLineChartDotsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartDotsView.m; sourceTree = "<group>"; };
+		9B13518B1C31FAB3000D4C92 /* JBLineChartDotView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartDotView.h; sourceTree = "<group>"; };
+		9B13518C1C31FAB3000D4C92 /* JBLineChartDotView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartDotView.m; sourceTree = "<group>"; };
+		9B13518D1C31FAB3000D4C92 /* JBLineChartLinesView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartLinesView.h; sourceTree = "<group>"; };
+		9B13518E1C31FAB3000D4C92 /* JBLineChartLinesView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartLinesView.m; sourceTree = "<group>"; };
 		9B2E530118218CF20079B9D2 /* JBChartViewDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JBChartViewDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9B2E530418218CF20079B9D2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		9B2E530618218CF20079B9D2 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -86,10 +119,6 @@
 		9B698F13182D7DAE003C135F /* icon-bar-chart@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-bar-chart@2x.png"; sourceTree = "<group>"; };
 		9B698F14182D7DAE003C135F /* icon-line-chart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-line-chart.png"; sourceTree = "<group>"; };
 		9B698F15182D7DAE003C135F /* icon-line-chart@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-line-chart@2x.png"; sourceTree = "<group>"; };
-		9B6A68D11829AB9F006DB3BF /* JBChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBChartView.h; path = ../../Classes/JBChartView.h; sourceTree = "<group>"; };
-		9B6A68D21829AB9F006DB3BF /* JBChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBChartView.m; path = ../../Classes/JBChartView.m; sourceTree = "<group>"; };
-		9B6A68D91829ADE1006DB3BF /* JBBarChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBBarChartView.h; path = ../../Classes/JBBarChartView.h; sourceTree = "<group>"; };
-		9B6A68DA1829ADE1006DB3BF /* JBBarChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBBarChartView.m; path = ../../Classes/JBBarChartView.m; sourceTree = "<group>"; };
 		9B6A68DC1829BE63006DB3BF /* JBBarChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBBarChartViewController.h; sourceTree = "<group>"; };
 		9B6A68DD1829BE63006DB3BF /* JBBarChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBBarChartViewController.m; sourceTree = "<group>"; };
 		9B6A68DF1829BED5006DB3BF /* JBLineChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartViewController.h; sourceTree = "<group>"; };
@@ -100,8 +129,6 @@
 		9B7967EE198317540003A2B0 /* icon-area-chart@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-area-chart@2x.png"; sourceTree = "<group>"; };
 		9BD57BBA18D13D1A00ACFA52 /* JBChartTooltipView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBChartTooltipView.h; sourceTree = "<group>"; };
 		9BD57BBB18D13D1A00ACFA52 /* JBChartTooltipView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBChartTooltipView.m; sourceTree = "<group>"; };
-		9BE0B0AB182AD26400232023 /* JBLineChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBLineChartView.h; path = ../../Classes/JBLineChartView.h; sourceTree = "<group>"; };
-		9BE0B0AC182AD26400232023 /* JBLineChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBLineChartView.m; path = ../../Classes/JBLineChartView.m; sourceTree = "<group>"; };
 		9BE0B0C5182B161000232023 /* JBChartHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBChartHeaderView.h; sourceTree = "<group>"; };
 		9BE0B0C6182B161000232023 /* JBChartHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBChartHeaderView.m; sourceTree = "<group>"; };
 		9BE0B0CC182B162E00232023 /* JBBarChartFooterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBBarChartFooterView.h; sourceTree = "<group>"; };
@@ -129,6 +156,113 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		9B13516F1C31FAB3000D4C92 /* Additions */ = {
+			isa = PBXGroup;
+			children = (
+				9B1351701C31FAB3000D4C92 /* NSMutableArray+JBStack.h */,
+				9B1351711C31FAB3000D4C92 /* NSMutableArray+JBStack.m */,
+			);
+			name = Additions;
+			path = ../../Classes/Additions;
+			sourceTree = "<group>";
+		};
+		9B1351721C31FAB3000D4C92 /* Bar */ = {
+			isa = PBXGroup;
+			children = (
+				9B1351731C31FAB3000D4C92 /* JBBarChartView.h */,
+				9B1351741C31FAB3000D4C92 /* JBBarChartView.m */,
+				9B1351751C31FAB3000D4C92 /* Views */,
+			);
+			name = Bar;
+			path = ../../Classes/Bar;
+			sourceTree = "<group>";
+		};
+		9B1351751C31FAB3000D4C92 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				9B1351761C31FAB3000D4C92 /* JBGradientBarView.h */,
+				9B1351771C31FAB3000D4C92 /* JBGradientBarView.m */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		9B1351781C31FAB3000D4C92 /* Base */ = {
+			isa = PBXGroup;
+			children = (
+				9B1351791C31FAB3000D4C92 /* JBChartView.h */,
+				9B13517A1C31FAB3000D4C92 /* JBChartView.m */,
+			);
+			name = Base;
+			path = ../../Classes/Base;
+			sourceTree = "<group>";
+		};
+		9B13517B1C31FAB3000D4C92 /* Line */ = {
+			isa = PBXGroup;
+			children = (
+				9B13517C1C31FAB3000D4C92 /* JBLineChartView.h */,
+				9B13517D1C31FAB3000D4C92 /* JBLineChartView.m */,
+				9B13517E1C31FAB3000D4C92 /* Layers */,
+				9B1351831C31FAB3000D4C92 /* Models */,
+				9B1351881C31FAB3000D4C92 /* Views */,
+			);
+			name = Line;
+			path = ../../Classes/Line;
+			sourceTree = "<group>";
+		};
+		9B13517E1C31FAB3000D4C92 /* Layers */ = {
+			isa = PBXGroup;
+			children = (
+				9B13517F1C31FAB3000D4C92 /* JBGradientLineLayer.h */,
+				9B1351801C31FAB3000D4C92 /* JBGradientLineLayer.m */,
+				9B1351811C31FAB3000D4C92 /* JBShapeLineLayer.h */,
+				9B1351821C31FAB3000D4C92 /* JBShapeLineLayer.m */,
+			);
+			path = Layers;
+			sourceTree = "<group>";
+		};
+		9B1351831C31FAB3000D4C92 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				9B1351841C31FAB3000D4C92 /* JBLineChartLine.h */,
+				9B1351851C31FAB3000D4C92 /* JBLineChartLine.m */,
+				9B1351861C31FAB3000D4C92 /* JBLineChartPoint.h */,
+				9B1351871C31FAB3000D4C92 /* JBLineChartPoint.m */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		9B1351881C31FAB3000D4C92 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				9B1351891C31FAB3000D4C92 /* JBLineChartDotsView.h */,
+				9B13518A1C31FAB3000D4C92 /* JBLineChartDotsView.m */,
+				9B13518B1C31FAB3000D4C92 /* JBLineChartDotView.h */,
+				9B13518C1C31FAB3000D4C92 /* JBLineChartDotView.m */,
+				9B13518D1C31FAB3000D4C92 /* JBLineChartLinesView.h */,
+				9B13518E1C31FAB3000D4C92 /* JBLineChartLinesView.m */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		9B13519B1C31FABE000D4C92 /* JBChartView */ = {
+			isa = PBXGroup;
+			children = (
+				9B13516F1C31FAB3000D4C92 /* Additions */,
+				9B1351721C31FAB3000D4C92 /* Bar */,
+				9B1351781C31FAB3000D4C92 /* Base */,
+				9B13517B1C31FAB3000D4C92 /* Line */,
+			);
+			name = JBChartView;
+			sourceTree = "<group>";
+		};
+		9B13519C1C31FAC3000D4C92 /* Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				9B13519B1C31FABE000D4C92 /* JBChartView */,
+			);
+			name = Libraries;
+			sourceTree = "<group>";
+		};
 		9B2E52F818218CF20079B9D2 = {
 			isa = PBXGroup;
 			children = (
@@ -163,6 +297,7 @@
 				9BE0B0D0182B16DD00232023 /* Constants */,
 				9B2E534018218D560079B9D2 /* Controllers */,
 				9B2E533C18218D310079B9D2 /* Delegate */,
+				9B13519C1C31FAC3000D4C92 /* Libraries */,
 				9B603D43182C7002000A76D0 /* Resources */,
 				9B2E530B18218CF20079B9D2 /* Supporting Files */,
 				9B6A68D01829AB85006DB3BF /* Views */,
@@ -263,7 +398,6 @@
 			isa = PBXGroup;
 			children = (
 				9B698F0E182D7BCF003C135F /* Cells */,
-				9BE0B0C0182B15DB00232023 /* Charts */,
 				9BE0B0CB182B162E00232023 /* Footers */,
 				9BE0B0C4182B161000232023 /* Headers */,
 				9BEBE9CF183167050046E4A8 /* Misc */,
@@ -271,19 +405,6 @@
 			name = Views;
 			sourceTree = "<group>";
 		};
-		9BE0B0C0182B15DB00232023 /* Charts */ = {
-			isa = PBXGroup;
-			children = (
-				9B6A68D91829ADE1006DB3BF /* JBBarChartView.h */,
-				9B6A68DA1829ADE1006DB3BF /* JBBarChartView.m */,
-				9B6A68D11829AB9F006DB3BF /* JBChartView.h */,
-				9B6A68D21829AB9F006DB3BF /* JBChartView.m */,
-				9BE0B0AB182AD26400232023 /* JBLineChartView.h */,
-				9BE0B0AC182AD26400232023 /* JBLineChartView.m */,
-			);
-			name = Charts;
-			sourceTree = "<group>";
-		};
 		9BE0B0C4182B161000232023 /* Headers */ = {
 			isa = PBXGroup;
 			children = (
@@ -405,24 +526,33 @@
 			buildActionMask = 2147483647;
 			files = (
 				9BE0B0CE182B162E00232023 /* JBBarChartFooterView.m in Sources */,
-				9B6A68D31829AB9F006DB3BF /* JBChartView.m in Sources */,
+				9B13519A1C31FAB3000D4C92 /* JBLineChartLinesView.m in Sources */,
+				9B1351901C31FAB3000D4C92 /* JBBarChartView.m in Sources */,
 				9BEBE9D2183167050046E4A8 /* JBChartInformationView.m in Sources */,
 				9B603D3E182C6E79000A76D0 /* JBBaseNavigationController.m in Sources */,
+				9B1351971C31FAB3000D4C92 /* JBLineChartPoint.m in Sources */,
 				9B698F11182D7BCF003C135F /* JBChartTableCell.m in Sources */,
-				9B6A68DB1829ADE1006DB3BF /* JBBarChartView.m in Sources */,
 				9B2E531118218CF20079B9D2 /* main.m in Sources */,
+				9B1351981C31FAB3000D4C92 /* JBLineChartDotsView.m in Sources */,
 				9B698F01182D5F44003C135F /* JBLineChartFooterView.m in Sources */,
 				9BE0B0C7182B161000232023 /* JBChartHeaderView.m in Sources */,
 				9B603D4E182C7163000A76D0 /* JBBaseTableViewController.m in Sources */,
 				9B6A68DE1829BE63006DB3BF /* JBBarChartViewController.m in Sources */,
 				9B4437AD18D7686800682EF0 /* JBChartTooltipTipView.m in Sources */,
 				94BDFC3419F933B2007492F6 /* JBLineChartMissingPointsViewController.m in Sources */,
-				9BE0B0AD182AD26400232023 /* JBLineChartView.m in Sources */,
 				9BEE694618D2789E005D9BA7 /* JBBaseChartViewController.m in Sources */,
 				9B6A68E11829BED5006DB3BF /* JBLineChartViewController.m in Sources */,
+				9B1351961C31FAB3000D4C92 /* JBLineChartLine.m in Sources */,
+				9B1351911C31FAB3000D4C92 /* JBGradientBarView.m in Sources */,
+				9B1351931C31FAB3000D4C92 /* JBLineChartView.m in Sources */,
+				9B1351991C31FAB3000D4C92 /* JBLineChartDotView.m in Sources */,
+				9B1351921C31FAB3000D4C92 /* JBChartView.m in Sources */,
 				9B2E533F18218D310079B9D2 /* AppDelegate.m in Sources */,
+				9B13518F1C31FAB3000D4C92 /* NSMutableArray+JBStack.m in Sources */,
+				9B1351941C31FAB3000D4C92 /* JBGradientLineLayer.m in Sources */,
 				9B7967EC198313E30003A2B0 /* JBAreaChartViewController.m in Sources */,
 				9BD57BBC18D13D1A00ACFA52 /* JBChartTooltipView.m in Sources */,
+				9B1351951C31FAB3000D4C92 /* JBShapeLineLayer.m in Sources */,
 				9B603D4B182C7117000A76D0 /* JBBaseViewController.m in Sources */,
 				9B0725211829822A0052109B /* JBChartListViewController.m in Sources */,
 			);

JBChartViewDemo/JBChartViewDemo/Constants/JBColorConstants.h

@@ -35,8 +35,6 @@
 #define kJBColorLineChartDefaultDashedFillColor [UIColor colorWithWhite:1.0 alpha:0.3]
 #define kJBColorLineChartDefaultGradientStartColor UIColorFromHex(0x0000FF)
 #define kJBColorLineChartDefaultGradientEndColor UIColorFromHex(0x00FF00)
-#define kJBColorLineChartDefaultFillGradientStartColor UIColorFromHex(0xFFFFFF)
-#define kJBColorLineChartDefaultFillGradientEndColor UIColorFromHex(0xbe0000)
 
 #define mark - Area Chart
 

JBChartViewDemo/JBChartViewDemo/Controllers/JBBarChartViewController.m

@@ -160,7 +160,7 @@ NSString * const kJBBarChartViewControllerNavButtonViewKey = @"view";
 
 - (NSUInteger)numberOfBarsInBarChartView:(JBBarChartView *)barChartView
 {
-    return kJBBarChartViewControllerNumBars;
+	return [self.chartData count];
 }
 
 - (void)barChartView:(JBBarChartView *)barChartView didSelectBarAtIndex:(NSUInteger)index touchPoint:(CGPoint)touchPoint
@@ -205,15 +205,15 @@ NSString * const kJBBarChartViewControllerNavButtonViewKey = @"view";
 
 - (void)chartToggleButtonPressed:(id)sender
 {
-    UIView *buttonImageView = [self.navigationItem.rightBarButtonItem valueForKey:kJBBarChartViewControllerNavButtonViewKey];
-    buttonImageView.userInteractionEnabled = NO;
-    
-    CGAffineTransform transform = self.barChartView.state == JBChartViewStateExpanded ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformMakeRotation(0);
-    buttonImageView.transform = transform;
-    
-    [self.barChartView setState:self.barChartView.state == JBChartViewStateExpanded ? JBChartViewStateCollapsed : JBChartViewStateExpanded animated:YES callback:^{
-        buttonImageView.userInteractionEnabled = YES;
-    }];
+	UIView *buttonImageView = [self.navigationItem.rightBarButtonItem valueForKey:kJBBarChartViewControllerNavButtonViewKey];
+	buttonImageView.userInteractionEnabled = NO;
+	
+	CGAffineTransform transform = self.barChartView.state == JBChartViewStateExpanded ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformMakeRotation(0);
+	buttonImageView.transform = transform;
+	
+	[self.barChartView setState:self.barChartView.state == JBChartViewStateExpanded ? JBChartViewStateCollapsed : JBChartViewStateExpanded animated:YES callback:^{
+		buttonImageView.userInteractionEnabled = YES;
+	}];
 }
 
 #pragma mark - Overrides

JBChartViewDemo/JBChartViewDemo/Controllers/JBLineChartViewController.m

@@ -18,8 +18,8 @@
 
 typedef NS_ENUM(NSInteger, JBLineChartLine){
 	JBLineChartLineSolid,
-    JBLineChartLineDashed,
-    JBLineChartLineCount
+	JBLineChartLineDashed,
+	JBLineChartLineCount
 };
 
 // Numerics
@@ -58,191 +58,191 @@ NSString * const kJBLineChartViewControllerNavButtonViewKey = @"view";
 
 - (id)init
 {
-    self = [super init];
-    if (self)
-    {
-        [self initFakeData];
-    }
-    return self;
+	self = [super init];
+	if (self)
+	{
+		[self initFakeData];
+	}
+	return self;
 }
 
 - (id)initWithCoder:(NSCoder *)aDecoder
 {
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        [self initFakeData];
-    }
-    return self;
+	self = [super initWithCoder:aDecoder];
+	if (self)
+	{
+		[self initFakeData];
+	}
+	return self;
 }
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self)
-    {
-        [self initFakeData];
-    }
-    return self;
+	self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+	if (self)
+	{
+		[self initFakeData];
+	}
+	return self;
 }
 
 - (void)dealloc
 {
-    _lineChartView.delegate = nil;
-    _lineChartView.dataSource = nil;
+	_lineChartView.delegate = nil;
+	_lineChartView.dataSource = nil;
 }
 
 #pragma mark - Data
 
 - (void)initFakeData
 {
-    NSMutableArray *mutableLineCharts = [NSMutableArray array];
-    for (int lineIndex=0; lineIndex<JBLineChartLineCount; lineIndex++)
-    {
-        NSMutableArray *mutableChartData = [NSMutableArray array];
-        for (int i=0; i<kJBLineChartViewControllerMaxNumChartPoints; i++)
-        {
-            [mutableChartData addObject:[NSNumber numberWithFloat:((double)arc4random() / ARC4RANDOM_MAX)]]; // random number between 0 and 1
-        }
-        [mutableLineCharts addObject:mutableChartData];
-    }
-    _chartData = [NSArray arrayWithArray:mutableLineCharts];
-    _daysOfWeek = [[[NSDateFormatter alloc] init] shortWeekdaySymbols];
+	NSMutableArray *mutableLineCharts = [NSMutableArray array];
+	for (int lineIndex=0; lineIndex<JBLineChartLineCount; lineIndex++)
+	{
+		NSMutableArray *mutableChartData = [NSMutableArray array];
+		for (int i=0; i<kJBLineChartViewControllerMaxNumChartPoints; i++)
+		{
+			[mutableChartData addObject:[NSNumber numberWithFloat:((double)arc4random() / ARC4RANDOM_MAX)]]; // random number between 0 and 1
+		}
+		[mutableLineCharts addObject:mutableChartData];
+	}
+	_chartData = [NSArray arrayWithArray:mutableLineCharts];
+	_daysOfWeek = [[[NSDateFormatter alloc] init] shortWeekdaySymbols];
 }
 
 - (NSArray *)largestLineData
 {
-    NSArray *largestLineData = nil;
-    for (NSArray *lineData in self.chartData)
-    {
-        if ([lineData count] > [largestLineData count])
-        {
-            largestLineData = lineData;
-        }
-    }
-    return largestLineData;
+	NSArray *largestLineData = nil;
+	for (NSArray *lineData in self.chartData)
+	{
+		if ([lineData count] > [largestLineData count])
+		{
+			largestLineData = lineData;
+		}
+	}
+	return largestLineData;
 }
 
 #pragma mark - View Lifecycle
 
 - (void)loadView
 {
-    [super loadView];
-    
-    self.view.backgroundColor = kJBColorLineChartControllerBackground;
-    self.navigationItem.rightBarButtonItem = [self chartToggleButtonWithTarget:self action:@selector(chartToggleButtonPressed:)];
-        
-    self.lineChartView = [[JBLineChartView alloc] init];
-    self.lineChartView.frame = CGRectMake(kJBLineChartViewControllerChartPadding, kJBLineChartViewControllerChartPadding, self.view.bounds.size.width - (kJBLineChartViewControllerChartPadding * 2), kJBLineChartViewControllerChartHeight);
-    self.lineChartView.delegate = self;
-    self.lineChartView.dataSource = self;
-    self.lineChartView.headerPadding = kJBLineChartViewControllerChartHeaderPadding;
-    self.lineChartView.backgroundColor = kJBColorLineChartBackground;
-    
-    JBChartHeaderView *headerView = [[JBChartHeaderView alloc] initWithFrame:CGRectMake(kJBLineChartViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBLineChartViewControllerChartHeaderHeight * 0.5), self.view.bounds.size.width - (kJBLineChartViewControllerChartPadding * 2), kJBLineChartViewControllerChartHeaderHeight)];
-    headerView.titleLabel.text = [kJBStringLabelAverageDailyRainfall uppercaseString];
-    headerView.titleLabel.textColor = kJBColorLineChartHeader;
-    headerView.titleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
-    headerView.titleLabel.shadowOffset = CGSizeMake(0, 1);
-    headerView.subtitleLabel.text = kJBStringLabel2013;
-    headerView.subtitleLabel.textColor = kJBColorLineChartHeader;
-    headerView.subtitleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
-    headerView.subtitleLabel.shadowOffset = CGSizeMake(0, 1);
-    headerView.separatorColor = kJBColorLineChartHeaderSeparatorColor;
-    self.lineChartView.headerView = headerView;
-    
-    JBLineChartFooterView *footerView = [[JBLineChartFooterView alloc] initWithFrame:CGRectMake(kJBLineChartViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBLineChartViewControllerChartFooterHeight * 0.5), self.view.bounds.size.width - (kJBLineChartViewControllerChartPadding * 2), kJBLineChartViewControllerChartFooterHeight)];
-    footerView.backgroundColor = [UIColor clearColor];
-    footerView.leftLabel.text = [[self.daysOfWeek firstObject] uppercaseString];
-    footerView.leftLabel.textColor = [UIColor whiteColor];
-    footerView.rightLabel.text = [[self.daysOfWeek lastObject] uppercaseString];;
-    footerView.rightLabel.textColor = [UIColor whiteColor];
-    footerView.sectionCount = [[self largestLineData] count];
-    self.lineChartView.footerView = footerView;
-    
-    [self.view addSubview:self.lineChartView];
-    
-    self.informationView = [[JBChartInformationView alloc] initWithFrame:CGRectMake(self.view.bounds.origin.x, CGRectGetMaxY(self.lineChartView.frame), self.view.bounds.size.width, self.view.bounds.size.height - CGRectGetMaxY(self.lineChartView.frame) - CGRectGetMaxY(self.navigationController.navigationBar.frame))];
-    [self.informationView setValueAndUnitTextColor:[UIColor colorWithWhite:1.0 alpha:0.75]];
-    [self.informationView setTitleTextColor:kJBColorLineChartHeader];
-    [self.informationView setTextShadowColor:nil];
-    [self.informationView setSeparatorColor:kJBColorLineChartHeaderSeparatorColor];
-    [self.view addSubview:self.informationView];
-    
-    [self.lineChartView reloadData];
+	[super loadView];
+	
+	self.view.backgroundColor = kJBColorLineChartControllerBackground;
+	self.navigationItem.rightBarButtonItem = [self chartToggleButtonWithTarget:self action:@selector(chartToggleButtonPressed:)];
+	
+	self.lineChartView = [[JBLineChartView alloc] init];
+	self.lineChartView.frame = CGRectMake(kJBLineChartViewControllerChartPadding, kJBLineChartViewControllerChartPadding, self.view.bounds.size.width - (kJBLineChartViewControllerChartPadding * 2), kJBLineChartViewControllerChartHeight);
+	self.lineChartView.delegate = self;
+	self.lineChartView.dataSource = self;
+	self.lineChartView.headerPadding = kJBLineChartViewControllerChartHeaderPadding;
+	self.lineChartView.backgroundColor = kJBColorLineChartBackground;
+	
+	JBChartHeaderView *headerView = [[JBChartHeaderView alloc] initWithFrame:CGRectMake(kJBLineChartViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBLineChartViewControllerChartHeaderHeight * 0.5), self.view.bounds.size.width - (kJBLineChartViewControllerChartPadding * 2), kJBLineChartViewControllerChartHeaderHeight)];
+	headerView.titleLabel.text = [kJBStringLabelAverageDailyRainfall uppercaseString];
+	headerView.titleLabel.textColor = kJBColorLineChartHeader;
+	headerView.titleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
+	headerView.titleLabel.shadowOffset = CGSizeMake(0, 1);
+	headerView.subtitleLabel.text = kJBStringLabel2013;
+	headerView.subtitleLabel.textColor = kJBColorLineChartHeader;
+	headerView.subtitleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
+	headerView.subtitleLabel.shadowOffset = CGSizeMake(0, 1);
+	headerView.separatorColor = kJBColorLineChartHeaderSeparatorColor;
+	self.lineChartView.headerView = headerView;
+	
+	JBLineChartFooterView *footerView = [[JBLineChartFooterView alloc] initWithFrame:CGRectMake(kJBLineChartViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBLineChartViewControllerChartFooterHeight * 0.5), self.view.bounds.size.width - (kJBLineChartViewControllerChartPadding * 2), kJBLineChartViewControllerChartFooterHeight)];
+	footerView.backgroundColor = [UIColor clearColor];
+	footerView.leftLabel.text = [[self.daysOfWeek firstObject] uppercaseString];
+	footerView.leftLabel.textColor = [UIColor whiteColor];
+	footerView.rightLabel.text = [[self.daysOfWeek lastObject] uppercaseString];;
+	footerView.rightLabel.textColor = [UIColor whiteColor];
+	footerView.sectionCount = [[self largestLineData] count];
+	self.lineChartView.footerView = footerView;
+	
+	[self.view addSubview:self.lineChartView];
+	
+	self.informationView = [[JBChartInformationView alloc] initWithFrame:CGRectMake(self.view.bounds.origin.x, CGRectGetMaxY(self.lineChartView.frame), self.view.bounds.size.width, self.view.bounds.size.height - CGRectGetMaxY(self.lineChartView.frame) - CGRectGetMaxY(self.navigationController.navigationBar.frame))];
+	[self.informationView setValueAndUnitTextColor:[UIColor colorWithWhite:1.0 alpha:0.75]];
+	[self.informationView setTitleTextColor:kJBColorLineChartHeader];
+	[self.informationView setTextShadowColor:nil];
+	[self.informationView setSeparatorColor:kJBColorLineChartHeaderSeparatorColor];
+	[self.view addSubview:self.informationView];
+	
+	[self.lineChartView reloadData];
 }
 
 - (void)viewWillAppear:(BOOL)animated
 {
-    [super viewWillAppear:animated];
-    [self.lineChartView setState:JBChartViewStateExpanded];
+	[super viewWillAppear:animated];
+	[self.lineChartView setState:JBChartViewStateExpanded];
 }
 
 #pragma mark - JBChartViewDataSource
 
 - (BOOL)shouldExtendSelectionViewIntoHeaderPaddingForChartView:(JBChartView *)chartView
 {
-    return YES;
+	return YES;
 }
 
 - (BOOL)shouldExtendSelectionViewIntoFooterPaddingForChartView:(JBChartView *)chartView
 {
-    return NO;
+	return NO;
 }
 
 #pragma mark - JBLineChartViewDataSource
 
 - (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView
 {
-    return [self.chartData count];
+	return [self.chartData count];
 }
 
 - (NSUInteger)lineChartView:(JBLineChartView *)lineChartView numberOfVerticalValuesAtLineIndex:(NSUInteger)lineIndex
 {
-    return [[self.chartData objectAtIndex:lineIndex] count];
+	return [[self.chartData objectAtIndex:lineIndex] count];
 }
 
 - (BOOL)lineChartView:(JBLineChartView *)lineChartView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return lineIndex == JBLineChartViewLineStyleDashed;
+	return lineIndex == JBLineChartViewLineStyleDashed;
 }
 
 - (BOOL)lineChartView:(JBLineChartView *)lineChartView smoothLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return lineIndex == JBLineChartViewLineStyleSolid;
+	return lineIndex == JBLineChartViewLineStyleSolid;
 }
 
 #pragma mark - JBLineChartViewDelegate
 
 - (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
 {
-    return [[[self.chartData objectAtIndex:lineIndex] objectAtIndex:horizontalIndex] floatValue];
+	return [[[self.chartData objectAtIndex:lineIndex] objectAtIndex:horizontalIndex] floatValue];
 }
 
 - (void)lineChartView:(JBLineChartView *)lineChartView didSelectLineAtIndex:(NSUInteger)lineIndex horizontalIndex:(NSUInteger)horizontalIndex touchPoint:(CGPoint)touchPoint
 {
-    NSNumber *valueNumber = [[self.chartData objectAtIndex:lineIndex] objectAtIndex:horizontalIndex];
-    [self.informationView setValueText:[NSString stringWithFormat:@"%.2f", [valueNumber floatValue]] unitText:kJBStringLabelMm];
-    [self.informationView setTitleText:lineIndex == JBLineChartLineSolid ? kJBStringLabelMetropolitanAverage : kJBStringLabelNationalAverage];
-    [self.informationView setHidden:NO animated:YES];
-    [self setTooltipVisible:YES animated:YES atTouchPoint:touchPoint];
-    [self.tooltipView setText:[[self.daysOfWeek objectAtIndex:horizontalIndex] uppercaseString]];
+	NSNumber *valueNumber = [[self.chartData objectAtIndex:lineIndex] objectAtIndex:horizontalIndex];
+	[self.informationView setValueText:[NSString stringWithFormat:@"%.2f", [valueNumber floatValue]] unitText:kJBStringLabelMm];
+	[self.informationView setTitleText:lineIndex == JBLineChartLineSolid ? kJBStringLabelMetropolitanAverage : kJBStringLabelNationalAverage];
+	[self.informationView setHidden:NO animated:YES];
+	[self setTooltipVisible:YES animated:YES atTouchPoint:touchPoint];
+	[self.tooltipView setText:[[self.daysOfWeek objectAtIndex:horizontalIndex] uppercaseString]];
 }
 
 - (void)didDeselectLineInLineChartView:(JBLineChartView *)lineChartView
 {
-    [self.informationView setHidden:YES animated:YES];
-    [self setTooltipVisible:NO animated:YES];
+	[self.informationView setHidden:YES animated:YES];
+	[self setTooltipVisible:NO animated:YES];
 }
 
 - (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidLineColor: kJBColorLineChartDefaultDashedLineColor;
+	return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidLineColor: nil;
 }
 
 - (UIColor *)lineChartView:(JBLineChartView *)lineChartView fillColorForLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidFillColor : kJBColorLineChartDefaultDashedFillColor;
+	return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidFillColor : nil;
 }
 
 - (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView gradientForLineAtLineIndex:(NSUInteger)lineIndex
@@ -261,60 +261,44 @@ NSString * const kJBLineChartViewControllerNavButtonViewKey = @"view";
 	}
 }
 
-- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView fillGradientForLineAtLineIndex:(NSUInteger)lineIndex
-{
-	if (lineIndex == JBLineChartLineSolid)
-	{
-		return nil;
-	}
-	else
-	{
-		CAGradientLayer *gradient = [CAGradientLayer new];
-		gradient.startPoint = CGPointMake(0.0, 0.0);
-		gradient.endPoint = CGPointMake(1.0, 0.0);
-		gradient.colors = @[(id)kJBColorLineChartDefaultFillGradientStartColor.CGColor, (id)kJBColorLineChartDefaultFillGradientEndColor.CGColor];
-		return gradient;
-	}	
-}
-
 - (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidLineColor: kJBColorLineChartDefaultDashedLineColor;
+	return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidLineColor: kJBColorLineChartDefaultDashedLineColor;
 }
 
 - (CGFloat)lineChartView:(JBLineChartView *)lineChartView widthForLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? kJBLineChartViewControllerChartSolidLineWidth: kJBLineChartViewControllerChartDashedLineWidth;
+	return (lineIndex == JBLineChartLineSolid) ? kJBLineChartViewControllerChartSolidLineWidth: kJBLineChartViewControllerChartDashedLineWidth;
 }
 
 - (CGFloat)lineChartView:(JBLineChartView *)lineChartView dotRadiusForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? 0.0: kJBLineChartViewControllerChartSolidLineDotRadius;
+	return (lineIndex == JBLineChartLineSolid) ? 0.0: kJBLineChartViewControllerChartSolidLineDotRadius;
 }
 
 - (UIColor *)lineChartView:(JBLineChartView *)lineChartView verticalSelectionColorForLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return [UIColor whiteColor];
+	return [UIColor whiteColor];
 }
 
 - (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidSelectedLineColor: kJBColorLineChartDefaultDashedSelectedLineColor;
+	return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidSelectedLineColor: nil;
 }
 
 - (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidSelectedLineColor: kJBColorLineChartDefaultDashedSelectedLineColor;
+	return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidSelectedLineColor: kJBColorLineChartDefaultDashedSelectedLineColor;
 }
 
 - (JBLineChartViewLineStyle)lineChartView:(JBLineChartView *)lineChartView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? JBLineChartViewLineStyleSolid : JBLineChartViewLineStyleDashed;
+	return (lineIndex == JBLineChartLineSolid) ? JBLineChartViewLineStyleSolid : JBLineChartViewLineStyleDashed;
 }
 
-- (JBLineChartViewLineColorStyle)lineChartView:(JBLineChartView *)lineChartView lineColorStyleForLineAtLineIndex:(NSUInteger)lineIndex
+- (JBLineChartViewColorStyle)lineChartView:(JBLineChartView *)lineChartView colorStyleForLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? JBLineChartViewLineColorStyleSolid : JBLineChartViewLineColorStyleGradient;
+	return (lineIndex == JBLineChartLineSolid) ? JBLineChartViewColorStyleSolid : JBLineChartViewColorStyleGradient;
 }
 
 #pragma mark - Buttons
@@ -322,21 +306,21 @@ NSString * const kJBLineChartViewControllerNavButtonViewKey = @"view";
 - (void)chartToggleButtonPressed:(id)sender
 {
 	UIView *buttonImageView = [self.navigationItem.rightBarButtonItem valueForKey:kJBLineChartViewControllerNavButtonViewKey];
-    buttonImageView.userInteractionEnabled = NO;
-    
-    CGAffineTransform transform = self.lineChartView.state == JBChartViewStateExpanded ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformMakeRotation(0);
-    buttonImageView.transform = transform;
-
-    [self.lineChartView setState:self.lineChartView.state == JBChartViewStateExpanded ? JBChartViewStateCollapsed : JBChartViewStateExpanded animated:YES callback:^{
-        buttonImageView.userInteractionEnabled = YES;
-    }];
+	buttonImageView.userInteractionEnabled = NO;
+	
+	CGAffineTransform transform = self.lineChartView.state == JBChartViewStateExpanded ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformMakeRotation(0);
+	buttonImageView.transform = transform;
+	
+	[self.lineChartView setState:self.lineChartView.state == JBChartViewStateExpanded ? JBChartViewStateCollapsed : JBChartViewStateExpanded animated:YES callback:^{
+		buttonImageView.userInteractionEnabled = YES;
+	}];
 }
 
 #pragma mark - Overrides
 
 - (JBChartView *)chartView
 {
-    return self.lineChartView;
+	return self.lineChartView;
 }
 
-@end
+@end

JBChartViewDemo/JBChartViewDemo/Misc/JBChartTooltipView.m

@@ -12,7 +12,7 @@
 #import <QuartzCore/QuartzCore.h>
 
 // Numerics
-CGFloat static const kJBChartTooltipViewCornerRadius = 5.0;
+CGFloat const kJBChartTooltipViewCornerRadius = 5.0;
 CGFloat const kJBChartTooltipViewDefaultWidth = 50.0f;
 CGFloat const kJBChartTooltipViewDefaultHeight = 25.0f;
 

README.md

@@ -100,9 +100,24 @@ Lastly, ensure you have set the *frame* of your barChartView & call *reloadData*
 
 	barChartView.frame = CGRectMake( ... );
 	[barChartView reloadData];
+
+Subsequent changes to the chart's frame will not invoke *reloadData*; it must be called directly afterwards for any changes to take effect. 
 	
-**Note**: subsequent changes to the chart's frame will not invoke *reloadData*; it must be called directly afterwards for any changes to take effect. 
-    
+
+### Animated Reload
+
+Both line and bar charts support *animated* reloads. The delta between the old data model and new data model is calculated and animated appropriately (ie. bars or lines will shrink, expand or morph in size). Due to techinical limitations in Apple's <a href="https://developer.apple.com/library/tvos/documentation/GraphicsImaging/Reference/CAShapeLayer_class/index.html#//apple_ref/occ/instp/CAShapeLayer/path">Quartz Core Framework</a>, line *fills* (both solid and gradient) can not be animated - they will simply 'snap' into place while the rest of the chart continues to animate.
+
+	- (void)reloadDataAnimated:(BOOL)animated;
+
+State changes during a reload will be ignored. As well, subsequent calls to reloadData: or reloadDataAnimated: before any previous reloads are complete, will also be ignored. Lastly, all touch events will be ignored until a reload has completed. You can always check on the state of the animation via the exposed *read-only* property: 
+
+	@property (nonatomic, readonly) BOOL reloading;
+
+By default, the animation will complete in approximately 0.25 seconds. The animation duration is independent from the data model size. 
+
+**Note**: the above restrictions apply only to *animated* reloads, as non-animated reloads are synchronous.
+ 
 #### JBLineChartView
 
 Similiarily, to initialize a JBLineChartView, you only need a few lines of code (see below). Line charts can also be initialized via a <b>nib</b> or with a <b>frame</b>.
@@ -140,7 +155,7 @@ Secondly, you need to inform the delegate of the y-position of each point (autom
 		return ...; // y-position (y-axis) of point at horizontalIndex (x-axis)
 	}
 
-**Note**: You can return NAN instead of CGFloat to indicate missing values. The chart's line will begin at the first non-NAN value and end at the last non-NAN value. The line will interopolate any NAN values in between (ie. the line will not be interrupted).
+**Note**: you can return NAN instead of CGFloat to indicate missing values. The chart's line will begin at the first non-NAN value and end at the last non-NAN value. The line will interopolate any NAN values in between (ie. the line will not be interrupted).
 
 	return [[NSNumber numberWithFloat:NAN] floatValue];