Compare commits

...

10 Commits

Author SHA1 Message Date
terryworona e4b0820418 Fixed one more warning 2016-01-20 15:22:20 -08:00
terryworona d30d5b9c96 Updated change log 2016-01-20 14:55:17 -08:00
terryworona 8db9d7baaf Updated pod spec 2016-01-20 14:54:24 -08:00
terryworona d49515c97e Fixed warnings 2016-01-20 14:53:04 -08:00
terryworona 7dfcd44d8c Updated change log and pod spec 2016-01-20 14:31:01 -08:00
terryworona 4e511f7164 Fixed #197 2016-01-20 14:25:49 -08:00
terryworona cd2c79ffa7 new version 2016-01-18 20:19:43 -08:00
terryworona fb2a7eeddd Merge pull request #196 from yasuoza/explicit_dependencies_import
Make sure to import dependent framework header explicitly
2016-01-18 20:18:18 -08:00
Yasuharu Ozaki 2268aed332 Make sure to import dependent frameworks explicitly 2016-01-18 14:32:35 +09:00
terryworona 4eacbe3696 Updated pod spec and change log 2016-01-15 18:43:11 -08:00
11 changed files with 50 additions and 24 deletions
+20
View File
@@ -1,5 +1,25 @@
# Change Log
## [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)
+8 -8
View File
@@ -12,12 +12,12 @@
#import "JBGradientBarView.h"
// Numerics
CGFloat const kJBBarChartViewBarBasePaddingMutliplier = 50.0f;
CGFloat const kJBBarChartViewUndefinedCachedHeight = -1.0f;
CGFloat const kJBBarChartViewStateAnimationDuration = 0.05f;
CGFloat const kJBBarChartViewReloadDataAnimationDuration = 0.15f;
CGFloat const kJBBarChartViewStatePopOffset = 10.0f;
NSInteger const kJBBarChartViewUndefinedBarIndex = -1;
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;
@@ -383,7 +383,7 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
preAddBarViewsBlock();
[UIView animateWithDuration:kJBBarChartViewReloadDataAnimationDuration delay:0 options:UIViewAnimationOptionTransitionNone animations:^{
postAddBarViewsBlock();
} completion:^(BOOL finished) {
} completion:^(BOOL finished2) {
refreshedCachedBarViewHeightsBlock();
completionBlock();
}];
@@ -402,7 +402,7 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
postRemoveBarViewsBlock();
[UIView animateWithDuration:kJBBarChartViewReloadDataAnimationDuration delay:0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
updateExistingBarViewsBlock();
} completion:^(BOOL finished) {
} completion:^(BOOL finished2) {
refreshedCachedBarViewHeightsBlock();
completionBlock();
}];
+1
View File
@@ -7,6 +7,7 @@
//
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
@class JBGradientBarView;
+13 -13
View File
@@ -33,18 +33,18 @@ static UIColor *kJBLineChartViewDefaultFillGradientStartColor = nil;
static UIColor *kJBLineChartViewDefaultFillGradientEndColor = nil;
// Numerics
CGFloat const kJBLineChartViewDefaultVerticalSelectionViewWidth = 20.0f;
CGFloat const kJBLineChartViewUndefinedCachedHeight = -1.0f;
CGFloat const kJBLineChartViewStateAnimationDuration = 0.25f;
CGFloat const kJBLineChartViewStateAnimationDelay = 0.05f;
CGFloat const kJBLineChartViewStateBounceOffset = 15.0f;
CGFloat const kJBLineChartViewDefaultStartPoint = 0.0;
CGFloat const kJBLineChartViewDefaultEndPoint = 1.0;
CGFloat const kJBLineChartViewReloadAnimationDuration = 0.1;
CGFloat const kJBLineChartViewDefaultDimmedSelectionOpacity = 0.20f;
CGFloat const kJBLineChartViewDefaultStrokeWidth = 5.0f;
NSInteger const kJBLineChartViewDefaultDotRadiusFactor = 3; // 3x size of line width
NSInteger const kJBLineChartUnselectedLineIndex = -1;
static CGFloat const kJBLineChartViewDefaultVerticalSelectionViewWidth = 20.0f;
static CGFloat const kJBLineChartViewUndefinedCachedHeight = -1.0f;
static CGFloat const kJBLineChartViewStateAnimationDuration = 0.25f;
static CGFloat const kJBLineChartViewStateAnimationDelay = 0.05f;
static CGFloat const kJBLineChartViewStateBounceOffset = 15.0f;
static CGFloat const kJBLineChartViewDefaultStartPoint = 0.0;
static CGFloat const kJBLineChartViewDefaultEndPoint = 1.0;
static CGFloat const kJBLineChartViewReloadAnimationDuration = 0.1;
static CGFloat const kJBLineChartViewDefaultDimmedSelectionOpacity = 0.20f;
static CGFloat const kJBLineChartViewDefaultStrokeWidth = 5.0f;
static NSInteger const kJBLineChartViewDefaultDotRadiusFactor = 3; // 3x size of line width
static NSInteger const kJBLineChartUnselectedLineIndex = -1;
@interface JBChartView (Private)
@@ -1053,7 +1053,7 @@ NSInteger const kJBLineChartUnselectedLineIndex = -1;
UITouch *touch = [touches anyObject];
CGPoint touchPoint = [self clampPoint:[touch locationInView:self.linesView] toBounds:self.linesView.bounds padding:[self padding]];
NSUInteger lineIndex = self.linesView.selectedLineIndex != kJBLineChartLinesViewUnselectedLineIndex ? self.linesView.selectedLineIndex : [self lineIndexForPoint:touchPoint];
NSInteger lineIndex = self.linesView.selectedLineIndex != kJBLineChartLinesViewUnselectedLineIndex ? self.linesView.selectedLineIndex : [self lineIndexForPoint:touchPoint];
if (lineIndex == kJBLineChartLinesViewUnselectedLineIndex || [((JBLineChartLine *)[self.lineChartLines objectAtIndex:lineIndex]).lineChartPoints count] <= 0)
{
@@ -7,6 +7,7 @@
//
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
@interface JBGradientLineLayer : CAGradientLayer
+1
View File
@@ -7,6 +7,7 @@
//
#import <Foundation/Foundation.h>
#import <CoreGraphics/CoreGraphics.h>
@interface JBLineChartPoint : NSObject
+1
View File
@@ -7,6 +7,7 @@
//
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
@interface JBLineChartDotView : UIView
+1
View File
@@ -7,6 +7,7 @@
//
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
// Numerics
extern NSInteger const kJBLineChartDotsViewUnselectedLineIndex;
+1 -1
View File
@@ -21,7 +21,7 @@
// Numerics
static CGFloat const kJBLineChartDotsViewReloadDataAnimationDuration = 0.15f;
NSInteger const kJBLineChartDotsViewUnselectedLineIndex = 0.25f;
NSInteger const kJBLineChartDotsViewUnselectedLineIndex = -1;
@implementation JBLineChartDotsView
@@ -7,6 +7,7 @@
//
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
// Numerics
extern NSInteger const kJBLineChartLinesViewUnselectedLineIndex;
+2 -2
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "JBChartView"
s.version = "3.0.0"
s.version = "3.0.4"
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 => "v3.0.0"
:tag => "v3.0.4"
}
s.platform = :ios, '6.0'