Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 409b58c53c | |||
| 0b6108dea8 | |||
| c7fe1c4114 | |||
| 318d59dadd |
@@ -139,13 +139,7 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
|
||||
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];
|
||||
|
||||
// Add new bar
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "JBChartView"
|
||||
s.version = "1.0.1"
|
||||
s.version = "1.0.3"
|
||||
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.1"
|
||||
:tag => "v1.0.3"
|
||||
}
|
||||
|
||||
s.platform = :ios, '7.0'
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user