Skip to content

Commit b727e82

Browse files
committed
Cosmetic
1 parent 2415dc0 commit b727e82

File tree

1 file changed

+39
-46
lines changed

1 file changed

+39
-46
lines changed

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

Lines changed: 39 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -278,21 +278,22 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
278278
limitLinePath.reset()
279279

280280
for (i in limitLines.indices) {
281-
val l = limitLines[i]
281+
val limitLine = limitLines[i]
282282

283-
if (!l.isEnabled) continue
283+
if (!limitLine.isEnabled)
284+
continue
284285

285286
c.withSave {
286287
limitLineClippingRect.set(viewPortHandler.contentRect)
287-
limitLineClippingRect.inset(0f, -l.lineWidth)
288+
limitLineClippingRect.inset(0f, -limitLine.lineWidth)
288289
c.clipRect(limitLineClippingRect)
289290

290291
limitLinePaint.style = Paint.Style.STROKE
291-
limitLinePaint.color = l.lineColor
292-
limitLinePaint.strokeWidth = l.lineWidth
293-
limitLinePaint.setPathEffect(l.dashPathEffect)
292+
limitLinePaint.color = limitLine.lineColor
293+
limitLinePaint.strokeWidth = limitLine.lineWidth
294+
limitLinePaint.setPathEffect(limitLine.dashPathEffect)
294295

295-
pts[1] = l.limit
296+
pts[1] = limitLine.limit
296297

297298
transformer?.pointValuesToPixel(pts)
298299

@@ -303,66 +304,58 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
303304
limitLinePath.reset()
304305

305306
// c.drawLines(pts, mLimitLinePaint);
306-
val label = l.label
307+
val label = limitLine.label
307308

308309
// if drawing the limit-value label is enabled
309310
if (label != null && label != "") {
310-
limitLinePaint.style = l.textStyle
311+
limitLinePaint.style = limitLine.textStyle
311312
limitLinePaint.setPathEffect(null)
312-
limitLinePaint.color = l.textColor
313-
limitLinePaint.setTypeface(l.typeface)
313+
limitLinePaint.color = limitLine.textColor
314+
limitLinePaint.setTypeface(limitLine.typeface)
314315
limitLinePaint.strokeWidth = 0.5f
315-
limitLinePaint.textSize = l.textSize
316+
limitLinePaint.textSize = limitLine.textSize
316317

317318
val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
318-
val xOffset = Utils.convertDpToPixel(4f) + l.xOffset
319-
val yOffset = l.lineWidth + labelLineHeight + l.yOffset
319+
val xOffset = Utils.convertDpToPixel(4f) + limitLine.xOffset
320+
val yOffset = limitLine.lineWidth + labelLineHeight + limitLine.yOffset
320321

321-
val position = l.labelPosition
322+
val position = limitLine.labelPosition
322323

323324
when (position) {
324325
LimitLabelPosition.RIGHT_TOP -> {
325326
limitLinePaint.textAlign = Align.RIGHT
326-
limitLinePaint.let {
327-
c.drawText(
328-
label,
329-
viewPortHandler.contentRight() - xOffset,
330-
pts[1] - yOffset + labelLineHeight, it
331-
)
332-
}
327+
c.drawText(
328+
label,
329+
viewPortHandler.contentRight() - xOffset,
330+
pts[1] - yOffset + labelLineHeight, limitLinePaint
331+
)
333332
}
334333

335334
LimitLabelPosition.RIGHT_BOTTOM -> {
336-
limitLinePaint.let {
337-
it.textAlign = Align.RIGHT
338-
c.drawText(
339-
label,
340-
viewPortHandler.contentRight() - xOffset,
341-
pts[1] + yOffset, it
342-
)
343-
}
335+
limitLinePaint.textAlign = Align.RIGHT
336+
c.drawText(
337+
label,
338+
viewPortHandler.contentRight() - xOffset,
339+
pts[1] + yOffset, limitLinePaint
340+
)
344341
}
345342

346343
LimitLabelPosition.LEFT_TOP -> {
347-
limitLinePaint.let {
348-
it.textAlign = Align.LEFT
349-
c.drawText(
350-
label,
351-
viewPortHandler.contentLeft() + xOffset,
352-
pts[1] - yOffset + labelLineHeight, it
353-
)
354-
}
344+
limitLinePaint.textAlign = Align.LEFT
345+
c.drawText(
346+
label,
347+
viewPortHandler.contentLeft() + xOffset,
348+
pts[1] - yOffset + labelLineHeight, limitLinePaint
349+
)
355350
}
356351

357352
else -> {
358-
limitLinePaint.let {
359-
it.textAlign = Align.LEFT
360-
c.drawText(
361-
label,
362-
viewPortHandler.offsetLeft() + xOffset,
363-
pts[1] + yOffset, it
364-
)
365-
}
353+
limitLinePaint.textAlign = Align.LEFT
354+
c.drawText(
355+
label,
356+
viewPortHandler.offsetLeft() + xOffset,
357+
pts[1] + yOffset, limitLinePaint
358+
)
366359
}
367360
}
368361
}

0 commit comments

Comments
 (0)