Skip to content

Commit 56dcc78

Browse files
authored
Merge pull request #614 from AppDevNext/DataAsVar
Data as var
2 parents 7a2c2e4 + 6c0c61f commit 56dcc78

File tree

72 files changed

+493
-201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+493
-201
lines changed

app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {
8989
dataSets.add(set1)
9090

9191
val data = BarData(dataSets)
92-
binding.chart1.setData(data)
92+
binding.chart1.data = data
9393
binding.chart1.setFitBars(true)
9494
}
9595

app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
178178
data.setValueTypeface(tfLight)
179179
data.barWidth = 0.9f
180180

181-
binding.chart1.setData(data)
181+
binding.chart1.data = data
182182
}
183183
}
184184

app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar
156156
data.setValueFormatter(LargeValueFormatter())
157157
data.setValueTypeface(tfLight)
158158

159-
binding.chart1.setData(data)
159+
binding.chart1.data = data
160160
}
161161

162162
// specify the width each bar should have

app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
113113
data.setDrawValues(false)
114114
data.barWidth = 0.8f
115115

116-
binding.chart1.setData(data)
116+
binding.chart1.data = data
117117
}
118118

119119
override fun onCreateOptionsMenu(menu: Menu?): Boolean {

app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class BarChartPositiveNegative : DemoBase() {
123123
data.setValueFormatter(ValueFormatter())
124124
data.barWidth = 0.8f
125125

126-
binding.chart1.setData(data)
126+
binding.chart1.data = data
127127
binding.chart1.invalidate()
128128
}
129129
}

app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
136136
data.setValueTextColor(Color.WHITE)
137137
data.setHighlightCircleWidth(1.5f)
138138

139-
binding.chart1.setData(data)
139+
binding.chart1.data = data
140140
binding.chart1.invalidate()
141141
}
142142

app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener {
116116
//set1.setHighlightLineWidth(1f);
117117
val data = CandleData(set1)
118118

119-
binding.chart1.setData(data)
119+
binding.chart1.data = data
120120
binding.chart1.invalidate()
121121
}
122122

app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class CombinedChartActivity : DemoBase() {
9292

9393
xAxis.axisMaximum = data.xMax + 0.25f
9494

95-
binding.chart1.setData(data)
95+
binding.chart1.data = data
9696
binding.chart1.invalidate()
9797
}
9898

app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
127127
data.setDrawValues(false)
128128

129129
// set data
130-
binding.chart1.setData(data)
130+
binding.chart1.data = data
131131
}
132132
}
133133

app/src/main/kotlin/info/appdev/chartexample/DataTools.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class DataTools {
170170
values.add(Entry(i.toFloat(), value, ContextCompat.getDrawable(context, R.drawable.star)))
171171
}
172172
}
173-
lineChart.getData()?.let {
173+
lineChart.data?.let {
174174
if (it.dataSetCount > 0) {
175175
val lineDataSet0 = it.getDataSetByIndex(0) as LineDataSet
176176
lineDataSet0.entries = values
@@ -240,7 +240,7 @@ class DataTools {
240240
// create a data object with the data sets
241241
val data = LineData(dataSets)
242242

243-
lineChart.setData(data)
243+
lineChart.data = data
244244
}
245245
}
246246
}

0 commit comments

Comments
 (0)