Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -153,23 +153,24 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
}

R.id.actionToggleValues -> {
binding.chart1.data!!.dataSets.forEach {
it?.isDrawValues = !it.isDrawValues
binding.chart1.data?.dataSets?.forEach {
it.isDrawValues = !it.isDrawValues
}
binding.chart1.invalidate()
}

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

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

R.id.actionTogglePinch -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,17 +140,17 @@ class ScatterChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSe
}

R.id.actionToggleValues -> {
binding.chart1.data!!.dataSets.forEach { set ->
set?.isDrawValues = !set.isDrawValues
binding.chart1.data?.dataSets?.forEach { set ->
set.isDrawValues = !set.isDrawValues
}
binding.chart1.invalidate()
}

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

R.id.actionTogglePinch -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,16 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener,
when (item.itemId) {
R.id.actionToggleValues -> {
binding.chart1.data?.dataSets?.forEach {
it?.isDrawValues = !it.isDrawValues
it.isDrawValues = !it.isDrawValues
}
binding.chart1.invalidate()
}

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

R.id.actionToggleFilled -> {
Expand Down
21 changes: 11 additions & 10 deletions app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele
val set1: BarDataSet

if (binding.chart1.data != null &&
binding.chart1.data!!.getDataSetCount() > 0
binding.chart1.data!!.dataSetCount > 0
) {
set1 = binding.chart1.data!!.getDataSetByIndex(0) as BarDataSet
set1.entries = values
Expand Down Expand Up @@ -150,24 +150,24 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele
}

R.id.actionToggleValues -> {
binding.chart1.data!!.dataSets.forEach {
it?.isDrawValues = !it.isDrawValues
binding.chart1.data?.dataSets?.forEach {
it.isDrawValues = !it.isDrawValues
}
binding.chart1.invalidate()
}

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

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

R.id.actionTogglePinch -> {
Expand All @@ -182,8 +182,9 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele
}

R.id.actionToggleBarBorders -> {
for (set in binding.chart1.data!!.dataSets) (set as BarDataSet).barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f

binding.chart1.data?.dataSets?.forEach { set ->
(set as BarDataSet).barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
}
binding.chart1.invalidate()
}

Expand Down
Loading