Merge pull request #463 from AppDevNext/RenameColorGetter

hannesa2 · web-flow · commit 47df367d80ee · 2025-12-13T09:08:06.000+01:00
Rename color getter
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt
@@ -123,7 +123,7 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
         return mColors[0]
     }
 
-    override fun getColor(index: Int): Int {
+    override fun getColorByIndex(index: Int): Int {
         return mColors[index % mColors.size]
     }
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java
@@ -240,7 +240,7 @@ public interface IDataSet<T extends Entry> {
      * Performs a IndexOutOfBounds check by modulus.
      *
      */
-    int getColor(int index);
+    int getColorByIndex(int index);
 
     /**
      * returns true if highlighting of values is enabled, false if not
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt
@@ -189,7 +189,7 @@ open class BarChartRenderer(
             if (!isSingleColor) {
                 // Set the color for the currently drawn value. If the index
                 // is out of bounds, reuse colors.
-                paintRender.color = dataSet.getColor(pos)
+                paintRender.color = dataSet.getColorByIndex(pos)
             }
 
             if (isCustomFill) {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt
@@ -80,7 +80,7 @@ open class BubbleChartRenderer(
 
             if (!viewPortHandler.isInBoundsRight(pointBuffer[0] - shapeHalf)) break
 
-            val color = dataSet.getColor(j)
+            val color = dataSet.getColorByIndex(j)
 
             paintRender.color = color
             canvas.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, paintRender)
@@ -238,7 +238,7 @@ open class BubbleChartRenderer(
 
             if (!viewPortHandler.isInBoundsRight(pointBuffer[0] - shapeHalf)) break
 
-            val originalColor = set.getColor(bubbleEntry.x.toInt())
+            val originalColor = set.getColorByIndex(bubbleEntry.x.toInt())
 
             Color.RGBToHSV(
                 Color.red(originalColor), Color.green(originalColor),
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt
@@ -85,12 +85,12 @@ open class CandleStickChartRenderer(
                 // draw the shadows
                 if (dataSet.shadowColorSameAsCandle) {
                     if (open > close) paintRender.color =
-                        if (dataSet.decreasingColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.decreasingColor
+                        if (dataSet.decreasingColor == ColorTemplate.COLOR_NONE) dataSet.getColorByIndex(j) else dataSet.decreasingColor
                     else if (open < close) paintRender.color =
-                        if (dataSet.increasingColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.increasingColor
-                    else paintRender.color = if (dataSet.neutralColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.neutralColor
+                        if (dataSet.increasingColor == ColorTemplate.COLOR_NONE) dataSet.getColorByIndex(j) else dataSet.increasingColor
+                    else paintRender.color = if (dataSet.neutralColor == ColorTemplate.COLOR_NONE) dataSet.getColorByIndex(j) else dataSet.neutralColor
                 } else {
-                    paintRender.color = if (dataSet.shadowColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.shadowColor
+                    paintRender.color = if (dataSet.shadowColor == ColorTemplate.COLOR_NONE) dataSet.getColorByIndex(j) else dataSet.shadowColor
                 }
 
                 paintRender.style = Paint.Style.STROKE
@@ -109,7 +109,7 @@ open class CandleStickChartRenderer(
                 if (open > close) { // decreasing
 
                     if (dataSet.decreasingColor == ColorTemplate.COLOR_NONE) {
-                        paintRender.color = dataSet.getColor(j)
+                        paintRender.color = dataSet.getColorByIndex(j)
                     } else {
                         paintRender.color = dataSet.decreasingColor
                     }
@@ -123,7 +123,7 @@ open class CandleStickChartRenderer(
                     )
                 } else if (open < close) {
                     if (dataSet.increasingColor == ColorTemplate.COLOR_NONE) {
-                        paintRender.color = dataSet.getColor(j)
+                        paintRender.color = dataSet.getColorByIndex(j)
                     } else {
                         paintRender.color = dataSet.increasingColor
                     }
@@ -138,7 +138,7 @@ open class CandleStickChartRenderer(
                 } else { // equal values
 
                     if (dataSet.neutralColor == ColorTemplate.COLOR_NONE) {
-                        paintRender.color = dataSet.getColor(j)
+                        paintRender.color = dataSet.getColorByIndex(j)
                     } else {
                         paintRender.color = dataSet.neutralColor
                     }
@@ -171,15 +171,15 @@ open class CandleStickChartRenderer(
 
                 // draw the ranges
                 val barColor = if (open > close) if (dataSet.decreasingColor == ColorTemplate.COLOR_NONE)
-                    dataSet.getColor(j)
+                    dataSet.getColorByIndex(j)
                 else
                     dataSet.decreasingColor
                 else if (open < close) if (dataSet.increasingColor == ColorTemplate.COLOR_NONE)
-                    dataSet.getColor(j)
+                    dataSet.getColorByIndex(j)
                 else
                     dataSet.increasingColor
                 else if (dataSet.neutralColor == ColorTemplate.COLOR_NONE)
-                    dataSet.getColor(j)
+                    dataSet.getColorByIndex(j)
                 else
                     dataSet.neutralColor
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt
@@ -130,7 +130,7 @@ open class HorizontalBarChartRenderer(
             if (!isSingleColor) {
                 // Set the color for the currently drawn value. If the index
                 // is out of bounds, reuse colors.
-                paintRender.color = dataSet.getColor(j / 4)
+                paintRender.color = dataSet.getColorByIndex(j / 4)
             }
 
             if (isCustomFill) {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt
@@ -331,7 +331,7 @@ class LineChartRenderer(
                 ) continue
 
                 // get the color that is set for this line-segment
-                paintRender.color = dataSet.getColor(j)
+                paintRender.color = dataSet.getColorByIndex(j)
 
                 canvas!!.drawLines(lineBuffer, 0, pointsPerEntryPair * 2, paintRender)
             }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt
@@ -228,10 +228,10 @@ open class PieChartRenderer(
 
             val accountForSliceSpacing = sliceSpace > 0f && sliceAngle <= 180f
 
-            paintRender.color = dataSet.getColor(j)
+            paintRender.color = dataSet.getColorByIndex(j)
 
             // Set current data set color to paint object
-            roundedCornerPaint.color = dataSet.getColor(j)
+            roundedCornerPaint.color = dataSet.getColorByIndex(j)
 
             val sliceSpaceAngleOuter = if (visibleAngleCount == 1) 0f else sliceSpace / (Utils.FDEG2RAD * radius)
             val startAngleOuter = rotationAngle + (angle + sliceSpaceAngleOuter / 2f) * phaseY
@@ -521,7 +521,7 @@ open class PieChartRenderer(
 
                         var lineColor = ColorTemplate.COLOR_NONE
 
-                        if (isUseValueColorForLineEnabled) lineColor = dataSet.getColor(j)
+                        if (isUseValueColorForLineEnabled) lineColor = dataSet.getColorByIndex(j)
                         else if (valueLineColor != ColorTemplate.COLOR_NONE) lineColor = valueLineColor
 
                         if (lineColor != ColorTemplate.COLOR_NONE) {
@@ -836,7 +836,7 @@ open class PieChartRenderer(
             val accountForSliceSpacing = sliceSpace > 0f && sliceAngle <= 180f
 
             var highlightColor = set.highlightColor
-            if (highlightColor == null) highlightColor = set.getColor(index)
+            if (highlightColor == null) highlightColor = set.getColorByIndex(index)
             paintRender.color = highlightColor
 
             val sliceSpaceAngleOuter = if (visibleAngleCount == 1) 0f else sliceSpace / (Utils.FDEG2RAD * radius)
@@ -994,7 +994,7 @@ open class PieChartRenderer(
                 val y = ((r - circleRadius)
                         * sin(v) + center.y).toFloat()
 
-                paintRender.color = dataSet.getColor(j)
+                paintRender.color = dataSet.getColorByIndex(j)
                 bitmapCanvas!!.drawCircle(x, y, circleRadius, paintRender)
             }
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt
@@ -69,7 +69,7 @@ open class RadarChartRenderer(
         var hasMovedToPoint = false
 
         for (j in 0..<dataSet.entryCount) {
-            paintRender.color = dataSet.getColor(j)
+            paintRender.color = dataSet.getColorByIndex(j)
 
             val e = dataSet.getEntryForIndex(j)
 
@@ -322,7 +322,7 @@ open class RadarChartRenderer(
                 if (!java.lang.Float.isNaN(pOut.x) && !java.lang.Float.isNaN(pOut.y)) {
                     var strokeColor = set.highlightCircleStrokeColor
                     if (strokeColor == ColorTemplate.COLOR_NONE) {
-                        strokeColor = set.getColor(0)
+                        strokeColor = set.getColorByIndex(0)
                     }
 
                     if (set.highlightCircleStrokeAlpha < 255) {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt
@@ -119,7 +119,7 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,
                 }
 
                 // Set the color for the currently drawn value. If the index
-                paintRender.color = dataSet.getColor(j / 4)
+                paintRender.color = dataSet.getColorByIndex(j / 4)
 
                 if (roundedPositiveDataSetRadius > 0) {
                     canvas.drawRoundRect(
@@ -187,7 +187,7 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,
 
         val isSingleColor = dataSet.colors.size == 1
         if (isSingleColor) {
-            paintRender.color = dataSet.getColor(index)
+            paintRender.color = dataSet.getColorByIndex(index)
         }
 
         var j = 0
@@ -202,7 +202,7 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,
             }
 
             if (!isSingleColor) {
-                paintRender.color = dataSet.getColor(j / 4)
+                paintRender.color = dataSet.getColorByIndex(j / 4)
             }
 
             paintRender.setShader(
@@ -211,8 +211,8 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,
                     buffer.buffer[j + 3],
                     buffer.buffer[j],
                     buffer.buffer[j + 1],
-                    dataSet.getColor(j / 4),
-                    dataSet.getColor(j / 4),
+                    dataSet.getColorByIndex(j / 4),
+                    dataSet.getColorByIndex(j / 4),
                     Shader.TileMode.MIRROR
                 )
             )
@@ -223,8 +223,8 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,
                     buffer.buffer[j + 3],
                     buffer.buffer[j],
                     buffer.buffer[j + 1],
-                    dataSet.getColor(j / 4),
-                    dataSet.getColor(j / 4),
+                    dataSet.getColorByIndex(j / 4),
+                    dataSet.getColorByIndex(j / 4),
                     Shader.TileMode.MIRROR
                 )
             )
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedHorizontalBarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedHorizontalBarChartRenderer.kt
@@ -120,7 +120,7 @@ class RoundedHorizontalBarChartRenderer(chart: BarDataProvider, animator: ChartA
                 }
 
                 // Set the color for the currently drawn value. If the index
-                paintRender.color = dataSet.getColor(j / 4)
+                paintRender.color = dataSet.getColorByIndex(j / 4)
 
                 if (roundedPositiveDataSetRadius > 0) {
                     canvas.drawRoundRect(
@@ -187,7 +187,7 @@ class RoundedHorizontalBarChartRenderer(chart: BarDataProvider, animator: ChartA
 
         val isSingleColor = dataSet.colors.size == 1
         if (isSingleColor) {
-            paintRender.color = dataSet.getColor(index)
+            paintRender.color = dataSet.getColorByIndex(index)
         }
 
         var j = 0
@@ -202,7 +202,7 @@ class RoundedHorizontalBarChartRenderer(chart: BarDataProvider, animator: ChartA
             }
 
             if (!isSingleColor) {
-                paintRender.color = dataSet.getColor(j / 4)
+                paintRender.color = dataSet.getColorByIndex(j / 4)
             }
 
             if ((dataSet.getEntryForIndex(j / 4).y < 0 && roundedNegativeDataSetRadius > 0)) {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt
@@ -62,7 +62,7 @@ open class ScatterChartRenderer(@JvmField var chart: ScatterDataProvider, animat
                 || !viewPortHandler.isInBoundsY(pixelBuffer[1])
             ) continue
 
-            paintRender.color = dataSet.getColor(i / 2)
+            paintRender.color = dataSet.getColorByIndex(i / 2)
             renderer.renderShape(
                 canvas, dataSet, this.viewPortHandler,
                 pixelBuffer[0], pixelBuffer[1],

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {`
`123`	`123`	`return mColors[0]`
`124`	`124`	`}`
`125`	`125`
`126`		`- override fun getColor(index: Int): Int {`
	`126`	`+ override fun getColorByIndex(index: Int): Int {`
`127`	`127`	`return mColors[index % mColors.size]`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ public interface IDataSet<T extends Entry> {`
`240`	`240`	`* Performs a IndexOutOfBounds check by modulus.`
`241`	`241`	`*`
`242`	`242`	`*/`
`243`		`- int getColor(int index);`
	`243`	`+ int getColorByIndex(int index);`
`244`	`244`
`245`	`245`	`/**`
`246`	`246`	`* returns true if highlighting of values is enabled, false if not`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ open class BarChartRenderer(`
`189`	`189`	`if (!isSingleColor) {`
`190`	`190`	`// Set the color for the currently drawn value. If the index`
`191`	`191`	`// is out of bounds, reuse colors.`
`192`		`- paintRender.color = dataSet.getColor(pos)`
	`192`	`+ paintRender.color = dataSet.getColorByIndex(pos)`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`if (isCustomFill) {`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ open class HorizontalBarChartRenderer(`
`130`	`130`	`if (!isSingleColor) {`
`131`	`131`	`// Set the color for the currently drawn value. If the index`
`132`	`132`	`// is out of bounds, reuse colors.`
`133`		`- paintRender.color = dataSet.getColor(j / 4)`
	`133`	`+ paintRender.color = dataSet.getColorByIndex(j / 4)`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`if (isCustomFill) {`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ class LineChartRenderer(`
`331`	`331`	`) continue`
`332`	`332`
`333`	`333`	`// get the color that is set for this line-segment`
`334`		`- paintRender.color = dataSet.getColor(j)`
	`334`	`+ paintRender.color = dataSet.getColorByIndex(j)`
`335`	`335`
`336`	`336`	`canvas!!.drawLines(lineBuffer, 0, pointsPerEntryPair * 2, paintRender)`
`337`	`337`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`// Set the color for the currently drawn value. If the index`
`122`		`- paintRender.color = dataSet.getColor(j / 4)`
	`122`	`+ paintRender.color = dataSet.getColorByIndex(j / 4)`
`123`	`123`
`124`	`124`	`if (roundedPositiveDataSetRadius > 0) {`
`125`	`125`	`canvas.drawRoundRect(`
`@@ -187,7 +187,7 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,`
`187`	`187`
`188`	`188`	`val isSingleColor = dataSet.colors.size == 1`
`189`	`189`	`if (isSingleColor) {`
`190`		`- paintRender.color = dataSet.getColor(index)`
	`190`	`+ paintRender.color = dataSet.getColorByIndex(index)`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`var j = 0`
`@@ -202,7 +202,7 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`if (!isSingleColor) {`
`205`		`- paintRender.color = dataSet.getColor(j / 4)`
	`205`	`+ paintRender.color = dataSet.getColorByIndex(j / 4)`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`paintRender.setShader(`
`@@ -211,8 +211,8 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,`
`211`	`211`	`buffer.buffer[j + 3],`
`212`	`212`	`buffer.buffer[j],`
`213`	`213`	`buffer.buffer[j + 1],`
`214`		`- dataSet.getColor(j / 4),`
`215`		`- dataSet.getColor(j / 4),`
	`214`	`+ dataSet.getColorByIndex(j / 4),`
	`215`	`+ dataSet.getColorByIndex(j / 4),`
`216`	`216`	`Shader.TileMode.MIRROR`
`217`	`217`	`)`
`218`	`218`	`)`
`@@ -223,8 +223,8 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,`
`223`	`223`	`buffer.buffer[j + 3],`
`224`	`224`	`buffer.buffer[j],`
`225`	`225`	`buffer.buffer[j + 1],`
`226`		`- dataSet.getColor(j / 4),`
`227`		`- dataSet.getColor(j / 4),`
	`226`	`+ dataSet.getColorByIndex(j / 4),`
	`227`	`+ dataSet.getColorByIndex(j / 4),`
`228`	`228`	`Shader.TileMode.MIRROR`
`229`	`229`	`)`
`230`	`230`	`)`