Renamed values to entries to reflect the property's type

Removed arbitrary setter access to `entries` to encourage use of `Collection` mechanics Added `replaceEntries`
williamhqs · Feb 16, 2019 · 9b99d1b · 9b99d1b
1 parent cf36285
commit 9b99d1b
Show file tree

Hide file tree

Showing 56 changed files with 178 additions and 171 deletions.
diff --git a/ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.m
@@ -97,13 +97,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = yVals;
+        [set1 replaceEntries:yVals];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[BarChartDataSet alloc] initWithValues:yVals label:@"DataSet"];
+        set1 = [[BarChartDataSet alloc] initWithEntries:yVals label:@"DataSet"];
         set1.colors = ChartColorTemplates.vordiplom;
         set1.drawValuesEnabled = NO;
 

diff --git a/ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.m
@@ -148,13 +148,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = yVals;
+        [set1 replaceEntries: yVals];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[BarChartDataSet alloc] initWithValues:yVals label:@"The year 2017"];
+        set1 = [[BarChartDataSet alloc] initWithEntries:yVals label:@"The year 2017"];
         [set1 setColors:ChartColorTemplates.material];
         set1.drawIconsEnabled = NO;
 

diff --git a/ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.m
@@ -115,17 +115,17 @@ - (void)setDataCount:(int)count range:(double)range
         [yVals3 addObject:[[BubbleChartDataEntry alloc] initWithX:i y:val size:size]];
     }
 
-    BubbleChartDataSet *set1 = [[BubbleChartDataSet alloc] initWithValues:yVals1 label:@"DS 1"];
+    BubbleChartDataSet *set1 = [[BubbleChartDataSet alloc] initWithEntries:yVals1 label:@"DS 1"];
     set1.drawIconsEnabled = NO;
     [set1 setColor:ChartColorTemplates.colorful[0] alpha:0.50f];
     [set1 setDrawValuesEnabled:YES];
 
-    BubbleChartDataSet *set2 = [[BubbleChartDataSet alloc] initWithValues:yVals2 label:@"DS 2"];
+    BubbleChartDataSet *set2 = [[BubbleChartDataSet alloc] initWithEntries:yVals2 label:@"DS 2"];
     set2.iconsOffset = CGPointMake(0, 15);
     [set2 setColor:ChartColorTemplates.colorful[1] alpha:0.50f];
     [set2 setDrawValuesEnabled:YES];
 
-    BubbleChartDataSet *set3 = [[BubbleChartDataSet alloc] initWithValues:yVals3 label:@"DS 3"];
+    BubbleChartDataSet *set3 = [[BubbleChartDataSet alloc] initWithEntries:yVals3 label:@"DS 3"];
     [set3 setColor:ChartColorTemplates.colorful[2] alpha:0.50f];
     [set3 setDrawValuesEnabled:YES];
 

diff --git a/ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.m
@@ -105,7 +105,7 @@ - (void)setDataCount:(int)count range:(double)range
         [yVals1 addObject:[[CandleChartDataEntry alloc] initWithX:i shadowH:val + high shadowL:val - low open:even ? val + open : val - open close:even ? val - close : val + close icon: [UIImage imageNamed:@"icon"]]];
     }
 
-    CandleChartDataSet *set1 = [[CandleChartDataSet alloc] initWithValues:yVals1 label:@"Data Set"];
+    CandleChartDataSet *set1 = [[CandleChartDataSet alloc] initWithEntries:yVals1 label:@"Data Set"];
     set1.axisDependency = AxisDependencyLeft;
     [set1 setColor:[UIColor colorWithWhite:80/255.f alpha:1.f]];
 

diff --git a/ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.m
@@ -86,7 +86,7 @@ - (LineChartData *)dataWithCount:(int)count range:(double)range
         [yVals addObject:[[ChartDataEntry alloc] initWithX:i y:val]];
     }
 
-    LineChartDataSet *set1 = [[LineChartDataSet alloc] initWithValues:yVals label:@"DataSet 1"];
+    LineChartDataSet *set1 = [[LineChartDataSet alloc] initWithEntries:yVals label:@"DataSet 1"];
 
     set1.lineWidth = 1.75;
     set1.circleRadius = 5.0;

diff --git a/ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.m
@@ -170,7 +170,7 @@ - (LineChartData *)generateLineData
         [entries addObject:[[ChartDataEntry alloc] initWithX:index + 0.5 y:(arc4random_uniform(15) + 5)]];
     }
 
