Skip to content

Commit ae5e4f0

Browse files
hannesa2hannesa2
committed
Rename color getter
1 parent 60b270c commit ae5e4f0

File tree

12 files changed

+35
-35
lines changed

12 files changed

+35
-35
lines changed

‎MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
123123
return mColors[0]
124124
}
125125

126-
override fun getColor(index: Int): Int {
126+
override fun getColorByIndex(index: Int): Int {
127127
return mColors[index % mColors.size]
128128
}
129129

‎MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public interface IDataSet<T extends Entry> {
240240
* Performs a IndexOutOfBounds check by modulus.
241241
*
242242
*/
243-
int getColor(int index);
243+
int getColorByIndex(int index);
244244

245245
/**
246246
* returns true if highlighting of values is enabled, false if not

‎MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ open class BarChartRenderer(
189189
if (!isSingleColor) {
190190
// Set the color for the currently drawn value. If the index
191191
// is out of bounds, reuse colors.
192-
paintRender.color = dataSet.getColor(pos)
192+
paintRender.color = dataSet.getColorByIndex(pos)
193193
}
194194

195195
if (isCustomFill) {

‎MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ open class BubbleChartRenderer(
8080

8181
if (!viewPortHandler.isInBoundsRight(pointBuffer[0] - shapeHalf)) break
8282

83-
val color = dataSet.getColor(j)
83+
val color = dataSet.getColorByIndex(j)
8484

8585
paintRender.color = color
8686
canvas.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, paintRender)
@@ -238,7 +238,7 @@ open class BubbleChartRenderer(
238238

239239
if (!viewPortHandler.isInBoundsRight(pointBuffer[0] - shapeHalf)) break
240240

241-
val originalColor = set.getColor(bubbleEntry.x.toInt())
241+
val originalColor = set.getColorByIndex(bubbleEntry.x.toInt())
242242

243243
Color.RGBToHSV(
244244
Color.red(originalColor), Color.green(originalColor),

‎MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ open class CandleStickChartRenderer(
8585
// draw the shadows
8686
if (dataSet.shadowColorSameAsCandle) {
8787
if (open > close) paintRender.color =
88-
if (dataSet.decreasingColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.decreasingColor
88+
if (dataSet.decreasingColor == ColorTemplate.COLOR_NONE) dataSet.getColorByIndex(j) else dataSet.decreasingColor
8989
else if (open < close) paintRender.color =
90-
if (dataSet.increasingColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.increasingColor
91-
else paintRender.color = if (dataSet.neutralColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.neutralColor
90+
if (dataSet.increasingColor == ColorTemplate.COLOR_NONE) dataSet.getColorByIndex(j) else dataSet.increasingColor
91+
else paintRender.color = if (dataSet.neutralColor == ColorTemplate.COLOR_NONE) dataSet.getColorByIndex(j) else dataSet.neutralColor
9292
} else {
93-
paintRender.color = if (dataSet.shadowColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.shadowColor
93+
paintRender.color = if (dataSet.shadowColor == ColorTemplate.COLOR_NONE) dataSet.getColorByIndex(j) else dataSet.shadowColor
9494
}
9595

9696
paintRender.style = Paint.Style.STROKE
@@ -109,7 +109,7 @@ open class CandleStickChartRenderer(
109109
if (open > close) { // decreasing
110110

111111
if (dataSet.decreasingColor == ColorTemplate.COLOR_NONE) {
112-
paintRender.color = dataSet.getColor(j)
112+
paintRender.color = dataSet.getColorByIndex(j)
113113
} else {
114114
paintRender.color = dataSet.decreasingColor
115115
}
@@ -123,7 +123,7 @@ open class CandleStickChartRenderer(
123123
)
124124
} else if (open < close) {
125125
if (dataSet.increasingColor == ColorTemplate.COLOR_NONE) {
126-
paintRender.color = dataSet.getColor(j)
126+
paintRender.color = dataSet.getColorByIndex(j)
127127
} else {
128128
paintRender.color = dataSet.increasingColor
129129
}
@@ -138,7 +138,7 @@ open class CandleStickChartRenderer(
138138
} else { // equal values
139139

140140
if (dataSet.neutralColor == ColorTemplate.COLOR_NONE) {
141-
paintRender.color = dataSet.getColor(j)
141+
paintRender.color = dataSet.getColorByIndex(j)
142142
} else {
143143
paintRender.color = dataSet.neutralColor
144144
}
@@ -171,15 +171,15 @@ open class CandleStickChartRenderer(
171171

172172
// draw the ranges
173173
val barColor = if (open > close) if (dataSet.decreasingColor == ColorTemplate.COLOR_NONE)
174-
dataSet.getColor(j)
174+
dataSet.getColorByIndex(j)
175175
else
176176
dataSet.decreasingColor
177177
else if (open < close) if (dataSet.increasingColor == ColorTemplate.COLOR_NONE)
178-
dataSet.getColor(j)
178+
dataSet.getColorByIndex(j)
179179
else
180180
dataSet.increasingColor
181181
else if (dataSet.neutralColor == ColorTemplate.COLOR_NONE)
182-
dataSet.getColor(j)
182+
dataSet.getColorByIndex(j)
183183
else
184184
dataSet.neutralColor
185185

‎MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ open class HorizontalBarChartRenderer(
130130
if (!isSingleColor) {
131131
// Set the color for the currently drawn value. If the index
132132
// is out of bounds, reuse colors.
133-
paintRender.color = dataSet.getColor(j / 4)
133+
paintRender.color = dataSet.getColorByIndex(j / 4)
134134
}
135135

136136
if (isCustomFill) {

‎MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ class LineChartRenderer(
331331
) continue
332332

333333
// get the color that is set for this line-segment
334-
paintRender.color = dataSet.getColor(j)
334+
paintRender.color = dataSet.getColorByIndex(j)
335335

336336
canvas!!.drawLines(lineBuffer, 0, pointsPerEntryPair * 2, paintRender)
337337
}

‎MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,10 @@ open class PieChartRenderer(
228228

229229
val accountForSliceSpacing = sliceSpace > 0f && sliceAngle <= 180f
230230

231-
paintRender.color = dataSet.getColor(j)
231+
paintRender.color = dataSet.getColorByIndex(j)
232232

233233
// Set current data set color to paint object
234-
roundedCornerPaint.color = dataSet.getColor(j)
234+
roundedCornerPaint.color = dataSet.getColorByIndex(j)
235235

236236
val sliceSpaceAngleOuter = if (visibleAngleCount == 1) 0f else sliceSpace / (Utils.FDEG2RAD * radius)
237237
val startAngleOuter = rotationAngle + (angle + sliceSpaceAngleOuter / 2f) * phaseY
@@ -521,7 +521,7 @@ open class PieChartRenderer(
521521

522522
var lineColor = ColorTemplate.COLOR_NONE
523523

524-
if (isUseValueColorForLineEnabled) lineColor = dataSet.getColor(j)
524+
if (isUseValueColorForLineEnabled) lineColor = dataSet.getColorByIndex(j)
525525
else if (valueLineColor != ColorTemplate.COLOR_NONE) lineColor = valueLineColor
526526

527527
if (lineColor != ColorTemplate.COLOR_NONE) {
@@ -836,7 +836,7 @@ open class PieChartRenderer(
836836
val accountForSliceSpacing = sliceSpace > 0f && sliceAngle <= 180f
837837

838838
var highlightColor = set.highlightColor
839-
if (highlightColor == null) highlightColor = set.getColor(index)
839+
if (highlightColor == null) highlightColor = set.getColorByIndex(index)
840840
paintRender.color = highlightColor
841841

842842
val sliceSpaceAngleOuter = if (visibleAngleCount == 1) 0f else sliceSpace / (Utils.FDEG2RAD * radius)
@@ -994,7 +994,7 @@ open class PieChartRenderer(
994994
val y = ((r - circleRadius)
995995
* sin(v) + center.y).toFloat()
996996

997-
paintRender.color = dataSet.getColor(j)
997+
paintRender.color = dataSet.getColorByIndex(j)
998998
bitmapCanvas!!.drawCircle(x, y, circleRadius, paintRender)
999999
}
10001000

‎MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ open class RadarChartRenderer(
6969
var hasMovedToPoint = false
7070

7171
for (j in 0..<dataSet.entryCount) {
72-
paintRender.color = dataSet.getColor(j)
72+
paintRender.color = dataSet.getColorByIndex(j)
7373

7474
val e = dataSet.getEntryForIndex(j)
7575

@@ -322,7 +322,7 @@ open class RadarChartRenderer(
322322
if (!java.lang.Float.isNaN(pOut.x) && !java.lang.Float.isNaN(pOut.y)) {
323323
var strokeColor = set.highlightCircleStrokeColor
324324
if (strokeColor == ColorTemplate.COLOR_NONE) {
325-
strokeColor = set.getColor(0)
325+
strokeColor = set.getColorByIndex(0)
326326
}
327327

328328
if (set.highlightCircleStrokeAlpha < 255) {

‎MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,
119119
}
120120

121121
// 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)
123123

124124
if (roundedPositiveDataSetRadius > 0) {
125125
canvas.drawRoundRect(
@@ -187,7 +187,7 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,
187187

188188
val isSingleColor = dataSet.colors.size == 1
189189
if (isSingleColor) {
190-
paintRender.color = dataSet.getColor(index)
190+
paintRender.color = dataSet.getColorByIndex(index)
191191
}
192192

193193
var j = 0
@@ -202,7 +202,7 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,
202202
}
203203

204204
if (!isSingleColor) {
205-
paintRender.color = dataSet.getColor(j / 4)
205+
paintRender.color = dataSet.getColorByIndex(j / 4)
206206
}
207207

208208
paintRender.setShader(
@@ -211,8 +211,8 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,
211211
buffer.buffer[j + 3],
212212
buffer.buffer[j],
213213
buffer.buffer[j + 1],
214-
dataSet.getColor(j / 4),
215-
dataSet.getColor(j / 4),
214+
dataSet.getColorByIndex(j / 4),
215+
dataSet.getColorByIndex(j / 4),
216216
Shader.TileMode.MIRROR
217217
)
218218
)
@@ -223,8 +223,8 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,
223223
buffer.buffer[j + 3],
224224
buffer.buffer[j],
225225
buffer.buffer[j + 1],
226-
dataSet.getColor(j / 4),
227-
dataSet.getColor(j / 4),
226+
dataSet.getColorByIndex(j / 4),
227+
dataSet.getColorByIndex(j / 4),
228228
Shader.TileMode.MIRROR
229229
)
230230
)

0 commit comments

Comments
 (0)