Skip to content

Data as var #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hannesa2 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Data as var #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5245793
Simplify CombinedHighlighter
hannesa2 Dec 29, 2025
b72ab3e
Data as var
hannesa2 Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {
dataSets.add(set1)

val data = BarData(dataSets)
binding.chart1.setData(data)
binding.chart1.data = data
binding.chart1.setFitBars(true)
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
data.setValueTypeface(tfLight)
data.barWidth = 0.9f

binding.chart1.setData(data)
binding.chart1.data = data
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar
data.setValueFormatter(LargeValueFormatter())
data.setValueTypeface(tfLight)

binding.chart1.setData(data)
binding.chart1.data = data
}

// specify the width each bar should have
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
data.setDrawValues(false)
data.barWidth = 0.8f

binding.chart1.setData(data)
binding.chart1.data = data
}

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class BarChartPositiveNegative : DemoBase() {
data.setValueFormatter(ValueFormatter())
data.barWidth = 0.8f

binding.chart1.setData(data)
binding.chart1.data = data
binding.chart1.invalidate()
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
data.setValueTextColor(Color.WHITE)
data.setHighlightCircleWidth(1.5f)

binding.chart1.setData(data)
binding.chart1.data = data
binding.chart1.invalidate()
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener {
//set1.setHighlightLineWidth(1f);
val data = CandleData(set1)

binding.chart1.setData(data)
binding.chart1.data = data
binding.chart1.invalidate()
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class CombinedChartActivity : DemoBase() {

xAxis.axisMaximum = data.xMax + 0.25f

binding.chart1.setData(data)
binding.chart1.data = data
binding.chart1.invalidate()
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
data.setDrawValues(false)

// set data
binding.chart1.setData(data)
binding.chart1.data = data
}
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/info/appdev/chartexample/DataTools.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class DataTools {
values.add(Entry(i.toFloat(), value, ContextCompat.getDrawable(context, R.drawable.star)))
}
}
lineChart.getData()?.let {
lineChart.data?.let {
if (it.dataSetCount > 0) {
val lineDataSet0 = it.getDataSetByIndex(0) as LineDataSet
lineDataSet0.entries = values
Expand Down Expand Up @@ -225,7 +225,7 @@ class DataTools {
// create a data object with the data sets
val data = LineData(dataSets)

lineChart.setData(data)
lineChart.data = data
}
}
}
8 changes: 4 additions & 4 deletions app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class DrawChartActivity : DemoBase(), OnChartValueSelectedListener, OnDrawListen
// create a data object with the data sets
val data = LineData(set1)

binding.chart1.setData(data)
binding.chart1.data = data
}

override fun onCreateOptionsMenu(menu: Menu): Boolean {
Expand All @@ -78,14 +78,14 @@ class DrawChartActivity : DemoBase(), OnChartValueSelectedListener, OnDrawListen
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
R.id.actionToggleValues -> {
binding.chart1.getData()?.dataSets?.forEach {
binding.chart1.data?.dataSets?.forEach {
it.isDrawValues = !it.isDrawValues
}
binding.chart1.invalidate()
}

R.id.actionToggleHighlight -> {
binding.chart1.getData()?.let {
binding.chart1.data?.let {
it.isHighlightEnabled = !it.isHighlightEnabled
}
binding.chart1.invalidate()
Expand Down Expand Up @@ -134,7 +134,7 @@ class DrawChartActivity : DemoBase(), OnChartValueSelectedListener, OnDrawListen
Timber.i("DataSet drawn. ${dataSet.toSimpleString()}")

// prepare the legend again
binding.chart1.getData()?.let { binding.chart1.legendRenderer?.computeLegend(it) }
binding.chart1.data?.let { binding.chart1.legendRenderer?.computeLegend(it) }
}

override fun onEntryMoved(entry: Entry) {
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/kotlin/info/appdev/chartexample/DynamicalAddingActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ import android.view.Menu
import android.view.MenuItem
import android.widget.Toast
import androidx.core.content.ContextCompat
import androidx.core.net.toUri
import info.appdev.chartexample.DataTools.Companion.getValues
import info.appdev.chartexample.databinding.ActivityLinechartNoseekbarBinding
import info.appdev.chartexample.notimportant.DemoBase
import info.appdev.charting.components.YAxis.AxisDependency
import info.appdev.charting.data.Entry
import info.appdev.charting.data.LineData
import info.appdev.charting.data.LineDataSet
import info.appdev.charting.highlight.Highlight
import info.appdev.charting.listener.OnChartValueSelectedListener
import info.appdev.charting.utils.ColorTemplate
import info.appdev.chartexample.DataTools.Companion.getValues
import info.appdev.chartexample.notimportant.DemoBase
import androidx.core.net.toUri
import info.appdev.chartexample.databinding.ActivityLinechartNoseekbarBinding

class DynamicalAddingActivity : DemoBase(), OnChartValueSelectedListener {
var sampleValues: Array<Double?> = getValues(102)
Expand All @@ -44,11 +44,11 @@ class DynamicalAddingActivity : DemoBase(), OnChartValueSelectedListener {
private val colors: IntArray = ColorTemplate.VORDIPLOM_COLORS

private fun addEntry() {
var data = binding.chart1.getData()
var data = binding.chart1.data

if (data == null) {
data = LineData()
binding.chart1.setData(data)
binding.chart1.data = data
}

var set = data.getDataSetByIndex(0)
Expand Down Expand Up @@ -81,7 +81,7 @@ class DynamicalAddingActivity : DemoBase(), OnChartValueSelectedListener {
}

private fun removeLastEntry() {
val data = binding.chart1.getData()
val data = binding.chart1.data

if (data != null) {
val set = data.getDataSetByIndex(0)
Expand All @@ -100,10 +100,10 @@ class DynamicalAddingActivity : DemoBase(), OnChartValueSelectedListener {
}

private fun addDataSet() {
val data = binding.chart1.getData()
val data = binding.chart1.data

if (data == null) {
binding.chart1.setData(LineData())
binding.chart1.data = LineData()
} else {
val count = (data.dataSetCount + 1)
val amount = data.getDataSetByIndex(0)?.entryCount ?: 0
Expand Down Expand Up @@ -136,7 +136,7 @@ class DynamicalAddingActivity : DemoBase(), OnChartValueSelectedListener {
}

private fun removeDataSet() {
val data = binding.chart1.getData()
val data = binding.chart1.data

if (data != null) {
data.removeDataSet(data.getDataSetByIndex(data.dataSetCount - 1))
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class FilledLineActivity : DemoBase() {
val data = LineData(dataSets)
data.setDrawValues(false)

binding.chart1.setData(data)
binding.chart1.data = data
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/GradientActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class GradientActivity : DemoBase() {
}

binding.chart.axisLeft.axisMinimum = 0f
binding.chart.setData(LineData(dataSet))
binding.chart.data = LineData(dataSet)
binding.chart.invalidate()
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/HalfPieChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class HalfPieChartActivity : DemoBase() {
data.setValueTextSize(11f)
data.setValueTextColor(Color.WHITE)
data.setValueTypeface(tfLight)
binding.chart1.setData(data)
binding.chart1.data = data

binding.chart1.invalidate()
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV
data.setValueTextSize(10f)
data.setValueTypeface(tfLight)
data.barWidth = barWidth
binding.chart1.setData(data)
binding.chart1.data = data
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class HorizontalBarNegativeChartActivity : DemoBase(), OnSeekBarChangeListener,
data.setValueTextSize(10f)
data.setValueTypeface(tfLight)
data.barWidth = barWidth
binding.chart1.setData(data)
binding.chart1.data = data
}
}

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
val data = LineData(set1)

// set data
binding.chart1.setData(data)
binding.chart1.data = data
}

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
Expand All @@ -139,21 +139,21 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
}

R.id.actionToggleHighlight -> {
binding.chart1.getData()?.let {
binding.chart1.data?.let {
it.isHighlightEnabled = !it.isHighlightEnabled
}
binding.chart1.invalidate()
}

R.id.actionToggleFilled -> {
binding.chart1.getData()?.dataSets?.forEach { set ->
binding.chart1.data?.dataSets?.forEach { set ->
set.isDrawFilledEnabled = !set.isDrawFilledEnabled
}
binding.chart1.invalidate()
}

R.id.actionToggleCircles -> {
binding.chart1.getData()?.dataSets?.forEach { set ->
binding.chart1.data?.dataSets?.forEach { set ->
set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled
}
binding.chart1.invalidate()
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,35 +160,35 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec
}

R.id.actionToggleIcons -> {
binding.chart1.getData()?.dataSets?.forEach { set ->
binding.chart1.data?.dataSets?.forEach { set ->
set.isDrawIcons = !set.isDrawIcons
}
binding.chart1.invalidate()
}

R.id.actionToggleHighlight -> {
binding.chart1.getData()?.let {
binding.chart1.data?.let {
it.isHighlightEnabled = !it.isHighlightEnabled
binding.chart1.invalidate()
}
}

R.id.actionToggleFilled -> {
binding.chart1.getData()?.dataSets?.forEach { set ->
binding.chart1.data?.dataSets?.forEach { set ->
set.isDrawFilledEnabled = !set.isDrawFilledEnabled
binding.chart1.invalidate()
}
}

R.id.actionToggleCircles -> {
binding.chart1.getData()?.dataSets?.map { it as LineDataSet }?.forEach { set ->
binding.chart1.data?.dataSets?.map { it as LineDataSet }?.forEach { set ->
set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled
}
binding.chart1.invalidate()
}

R.id.actionToggleCubic -> {
binding.chart1.getData()?.dataSets?.map { it as LineDataSet }?.forEach { set ->
binding.chart1.data?.dataSets?.map { it as LineDataSet }?.forEach { set ->
set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER)
LineDataSet.Mode.LINEAR
else
Expand All @@ -198,7 +198,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec
}

R.id.actionToggleStepped -> {
binding.chart1.getData()?.dataSets?.map { it as LineDataSet }?.forEach { set ->
binding.chart1.data?.dataSets?.map { it as LineDataSet }?.forEach { set ->
set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED)
LineDataSet.Mode.LINEAR
else
Expand All @@ -208,7 +208,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec
}

R.id.actionToggleHorizontalCubic -> {
binding.chart1.getData()?.dataSets?.map { it as LineDataSet }?.forEach { set ->
binding.chart1.data?.dataSets?.map { it as LineDataSet }?.forEach { set ->
set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER)
LineDataSet.Mode.LINEAR
else
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class LineChartActivityColored : DemoBase() {
chart.setViewPortOffsets(10f, 0f, 10f, 0f)

// add data
chart.setData(data)
chart.data = data

// get the legend (only possible after setting data)
chart.legend.apply {
Expand Down
Loading
Loading