-    LineChartDataSet *set = [[LineChartDataSet alloc] initWithValues:entries label:@"Line DataSet"];
+    LineChartDataSet *set = [[LineChartDataSet alloc] initWithEntries:entries label:@"Line DataSet"];
     [set setColor:[UIColor colorWithRed:240/255.f green:238/255.f blue:70/255.f alpha:1.f]];
     set.lineWidth = 2.5;
     [set setCircleColor:[UIColor colorWithRed:240/255.f green:238/255.f blue:70/255.f alpha:1.f]];
@@ -202,13 +202,13 @@ - (BarChartData *)generateBarData
         [entries2 addObject:[[BarChartDataEntry alloc] initWithX:0.0 yValues:@[@(arc4random_uniform(13) + 12), @(arc4random_uniform(13) + 12)]]];
     }
 
-    BarChartDataSet *set1 = [[BarChartDataSet alloc] initWithValues:entries1 label:@"Bar 1"];
+    BarChartDataSet *set1 = [[BarChartDataSet alloc] initWithEntries:entries1 label:@"Bar 1"];
     [set1 setColor:[UIColor colorWithRed:60/255.f green:220/255.f blue:78/255.f alpha:1.f]];
     set1.valueTextColor = [UIColor colorWithRed:60/255.f green:220/255.f blue:78/255.f alpha:1.f];
     set1.valueFont = [UIFont systemFontOfSize:10.f];
     set1.axisDependency = AxisDependencyRight;
 
-    BarChartDataSet *set2 = [[BarChartDataSet alloc] initWithValues:entries2 label:@""];
+    BarChartDataSet *set2 = [[BarChartDataSet alloc] initWithEntries:entries2 label:@""];
     set2.stackLabels = @[@"Stack 1", @"Stack 2"];
     set2.colors = @[
                     [UIColor colorWithRed:61/255.f green:165/255.f blue:255/255.f alpha:1.f],
@@ -243,7 +243,7 @@ - (ScatterChartData *)generateScatterData
         [entries addObject:[[ChartDataEntry alloc] initWithX:index + 0.25 y:(arc4random_uniform(10) + 55)]];
     }
 
-    ScatterChartDataSet *set = [[ScatterChartDataSet alloc] initWithValues:entries label:@"Scatter DataSet"];
+    ScatterChartDataSet *set = [[ScatterChartDataSet alloc] initWithEntries:entries label:@"Scatter DataSet"];
     set.colors = ChartColorTemplates.material;
     set.scatterShapeSize = 4.5;
     [set setDrawValuesEnabled:NO];
@@ -265,7 +265,7 @@ - (CandleChartData *)generateCandleData
         [entries addObject:[[CandleChartDataEntry alloc] initWithX:index + 1 shadowH:90.0 shadowL:70.0 open:85.0 close:75.0]];
     }
 
-    CandleChartDataSet *set = [[CandleChartDataSet alloc] initWithValues:entries label:@"Candle DataSet"];
+    CandleChartDataSet *set = [[CandleChartDataSet alloc] initWithEntries:entries label:@"Candle DataSet"];
     [set setColor:[UIColor colorWithRed:80/255.f green:80/255.f blue:80/255.f alpha:1.f]];
     set.decreasingColor = [UIColor colorWithRed:142/255.0 green:150/255.0 blue:175/255.0 alpha:1.0];
     set.shadowColor = UIColor.darkGrayColor;
@@ -290,7 +290,7 @@ - (BubbleChartData *)generateBubbleData
         [entries addObject:[[BubbleChartDataEntry alloc] initWithX:index + 0.5 y:y size:size]];
     }
 
-    BubbleChartDataSet *set = [[BubbleChartDataSet alloc] initWithValues:entries label:@"Bubble DataSet"];
+    BubbleChartDataSet *set = [[BubbleChartDataSet alloc] initWithEntries:entries label:@"Bubble DataSet"];
     [set setColors:ChartColorTemplates.vordiplom];
     set.valueTextColor = UIColor.whiteColor;
     set.valueFont = [UIFont systemFontOfSize:10.f];

diff --git a/ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.m
@@ -126,13 +126,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (LineChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = yVals1;
+        [set1 replaceEntries:yVals1];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[LineChartDataSet alloc] initWithValues:yVals1 label:@"DataSet 1"];
+        set1 = [[LineChartDataSet alloc] initWithEntries:yVals1 label:@"DataSet 1"];
         set1.mode = LineChartModeCubicBezier;
         set1.cubicIntensity = 0.2;
         set1.drawCirclesEnabled = NO;

diff --git a/ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.m
@@ -101,7 +101,7 @@ - (void)setDataCount:(int)count range:(double)range
         [values addObject:[[PieChartDataEntry alloc] initWithValue:(arc4random_uniform(mult) + mult / 5) label:parties[i % parties.count]]];
     }
 
