Renamed axisMinValue/axisMaxValue to axisMinimum/axisMaximum

Charts/ChartsTests/BarChartTests.swift

@@ -33,8 +33,8 @@ class BarChartTests: FBSnapshotTestCase
         data.barWidth = 0.85;
 
         chart = BarChartView(frame: CGRectMake(0, 0, 480, 350))
-        chart.leftAxis.axisMinValue = 0.0
-        chart.rightAxis.axisMinValue = 0.0
+        chart.leftAxis.axisMinimum = 0.0
+        chart.rightAxis.axisMinimum = 0.0
         chart.data = data
     }
 

Charts/ChartsTests/LineChartTests.swift

@@ -30,8 +30,8 @@ class LineChartTests: FBSnapshotTestCase
         dataSet = LineChartDataSet(values: entries, label: "First unit test data")
 
         chart = LineChartView(frame: CGRectMake(0, 0, 480, 350))
-        chart.leftAxis.axisMinValue = 0.0
-        chart.rightAxis.axisMinValue = 0.0
+        chart.leftAxis.axisMinimum = 0.0
+        chart.rightAxis.axisMinimum = 0.0
         chart.data = LineChartData(dataSet: dataSet)
     }
 

Charts/Classes/Components/ChartAxisBase.swift

@@ -193,12 +193,12 @@ public class ChartAxisBase: ChartComponentBase
     /// Flag indicating that the axis-max value has been customized
     internal var _customAxisMax: Bool = false
 
-    /// Do not touch this directly, instead, use axisMinValue.
+    /// Do not touch this directly, instead, use axisMinimum.
     /// This is automatically calculated to represent the real min value,
     /// and is used when calculating the effective minimum.
     internal var _axisMinimum = Double(0)
 
-    /// Do not touch this directly, instead, use axisMaxValue.
+    /// Do not touch this directly, instead, use axisMaximum.
     /// This is automatically calculated to represent the real max value,
     /// and is used when calculating the effective maximum.
     internal var _axisMaximum = Double(0)
@@ -292,10 +292,26 @@ public class ChartAxisBase: ChartComponentBase
 
     public var isAxisMaxCustom: Bool { return _customAxisMax }
 
+    /// This property is deprecated - Use `axisMinimum` instead.
+    @available(*, deprecated=1.0, message="Use axisMinimum instead.")
+    public var axisMinValue: Double
+    {
+        get { return axisMinimum }
+        set { axisMinimum = newValue }
+    }
+
+    /// This property is deprecated - Use `axisMaximum` instead.
+    @available(*, deprecated=1.0, message="Use axisMaximum instead.")
+    public var axisMaxValue: Double
+    {
+        get { return axisMaximum }
+        set { axisMaximum = newValue }
+    }
+
     /// The minimum value for this axis.
     /// If set, this value will not be calculated automatically depending on the provided data.
     /// Use `resetCustomAxisMin()` to undo this.
