Merge branch 'master' of https://github.com/kevinzhow/PNChart

Author: kevinzhow

.travis.yml

@@ -1,7 +1,7 @@
 language: objective-c
-osx_image: xcode8.0
+osx_image: xcode9.1
 before_install:
-    - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
+    - gem install cocoapods -v '1.3.1' --no-rdoc --no-ri --no-document --quiet
     - pod install
 before_script:
   - export LANG=en_US.UTF-8

PNChart/PNLineChart.m

@@ -145,7 +145,7 @@ - (void)setYLabels:(NSArray *)yLabels withHeight:(CGFloat)height {
 
             NSInteger y = (NSInteger) (_chartCavanHeight + _chartMarginTop - index * yStepHeight);
 
-            PNChartLabel *label = [[PNChartLabel alloc] initWithFrame:CGRectMake(0.0, y, (CGFloat) ((NSInteger) _chartMarginLeft * 0.9), (NSInteger) _yLabelHeight)];
+            PNChartLabel *label = [[PNChartLabel alloc] initWithFrame:CGRectMake(0.0, y - (NSInteger) _chartMarginBottom / 2, (CGFloat) ((NSInteger) _chartMarginLeft * 0.9), (NSInteger) _yLabelHeight)];
             [label setTextAlignment:NSTextAlignmentRight];
             label.text = labelText;
             [self setCustomStyleForYLabel:label];

PNChartDemo/Base.lproj/Main.storyboard

@@ -116,6 +116,7 @@
                     </view>
                     <navigationItem key="navigationItem" title="PNChart" id="Ukg-Sg-E2z"/>
                     <connections>
+                        <outlet property="animationsLabel" destination="lc1-oP-FNw" id="9Ij-Ku-pOt"/>
                         <outlet property="animationsSwitch" destination="Mnm-Is-oih" id="haB-27-exI"/>
                         <outlet property="centerSwitch" destination="kav-3r-blI" id="aDA-mR-FhR"/>
                         <outlet property="centerSwitchLabel" destination="sMF-o9-dZX" id="Epf-8v-NeL"/>

PNChartDemo/PCChartViewController.h

@@ -26,6 +26,7 @@
 @property (weak, nonatomic) IBOutlet UIButton *changeValueButton;
 
 @property (weak, nonatomic) IBOutlet UISwitch *animationsSwitch;
+@property (weak, nonatomic) IBOutlet UILabel *animationsLabel;
 @property (weak, nonatomic) IBOutlet UISwitch *leftSwitch;
 @property (weak, nonatomic) IBOutlet UISwitch *centerSwitch;
 @property (weak, nonatomic) IBOutlet UISwitch *rightSwitch;

PNChartDemo/PCChartViewController.m

@@ -226,6 +226,7 @@ - (void)viewDidLoad {
         self.changeValueButton.hidden = YES;
     } else if ([self.title isEqualToString:@"Scatter Chart"]) {
         self.animationsSwitch.hidden = YES;
+        self.animationsLabel.hidden = YES;
 
         self.titleLabel.text = @"Scatter Chart";
 

Podfile.lock

@@ -1,15 +1,15 @@
 PODS:
-  - Expecta (1.0.5)
+  - Expecta (1.0.6)
   - UICountingLabel (1.4.1)
 
 DEPENDENCIES:
   - Expecta
   - UICountingLabel (~> 1.4.1)
 
 SPEC CHECKSUMS:
-  Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
+  Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
   UICountingLabel: faf890b505d96312e324a86718f031fafffb0ccb
 
 PODFILE CHECKSUM: de6be598c24bcfa6bcb5d22972adde29af718156
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.3.1