From 0c0e14e417d9554394b4957a57e4e6efd3cf9c4d Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Sun, 28 Dec 2025 18:05:15 +0100 Subject: [PATCH] Description is non nullable --- .../appdev/chartexample/AnotherBarActivity.kt | 2 +- .../appdev/chartexample/BarChartActivity.kt | 2 +- .../BarChartActivityMultiDataset.kt | 2 +- .../chartexample/BarChartActivitySinus.kt | 2 +- .../chartexample/BarChartPositiveNegative.kt | 2 +- .../chartexample/BubbleChartActivity.kt | 2 +- .../chartexample/CandleStickChartActivity.kt | 2 +- .../chartexample/CombinedChartActivity.kt | 2 +- .../chartexample/CubicLineChartActivity.kt | 2 +- .../chartexample/DynamicalAddingActivity.kt | 2 +- .../appdev/chartexample/FilledLineActivity.kt | 2 +- .../appdev/chartexample/GradientActivity.kt | 2 +- .../chartexample/HalfPieChartActivity.kt | 2 +- .../HorizontalBarChartActivity.kt | 2 +- .../HorizontalBarNegativeChartActivity.kt | 2 +- .../chartexample/InvertedLineChartActivity.kt | 2 +- .../appdev/chartexample/LineChartActivity.kt | 2 +- .../chartexample/LineChartActivityColored.kt | 2 +- .../chartexample/LineChartDualAxisActivity.kt | 2 +- .../chartexample/LineChartTimeActivity.kt | 2 +- .../chartexample/ListViewBarChartActivity.kt | 2 +- .../chartexample/MultiLineChartActivity.kt | 2 +- .../chartexample/PerformanceLineChart.kt | 2 +- .../appdev/chartexample/PieChartActivity.kt | 2 +- .../chartexample/PieChartRoundedActivity.kt | 2 +- .../chartexample/PiePolylineChartActivity.kt | 2 +- .../appdev/chartexample/RadarChartActivity.kt | 2 +- .../chartexample/RealtimeLineChartActivity.kt | 2 +- .../chartexample/ScatterChartActivity.kt | 2 +- .../appdev/chartexample/ScrollViewActivity.kt | 2 +- .../SpecificPositionsLineChartActivity.kt | 2 +- .../appdev/chartexample/StackedBarActivity.kt | 2 +- .../StackedBarActivityNegative.kt | 2 +- .../compose/HorizontalBarComposeActivity.kt | 2 +- .../chartexample/fragments/BarChartFrag.kt | 2 +- .../fragments/ComplexityFragment.kt | 2 +- .../chartexample/fragments/PieChartFrag.kt | 2 +- .../fragments/ScatterChartFrag.kt | 2 +- .../fragments/SineCosineFragment.kt | 2 +- .../listviewitems/BarChartItem.kt | 2 +- .../listviewitems/LineChartItem.kt | 2 +- .../listviewitems/PieChartItem.kt | 2 +- .../info/appdev/charting/charts/Chart.kt | 45 +++++++++---------- 43 files changed, 64 insertions(+), 65 deletions(-) diff --git a/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt index ddacd99e1..4de1d5ad2 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt @@ -31,7 +31,7 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener { binding.seekBarX.setOnSeekBarChangeListener(this) binding.seekBarY.setOnSeekBarChangeListener(this) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // if more than 60 entries are displayed in the chart, no values will be drawn binding.chart1.setMaxVisibleValueCount(60) diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt index 3d85c1aab..dede3e2df 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt @@ -53,7 +53,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect binding.chart1.setDrawBarShadow(false) binding.chart1.setDrawValueAboveBar(true) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // if more than 60 entries are displayed in the chart, no values will be // drawn diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt index 1bc09c3ca..63513c7a3 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt @@ -45,7 +45,7 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar binding.seekBarY.setOnSeekBarChangeListener(this) binding.chart1.setOnChartValueSelectedListener(this) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // chart.setDrawBorders(true); diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt index 8fa84a21a..5e95dc7e6 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt @@ -35,7 +35,7 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener { binding.chart1.setDrawBarShadow(false) binding.chart1.setDrawValueAboveBar(true) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // if more than 60 entries are displayed in the chart, no values will be drawn binding.chart1.setMaxVisibleValueCount(60) diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt index 0207d00e4..71cf2fe97 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartPositiveNegative.kt @@ -39,7 +39,7 @@ class BarChartPositiveNegative : DemoBase() { binding.chart1.setDrawBarShadow(false) binding.chart1.setDrawValueAboveBar(true) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // scaling can now only be done on x- and y-axis separately binding.chart1.setPinchZoom(false) diff --git a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt index 04c73abcf..c66ccce5f 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt @@ -39,7 +39,7 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel binding.seekBarX.setOnSeekBarChangeListener(this) binding.seekBarY.setOnSeekBarChangeListener(this) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false binding.chart1.setOnChartValueSelectedListener(this) binding.chart1.setDrawGridBackground(false) binding.chart1.setTouchEnabled(true) diff --git a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt index 6c1e21fb9..f1a02fdff 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt @@ -34,7 +34,7 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener { binding.seekBarX.setOnSeekBarChangeListener(this) binding.seekBarY.setOnSeekBarChangeListener(this) binding.chart1.setBackgroundColor(Color.WHITE) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // if more than 60 entries are displayed in the chart, no values will be drawn binding.chart1.setMaxVisibleValueCount(60) diff --git a/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt index 38dec93fb..0633bb8ad 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt @@ -44,7 +44,7 @@ class CombinedChartActivity : DemoBase() { binding = ActivityCombinedBinding.inflate(layoutInflater) setContentView(binding.root) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false binding.chart1.setBackgroundColor(Color.WHITE) binding.chart1.setDrawGridBackground(false) binding.chart1.setDrawBarShadow(false) diff --git a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt index e549aa5a8..cd9e066cc 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt @@ -36,7 +36,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener { binding.chart1.setBackgroundColor(Color.rgb(104, 241, 175)) // no description text - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // enable touch gestures binding.chart1.setTouchEnabled(true) diff --git a/app/src/main/kotlin/info/appdev/chartexample/DynamicalAddingActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/DynamicalAddingActivity.kt index d96d83e1c..f3fbd815d 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/DynamicalAddingActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/DynamicalAddingActivity.kt @@ -33,7 +33,7 @@ class DynamicalAddingActivity : DemoBase(), OnChartValueSelectedListener { binding.chart1.setOnChartValueSelectedListener(this) binding.chart1.setDrawGridBackground(false) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false binding.chart1.setNoDataText("No chart data available. Use the menu to add entries and data sets!") // chart.getXAxis().setDrawLabels(false); diff --git a/app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt index 9e9e1be00..bd28eff2c 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt @@ -41,7 +41,7 @@ class FilledLineActivity : DemoBase() { binding.chart1.setDrawBorders(true) // no description text - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // if disabled, scaling can be done on x- and y-axis separately binding.chart1.setPinchZoom(false) diff --git a/app/src/main/kotlin/info/appdev/chartexample/GradientActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/GradientActivity.kt index 63a905aad..cc84a3cd6 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/GradientActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/GradientActivity.kt @@ -33,7 +33,7 @@ class GradientActivity : DemoBase() { val chart: LineChart = findViewById(R.id.chart) // Minimal chart setup - chart.description?.isEnabled = false + chart.description.isEnabled = false chart.legend.isEnabled = false chart.axisRight.isEnabled = false chart.setDrawGridBackground(false) diff --git a/app/src/main/kotlin/info/appdev/chartexample/HalfPieChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HalfPieChartActivity.kt index f18f5fceb..c192f62a6 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HalfPieChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HalfPieChartActivity.kt @@ -38,7 +38,7 @@ class HalfPieChartActivity : DemoBase() { moveOffScreen() binding.chart1.setUsePercentValues(true) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false binding.chart1.setCenterTextTypeface(tfLight) binding.chart1.centerText = generateCenterSpannableText() diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt index fdc944334..8a54acadb 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt @@ -47,7 +47,7 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV binding.chart1.setDrawValueAboveBar(true) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // if more than 60 entries are displayed in the chart, no values will be // drawn diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt index a76983bb0..99b712773 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt @@ -45,7 +45,7 @@ class HorizontalBarNegativeChartActivity : DemoBase(), OnSeekBarChangeListener, binding.chart1.setDrawBarShadow(false) binding.chart1.setDrawValueAboveBar(true) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // if more than 60 entries are displayed in the chart, no values will be // drawn diff --git a/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt index adb79048a..6508a2a6f 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt @@ -40,7 +40,7 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa binding.chart1.setDrawGridBackground(false) // no description text - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // enable touch gestures binding.chart1.setTouchEnabled(true) diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt index a42ac5da8..d6f5e0285 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt @@ -46,7 +46,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec binding.chart1.setBackgroundColor(Color.WHITE) // disable description text - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // enable touch gestures binding.chart1.setTouchEnabled(true) diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt index 199d89ada..0193ea03a 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt @@ -48,7 +48,7 @@ class LineChartActivityColored : DemoBase() { (data.getDataSetByIndex(0) as LineDataSet).circleHoleColor = color // no description text - chart.description?.isEnabled = false + chart.description.isEnabled = false // chart.setDrawHorizontalGrid(false); // diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt index 1697925d1..87fe7eab4 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt @@ -47,7 +47,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa binding.chart1.setOnChartValueSelectedListener(this) // no description text - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // enable touch gestures binding.chart1.setTouchEnabled(true) diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt index d14d7bbd7..b3b03215f 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt @@ -41,7 +41,7 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener { binding.seekBarX.setOnSeekBarChangeListener(this) // no description text - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // enable touch gestures binding.chart1.setTouchEnabled(true) diff --git a/app/src/main/kotlin/info/appdev/chartexample/ListViewBarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/ListViewBarChartActivity.kt index a4fecee58..19f881231 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/ListViewBarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/ListViewBarChartActivity.kt @@ -68,7 +68,7 @@ class ListViewBarChartActivity : DemoBase() { data?.setValueTypeface(tfLight) data?.setValueTextColor(Color.BLACK) - holder.chart?.description?.isEnabled = false + holder.chart!!.description.isEnabled = false holder.chart?.setDrawGridBackground(false) diff --git a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt index af78458a2..cca755461 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt @@ -39,7 +39,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu binding.seekBarY.setOnSeekBarChangeListener(this) binding.chart1.setOnChartValueSelectedListener(this) binding.chart1.setDrawGridBackground(false) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false binding.chart1.setDrawBorders(false) binding.chart1.axisLeft.isEnabled = false diff --git a/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt b/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt index 0cef87b71..2f2020005 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt @@ -29,7 +29,7 @@ class PerformanceLineChart : DemoBase(), OnSeekBarChangeListener { binding.chart1.setDrawGridBackground(false) // no description text - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // enable touch gestures binding.chart1.setTouchEnabled(true) diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt index 1310c1756..768373e88 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt @@ -46,7 +46,7 @@ class PieChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect binding.seekBarY.setOnSeekBarChangeListener(this) binding.chart1.setUsePercentValues(true) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false binding.chart1.setExtraOffsets(5f, 10f, 5f, 5f) binding.chart1.dragDecelerationFrictionCoef = 0.95f diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt index 416bd1ea3..b1ff3bccf 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt @@ -46,7 +46,7 @@ class PieChartRoundedActivity : DemoBase(), OnSeekBarChangeListener, OnChartValu binding.seekBarX.setOnSeekBarChangeListener(this) binding.seekBarY.setOnSeekBarChangeListener(this) binding.chart1.setUsePercentValues(true) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false binding.chart1.setExtraOffsets(5f, 10f, 5f, 5f) binding.chart1.dragDecelerationFrictionCoef = 0.95f diff --git a/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt index fa1bf7dcf..b0299bb53 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt @@ -45,7 +45,7 @@ class PiePolylineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVal binding.seekBarY.setOnSeekBarChangeListener(this) binding.chart1.setUsePercentValues(true) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false binding.chart1.setExtraOffsets(5f, 10f, 5f, 5f) binding.chart1.dragDecelerationFrictionCoef = 0.95f diff --git a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt index 63178d691..639366f97 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt @@ -33,7 +33,7 @@ class RadarChartActivity : DemoBase() { setContentView(binding.root) binding.chart1.setBackgroundColor(Color.rgb(60, 65, 82)) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false binding.chart1.webLineWidth = 1f binding.chart1.webColor = Color.LTGRAY diff --git a/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt index dca25a5bf..4c76f774f 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt @@ -34,7 +34,7 @@ class RealtimeLineChartActivity : DemoBase(), OnChartValueSelectedListener { setContentView(binding.root) binding.chart1.setOnChartValueSelectedListener(this) - binding.chart1.description?.isEnabled = true + binding.chart1.description.isEnabled = true // enable touch gestures binding.chart1.setTouchEnabled(true) diff --git a/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt index 2058142a8..2f62a3c51 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt @@ -36,7 +36,7 @@ class ScatterChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSe binding.seekBarX.setOnSeekBarChangeListener(this) binding.seekBarY.setOnSeekBarChangeListener(this) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false binding.chart1.setOnChartValueSelectedListener(this) binding.chart1.setDrawGridBackground(false) diff --git a/app/src/main/kotlin/info/appdev/chartexample/ScrollViewActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/ScrollViewActivity.kt index 2636edf1a..5f1ba0145 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/ScrollViewActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/ScrollViewActivity.kt @@ -23,7 +23,7 @@ class ScrollViewActivity : DemoBase() { binding = ActivityScrollviewBinding.inflate(layoutInflater) setContentView(binding.root) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // scaling can now only be done on x- and y-axis separately binding.chart1.setPinchZoom(false) diff --git a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt index 6707a01dd..934040c11 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt @@ -49,7 +49,7 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener, binding.chart1.setDrawGridBackground(false) // no description text - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // enable touch gestures binding.chart1.setTouchEnabled(true) diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt index aa328b577..079fb7567 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt @@ -43,7 +43,7 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele binding.chart1.setOnChartValueSelectedListener(this) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // if more than 60 entries are displayed in the chart, no values will be // drawn diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt index 4b14abbe0..03bc1c362 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt @@ -40,7 +40,7 @@ class StackedBarActivityNegative : DemoBase(), OnChartValueSelectedListener { binding.chart1.setOnChartValueSelectedListener(this) binding.chart1.setDrawGridBackground(false) - binding.chart1.description?.isEnabled = false + binding.chart1.description.isEnabled = false // scaling can now only be done on x- and y-axis separately binding.chart1.setPinchZoom(false) diff --git a/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt index 2f4cb02e6..bd76ab196 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt @@ -290,7 +290,7 @@ class HorizontalBarComposeActivity : DemoBaseCompose() { chart.setDrawBarShadow(false) chart.setDrawValueAboveBar(true) - chart.description?.isEnabled = false + chart.description.isEnabled = false chart.setMaxVisibleValueCount(60) chart.setPinchZoom(false) chart.setDrawGridBackground(false) diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/BarChartFrag.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/BarChartFrag.kt index 4ab89abc3..a1feade99 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/fragments/BarChartFrag.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/fragments/BarChartFrag.kt @@ -23,7 +23,7 @@ class BarChartFrag : SimpleFragment(), OnChartGestureListener { // create a new chart object chart = BarChart(requireActivity()) - chart!!.description?.isEnabled = false + chart!!.description.isEnabled = false chart!!.onChartGestureListener = this val mv = MyMarkerView(activity, R.layout.custom_marker_view) diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/ComplexityFragment.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/ComplexityFragment.kt index 8b245fbe2..8b01d8880 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/fragments/ComplexityFragment.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/fragments/ComplexityFragment.kt @@ -17,7 +17,7 @@ class ComplexityFragment : SimpleFragment() { chart = v.findViewById(R.id.lineChart1) - chart!!.description?.isEnabled = false + chart!!.description.isEnabled = false chart!!.setDrawGridBackground(false) diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/PieChartFrag.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/PieChartFrag.kt index d662c4305..4bef9518c 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/fragments/PieChartFrag.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/fragments/PieChartFrag.kt @@ -21,7 +21,7 @@ class PieChartFrag : SimpleFragment() { val v = inflater.inflate(R.layout.frag_simple_pie, container, false) chart = v.findViewById(R.id.pieChart1) - chart!!.description?.isEnabled = false + chart!!.description.isEnabled = false val tf = Typeface.createFromAsset(requireContext().assets, "OpenSans-Light.ttf") diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/ScatterChartFrag.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/ScatterChartFrag.kt index 1abe4a4a2..00998f303 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/fragments/ScatterChartFrag.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/fragments/ScatterChartFrag.kt @@ -18,7 +18,7 @@ class ScatterChartFrag : SimpleFragment() { val v = inflater.inflate(R.layout.frag_simple_scatter, container, false) chart = v.findViewById(R.id.scatterChart1) - chart!!.description?.isEnabled = false + chart!!.description.isEnabled = false val tf = Typeface.createFromAsset(requireContext().assets, "OpenSans-Light.ttf") diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/SineCosineFragment.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/SineCosineFragment.kt index 1390d73d0..fd127fa6e 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/fragments/SineCosineFragment.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/fragments/SineCosineFragment.kt @@ -17,7 +17,7 @@ class SineCosineFragment : SimpleFragment() { chart = v.findViewById(R.id.lineChart1) - chart!!.description?.isEnabled = false + chart!!.description.isEnabled = false chart!!.setDrawGridBackground(false) diff --git a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/BarChartItem.kt b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/BarChartItem.kt index 22364f446..04997f169 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/BarChartItem.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/BarChartItem.kt @@ -36,7 +36,7 @@ class BarChartItem(cd: ChartData<*>, c: Context) : ChartItem(cd) { } // apply styling - holder.chart!!.description?.isEnabled = false + holder.chart!!.description.isEnabled = false holder.chart!!.setDrawGridBackground(false) holder.chart!!.setDrawBarShadow(false) diff --git a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/LineChartItem.kt b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/LineChartItem.kt index f7b8af435..364a7badc 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/LineChartItem.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/LineChartItem.kt @@ -37,7 +37,7 @@ class LineChartItem(cd: ChartData<*>, c: Context) : ChartItem(cd) { // apply styling // holder.chart.setValueTypeface(mTf); - holder.chart!!.description?.isEnabled = false + holder.chart!!.description.isEnabled = false holder.chart!!.setDrawGridBackground(false) val xAxis = holder.chart!!.xAxis diff --git a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/PieChartItem.kt b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/PieChartItem.kt index 4c41f76d3..0eaca7e8b 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/listviewitems/PieChartItem.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/listviewitems/PieChartItem.kt @@ -48,7 +48,7 @@ class PieChartItem(cd: ChartData<*>, c: Context) : ChartItem(cd) { } // apply styling - holder.chart!!.description?.isEnabled = false + holder.chart!!.description.isEnabled = false holder.chart!!.holeRadius = 52f holder.chart!!.transparentCircleRadius = 57f holder.chart!!.centerText = centerText diff --git a/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt index 955337987..1f07060a4 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt @@ -108,13 +108,13 @@ abstract class Chart>?> : ViewGroup, IBase * paint object used for drawing the description text in the bottom right * corner of the chart */ - protected var mDescPaint: Paint? = null + protected var mDescPaint = Paint(Paint.ANTI_ALIAS_FLAG) /** * paint object for drawing the information text when there are no values in * the chart */ - protected var mInfoPaint: Paint? = null + protected var mInfoPaint = Paint(Paint.ANTI_ALIAS_FLAG) /** * the object representing the labels on the x-axis @@ -136,7 +136,7 @@ abstract class Chart>?> : ViewGroup, IBase /** * the object responsible for representing the description text */ - var description: Description? = null + var description = Description() /** * Returns the Legend object of the chart. This method can be used to get an @@ -254,10 +254,9 @@ abstract class Chart>?> : ViewGroup, IBase mDescPaint = Paint(Paint.ANTI_ALIAS_FLAG) - mInfoPaint = Paint(Paint.ANTI_ALIAS_FLAG) - mInfoPaint!!.color = Color.rgb(247, 189, 51) // orange - mInfoPaint!!.textAlign = Align.CENTER - mInfoPaint!!.textSize = 12f.convertDpToPixel() + mInfoPaint.color = Color.rgb(247, 189, 51) // orange + mInfoPaint.textAlign = Align.CENTER + mInfoPaint.textSize = 12f.convertDpToPixel() if (this.isLogEnabled) { Timber.i("Chart.init()") @@ -390,18 +389,18 @@ abstract class Chart>?> : ViewGroup, IBase if (hasText) { val pt = this.center - when (mInfoPaint!!.textAlign) { + when (mInfoPaint.textAlign) { Align.LEFT -> { pt.x = 0F - canvas.drawText(mNoDataText, pt.x, pt.y, mInfoPaint!!) + canvas.drawText(mNoDataText, pt.x, pt.y, mInfoPaint) } Align.RIGHT -> { pt.x *= 2.0f - canvas.drawText(mNoDataText, pt.x, pt.y, mInfoPaint!!) + canvas.drawText(mNoDataText, pt.x, pt.y, mInfoPaint) } - else -> canvas.drawText(mNoDataText, pt.x, pt.y, mInfoPaint!!) + else -> canvas.drawText(mNoDataText, pt.x, pt.y, mInfoPaint) } } @@ -420,27 +419,27 @@ abstract class Chart>?> : ViewGroup, IBase protected fun drawDescription(c: Canvas) { // check if description should be drawn - if (this.description != null && description!!.isEnabled) { - val position = description!!.position + if (description.isEnabled) { + val position = description.position - mDescPaint!!.typeface = description!!.typeface - mDescPaint!!.textSize = description!!.textSize - mDescPaint!!.color = description!!.textColor - mDescPaint!!.textAlign = description!!.textAlign + mDescPaint.typeface = description.typeface + mDescPaint.textSize = description.textSize + mDescPaint.color = description.textColor + mDescPaint.textAlign = description.textAlign val x: Float val y: Float // if no position specified, draw on default position if (position == null) { - x = width - viewPortHandler.offsetRight() - description!!.xOffset - y = height - viewPortHandler.offsetBottom() - description!!.yOffset + x = width - viewPortHandler.offsetRight() - description.xOffset + y = height - viewPortHandler.offsetBottom() - description.yOffset } else { x = position.x y = position.y } - c.drawText(description!!.text!!, x, y, mDescPaint!!) + c.drawText(description.text!!, x, y, mDescPaint) } } @@ -981,21 +980,21 @@ abstract class Chart>?> : ViewGroup, IBase * Sets the color of the no data text. */ fun setNoDataTextColor(color: Int) { - mInfoPaint!!.color = color + mInfoPaint.color = color } /** * Sets the typeface to be used for the no data text. */ fun setNoDataTextTypeface(tf: Typeface?) { - mInfoPaint!!.typeface = tf + mInfoPaint.typeface = tf } /** * alignment of the no data text */ fun setNoDataTextAlignment(align: Align?) { - mInfoPaint!!.textAlign = align + mInfoPaint.textAlign = align } /**