Updated read me and pod spec

Reset cached max height on data reload Fixes #7

Classes/JBBarChartView.h

@@ -90,16 +90,16 @@
 - (NSInteger)barPaddingForBarChartView:(JBBarChartView *)barChartView;
 
 /**
- *  The color of all bars within the chart.
+ *  A UIView subclass representing the bar at a particular index.
  *
- *  Default: black color
+ *  Default: solid black UIView
  *
  *  @param barChartView The origin chart
  *  @param index        The 0-based index of a given bar (left to right, x-axis)
  *
- *  @return The color to be used on each of the bars within the chart.
+ *  @return A UIView subclass. The view will automatically be resized by the chart during creation (ie. no need to set the frame).
  */
-- (UIColor *)barColorForBarChartView:(JBBarChartView *)barChartView atIndex:(NSInteger)index;
+- (UIView *)barViewForBarChartView:(JBBarChartView *)barChartView atIndex:(NSInteger)index;
 
 /**
  *  The selection color to be overlayed on a bar during touch events. 

Classes/JBBarChartView.m

@@ -78,6 +78,9 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
 
 - (void)reloadData
 {
+    // reset cached max height
+    self.cachedMaxHeight = kJBBarChartViewUndefinedMaxHeight;
+
     /*
      * The data collection holds all position information:
      * constructed via datasource and delegate functions
@@ -129,25 +132,30 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
         NSMutableArray *mutableBarViews = [NSMutableArray array];
         for (NSNumber *key in [[self.chartDataDictionary allKeys] sortedArrayUsingSelector:@selector(compare:)])
         {
-            UIView *barView = [[UIView alloc] init];
-            if ([self.dataSource respondsToSelector:@selector(barColorForBarChartView:atIndex:)])
+            UIView *barView = nil; // since all bars are visible at once, no need to cache this view
+            if ([self.dataSource respondsToSelector:@selector(barViewForBarChartView:atIndex:)])
             {
-                barView.backgroundColor = [self.dataSource barColorForBarChartView:self atIndex:index];
+                barView = [self.dataSource barViewForBarChartView:self atIndex:index];
             }
             else
             {
+                barView = [[UIView alloc] init];
                 barView.backgroundColor = kJBBarChartViewDefaultBarColor;
-            }
+            }            
             CGFloat height = [self normalizedHeightForRawHeight:[self.chartDataDictionary objectForKey:key]];
-            barView.frame = CGRectMake(xOffset, self.bounds.size.height - height - self.footerView.frame.size.height + self.headerPadding, [self barWidth], height + kJBBarChartViewPopOffset - self.headerPadding);
-            
-            barView.layer.shadowColor = [UIColor blackColor].CGColor;
-            barView.layer.shadowOffset = CGSizeMake(0, 0);
-            barView.layer.shadowOpacity = 0.4;
-            barView.layer.shadowRadius = 1.0;
-            
+            barView.frame = CGRectMake(xOffset, self.bounds.size.height - height - self.footerView.frame.size.height + self.headerPadding, [self barWidth], height + kJBBarChartViewPopOffset - self.headerPadding);                        
             [mutableBarViews addObject:barView];
-            [self insertSubview:barView belowSubview:self.footerView];
+			
+            // Add new bar
+            if (self.footerView)
+			{
+				[self insertSubview:barView belowSubview:self.footerView];
+			}
+			else
+			{
+				[self addSubview:barView];
+			}
+            
             xOffset += ([self barWidth] + self.barPadding);
             index++;
         }
@@ -158,6 +166,8 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
      * Creates a vertical selection view for touch events
      */
     dispatch_block_t createSelectionView = ^{
+        
+        // Remove old selection bar
         if (self.selectionView)
         {
             [self.selectionView removeFromSuperview];
@@ -170,7 +180,16 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
         {
             self.selectionView.bgColor = [self.dataSource selectionBarColorForBarChartView:self];
         }
-        [self insertSubview:self.selectionView belowSubview:self.footerView];
+        
+        // Add new selection bar
+        if (self.footerView)
+        {
+            [self insertSubview:self.selectionView belowSubview:self.footerView];
+        }
+        else
+        {
+            [self addSubview:self.selectionView];
+        }
     };
     
     createDataDictionaries();

Classes/JBChartView.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "JBChartView"
-  s.version      = "1.0"
+  s.version      = "1.1.1"
   s.summary      = "Jawbone's iOS-based charting library for both line and bar graphs."
   s.homepage     = "https://github.com/Jawbone/JBChartView"
 
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
   s.author       = { "Terry Worona" => "tworona@jawbone.com" }
   s.source       = { 
 	:git => "https://github.com/Jawbone/JBChartView.git",
-	:tag => "v1.0"
+	:tag => "v1.1.1"
   }
 
   s.platform     = :ios, '7.0'

Classes/JBLineChartView.m

@@ -117,6 +117,9 @@ static UIColor *kJBLineChartViewDefaultLineColor = nil;
 
 - (void)reloadData
 {
+    // reset cached max height
+    self.cachedMaxHeight = kJBLineChartViewUndefinedMaxHeight;
+
     /*
      * Subview rectangle calculations
      */

JBChartViewDemo/JBChartViewDemo/Controllers/JBBarChartViewController.m

@@ -137,9 +137,11 @@ NSString * const kJBBarChartViewControllerNavButtonViewKey = @"view";
     return kJBBarChartViewControllerBarPadding;
 }
 
-- (UIColor *)barColorForBarChartView:(JBBarChartView *)barChartView atIndex:(NSInteger)index
+- (UIView *)barViewForBarChartView:(JBBarChartView *)barChartView atIndex:(NSInteger)index
 {
-    return (index % 2 == 0) ? kJBColorBarChartBarBlue : kJBColorBarChartBarGreen;
+    UIView *barView = [[UIView alloc] init];
+    barView.backgroundColor = (index % 2 == 0) ? kJBColorBarChartBarBlue : kJBColorBarChartBarGreen;
+    return barView;
 }
 
 - (UIColor *)selectionBarColorForBarChartView:(JBBarChartView *)barChartView

JBChartViewDemo/JBChartViewDemo/Misc/JBChartInformationView.m

@@ -185,7 +185,7 @@ static UIColor *kJBChartInformationViewShadowColor = nil;
     {
         if (hidden)
         {
-            [UIView animateWithDuration:kJBNumericDefaultAnimationDuration * 0.5 animations:^{
+            [UIView animateWithDuration:kJBNumericDefaultAnimationDuration * 0.5 delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
                 self.titleLabel.alpha = 0.0;
                 self.separatorView.alpha = 0.0;
                 self.valueView.valueLabel.alpha = 0.0;
@@ -197,17 +197,14 @@ static UIColor *kJBChartInformationViewShadowColor = nil;
         }
         else
         {
-            [UIView animateWithDuration:kJBNumericDefaultAnimationDuration animations:^{
+            [UIView animateWithDuration:kJBNumericDefaultAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
                 self.titleLabel.frame = [self titleViewRectForHidden:NO];
-                self.titleLabel.alpha = hidden ? 0.0 : 1.0;
+                self.titleLabel.alpha = 1.0;
+                self.valueView.valueLabel.alpha = 1.0;
+                self.valueView.unitLabel.alpha = 1.0;
                 self.separatorView.frame = [self separatorViewRectForHidden:NO];
-                self.separatorView.alpha = hidden ? 0.0 : 1.0;
-            } completion:^(BOOL finished) {
-                [UIView animateWithDuration:kJBNumericDefaultAnimationDuration animations:^{
-                    self.valueView.valueLabel.alpha = hidden ? 0.0 : 1.0;
-                    self.valueView.unitLabel.alpha = hidden ? 0.0 : 1.0;
-                }];
-            }];
+                self.separatorView.alpha = 1.0;
+            } completion:nil];
         }
     }
     else

README.md

@@ -36,7 +36,7 @@ Simply add the following line to your <code>Podfile</code>:
 Your Podfile should look something like:
 
 	platform :ios, '7.0'
-	pod 'JBChartView', '~> 1.0'
+	pod 'JBChartView', '~> 1.1.1'
 	
 ### The Old School Way
 
@@ -66,7 +66,7 @@ At a minimum, you need to inform the data source how many bars are in the chart:
 		return ...; // number of bars in chart
 	}
 
-Secondly, you nee to inform the delegate the height of each bar (automatically normalized across the entire chart):
+Secondly, you need to inform the delegate the height of each bar (automatically normalized across the entire chart):
     
     - (NSInteger)barChartView:(JBBarChartView *)barChartView heightForBarViewAtAtIndex:(NSInteger)index
     {
@@ -89,7 +89,7 @@ At a minimum, you need to inform the data source how many points are in the line
 		return ...; // number of points in chart
 	}
 
-Secondly, you nee to inform the delegate the y-position of each point (automatically normalized across the entire chart):
+Secondly, you need to inform the delegate the y-position of each point (automatically normalized across the entire chart):
     
 	- (NSInteger)lineChartView:(JBLineChartView *)lineChartView heightForIndex:(NSInteger)index
     {
@@ -116,9 +116,9 @@ Lastly, any JBChartView subclass can be collapsed or expanded programmatically v
 
 #### JBBarChartView
 
-The color of a chart's bar can be customized via the <i>optional</i> protocol:
+By default, a chart's bars will be black and flat. They can be customized by supplying a UIView subclass through the <i>optional</i> protocol:
 
-	- (UIColor *)barColorForBarChartView:(JBBarChartView *)barChartView atIndex:(NSInteger)index
+	- (UIView *)barViewForBarChartView:(JBBarChartView *)barChartView atIndex:(NSInteger)index
 	{
 		return ...; // color of line in chart
 	}