Skip to content

Commit a96d26d

Browse files
hannesa2hannesa2
committed
Cosmetic
1 parent 2415dc0 commit a96d26d

File tree

2 files changed

+74
-81
lines changed

2 files changed

+74
-81
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
}

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

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ open class YAxisRendererHorizontalBarChart(
6868

6969
val positions = transformedPositions
7070

71-
paintAxisLabels!!.setTypeface(yAxis.typeface)
72-
paintAxisLabels!!.textSize = yAxis.textSize
73-
paintAxisLabels!!.color = yAxis.textColor
74-
paintAxisLabels!!.textAlign = Align.CENTER
71+
paintAxisLabels.setTypeface(yAxis.typeface)
72+
paintAxisLabels.textSize = yAxis.textSize
73+
paintAxisLabels.color = yAxis.textColor
74+
paintAxisLabels.textAlign = Align.CENTER
7575

7676
val baseYOffset = Utils.convertDpToPixel(2.5f)
7777
val textHeight = Utils.calcTextHeight(paintAxisLabels, "Q").toFloat()
@@ -99,20 +99,20 @@ open class YAxisRendererHorizontalBarChart(
9999
override fun renderAxisLine(c: Canvas) {
100100
if (!yAxis.isEnabled || !yAxis.isDrawAxisLineEnabled) return
101101

102-
paintAxisLine!!.color = yAxis.axisLineColor
103-
paintAxisLine!!.strokeWidth = yAxis.axisLineWidth
102+
paintAxisLine.color = yAxis.axisLineColor
103+
paintAxisLine.strokeWidth = yAxis.axisLineWidth
104104

105105
if (yAxis.axisDependency == AxisDependency.LEFT) {
106106
c.drawLine(
107107
viewPortHandler.contentLeft(),
108108
viewPortHandler.contentTop(), viewPortHandler.contentRight(),
109-
viewPortHandler.contentTop(), paintAxisLine!!
109+
viewPortHandler.contentTop(), paintAxisLine
110110
)
111111
} else {
112112
c.drawLine(
113113
viewPortHandler.contentLeft(),
114114
viewPortHandler.contentBottom(), viewPortHandler.contentRight(),
115-
viewPortHandler.contentBottom(), paintAxisLine!!
115+
viewPortHandler.contentBottom(), paintAxisLine
116116
)
117117
}
118118
}
@@ -124,9 +124,9 @@ open class YAxisRendererHorizontalBarChart(
124124
* @param positions
125125
*/
126126
override fun drawYLabels(c: Canvas, fixedPosition: Float, positions: FloatArray, offset: Float) {
127-
paintAxisLabels!!.setTypeface(yAxis.typeface)
128-
paintAxisLabels!!.textSize = yAxis.textSize
129-
paintAxisLabels!!.color = yAxis.textColor
127+
paintAxisLabels.setTypeface(yAxis.typeface)
128+
paintAxisLabels.textSize = yAxis.textSize
129+
paintAxisLabels.color = yAxis.textColor
130130

131131
val from = if (yAxis.isDrawBottomYLabelEntryEnabled) 0 else 1
132132
val to = if (yAxis.isDrawTopYLabelEntryEnabled)
@@ -143,7 +143,7 @@ open class YAxisRendererHorizontalBarChart(
143143
text,
144144
positions[i * 2],
145145
fixedPosition - offset + xOffset,
146-
paintAxisLabels!!
146+
paintAxisLabels
147147
)
148148
}
149149
}
@@ -189,8 +189,8 @@ open class YAxisRendererHorizontalBarChart(
189189
// draw zero line
190190
val pos = transformer!!.getPixelForValues(0f, 0f)
191191

192-
zeroLinePaint!!.color = yAxis.zeroLineColor
193-
zeroLinePaint!!.strokeWidth = yAxis.zeroLineWidth
192+
zeroLinePaint.color = yAxis.zeroLineColor
193+
zeroLinePaint.strokeWidth = yAxis.zeroLineWidth
194194

195195
val zeroLinePath = drawZeroLinePathBuffer
196196
zeroLinePath.reset()
@@ -199,7 +199,7 @@ open class YAxisRendererHorizontalBarChart(
199199
zeroLinePath.lineTo(pos.x.toFloat() - 1, viewPortHandler.contentBottom())
200200

201201
// draw a path because lines don't support dashing on lower android versions
202-
c.drawPath(zeroLinePath, zeroLinePaint!!)
202+
c.drawPath(zeroLinePath, zeroLinePaint)
203203

204204
}
205205
}
@@ -208,7 +208,7 @@ open class YAxisRendererHorizontalBarChart(
208208
protected var mRenderLimitLinesBuffer: FloatArray = FloatArray(4)
209209

210210
init {
211-
limitLinePaint!!.textAlign = Align.LEFT
211+
limitLinePaint.textAlign = Align.LEFT
212212
}
213213

214214
/**
@@ -251,24 +251,24 @@ open class YAxisRendererHorizontalBarChart(
251251
limitLinePath.moveTo(pts[0], pts[1])
252252
limitLinePath.lineTo(pts[2], pts[3])
253253

254-
limitLinePaint!!.style = Paint.Style.STROKE
255-
limitLinePaint!!.color = l.lineColor
256-
limitLinePaint!!.setPathEffect(l.dashPathEffect)
257-
limitLinePaint!!.strokeWidth = l.lineWidth
254+
limitLinePaint.style = Paint.Style.STROKE
255+
limitLinePaint.color = l.lineColor
256+
limitLinePaint.setPathEffect(l.dashPathEffect)
257+
limitLinePaint.strokeWidth = l.lineWidth
258258

259-
c.drawPath(limitLinePath, limitLinePaint!!)
259+
c.drawPath(limitLinePath, limitLinePaint)
260260
limitLinePath.reset()
261261

262262
val label = l.label
263263

264264
// if drawing the limit-value label is enabled
265265
if (label != null && label != "") {
266-
limitLinePaint!!.style = l.textStyle
267-
limitLinePaint!!.setPathEffect(null)
268-
limitLinePaint!!.color = l.textColor
269-
limitLinePaint!!.setTypeface(l.typeface)
270-
limitLinePaint!!.strokeWidth = 0.5f
271-
limitLinePaint!!.textSize = l.textSize
266+
limitLinePaint.style = l.textStyle
267+
limitLinePaint.setPathEffect(null)
268+
limitLinePaint.color = l.textColor
269+
limitLinePaint.setTypeface(l.typeface)
270+
limitLinePaint.strokeWidth = 0.5f
271+
limitLinePaint.textSize = l.textSize
272272

273273
val xOffset = l.lineWidth + l.xOffset
274274
val yOffset = Utils.convertDpToPixel(2f) + l.yOffset
@@ -278,21 +278,21 @@ open class YAxisRendererHorizontalBarChart(
278278
when (position) {
279279
LimitLabelPosition.RIGHT_TOP -> {
280280
val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
281-
limitLinePaint!!.textAlign = Align.LEFT
282-
c.drawText(label, pts[0] + xOffset, viewPortHandler.contentTop() + yOffset + labelLineHeight, limitLinePaint!!)
281+
limitLinePaint.textAlign = Align.LEFT
282+
c.drawText(label, pts[0] + xOffset, viewPortHandler.contentTop() + yOffset + labelLineHeight, limitLinePaint)
283283
}
284284
LimitLabelPosition.RIGHT_BOTTOM -> {
285-
limitLinePaint!!.textAlign = Align.LEFT
286-
c.drawText(label, pts[0] + xOffset, viewPortHandler.contentBottom() - yOffset, limitLinePaint!!)
285+
limitLinePaint.textAlign = Align.LEFT
286+
c.drawText(label, pts[0] + xOffset, viewPortHandler.contentBottom() - yOffset, limitLinePaint)
287287
}
288288
LimitLabelPosition.LEFT_TOP -> {
289-
limitLinePaint!!.textAlign = Align.RIGHT
289+
limitLinePaint.textAlign = Align.RIGHT
290290
val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
291-
c.drawText(label, pts[0] - xOffset, viewPortHandler.contentTop() + yOffset + labelLineHeight, limitLinePaint!!)
291+
c.drawText(label, pts[0] - xOffset, viewPortHandler.contentTop() + yOffset + labelLineHeight, limitLinePaint)
292292
}
293293
else -> {
294-
limitLinePaint!!.textAlign = Align.RIGHT
295-
c.drawText(label, pts[0] - xOffset, viewPortHandler.contentBottom() - yOffset, limitLinePaint!!)
294+
limitLinePaint.textAlign = Align.RIGHT
295+
c.drawText(label, pts[0] - xOffset, viewPortHandler.contentBottom() - yOffset, limitLinePaint)
296296
}
297297
}
298298
}

0 commit comments

Comments
 (0)