Merge branch 'release/1.1.0'

Author: michalkonturek

GraphKit.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "GraphKit"
-  s.version      = "1.0.0"
+  s.version      = "1.1.0"
   s.summary      = "A lightweight library of animated charts for iOS."
   s.homepage     = "https://github.com/michalkonturek/GraphKit"
   s.license      = 'MIT'
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.social_media_url = 'https://twitter.com/michalkonturek'
   s.source       = { 
     :git => "https://github.com/michalkonturek/GraphKit.git", 
-    :tag => "1.0.0" 
+    :tag => "1.1.0" 
   }
 
   s.source_files = 'Source/**/*.{h,m}'

GraphKit/Example/ExampleBarGraphVC.m

@@ -80,6 +80,10 @@ - (UIColor *)colorForBarAtIndex:(NSInteger)index {
     return [colors objectAtIndex:index];
 }
 
+//- (UIColor *)colorForBarBackgroundAtIndex:(NSInteger)index {
+//    return [UIColor redColor];
+//}
+
 - (CFTimeInterval)animationDurationForBarAtIndex:(NSInteger)index {
     CGFloat percentage = [[self valueForBarAtIndex:index] doubleValue];
     percentage = (percentage / 100);

GraphKit/Example/ExampleLineGraph.m

@@ -24,17 +24,68 @@ - (void)viewDidLoad {
 
     self.view.backgroundColor = [UIColor gk_cloudsColor];
 
+    [self _setupExampleGraph];
+//    [self _setupTestingGraphLow];
+//    [self _setupTestingGraphHigh];
+}
+
+- (void)_setupExampleGraph {
+
     self.data = @[
                   @[@20, @40, @20, @60, @40, @140, @80],
                   @[@40, @20, @60, @100, @60, @20, @60],
                   @[@80, @60, @40, @160, @100, @40, @110],
-                  @[@120, @150, @80, @120, @140, @100, @0]
+                  @[@120, @150, @80, @120, @140, @100, @0],
+//                  @[@620, @650, @580, @620, @540, @400, @0]
+                  ];
+    
+    self.labels = @[@"2001", @"2002", @"2003", @"2004", @"2005", @"2006", @"2007"];
+    
+    self.graph.dataSource = self;
+    self.graph.lineWidth = 3.0;
+    
+    self.graph.valueLabelCount = 6;
+    
+    [self.graph draw];
+}
+
+- (void)_setupTestingGraphLow {
+    
+    /*
+     A custom max and min values can be achieved by adding 
+     values for another line and setting its color to clear.
+     */
+    
+    self.data = @[
+                  @[@10, @4, @8, @2, @9, @3, @6],
+                  @[@1, @2, @3, @4, @5, @6, @10]
+                  ];
+    
+    self.labels = @[@"2001", @"2002", @"2003", @"2004", @"2005", @"2006", @"2007"];
+    
+    self.graph.dataSource = self;
+    self.graph.lineWidth = 3.0;
+    
+//    self.graph.startFromZero = YES;
+    self.graph.valueLabelCount = 10;
+    
+    [self.graph draw];
+}
+
+- (void)_setupTestingGraphHigh {
+    
+    self.data = @[
+                  @[@1000, @2000, @3000, @4000, @5000, @6000, @10000]
                   ];
+    
     self.labels = @[@"2001", @"2002", @"2003", @"2004", @"2005", @"2006", @"2007"];
 
     self.graph.dataSource = self;
     self.graph.lineWidth = 3.0;
 
+    //    self.graph.startFromZero = YES;
+    self.graph.valueLabelCount = 10;
+    
     [self.graph draw];
 }
 
@@ -43,7 +94,7 @@ - (void)didReceiveMemoryWarning {
 }
 
 
-#pragma mark -
+#pragma mark - Event Handlers
 
 - (IBAction)onButtonDraw:(id)sender {
     [self.graph reset];

GraphKit/Example/ExampleLineGraph.xib

@@ -16,12 +16,12 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" id="4t0-gr-3LL" customClass="GKLineGraph">
-                    <rect key="frame" x="0.0" y="40" width="320" height="200"/>
+                    <rect key="frame" x="0.0" y="40" width="320" height="220"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="muc-bY-Ywz" customClass="BButton">
-                    <rect key="frame" x="76" y="257" width="80" height="30"/>
+                    <rect key="frame" x="76" y="268" width="80" height="30"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal" title="Draw">
                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -31,7 +31,7 @@
                     </connections>
                 </button>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Bog-3S-GhQ" customClass="BButton">
-                    <rect key="frame" x="164" y="257" width="80" height="30"/>
+                    <rect key="frame" x="164" y="268" width="80" height="30"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal" title="Reset">
                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>

GraphKit/GraphKit/GraphKit-Info.plist

@@ -24,17 +24,16 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>

README.md

@@ -58,6 +58,7 @@ Please see [example][BAR].
 
 @optional
 - (UIColor *)colorForBarAtIndex:(NSInteger)index;
+- (UIColor *)colorForBarBackgroundAtIndex:(NSInteger)index;
 - (CFTimeInterval)animationDurationForBarAtIndex:(NSInteger)index;
 - (NSString *)titleForBarAtIndex:(NSInteger)index;
 ```

Source/BarGraph/GKBarGraph.h

@@ -54,6 +54,7 @@
 
 @optional
 - (UIColor *)colorForBarAtIndex:(NSInteger)index;
+- (UIColor *)colorForBarBackgroundAtIndex:(NSInteger)index;
 - (CFTimeInterval)animationDurationForBarAtIndex:(NSInteger)index;
 
 - (NSString *)titleForBarAtIndex:(NSInteger)index;

Source/BarGraph/GKBarGraph.m

@@ -215,6 +215,10 @@ - (void)_drawBars {
             item.foregroundColor = [source colorForBarAtIndex:idx];
         }
 
+        if ([source respondsToSelector:@selector(colorForBarBackgroundAtIndex:)]) {
+            item.backgroundColor = [source colorForBarBackgroundAtIndex:idx];
+        }
+        
         item.percentage = [[source valueForBarAtIndex:idx] doubleValue];
         idx++;
     }];

Source/LineGraph/GKLineGraph.h

@@ -35,9 +35,14 @@
 @property (nonatomic, assign) id<GKLineGraphDataSource> dataSource;
 
 @property (nonatomic, assign) CGFloat lineWidth;
-
 @property (nonatomic, assign) CGFloat margin;
 
+@property (nonatomic, assign) NSInteger valueLabelCount;
+//@property (nonatomic, strong) NSNumber *maxValue;
+
+@property (nonatomic, assign) CGFloat *minValue;
+@property (nonatomic, assign) BOOL startFromZero;
+
 - (void)draw;
 - (void)reset;
 

Source/LineGraph/GKLineGraph.m

@@ -29,12 +29,12 @@
 #import <MKFoundationKit/NSArray+MK.h>
 
 static CGFloat kDefaultLabelWidth = 40.0;
-static CGFloat kDefaultLabelHeight = 15.0;
+static CGFloat kDefaultLabelHeight = 12.0;
 static NSInteger kDefaultValueLabelCount = 5;
 
 static CGFloat kDefaultLineWidth = 3.0;
 static CGFloat kDefaultMargin = 10.0;
-static CGFloat kDefaultMarginBottom = 10.0;
+static CGFloat kDefaultMarginBottom = 20.0;
 
 static CGFloat kAxisMargin = 50.0;
 
@@ -68,6 +68,7 @@ - (void)_init {
     self.animationDuration = 1;
     self.lineWidth = kDefaultLineWidth;
     self.margin = kDefaultMargin;
+    self.valueLabelCount = kDefaultValueLabelCount;
     self.clipsToBounds = YES;
 }
 
@@ -150,7 +151,7 @@ - (CGFloat)_stepX {
 
 - (void)_constructValueLabels {
 
-    NSInteger count = kDefaultValueLabelCount + 1;
+    NSInteger count = self.valueLabelCount;
     id items = [NSMutableArray arrayWithCapacity:count];
 
     for (NSInteger idx = 0; idx < count; idx++) {
@@ -165,6 +166,7 @@ - (void)_constructValueLabels {
         item.centerY = [self _positionYForLineValue:value];
 
         item.text = [@(ceil(value)) stringValue];
+//        item.text = [@(value) stringValue];
 
         [items addObject:item];
         [self addSubview:item];
@@ -173,7 +175,7 @@ - (void)_constructValueLabels {
 }
 
 - (CGFloat)_stepValueLabelY {
-    return (([self _maxValue] - [self _minValue]) / kDefaultValueLabelCount);
+    return (([self _maxValue] - [self _minValue]) / (self.valueLabelCount - 1));
 }
 
 - (CGFloat)_maxValue {
@@ -182,6 +184,7 @@ - (CGFloat)_maxValue {
 }
 
 - (CGFloat)_minValue {
+    if (self.startFromZero) return 0;
     id values = [self _allValues];
     return [[values mk_min] floatValue];
 }
@@ -207,6 +210,10 @@ - (CGFloat)_plotWidth {
     return (self.width - (2 * self.margin) - kAxisMargin);
 }
 
+- (CGFloat)_plotHeight {
+    return (self.height - (2 * kDefaultLabelHeight + kDefaultMarginBottom));
+}
+
 - (void)_drawLines {
     for (NSInteger idx = 0; idx < [self.dataSource numberOfLines]; idx++) {
         [self _drawLineAtIndex:idx];
@@ -253,8 +260,10 @@ - (void)_drawLineAtIndex:(NSInteger)index {
 }
 
 - (CGFloat)_positionYForLineValue:(CGFloat)value {
-    CGFloat result = (self.height -  value);
-    result -= kDefaultLabelHeight + kDefaultMarginBottom;
+    CGFloat scale = (value - [self _minValue]) / ([self _maxValue] - [self _minValue]);
+    CGFloat result = [self _plotHeight] * scale;
+    result = ([self _plotHeight] -  result);
+    result += kDefaultLabelHeight;
     return result;
 }