-    public var axisMinValue: Double
+    public var axisMinimum: Double
     {
         get
         {
@@ -312,7 +328,7 @@ public class ChartAxisBase: ChartComponentBase
     /// The maximum value for this axis.
     /// If set, this value will not be calculated automatically depending on the provided data.
     /// Use `resetCustomAxisMin()` to undo this.
-    public var axisMaxValue: Double
+    public var axisMaximum: Double
     {
         get
         {

Charts/Classes/Components/ChartYAxis.swift

@@ -46,8 +46,8 @@ public class ChartYAxis: ChartAxisBase
     /// flag that indicates if the axis is inverted or not
     public var inverted = false
 
-    /// This property is deprecated - Use `axisMinValue` instead.
-    @available(*, deprecated=1.0, message="Use axisMinValue instead.")
+    /// This property is deprecated - Use `axisMinimum` instead.
+    @available(*, deprecated=1.0, message="Use axisMinimum instead.")
     public var startAtZeroEnabled: Bool
     {
         get
@@ -58,7 +58,7 @@ public class ChartYAxis: ChartAxisBase
         {
             if newValue
             {
-                axisMinValue = 0.0
+                axisMinimum = 0.0
             }
             else
             {
@@ -192,8 +192,8 @@ public class ChartYAxis: ChartAxisBase
         axisRange = abs(_axisMaximum - _axisMinimum)
     }
 
-    /// This is deprecated now, use `axisMinValue`
-    @available(*, deprecated=1.0, message="Use axisMinValue instead.")
+    /// This is deprecated now, use `axisMinimum`
+    @available(*, deprecated=1.0, message="Use axisMinimum instead.")
     public var isStartAtZeroEnabled: Bool { return startAtZeroEnabled }
 
     public var isDrawTopYLabelEntryEnabled: Bool { return drawTopYLabelEntryEnabled; }

ChartsDemo/Classes/Demos/BarChartViewController.m

@@ -75,7 +75,7 @@ - (void)viewDidLoad
     leftAxis.valueFormatter = [[ChartDefaultAxisValueFormatter alloc] initWithFormatter:leftAxisFormatter];
     leftAxis.labelPosition = YAxisLabelPositionOutsideChart;
     leftAxis.spaceTop = 0.15;
-    leftAxis.axisMinValue = 0.0; // this replaces startAtZero = YES
+    leftAxis.axisMinimum = 0.0; // this replaces startAtZero = YES
 
     ChartYAxis *rightAxis = _chartView.rightAxis;
     rightAxis.enabled = YES;
@@ -84,7 +84,7 @@ - (void)viewDidLoad
     rightAxis.labelCount = 8;
     rightAxis.valueFormatter = leftAxis.valueFormatter;
     rightAxis.spaceTop = 0.15;
-    rightAxis.axisMinValue = 0.0; // this replaces startAtZero = YES
+    rightAxis.axisMinimum = 0.0; // this replaces startAtZero = YES
 
     _chartView.legend.position = ChartLegendPositionBelowChartLeft;
     _chartView.legend.form = ChartLegendFormSquare;
@@ -128,8 +128,8 @@ - (void)setDataCount:(int)count range:(double)range
 {
     double start = 0.0;
 
-    _chartView.xAxis.axisMinValue = start;
-    _chartView.xAxis.axisMaxValue = start + count + 2;
+    _chartView.xAxis.axisMinimum = start;
+    _chartView.xAxis.axisMaximum = start + count + 2;
 
     NSMutableArray *yVals = [[NSMutableArray alloc] init];
 

ChartsDemo/Classes/Demos/BubbleChartViewController.m

@@ -61,7 +61,7 @@ - (void)viewDidLoad
     yl.labelFont = [UIFont fontWithName:@"HelveticaNeue-Light" size:10.f];
     yl.spaceTop = 0.3;
     yl.spaceBottom = 0.3;
-    yl.axisMinValue = 0.0; // this replaces startAtZero = YES
+    yl.axisMinimum = 0.0; // this replaces startAtZero = YES
 
     _chartView.rightAxis.enabled = NO;
 

ChartsDemo/Classes/Demos/CombinedChartViewController.m

@@ -72,15 +72,15 @@ - (void)viewDidLoad
 
     ChartYAxis *rightAxis = _chartView.rightAxis;
     rightAxis.drawGridLinesEnabled = NO;
-    rightAxis.axisMinValue = 0.0; // this replaces startAtZero = YES
+    rightAxis.axisMinimum = 0.0; // this replaces startAtZero = YES
 
     ChartYAxis *leftAxis = _chartView.leftAxis;
     leftAxis.drawGridLinesEnabled = NO;
-    leftAxis.axisMinValue = 0.0; // this replaces startAtZero = YES
+    leftAxis.axisMinimum = 0.0; // this replaces startAtZero = YES
 
     ChartXAxis *xAxis = _chartView.xAxis;
     xAxis.labelPosition = XAxisLabelPositionBothSided;
-    xAxis.axisMinValue = 0.0;
+    xAxis.axisMinimum = 0.0;
     xAxis.granularity = 1.0;
     xAxis.valueFormatter = self;
 
@@ -113,7 +113,7 @@ - (void)setChartData
     data.scatterData = [self generateScatterData];
     data.candleData = [self generateCandleData];
 
-    _chartView.xAxis.axisMaxValue = data.xMax + 0.25;
+    _chartView.xAxis.axisMaximum = data.xMax + 0.25;
 
     _chartView.data = data;
 }

ChartsDemo/Classes/Demos/HorizontalBarChartViewController.m

@@ -65,14 +65,14 @@ - (void)viewDidLoad
     leftAxis.labelFont = [UIFont systemFontOfSize:10.f];
     leftAxis.drawAxisLineEnabled = YES;
     leftAxis.drawGridLinesEnabled = YES;
-    leftAxis.axisMinValue = 0.0; // this replaces startAtZero = YES
+    leftAxis.axisMinimum = 0.0; // this replaces startAtZero = YES
 
     ChartYAxis *rightAxis = _chartView.rightAxis;
     rightAxis.enabled = YES;
     rightAxis.labelFont = [UIFont systemFontOfSize:10.f];
     rightAxis.drawAxisLineEnabled = YES;
     rightAxis.drawGridLinesEnabled = NO;
-    rightAxis.axisMinValue = 0.0; // this replaces startAtZero = YES
+    rightAxis.axisMinimum = 0.0; // this replaces startAtZero = YES
 
     _chartView.legend.position = ChartLegendPositionBelowChartLeft;
     _chartView.legend.form = ChartLegendFormSquare;

ChartsDemo/Classes/Demos/LineChart1ViewController.m

@@ -87,8 +87,8 @@ - (void)viewDidLoad
     [leftAxis removeAllLimitLines];
     [leftAxis addLimitLine:ll1];
     [leftAxis addLimitLine:ll2];
-    leftAxis.axisMaxValue = 200.0;
-    leftAxis.axisMinValue = -50.0;
+    leftAxis.axisMaximum = 200.0;
+    leftAxis.axisMinimum = -50.0;
     leftAxis.gridLineDashLengths = @[@5.f, @5.f];
     leftAxis.drawZeroLineEnabled = NO;
     leftAxis.drawLimitLinesBehindDataEnabled = YES;

ChartsDemo/Classes/Demos/LineChart2ViewController.m

@@ -74,16 +74,16 @@ - (void)viewDidLoad
 
     ChartYAxis *leftAxis = _chartView.leftAxis;
     leftAxis.labelTextColor = [UIColor colorWithRed:51/255.f green:181/255.f blue:229/255.f alpha:1.f];
-    leftAxis.axisMaxValue = 200.0;
-    leftAxis.axisMinValue = 0.0;
+    leftAxis.axisMaximum = 200.0;
+    leftAxis.axisMinimum = 0.0;
     leftAxis.drawGridLinesEnabled = YES;
     leftAxis.drawZeroLineEnabled = NO;
     leftAxis.granularityEnabled = YES;
 
     ChartYAxis *rightAxis = _chartView.rightAxis;
     rightAxis.labelTextColor = UIColor.redColor;
-    rightAxis.axisMaxValue = 900.0;
-    rightAxis.axisMinValue = -200.0;
+    rightAxis.axisMaximum = 900.0;
+    rightAxis.axisMinimum = -200.0;
     rightAxis.drawGridLinesEnabled = NO;
     rightAxis.granularityEnabled = NO;
 

ChartsDemo/Classes/Demos/LineChartFilledViewController.m

@@ -52,8 +52,8 @@ - (void)viewDidLoad
     xAxis.enabled = NO;
 
     ChartYAxis *leftAxis = _chartView.leftAxis;
-    leftAxis.axisMaxValue = 900.0;
-    leftAxis.axisMinValue = -250.0;
+    leftAxis.axisMaximum = 900.0;
+    leftAxis.axisMinimum = -250.0;
     leftAxis.drawAxisLineEnabled = NO;
     leftAxis.drawZeroLineEnabled = NO;
     leftAxis.drawGridLinesEnabled = NO;
@@ -125,7 +125,7 @@ - (void)setDataCount:(int)count range:(double)range
         set1.highlightColor = [UIColor colorWithRed:244/255.0 green:117/255.0 blue:117/255.0 alpha:1.0];
         set1.drawCircleHoleEnabled = NO;
         set1.fillFormatter = [ChartDefaultFillFormatter withBlock:^CGFloat(id<ILineChartDataSet>  _Nonnull dataSet, id<LineChartDataProvider>  _Nonnull dataProvider) {
-            return _chartView.leftAxis.axisMinValue;
+            return _chartView.leftAxis.axisMinimum;
         }];
 
         set2 = [[LineChartDataSet alloc] initWithValues:yVals2 label:@"DataSet 2"];
@@ -140,7 +140,7 @@ - (void)setDataCount:(int)count range:(double)range
         set2.highlightColor = [UIColor colorWithRed:244/255.0 green:117/255.0 blue:117/255.0 alpha:1.0];
         set2.drawCircleHoleEnabled = NO;
         set2.fillFormatter = [ChartDefaultFillFormatter withBlock:^CGFloat(id<ILineChartDataSet>  _Nonnull dataSet, id<LineChartDataProvider>  _Nonnull dataProvider) {
-            return _chartView.leftAxis.axisMaxValue;
+            return _chartView.leftAxis.axisMaximum;
         }];
 
         NSMutableArray *dataSets = [[NSMutableArray alloc] init];

ChartsDemo/Classes/Demos/LineChartTimeViewController.m

@@ -77,8 +77,8 @@ - (void)viewDidLoad
     leftAxis.labelTextColor = [UIColor colorWithRed:51/255.0 green:181/255.0 blue:229/255.0 alpha:1.0];
     leftAxis.drawGridLinesEnabled = YES;
     leftAxis.granularityEnabled = YES;
-    leftAxis.axisMinValue = 0.0;
-    leftAxis.axisMaxValue = 170.0;
+    leftAxis.axisMinimum = 0.0;
+    leftAxis.axisMaximum = 170.0;
     leftAxis.yOffset = -9.0;
     leftAxis.labelTextColor = [UIColor colorWithRed:255/255.0 green:192/255.0 blue:56/255.0 alpha:1.0];
 

ChartsDemo/Classes/Demos/MultipleBarChartViewController.m

@@ -84,7 +84,7 @@ - (void)viewDidLoad
     leftAxis.valueFormatter = [[LargeValueFormatter alloc] init];
     leftAxis.drawGridLinesEnabled = NO;
     leftAxis.spaceTop = 0.25;
-    leftAxis.axisMinValue = 0;
+    leftAxis.axisMinimum = 0;
 
     _chartView.rightAxis.enabled = NO;
 
@@ -150,8 +150,8 @@ - (void)setDataCount:(int)count range:(double)range
 
         BarChartData *data = _chartView.barData;
 
-        _chartView.xAxis.axisMinValue = startYear;
-        _chartView.xAxis.axisMaxValue = [data groupWidthWithGroupSpace:groupSpace barSpace: barSpace] * _sliderX.value + startYear;
+        _chartView.xAxis.axisMinimum = startYear;
+        _chartView.xAxis.axisMaximum = [data groupWidthWithGroupSpace:groupSpace barSpace: barSpace] * _sliderX.value + startYear;
         [data groupBarsFromX: startYear groupSpace: groupSpace barSpace: barSpace];
 
         [_chartView.data notifyDataChanged];
@@ -179,8 +179,8 @@ - (void)setDataCount:(int)count range:(double)range
 
         data.barWidth = barWidth;
 
-        _chartView.xAxis.axisMinValue = startYear;
-        _chartView.xAxis.axisMaxValue = [data groupWidthWithGroupSpace:groupSpace barSpace: barSpace] * _sliderX.value + startYear;
+        _chartView.xAxis.axisMinimum = startYear;
+        _chartView.xAxis.axisMaximum = [data groupWidthWithGroupSpace:groupSpace barSpace: barSpace] * _sliderX.value + startYear;
         [data groupBarsFromX: startYear groupSpace: groupSpace barSpace: barSpace];
 
         _chartView.data = data;

ChartsDemo/Classes/Demos/NegativeStackedBarChartViewController.m

@@ -64,8 +64,8 @@ - (void)viewDidLoad
     _chartView.drawValueAboveBarEnabled = YES;
 
     _chartView.leftAxis.enabled = NO;
-    _chartView.rightAxis.axisMaxValue = 25.0;
-    _chartView.rightAxis.axisMinValue = -25.0;
+    _chartView.rightAxis.axisMaximum = 25.0;
+    _chartView.rightAxis.axisMinimum = -25.0;
     _chartView.rightAxis.drawGridLinesEnabled = NO;
     _chartView.rightAxis.drawZeroLineEnabled = YES;
     _chartView.rightAxis.labelCount = 7;
@@ -76,8 +76,8 @@ - (void)viewDidLoad
     xAxis.labelPosition = XAxisLabelPositionBothSided;
     xAxis.drawGridLinesEnabled = NO;
     xAxis.drawAxisLineEnabled = NO;
-    xAxis.axisMinValue = 0.0;
-    xAxis.axisMaxValue = 110.0;
+    xAxis.axisMinimum = 0.0;
+    xAxis.axisMaximum = 110.0;
     xAxis.centerAxisLabelsEnabled = YES;
     xAxis.labelCount = 12;
     xAxis.granularity = 10.0;

ChartsDemo/Classes/Demos/PositiveNegativeBarChartViewController.m

@@ -69,8 +69,8 @@ - (void)viewDidLoad
     xAxis.drawGridLinesEnabled = NO;
     xAxis.drawAxisLineEnabled = NO;
     xAxis.labelTextColor = [UIColor lightGrayColor];
-    xAxis.axisMinValue = 0.0;
-    xAxis.axisMaxValue = 5.0;
+    xAxis.axisMinimum = 0.0;
+    xAxis.axisMaximum = 5.0;
     xAxis.labelCount = 5;
     xAxis.centerAxisLabelsEnabled = YES;
     xAxis.granularity = 1.0;

ChartsDemo/Classes/Demos/RadarChartViewController.m

@@ -75,8 +75,8 @@ - (void)viewDidLoad
     ChartYAxis *yAxis = _chartView.yAxis;
     yAxis.labelFont = [UIFont fontWithName:@"HelveticaNeue-Light" size:9.f];
     yAxis.labelCount = 5;
-    yAxis.axisMinValue = 0.0;
-    yAxis.axisMaxValue = 80.0;
+    yAxis.axisMinimum = 0.0;
+    yAxis.axisMaximum = 80.0;
     yAxis.drawLabelsEnabled = NO;
 
     ChartLegend *l = _chartView.legend;

ChartsDemo/Classes/Demos/ScatterChartViewController.m

@@ -62,7 +62,7 @@ - (void)viewDidLoad
 
     ChartYAxis *yl = _chartView.leftAxis;
     yl.labelFont = [UIFont fontWithName:@"HelveticaNeue-Light" size:10.f];
-    yl.axisMinValue = 0.0; // this replaces startAtZero = YES
+    yl.axisMinimum = 0.0; // this replaces startAtZero = YES
 
     _chartView.rightAxis.enabled = NO;
 

ChartsDemo/Classes/Demos/SinusBarChartViewController.m

@@ -62,17 +62,17 @@ - (void)viewDidLoad
     ChartYAxis *leftAxis = _chartView.leftAxis;
     leftAxis.labelFont = [UIFont fontWithName:@"HelveticaNeue-Light" size:10.f];
     leftAxis.labelCount = 6;
-    leftAxis.axisMinValue = -2.5;
-    leftAxis.axisMaxValue = 2.5;
+    leftAxis.axisMinimum = -2.5;
+    leftAxis.axisMaximum = 2.5;
     leftAxis.granularityEnabled = true;
     leftAxis.granularity = 0.1;
 
     ChartYAxis *rightAxis = _chartView.rightAxis;
     rightAxis.drawGridLinesEnabled = NO;
     rightAxis.labelFont = [UIFont fontWithName:@"HelveticaNeue-Light" size:10.f];
     rightAxis.labelCount = 6;
-    rightAxis.axisMinValue = -2.5;
-    rightAxis.axisMaxValue = 2.5;
+    rightAxis.axisMinimum = -2.5;
+    rightAxis.axisMaximum = 2.5;
     rightAxis.granularity = 0.1;
 
     ChartLegend *l = _chartView.legend;

ChartsDemo/Classes/Demos/StackedBarChartViewController.m

@@ -64,7 +64,7 @@ - (void)viewDidLoad
 
     ChartYAxis *leftAxis = _chartView.leftAxis;
     leftAxis.valueFormatter = [[ChartDefaultAxisValueFormatter alloc] initWithFormatter:leftAxisFormatter];
-    leftAxis.axisMinValue = 0.0; // this replaces startAtZero = YES
+    leftAxis.axisMinimum = 0.0; // this replaces startAtZero = YES
 
     _chartView.rightAxis.enabled = NO;
 

ChartsDemo/Classes/RealmDemos/RealmHorizontalBarChartViewController.m

@@ -47,7 +47,7 @@ - (void)viewDidLoad
 
     [self setupBarLineChartView:_chartView];
 
-    _chartView.leftAxis.axisMinValue = 0.0;
+    _chartView.leftAxis.axisMinimum = 0.0;
     _chartView.drawValueAboveBarEnabled = NO;
 
     [self setData];

ChartsDemo/Classes/RealmDemos/RealmLineChartViewController.m

@@ -51,8 +51,8 @@ - (void)viewDidLoad
 
     [self setupBarLineChartView:_chartView];
 
-    _chartView.leftAxis.axisMaxValue = 150.f;
-    _chartView.leftAxis.axisMinValue = 0.f;
+    _chartView.leftAxis.axisMaximum = 150.f;
+    _chartView.leftAxis.axisMinimum = 0.f;
     _chartView.leftAxis.drawGridLinesEnabled = NO;
     _chartView.xAxis.drawGridLinesEnabled = NO;