-    PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithValues:values label:@"Election Results"];
+    PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithEntries:values label:@"Election Results"];
     dataSet.sliceSpace = 3.0;
     dataSet.selectionShift = 5.0;
 

diff --git a/ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.m
@@ -127,13 +127,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = yVals;
+        [set1 replaceEntries:yVals];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[BarChartDataSet alloc] initWithValues:yVals label:@"DataSet"];
+        set1 = [[BarChartDataSet alloc] initWithEntries:yVals label:@"DataSet"];
 
         set1.drawIconsEnabled = NO;
 

diff --git a/ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.m b/ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.m
@@ -145,13 +145,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (LineChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = values;
+        [set1 replaceEntries: values];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[LineChartDataSet alloc] initWithValues:values label:@"DataSet 1"];
+        set1 = [[LineChartDataSet alloc] initWithEntries:values label:@"DataSet 1"];
 
         set1.drawIconsEnabled = NO;
 

diff --git a/ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.m b/ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.m
@@ -146,15 +146,15 @@ - (void)setDataCount:(int)count range:(double)range
         set1 = (LineChartDataSet *)_chartView.data.dataSets[0];
         set2 = (LineChartDataSet *)_chartView.data.dataSets[1];
         set3 = (LineChartDataSet *)_chartView.data.dataSets[2];
-        set1.values = yVals1;
-        set2.values = yVals2;
-        set3.values = yVals3;
+        [set1 replaceEntries:yVals1];
+        [set2 replaceEntries:yVals2];
+        [set3 replaceEntries:yVals3];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[LineChartDataSet alloc] initWithValues:yVals1 label:@"DataSet 1"];
+        set1 = [[LineChartDataSet alloc] initWithEntries:yVals1 label:@"DataSet 1"];
         set1.axisDependency = AxisDependencyLeft;
         [set1 setColor:[UIColor colorWithRed:51/255.f green:181/255.f blue:229/255.f alpha:1.f]];
         [set1 setCircleColor:UIColor.whiteColor];
@@ -165,7 +165,7 @@ - (void)setDataCount:(int)count range:(double)range
         set1.highlightColor = [UIColor colorWithRed:244/255.f green:117/255.f blue:117/255.f alpha:1.f];
         set1.drawCircleHoleEnabled = NO;
 
-        set2 = [[LineChartDataSet alloc] initWithValues:yVals2 label:@"DataSet 2"];
+        set2 = [[LineChartDataSet alloc] initWithEntries:yVals2 label:@"DataSet 2"];
         set2.axisDependency = AxisDependencyRight;
         [set2 setColor:UIColor.redColor];
         [set2 setCircleColor:UIColor.whiteColor];
@@ -176,7 +176,7 @@ - (void)setDataCount:(int)count range:(double)range
         set2.highlightColor = [UIColor colorWithRed:244/255.f green:117/255.f blue:117/255.f alpha:1.f];
         set2.drawCircleHoleEnabled = NO;
 
-        set3 = [[LineChartDataSet alloc] initWithValues:yVals3 label:@"DataSet 3"];
+        set3 = [[LineChartDataSet alloc] initWithEntries:yVals3 label:@"DataSet 3"];
         set3.axisDependency = AxisDependencyRight;
         [set3 setColor:UIColor.yellowColor];
         [set3 setCircleColor:UIColor.whiteColor];

diff --git a/ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m b/ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m
@@ -105,14 +105,14 @@ - (void)setDataCount:(int)count range:(double)range
     {
         set1 = (LineChartDataSet *)_chartView.data.dataSets[0];
         set2 = (LineChartDataSet *)_chartView.data.dataSets[1];
-        set1.values = yVals1;
-        set2.values = yVals2;
+        [set1 replaceEntries:yVals1];
+        [set2 replaceEntries:yVals2];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[LineChartDataSet alloc] initWithValues:yVals1 label:@"DataSet 1"];
+        set1 = [[LineChartDataSet alloc] initWithEntries:yVals1 label:@"DataSet 1"];
         set1.axisDependency = AxisDependencyLeft;
         [set1 setColor:[UIColor colorWithRed:255/255.0 green:241/255.0 blue:46/255.0 alpha:1.0]];
         set1.drawCirclesEnabled = NO;
@@ -127,7 +127,7 @@ - (void)setDataCount:(int)count range:(double)range
             return self.chartView.leftAxis.axisMinimum;
         }];
 
