From 6236a021c3ef443c6cf8bdddaa6efcead30f1773 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Mon, 22 Dec 2025 09:24:43 +0100 Subject: [PATCH 1/2] CleanupHighLighter --- .../charting/highlight/ChartHighlighter.kt | 9 +++++---- .../charting/highlight/RadarHighlighter.kt | 20 +++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt index 869b21901..945218175 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt @@ -61,7 +61,7 @@ open class ChartHighlighter(protecte var distance = Float.MAX_VALUE for (i in closestValues.indices) { - val high = closestValues.get(i) + val high = closestValues[i] if (high.axis == axis) { val tempDistance = abs(getHighlightPos(high) - pos) @@ -112,6 +112,7 @@ open class ChartHighlighter(protecte /** * An array of `Highlight` objects corresponding to the selected xValue and dataSetIndex. */ + @Suppress("SameParameterValue") protected open fun buildHighlights(set: IDataSet<*>, dataSetIndex: Int, xVal: Float, rounding: DataSet.Rounding?): MutableList { val highlights = ArrayList() @@ -129,7 +130,7 @@ open class ChartHighlighter(protecte if (entries != null) for (e in entries) { - val pixels = provider!!.getTransformer(set.axisDependency)!!.getPixelForValues(e.x, e.y) + val pixels = provider.getTransformer(set.axisDependency)!!.getPixelForValues(e.x, e.y) highlights.add( Highlight( @@ -159,7 +160,7 @@ open class ChartHighlighter(protecte var distance = minSelectionDistance for (i in closestValues.indices) { - val high = closestValues.get(i) + val high = closestValues[i] if (axis == null || high.axis == axis) { val cDistance = getDistance(x, y, high.xPx, high.yPx) @@ -184,5 +185,5 @@ open class ChartHighlighter(protecte } protected open val data: BarLineScatterCandleBubbleData<*> - get() = provider!!.getData() + get() = provider.getData() } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt index 86026bc89..43d643fa2 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt @@ -11,7 +11,7 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter override fun getClosestHighlight(index: Int, x: Float, y: Float): Highlight? { val highlights = getHighlightsAtIndex(index) - val distanceToCenter = chartPieRadar!!.distanceToCenter(x, y) / chartPieRadar!!.getFactor() + val distanceToCenter = chartPieRadar.distanceToCenter(x, y) / chartPieRadar.getFactor() var closest: Highlight? = null var distance = Float.MAX_VALUE @@ -38,22 +38,22 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter protected fun getHighlightsAtIndex(index: Int): MutableList { mHighlightBuffer.clear() - val phaseX = chartPieRadar!!.animator.phaseX - val phaseY = chartPieRadar!!.animator.phaseY - val sliceAngle = chartPieRadar!!.sliceAngle - val factor = chartPieRadar!!.getFactor() + val phaseX = chartPieRadar.animator.phaseX + val phaseY = chartPieRadar.animator.phaseY + val sliceAngle = chartPieRadar.sliceAngle + val factor = chartPieRadar.getFactor() val pOut = MPPointF.getInstance(0f, 0f) - for (i in 0.. = chartPieRadar!!.data!!.getDataSetByIndex(i) + for (i in 0.. = chartPieRadar.data!!.getDataSetByIndex(i) val entry: Entry? = dataSet.getEntryForIndex(index) - val y = (entry!!.y - chartPieRadar!!.yChartMin) + val y = (entry!!.y - chartPieRadar.yChartMin) Utils.getPosition( - chartPieRadar!!.centerOffsets, y * factor * phaseY, - sliceAngle * index * phaseX + chartPieRadar!!.rotationAngle, pOut + chartPieRadar.centerOffsets, y * factor * phaseY, + sliceAngle * index * phaseX + chartPieRadar.rotationAngle, pOut ) mHighlightBuffer.add(Highlight(index.toFloat(), entry.y, pOut.x, pOut.y, i, dataSet.axisDependency)) From 915d1bf629483df35cb0daf0623bac6f4ae732a4 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Mon, 22 Dec 2025 09:14:16 +0100 Subject: [PATCH 2/2] Cleanup BarDataset --- .../com/github/mikephil/charting/data/BarDataSet.kt | 12 ++++++------ .../info/appdev/chartexample/BarChartActivity.kt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.kt index 095ad48a4..57e572c7d 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.kt @@ -51,7 +51,7 @@ open class BarDataSet(yVals: MutableList, label: String = "") : BarLin * Use getFills() instead. */ @get:Deprecated("") - var gradients: MutableList? = null + var gradients: MutableList? = null protected set init { @@ -82,7 +82,7 @@ open class BarDataSet(yVals: MutableList, label: String = "") : BarLin barDataSet.mHighLightAlpha = mHighLightAlpha } - override fun getFills(): MutableList? { + override fun getFills(): MutableList? { return this.gradients } @@ -99,19 +99,19 @@ open class BarDataSet(yVals: MutableList, label: String = "") : BarLin * Sets the start and end color for gradient color, ONLY color that should be used for this DataSet. */ fun setGradientColor(startColor: Int, endColor: Int) { - gradients!!.clear() - gradients!!.add(Fill(startColor, endColor)) + gradients?.clear() + gradients?.add(Fill(startColor, endColor)) } @Deprecated("Use setFills(...) instead") - fun setGradientColors(gradientColors: MutableList?) { + fun setGradientColors(gradientColors: MutableList?) { this.gradients = gradientColors } /** * Sets the fills for the bars in this dataset. */ - fun setFills(fills: MutableList?) { + fun setFills(fills: MutableList?) { this.gradients = fills } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt index 443b43d77..661c0f064 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt @@ -167,7 +167,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect val endColor4 = ContextCompat.getColor(this, android.R.color.holo_red_dark) val endColor5 = ContextCompat.getColor(this, android.R.color.holo_orange_dark) - val gradientFills: MutableList = ArrayList() + val gradientFills: MutableList = ArrayList() gradientFills.add(Fill(startColor1, endColor1)) gradientFills.add(Fill(startColor2, endColor2)) gradientFills.add(Fill(startColor3, endColor3))