Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9ae2adb81c | |||
| 185782daab |
@@ -9,11 +9,11 @@
|
||||
#import "JBBarChartView.h"
|
||||
|
||||
// Numerics
|
||||
CGFloat const kJBBarChartViewBarBasePaddingMutliplier = 50.0f;
|
||||
CGFloat const kJBBarChartViewUndefinedMaxHeight = -1.0f;
|
||||
CGFloat const kJBBarChartViewStateAnimationDuration = 0.05f;
|
||||
CGFloat const kJBBarChartViewPopOffset = 10.0f; // used to offset bars for 'pop' animations
|
||||
NSInteger const kJBBarChartViewUndefinedBarIndex = -1;
|
||||
CGFloat static const kJBBarChartViewBarBasePaddingMutliplier = 50.0f;
|
||||
CGFloat static const kJBBarChartViewUndefinedMaxHeight = -1.0f;
|
||||
CGFloat static const kJBBarChartViewStateAnimationDuration = 0.05f;
|
||||
CGFloat static const kJBBarChartViewPopOffset = 10.0f; // used to offset bars for 'pop' animations
|
||||
NSInteger static const kJBBarChartViewUndefinedBarIndex = -1;
|
||||
|
||||
// Colors (JBChartView)
|
||||
static UIColor *kJBBarChartViewDefaultBarColor = nil;
|
||||
@@ -263,7 +263,7 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
|
||||
{
|
||||
CGFloat popOffset = self.bounds.size.height - self.footerView.frame.size.height;
|
||||
|
||||
NSInteger index = 0;
|
||||
NSUInteger index = 0;
|
||||
for (UIView *barView in self.barViews)
|
||||
{
|
||||
[UIView animateWithDuration:kJBBarChartViewStateAnimationDuration delay:(kJBBarChartViewStateAnimationDuration * 0.5) * index options:UIViewAnimationOptionBeginFromCurrentState animations:^{
|
||||
@@ -278,7 +278,7 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
|
||||
{
|
||||
barView.frame = CGRectMake(barView.frame.origin.x, self.bounds.size.height, barView.frame.size.width, barView.frame.size.height);
|
||||
}
|
||||
} completion:^(BOOL finished) {
|
||||
} completion:^(BOOL lastBarFinished) {
|
||||
if (index == [self.barViews count] - 1)
|
||||
{
|
||||
if (callbackCopy)
|
||||
@@ -358,7 +358,7 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
|
||||
if (animated)
|
||||
{
|
||||
[UIView animateWithDuration:kJBChartViewDefaultAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
|
||||
self.selectionView.alpha = _selectionViewVisible ? 1.0 : 0.0;
|
||||
self.selectionView.alpha = self.selectionViewVisible ? 1.0 : 0.0;
|
||||
} completion:nil];
|
||||
}
|
||||
else
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "JBChartView"
|
||||
s.version = "1.1.3"
|
||||
s.version = "1.1.4"
|
||||
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.1.3"
|
||||
:tag => "v1.1.4"
|
||||
}
|
||||
|
||||
s.platform = :ios, '7.0'
|
||||
|
||||
@@ -18,16 +18,16 @@ typedef NS_ENUM(NSInteger, JBLineChartLineViewState){
|
||||
};
|
||||
|
||||
// Numerics (JBLineChartLineView)
|
||||
CGFloat const kJBLineChartLineViewEdgePadding = 10.0;
|
||||
CGFloat const kJBLineChartLineViewStrokeWidth = 5.0;
|
||||
CGFloat const kJBLineChartLineViewMiterLimit = -5.0;
|
||||
CGFloat const kJBLineChartLineViewStateAnimationDuration = 0.25f;
|
||||
CGFloat static const kJBLineChartLineViewEdgePadding = 10.0;
|
||||
CGFloat static const kJBLineChartLineViewStrokeWidth = 5.0;
|
||||
CGFloat static const kJBLineChartLineViewMiterLimit = -5.0;
|
||||
CGFloat static const kJBLineChartLineViewStateAnimationDuration = 0.25f;
|
||||
|
||||
// Numerics (JBLineSelectionView)
|
||||
CGFloat const kJBLineSelectionViewWidth = 20.0f;
|
||||
CGFloat static const kJBLineSelectionViewWidth = 20.0f;
|
||||
|
||||
// Numerics (JBLineChartView)
|
||||
CGFloat const kJBLineChartViewUndefinedMaxHeight = -1.0f;
|
||||
CGFloat static const kJBLineChartViewUndefinedMaxHeight = -1.0f;
|
||||
|
||||
// Colors (JBLineChartView)
|
||||
static UIColor *kJBLineChartViewDefaultLineColor = nil;
|
||||
@@ -312,7 +312,7 @@ static UIColor *kJBLineChartViewDefaultLineColor = nil;
|
||||
if (animated)
|
||||
{
|
||||
[UIView animateWithDuration:kJBChartViewDefaultAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
|
||||
self.selectionView.alpha = _selectionViewVisible ? 1.0 : 0.0;
|
||||
self.selectionView.alpha = self.selectionViewVisible ? 1.0 : 0.0;
|
||||
} completion:nil];
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user