-        set2 = [[LineChartDataSet alloc] initWithValues:yVals2 label:@"DataSet 2"];
+        set2 = [[LineChartDataSet alloc] initWithEntries:yVals2 label:@"DataSet 2"];
         set2.axisDependency = AxisDependencyLeft;
         [set2 setColor:[UIColor colorWithRed:255/255.0 green:241/255.0 blue:46/255.0 alpha:1.0]];
         set2.drawCirclesEnabled = NO;

diff --git a/ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.m b/ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.m
@@ -126,13 +126,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (LineChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = values;
+        [set1 replaceEntries: values];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[LineChartDataSet alloc] initWithValues:values label:@"DataSet 1"];
+        set1 = [[LineChartDataSet alloc] initWithEntries:values label:@"DataSet 1"];
         set1.axisDependency = AxisDependencyLeft;
         set1.valueTextColor = [UIColor colorWithRed:51/255.0 green:181/255.0 blue:229/255.0 alpha:1.0];
         set1.lineWidth = 1.5;

diff --git a/ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.m
@@ -155,10 +155,10 @@ - (void)setDataCount:(int)count range:(double)range
         set2 = (BarChartDataSet *)_chartView.data.dataSets[1];
         set3 = (BarChartDataSet *)_chartView.data.dataSets[2];
         set4 = (BarChartDataSet *)_chartView.data.dataSets[3];
-        set1.values = yVals1;
-        set2.values = yVals2;
-        set3.values = yVals3;
-        set4.values = yVals4;
+        [set1 replaceEntries:yVals1];
+        [set2 replaceEntries:yVals2];
+        [set3 replaceEntries:yVals3];
+        [set4 replaceEntries:yVals4];
 
         BarChartData *data = _chartView.barData;
 
@@ -171,16 +171,16 @@ - (void)setDataCount:(int)count range:(double)range
     }
     else
     {
-        set1 = [[BarChartDataSet alloc] initWithValues:yVals1 label:@"Company A"];
+        set1 = [[BarChartDataSet alloc] initWithEntries:yVals1 label:@"Company A"];
         [set1 setColor:[UIColor colorWithRed:104/255.f green:241/255.f blue:175/255.f alpha:1.f]];
 
-        set2 = [[BarChartDataSet alloc] initWithValues:yVals2 label:@"Company B"];
+        set2 = [[BarChartDataSet alloc] initWithEntries:yVals2 label:@"Company B"];
         [set2 setColor:[UIColor colorWithRed:164/255.f green:228/255.f blue:251/255.f alpha:1.f]];
 
-        set3 = [[BarChartDataSet alloc] initWithValues:yVals3 label:@"Company C"];
+        set3 = [[BarChartDataSet alloc] initWithEntries:yVals3 label:@"Company C"];
         [set3 setColor:[UIColor colorWithRed:242/255.f green:247/255.f blue:158/255.f alpha:1.f]];
 
-        set4 = [[BarChartDataSet alloc] initWithValues:yVals4 label:@"Company D"];
+        set4 = [[BarChartDataSet alloc] initWithEntries:yVals4 label:@"Company D"];
         [set4 setColor:[UIColor colorWithRed:255/255.f green:102/255.f blue:0/255.f alpha:1.f]];
 
         NSMutableArray *dataSets = [[NSMutableArray alloc] init];

diff --git a/ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.m
@@ -106,7 +106,7 @@ - (void)setDataCount:(int)count range:(double)range
             [values addObject:[[ChartDataEntry alloc] initWithX:i y:val]];
         }
 
-        LineChartDataSet *d = [[LineChartDataSet alloc] initWithValues:values label:[NSString stringWithFormat:@"DataSet %d", z + 1]];
+        LineChartDataSet *d = [[LineChartDataSet alloc] initWithEntries:values label:[NSString stringWithFormat:@"DataSet %d", z + 1]];
         d.lineWidth = 2.5;
         d.circleRadius = 4.0;
         d.circleHoleRadius = 2.0;

diff --git a/ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.m
@@ -124,7 +124,7 @@ - (void)setChartData
     if (_chartView.data.dataSetCount > 0)
     {
         set = (BarChartDataSet *)_chartView.data.dataSets[0];
-        set.values = yValues;
+        [set replaceEntries: yValues];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
@@ -137,7 +137,7 @@ - (void)setChartData
         customFormatter.minimumSignificantDigits = 1;
         customFormatter.minimumFractionDigits = 1;
 
-        set = [[BarChartDataSet alloc] initWithValues:yValues label:@"Age Distribution"];
+        set = [[BarChartDataSet alloc] initWithEntries:yValues label:@"Age Distribution"];
 
         set.drawIconsEnabled = NO;
 

diff --git a/ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.m
@@ -97,7 +97,7 @@ - (void)setDataCount:(int)count range:(double)range
         [values addObject:[[PieChartDataEntry alloc] initWithValue:(arc4random_uniform(mult) + mult / 5) label:parties[i % parties.count] icon: [UIImage imageNamed:@"icon"]]];
     }
 
