Skip to content

Commit ab50eac

Browse files
hannesa2hannesa2
committed
Rename
1 parent a954c50 commit ab50eac

5 files changed

Lines changed: 38 additions & 39 deletions

File tree

‎MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -418,22 +418,22 @@ protected void calculateLegendOffsets(RectF offsets) {
418418

419419
switch (getLegend().getHorizontalAlignment()) {
420420
case LEFT:
421-
offsets.left += Math.min(getLegend().mNeededWidth, getViewPortHandler().getChartWidth() * getLegend().getMaxSizePercent()) + getLegend().getXOffset();
421+
offsets.left += Math.min(getLegend().neededWidth, getViewPortHandler().getChartWidth() * getLegend().getMaxSizePercent()) + getLegend().getXOffset();
422422
break;
423423

424424
case RIGHT:
425-
offsets.right += Math.min(getLegend().mNeededWidth, getViewPortHandler().getChartWidth() * getLegend().getMaxSizePercent()) + getLegend().getXOffset();
425+
offsets.right += Math.min(getLegend().neededWidth, getViewPortHandler().getChartWidth() * getLegend().getMaxSizePercent()) + getLegend().getXOffset();
426426
break;
427427

428428
case CENTER:
429429

430430
switch (getLegend().getVerticalAlignment()) {
431431
case TOP:
432-
offsets.top += Math.min(getLegend().mNeededHeight, getViewPortHandler().getChartHeight() * getLegend().getMaxSizePercent()) + getLegend().getYOffset();
432+
offsets.top += Math.min(getLegend().neededHeight, getViewPortHandler().getChartHeight() * getLegend().getMaxSizePercent()) + getLegend().getYOffset();
433433
break;
434434

435435
case BOTTOM:
436-
offsets.bottom += Math.min(getLegend().mNeededHeight, getViewPortHandler().getChartHeight() * getLegend().getMaxSizePercent()) + getLegend().getYOffset();
436+
offsets.bottom += Math.min(getLegend().neededHeight, getViewPortHandler().getChartHeight() * getLegend().getMaxSizePercent()) + getLegend().getYOffset();
437437
break;
438438

439439
default:
@@ -447,13 +447,13 @@ protected void calculateLegendOffsets(RectF offsets) {
447447

448448
switch (getLegend().getVerticalAlignment()) {
449449
case TOP:
450-
offsets.top += Math.min(getLegend().mNeededHeight, getViewPortHandler().getChartHeight() * getLegend().getMaxSizePercent()) + getLegend().getYOffset();
450+
offsets.top += Math.min(getLegend().neededHeight, getViewPortHandler().getChartHeight() * getLegend().getMaxSizePercent()) + getLegend().getYOffset();
451451

452452

453453
break;
454454

455455
case BOTTOM:
456-
offsets.bottom += Math.min(getLegend().mNeededHeight, getViewPortHandler().getChartHeight() * getLegend().getMaxSizePercent()) + getLegend().getYOffset();
456+
offsets.bottom += Math.min(getLegend().neededHeight, getViewPortHandler().getChartHeight() * getLegend().getMaxSizePercent()) + getLegend().getYOffset();
457457

458458

459459
break;

‎MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.kt‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,31 +59,30 @@ open class HorizontalBarChart : BarChart {
5959
offsets.top = 0f
6060
offsets.bottom = 0f
6161

62-
if (legend == null || !legend!!.isEnabled || legend!!.isDrawInsideEnabled) {
63-
return
64-
}
65-
6662
legend?.let { legend ->
63+
if (!legend.isEnabled || legend.isDrawInsideEnabled) {
64+
return
65+
}
6766
when (legend.orientation) {
6867
LegendOrientation.VERTICAL -> when (legend.horizontalAlignment) {
6968
LegendHorizontalAlignment.LEFT -> offsets.left += min(
70-
legend.mNeededWidth,
69+
legend.neededWidth,
7170
viewPortHandler.chartWidth * legend.maxSizePercent
7271
) + legend.xOffset
7372

7473
LegendHorizontalAlignment.RIGHT -> offsets.right += min(
75-
legend.mNeededWidth,
74+
legend.neededWidth,
7675
viewPortHandler.chartWidth * legend.maxSizePercent
7776
) + legend.xOffset
7877

7978
LegendHorizontalAlignment.CENTER -> when (legend.verticalAlignment) {
8079
LegendVerticalAlignment.TOP -> offsets.top += min(
81-
legend.mNeededHeight,
80+
legend.neededHeight,
8281
viewPortHandler.chartHeight * legend.maxSizePercent
8382
) + legend.yOffset
8483

8584
LegendVerticalAlignment.BOTTOM -> offsets.bottom += min(
86-
legend.mNeededHeight,
85+
legend.neededHeight,
8786
viewPortHandler.chartHeight * legend.maxSizePercent
8887
) + legend.yOffset
8988

@@ -94,7 +93,7 @@ open class HorizontalBarChart : BarChart {
9493
LegendOrientation.HORIZONTAL -> when (legend.verticalAlignment) {
9594
LegendVerticalAlignment.TOP -> {
9695
offsets.top += min(
97-
legend.mNeededHeight,
96+
legend.neededHeight,
9897
viewPortHandler.chartHeight * legend.maxSizePercent
9998
) + legend.yOffset
10099

@@ -107,7 +106,7 @@ open class HorizontalBarChart : BarChart {
107106

108107
LegendVerticalAlignment.BOTTOM -> {
109108
offsets.bottom += min(
110-
legend.mNeededHeight,
109+
legend.neededHeight,
111110
viewPortHandler.chartHeight * legend.maxSizePercent
112111
) + legend.yOffset
113112

‎MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ abstract class PieRadarChartBase<T : ChartData<out IDataSet<out Entry>>>
123123
legend?.let { legend ->
124124
if (legend.isEnabled && !legend.isDrawInsideEnabled) {
125125
val fullLegendWidth = min(
126-
legend.mNeededWidth,
126+
legend.neededWidth,
127127
viewPortHandler.chartWidth * legend.maxSizePercent
128128
)
129129
val fullLegendHeight = min(
130-
legend.mNeededHeight,
130+
legend.neededHeight,
131131
viewPortHandler.chartHeight * legend.maxSizePercent
132132
)
133133

@@ -156,7 +156,7 @@ abstract class PieRadarChartBase<T : ChartData<out IDataSet<out Entry>>>
156156

157157
if (legend.isEnabled && !legend.isDrawInsideEnabled) {
158158
val fullLegendWidth = min(
159-
legend.mNeededWidth,
159+
legend.neededWidth,
160160
viewPortHandler.chartWidth * legend.maxSizePercent
161161
)
162162

@@ -177,7 +177,7 @@ abstract class PieRadarChartBase<T : ChartData<out IDataSet<out Entry>>>
177177
val spacing = 8f.convertDpToPixel()
178178

179179
val legendWidth = fullLegendWidth + spacing
180-
val legendHeight = legend.mNeededHeight + legend.mTextHeightMax
180+
val legendHeight = legend.neededHeight + legend.mTextHeightMax
181181

182182
val bottomX = if (legend.horizontalAlignment ==
183183
LegendHorizontalAlignment.RIGHT
@@ -213,12 +213,12 @@ abstract class PieRadarChartBase<T : ChartData<out IDataSet<out Entry>>>
213213
LegendHorizontalAlignment.RIGHT -> legendRight = xLegendOffset
214214
LegendHorizontalAlignment.CENTER -> when (legend.verticalAlignment) {
215215
LegendVerticalAlignment.TOP -> legendTop = min(
216-
legend.mNeededHeight,
216+
legend.neededHeight,
217217
viewPortHandler.chartHeight * legend.maxSizePercent
218218
)
219219

220220
LegendVerticalAlignment.BOTTOM -> legendBottom = min(
221-
legend.mNeededHeight,
221+
legend.neededHeight,
222222
viewPortHandler.chartHeight * legend.maxSizePercent
223223
)
224224

@@ -240,7 +240,7 @@ abstract class PieRadarChartBase<T : ChartData<out IDataSet<out Entry>>>
240240
val yOffset = this.requiredLegendOffset
241241

242242
yLegendOffset = min(
243-
legend.mNeededHeight + yOffset,
243+
legend.neededHeight + yOffset,
244244
viewPortHandler.chartHeight * legend.maxSizePercent
245245
)
246246

‎MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -311,13 +311,13 @@ class Legend() : ComponentBase() {
311311
* the total width of the legend (needed width space)
312312
*/
313313
@JvmField
314-
var mNeededWidth: kotlin.Float = 0f
314+
var neededWidth: kotlin.Float = 0f
315315

316316
/**
317317
* the total height of the legend (needed height space)
318318
*/
319319
@JvmField
320-
var mNeededHeight: kotlin.Float = 0f
320+
var neededHeight: kotlin.Float = 0f
321321

322322
@JvmField
323323
var mTextHeightMax: kotlin.Float = 0f
@@ -421,8 +421,8 @@ class Legend() : ComponentBase() {
421421
i++
422422
}
423423

424-
mNeededWidth = maxWidth
425-
mNeededHeight = maxHeight
424+
neededWidth = maxWidth
425+
neededHeight = maxHeight
426426
}
427427

428428
LegendOrientation.HORIZONTAL -> {
@@ -515,8 +515,8 @@ class Legend() : ComponentBase() {
515515
i++
516516
}
517517

518-
mNeededWidth = maxLineWidth
519-
mNeededHeight = (labelLineHeight
518+
neededWidth = maxLineWidth
519+
neededHeight = (labelLineHeight
520520
* (calculatedLineSizes.size).toFloat()
521521
+ labelLineSpacing * (if (calculatedLineSizes.isEmpty())
522522
0
@@ -525,7 +525,7 @@ class Legend() : ComponentBase() {
525525
}
526526
}
527527

528-
mNeededHeight += mYOffset
529-
mNeededWidth += mXOffset
528+
neededHeight += mYOffset
529+
neededWidth += mXOffset
530530
}
531531
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,15 +235,15 @@ open class LegendRenderer(
235235
originPosX = if (orientation == LegendOrientation.VERTICAL) xOffset
236236
else viewPortHandler.contentLeft() + xOffset
237237

238-
if (direction == LegendDirection.RIGHT_TO_LEFT) originPosX += legend.mNeededWidth
238+
if (direction == LegendDirection.RIGHT_TO_LEFT) originPosX += legend.neededWidth
239239
}
240240

241241
LegendHorizontalAlignment.RIGHT -> {
242242
originPosX = if (orientation == LegendOrientation.VERTICAL) viewPortHandler.chartWidth - xOffset
243243
else viewPortHandler.contentRight() - xOffset
244244

245245
if (direction == LegendDirection.LEFT_TO_RIGHT)
246-
originPosX -= legend.mNeededWidth
246+
originPosX -= legend.neededWidth
247247
}
248248

249249
LegendHorizontalAlignment.CENTER -> {
@@ -261,9 +261,9 @@ open class LegendRenderer(
261261
// So here we offset the vertical ones only.
262262
if (orientation == LegendOrientation.VERTICAL) {
263263
originPosX += (if (direction == LegendDirection.LEFT_TO_RIGHT)
264-
-legend.mNeededWidth / 2.0 + xOffset
264+
-legend.neededWidth / 2.0 + xOffset
265265
else
266-
legend.mNeededWidth / 2.0 - xOffset).toFloat()
266+
legend.neededWidth / 2.0 - xOffset).toFloat()
267267
}
268268
}
269269
}
@@ -278,8 +278,8 @@ open class LegendRenderer(
278278

279279
var posY: Float = when (verticalAlignment) {
280280
LegendVerticalAlignment.TOP -> yOffset
281-
LegendVerticalAlignment.BOTTOM -> viewPortHandler.chartHeight - yOffset - legend.mNeededHeight
282-
LegendVerticalAlignment.CENTER -> (viewPortHandler.chartHeight - legend.mNeededHeight) / 2f + yOffset
281+
LegendVerticalAlignment.BOTTOM -> viewPortHandler.chartHeight - yOffset - legend.neededHeight
282+
LegendVerticalAlignment.CENTER -> (viewPortHandler.chartHeight - legend.neededHeight) / 2f + yOffset
283283
}
284284

285285
var lineIndex = 0
@@ -354,11 +354,11 @@ open class LegendRenderer(
354354
viewPortHandler.chartHeight
355355
else
356356
viewPortHandler.contentBottom())
357-
posY -= legend.mNeededHeight + yOffset
357+
posY -= legend.neededHeight + yOffset
358358
}
359359

360360
LegendVerticalAlignment.CENTER -> posY = (viewPortHandler.chartHeight / 2f
361-
- legend.mNeededHeight / 2f
361+
- legend.neededHeight / 2f
362362
+ legend.yOffset)
363363
}
364364

0 commit comments

Comments
 (0)