Merge branch 'develop'

Author: michalkonturek

GraphKit/Example/ExampleBarGraphVC.m

@@ -32,10 +32,10 @@ - (void)viewDidLoad {
 //    self.graphView.barWidth = 22;
 //    self.graphView.barHeight = 140;
 //    self.graphView.marginBar = 25;
+//    self.graphView.animationDuration = 2.0;
+    
     self.graphView.dataSource = self;
 
-    [self.graphView construct];
-    self.graphView.animationDuration = 2.0;
     [self.graphView draw];
 
     self.green = YES;

README.md

@@ -1,8 +1,9 @@
 # GraphKit
 
-[![License MIT](https://go-shields.herokuapp.com/license-MIT-blue.png)](https://github.com/michalkonturek/GraphKit/blob/master/LICENSE)
-[![Build Platform](https://cocoapod-badges.herokuapp.com/p/GraphKit/badge.png)](https://github.com/michalkonturek/GraphKit)
-[![Build Version](https://cocoapod-badges.herokuapp.com/v/GraphKit/badge.png)](https://github.com/michalkonturek/GraphKit)
+[![License MIT](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/michalkonturek/GraphKit/blob/master/LICENSE)
+[![CocoaPods](https://img.shields.io/cocoapods/v/GraphKit.svg?style=flat)](https://github.com/michalkonturek/GraphKit)
+[![License MIT](http://img.shields.io/badge/[email protected]?style=flat)](http://twitter.com/michalkonturek)
+
 
 A lightweight library of animated charts for iOS.
 
@@ -19,4 +20,78 @@ Source code of this project is available under the standard MIT license. Please
 
 ### Bar Graph
 
-### Line Graph
+![Build Platform](images/bar-graph.png)
+
+Initialize `GKBarGraph` from nib or programmatically:
+
+```objc
+CGRect frame = CGRectMake(0, 40, 320, 200);
+self.graphView = [[GKBarGraph alloc] initWithFrame:frame];
+```
+
+then set `GKGraphViewDataSource` 
+
+```objc
+self.graphView.dataSource = self;
+```
+
+and call `draw` method.
+
+```objc
+[self.graphView draw];
+```
+
+
+Please see [example][BAR].
+
+[BAR]:https://github.com/michalkonturek/GraphKit/blob/master/GraphKit/Example/ExampleBarGraphVC.m
+
+
+#### `GKBarGraphDataSource` Protocol
+
+```objc
+@required
+- (NSInteger)numberOfBars;
+- (NSNumber *)valueForBarAtIndex:(NSInteger)index;
+
+@optional
+- (UIColor *)colorForBarAtIndex:(NSInteger)index;
+- (CFTimeInterval)animationDurationForBarAtIndex:(NSInteger)index;
+- (NSString *)titleForBarAtIndex:(NSInteger)index;
+```
+
+
+### Line Graph
+
+![Build Platform](images/line-graph.png)
+
+```objc
+CGRect frame = CGRectMake(0, 40, 320, 200);
+self.graphView = [[GKLineGraph alloc] initWithFrame:frame];
+
+self.graph.dataSource = self;
+self.graph.lineWidth = 3.0;
+
+[self.graph draw];
+```
+
+Please see [example][LINE].
+
+[LINE]:https://github.com/michalkonturek/GraphKit/blob/master/GraphKit/Example/ExampleLineGraph.m
+
+
+#### `GKLineGraphDataSource` Protocol
+
+```objc
+@required
+- (NSInteger)numberOfLines;
+- (UIColor *)colorForLineAtIndex:(NSInteger)index;
+- (NSArray *)valuesForLineAtIndex:(NSInteger)index;
+
+@optional
+- (CFTimeInterval)animationDurationForLineAtIndex:(NSInteger)index;
+- (NSString *)titleForLineAtIndex:(NSInteger)index;
+```
+
+<!--[@MichalKonturek](https://twitter.com/MichalKonturek)-->
+

Source/BarGraph/GKBar.m

@@ -12,6 +12,8 @@
 
 #import "UIColor+GraphKit.h"
 
+static CFTimeInterval kDefaultAnimationDuration = 1.0;
+
 @interface GKBar ()
 
 @property (atomic, assign) BOOL animationInProgress;
@@ -47,7 +49,7 @@ - (id)initWithFrame:(CGRect)frame {
 
 - (void)_init {
     self.animated = YES;
-    self.animationDuration = 0.5;
+    self.animationDuration = kDefaultAnimationDuration;
     self.clipsToBounds = YES;
     self.cornerRadius = 2.0;
     self.foregroundColor = [UIColor gk_turquoiseColor];

Source/BarGraph/GKBarGraph.h

@@ -25,10 +25,8 @@
 @property (nonatomic, assign) CGFloat barWidth;
 @property (nonatomic, assign) CGFloat marginBar;
 
-- (instancetype)redraw;
-- (instancetype)construct;
-- (instancetype)draw;
-- (instancetype)reset;
+- (void)draw;
+- (void)reset;
 
 @end
 

Source/BarGraph/GKBarGraph.m

@@ -19,6 +19,8 @@
 static CGFloat kDefaultLabelWidth = 40;
 static CGFloat kDefaultLabelHeight = 15;
 
+static CGFloat kDefaultAnimationDuration = 2.0;
+
 @implementation GKBarGraph
 
 - (id)initWithCoder:(NSCoder *)aDecoder {
@@ -39,6 +41,7 @@ - (id)initWithFrame:(CGRect)frame {
 }
 
 - (void)_init {
+    self.animationDuration = kDefaultAnimationDuration;
     self.barHeight = kDefaultBarHeight;
     self.barWidth = kDefaultBarWidth;
     self.marginBar = kDefaultBarMargin;
@@ -65,26 +68,22 @@ - (void)setBarColor:(UIColor *)color {
     }];
 }
 
-- (instancetype)redraw {
-    return [[self construct] draw];
-}
-
-- (instancetype)construct {
-    NSAssert(self.dataSource, @"GKBarGraph : No data source is assgined.");
-    
+- (void)draw {
     [self _construct];
-    [self _positionBars];
-    [self _positionLabels];
-    
-    return self;
+    [self _drawBars];
 }
 
 - (void)_construct {
+    NSAssert(self.dataSource, @"GKBarGraph : No data source is assgined.");
+    
     if ([self _hasBars]) [self _removeBars];
     if ([self _hasLabels]) [self _removeLabels];
 
     [self _constructBars];
     [self _constructLabels];
+    
+    [self _positionBars];
+    [self _positionLabels];
 }
 
 - (BOOL)_hasBars {
@@ -186,7 +185,7 @@ - (void)_positionLabels {
     }];
 }
 
-- (instancetype)draw {
+- (void)_drawBars {
     __block NSInteger idx = 0;
     id source = self.dataSource;
     [self.bars mk_each:^(GKBar *item) {
@@ -202,14 +201,12 @@ - (instancetype)draw {
         item.percentage = [[source valueForBarAtIndex:idx] doubleValue];
         idx++;
     }];
-    return self;
 }
 
-- (instancetype)reset {
+- (void)reset {
     [self.bars mk_each:^(GKBar *item) {
         [item reset];
     }];
-    return self;
 }
 
 @end