From 125a6d3be15b3753441e27ca70492314a86f8cbe Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Mon, 22 Dec 2025 22:57:27 +0100 Subject: [PATCH] Cosmetic in some activities --- .../appdev/chartexample/AnotherBarActivity.kt | 22 ++++++++------- .../appdev/chartexample/BarChartActivity.kt | 28 ++++++++----------- .../BarChartActivityMultiDataset.kt | 18 ++++++------ .../chartexample/BarChartActivitySinus.kt | 18 ++++++------ .../chartexample/BarChartPositiveNegative.kt | 2 +- 5 files changed, 43 insertions(+), 45 deletions(-) diff --git a/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt index 7791bf56e..0acf1cdb4 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt @@ -74,7 +74,7 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener { 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 @@ -111,18 +111,17 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener { } 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.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 -> { @@ -140,9 +139,12 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener { } 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() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt index cbe49ac12..27978293b 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt @@ -135,7 +135,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect 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 @@ -192,25 +192,24 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect } 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 -> { @@ -226,12 +225,9 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect } 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() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt index 0f9be3ef5..2b9051579 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt @@ -129,7 +129,7 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar val set3: BarDataSet val set4: BarDataSet - if (binding.chart1.data != null && binding.chart1.data!!.getDataSetCount() > 0) { + if (binding.chart1.data != null && binding.chart1.data!!.dataSetCount > 0) { set1 = binding.chart1.data!!.getDataSetByIndex(0) as BarDataSet set2 = binding.chart1.data!!.getDataSetByIndex(1) as BarDataSet set3 = binding.chart1.data!!.getDataSetByIndex(2) as BarDataSet @@ -185,10 +185,9 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar } R.id.actionToggleValues -> { - binding.chart1.data!!.dataSets.forEach { - it?.isDrawValues = !it.isDrawValues + binding.chart1.data?.dataSets?.forEach { + it.isDrawValues = !it.isDrawValues } - binding.chart1.invalidate() } @@ -205,16 +204,17 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar } 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() } 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.actionSave -> { diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt index c09365abf..24e92e86c 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt @@ -96,7 +96,7 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener { val set: BarDataSet if (binding.chart1.data != null && - binding.chart1.data!!.getDataSetCount() > 0 + binding.chart1.data!!.dataSetCount > 0 ) { set = binding.chart1.data!!.getDataSetByIndex(0) as BarDataSet set.entries = entries @@ -130,18 +130,17 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener { } 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.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 -> { @@ -158,8 +157,9 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener { } 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() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt index d025b80ea..1e0571e30 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt @@ -106,7 +106,7 @@ class BarChartPositiveNegative : DemoBase() { val set: BarDataSet if (binding.chart1.data != null && - binding.chart1.data!!.getDataSetCount() > 0 + binding.chart1.data!!.dataSetCount > 0 ) { set = binding.chart1.data!!.getDataSetByIndex(0) as BarDataSet set.entries = values