-    PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithValues:values label:@"Election Results"];
+    PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithEntries:values label:@"Election Results"];
 
     dataSet.drawIconsEnabled = NO;
 

diff --git a/ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.m
@@ -82,7 +82,7 @@ - (void)setDataCount:(int)count range:(double)range
         [entries addObject:[[PieChartDataEntry alloc] initWithValue:(arc4random_uniform(mult) + mult / 5) label:parties[i % parties.count]]];
     }
 
-    PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithValues:entries label:@"Election Results"];
+    PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithEntries:entries label:@"Election Results"];
     dataSet.sliceSpace = 2.0;
 
     // add a lot of colors

diff --git a/ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.m
@@ -149,7 +149,7 @@ - (void)setChartData
         }
     }
 
-    BarChartDataSet *set = set = [[BarChartDataSet alloc] initWithValues:values label:@"Values"];
+    BarChartDataSet *set = set = [[BarChartDataSet alloc] initWithEntries:values label:@"Values"];
     set.colors = colors;
     set.valueColors = colors;
 

diff --git a/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m
@@ -151,7 +151,7 @@ - (void)setChartData
         [entries2 addObject:[[RadarChartDataEntry alloc] initWithValue:(arc4random_uniform(mult) + min)]];
     }
 
-    RadarChartDataSet *set1 = [[RadarChartDataSet alloc] initWithValues:entries1 label:@"Last Week"];
+    RadarChartDataSet *set1 = [[RadarChartDataSet alloc] initWithEntries:entries1 label:@"Last Week"];
     [set1 setColor:[UIColor colorWithRed:103/255.0 green:110/255.0 blue:129/255.0 alpha:1.0]];
     set1.fillColor = [UIColor colorWithRed:103/255.0 green:110/255.0 blue:129/255.0 alpha:1.0];
     set1.drawFilledEnabled = YES;
@@ -160,7 +160,7 @@ - (void)setChartData
     set1.drawHighlightCircleEnabled = YES;
     [set1 setDrawHighlightIndicators:NO];
 
-    RadarChartDataSet *set2 = [[RadarChartDataSet alloc] initWithValues:entries2 label:@"This Week"];
+    RadarChartDataSet *set2 = [[RadarChartDataSet alloc] initWithEntries:entries2 label:@"This Week"];
     [set2 setColor:[UIColor colorWithRed:121/255.0 green:162/255.0 blue:175/255.0 alpha:1.0]];
     set2.fillColor = [UIColor colorWithRed:121/255.0 green:162/255.0 blue:175/255.0 alpha:1.0];
     set2.drawFilledEnabled = YES;

diff --git a/ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.m
@@ -110,15 +110,15 @@ - (void)setDataCount:(int)count range:(double)range
         [yVals3 addObject:[[ChartDataEntry alloc] initWithX:(double)i + 0.66 y:val]];
     }
 
-    ScatterChartDataSet *set1 = [[ScatterChartDataSet alloc] initWithValues:yVals1 label:@"DS 1"];
+    ScatterChartDataSet *set1 = [[ScatterChartDataSet alloc] initWithEntries:yVals1 label:@"DS 1"];
     [set1 setScatterShape:ScatterShapeSquare];
     [set1 setColor:ChartColorTemplates.colorful[0]];
-    ScatterChartDataSet *set2 = [[ScatterChartDataSet alloc] initWithValues:yVals2 label:@"DS 2"];
+    ScatterChartDataSet *set2 = [[ScatterChartDataSet alloc] initWithEntries:yVals2 label:@"DS 2"];
     [set2 setScatterShape:ScatterShapeCircle];
     set2.scatterShapeHoleColor = ChartColorTemplates.colorful[3];
     set2.scatterShapeHoleRadius = 3.5f;
     [set2 setColor:ChartColorTemplates.colorful[1]];
-    ScatterChartDataSet *set3 = [[ScatterChartDataSet alloc] initWithValues:yVals3 label:@"DS 3"];
+    ScatterChartDataSet *set3 = [[ScatterChartDataSet alloc] initWithEntries:yVals3 label:@"DS 3"];
     [set3 setScatterShape:ScatterShapeCross];
     [set3 setColor:ChartColorTemplates.colorful[2]];