Compare commits

...

2 Commits

Author SHA1 Message Date
terryworona e7c84aa4de Fixed #192 2015-12-16 20:53:31 -08:00
terryworona b7f7324d96 updated pod spec and change log 2015-12-04 17:38:38 -08:00
3 changed files with 37 additions and 21 deletions
+4
View File
@@ -1,5 +1,8 @@
# Change Log
## [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 +72,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)
+31 -19
View File
@@ -432,27 +432,39 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
{
if (animated)
{
NSUInteger index = 0;
dispatch_block_t animationCompletionBlock = ^{
if (callbackCopy)
{
callbackCopy();
}
};
NSUInteger animationDelayIndex = 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++;
}
}
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)
+2 -2
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "JBChartView"
s.version = "2.8.19"
s.version = "2.9.0"
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 => "v2.9.0"
}
s.platform = :ios, '6.0'