Skip to content

Kotlin Utils #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hannesa2 merged 2 commits into from
Dec 8, 2025
Merged

Kotlin Utils #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e1c909
Kotlin Utils
hannesa2 Dec 7, 2025
790288e
Use Math.nextUp
hannesa2 Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ class BarLineChartTouchListener(
MotionEvent.ACTION_UP -> {
val velocityTracker = mVelocityTracker
val pointerId = event.getPointerId(0)
velocityTracker!!.computeCurrentVelocity(1000, Utils.getMaximumFlingVelocity().toFloat())
velocityTracker!!.computeCurrentVelocity(1000, Utils.maximumFlingVelocity.toFloat())
val velocityY = velocityTracker.getYVelocity(pointerId)
val velocityX = velocityTracker.getXVelocity(pointerId)

if (abs(velocityX.toDouble()) > Utils.getMinimumFlingVelocity() ||
abs(velocityY.toDouble()) > Utils.getMinimumFlingVelocity()
if (abs(velocityX.toDouble()) > Utils.minimumFlingVelocity ||
abs(velocityY.toDouble()) > Utils.minimumFlingVelocity
) {
if (mTouchMode == DRAG && mChart!!.isDragDecelerationEnabled) {
stopDeceleration()
Expand All @@ -225,8 +225,8 @@ class BarLineChartTouchListener(
mDecelerationVelocity.x = velocityX
mDecelerationVelocity.y = velocityY

Utils.postInvalidateOnAnimation(mChart) // This causes computeScroll to fire, recommended for this by
// Google
// This causes computeScroll to fire, recommended for this by Google
Utils.postInvalidateOnAnimation(mChart!!)
}
}

Expand All @@ -249,7 +249,7 @@ class BarLineChartTouchListener(
}

MotionEvent.ACTION_POINTER_UP -> {
Utils.velocityTrackerPointerUpCleanUpIfNecessary(event, mVelocityTracker)
mVelocityTracker?.let { Utils.velocityTrackerPointerUpCleanUpIfNecessary(event, it) }

mTouchMode = POST_ZOOM
}
Expand Down Expand Up @@ -469,10 +469,9 @@ class BarLineChartTouchListener(
val vph = mChart!!.viewPortHandler

val xTrans = x - vph.offsetLeft()
var yTrans = 0f

// check if axis is inverted
yTrans = if (inverted()) {
val yTrans: Float = if (inverted()) {
-(y - vph.offsetTop())
} else {
-(mChart!!.measuredHeight - y - vph.offsetBottom())
Expand Down
6 changes: 5 additions & 1 deletion MPChartLib/src/main/java/com/github/mikephil/charting/renderer/AxisRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import kotlin.math.abs
import kotlin.math.ceil
import kotlin.math.floor
import kotlin.math.log10
import kotlin.math.nextUp
import kotlin.math.pow

/**
Expand Down Expand Up @@ -180,7 +181,10 @@ abstract class AxisRenderer(
first -= interval
}

val last = if (interval == 0.0) 0.0 else Utils.nextUp(floor(max / interval) * interval)
val last = if (interval == 0.0)
0.0
else
(floor(max / interval) * interval).nextUp()

var f: Double

Expand Down
48 changes: 24 additions & 24 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,14 @@ open class BarChartRenderer(
px += iconsOffset.x
py += iconsOffset.y

Utils.drawImage(
canvas,
icon,
px.toInt(),
py.toInt(),
icon!!.intrinsicWidth,
icon.intrinsicHeight
)
icon?.let {
Utils.drawImage(
canvas,
it,
px.toInt(),
py.toInt()
)
}
}
j += 4
}
Expand Down Expand Up @@ -390,14 +390,14 @@ open class BarChartRenderer(
px += iconsOffset.x
py += iconsOffset.y

Utils.drawImage(
canvas,
icon,
px.toInt(),
py.toInt(),
icon!!.intrinsicWidth,
icon.intrinsicHeight
)
icon?.let {
Utils.drawImage(
canvas,
it,
px.toInt(),
py.toInt()
)
}
}

// draw stack values
Expand Down Expand Up @@ -469,14 +469,14 @@ open class BarChartRenderer(
if (entry.icon != null && dataSet.isDrawIconsEnabled) {
val icon = entry.icon

Utils.drawImage(
canvas,
icon,
(x + iconsOffset.x).toInt(),
(y + iconsOffset.y).toInt(),
icon!!.intrinsicWidth,
icon.intrinsicHeight
)
icon?.let {
Utils.drawImage(
canvas,
it,
(x + iconsOffset.x).toInt(),
(y + iconsOffset.y).toInt()
)
}
}
k += 2
}
Expand Down
16 changes: 8 additions & 8 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,14 @@ open class BubbleChartRenderer(
if (entry.icon != null && dataSet.isDrawIconsEnabled) {
val icon = entry.icon

Utils.drawImage(
canvas,
icon,
(x + iconsOffset.x).toInt(),
(y + iconsOffset.y).toInt(),
icon!!.intrinsicWidth,
icon.intrinsicHeight
)
icon?.let {
Utils.drawImage(
canvas,
it,
(x + iconsOffset.x).toInt(),
(y + iconsOffset.y).toInt()
)
}
}
j += 2
}
Expand Down
16 changes: 8 additions & 8 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,14 @@ open class CandleStickChartRenderer(
if (entry.icon != null && dataSet.isDrawIconsEnabled) {
val icon = entry.icon

Utils.drawImage(
canvas,
icon,
(x + iconsOffset.x).toInt(),
(y + iconsOffset.y).toInt(),
icon!!.intrinsicWidth,
icon.intrinsicHeight
)
icon?.let {
Utils.drawImage(
canvas,
it,
(x + iconsOffset.x).toInt(),
(y + iconsOffset.y).toInt()
)
}
}
j += 2
}
Expand Down
48 changes: 24 additions & 24 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,14 @@ open class HorizontalBarChartRenderer(
px += iconsOffset.x
py += iconsOffset.y

Utils.drawImage(
canvas,
icon,
px.toInt(),
py.toInt(),
icon!!.intrinsicWidth,
icon.intrinsicHeight
)
icon?.let {
Utils.drawImage(
canvas,
it,
px.toInt(),
py.toInt()
)
}
}
j += 4
}
Expand Down Expand Up @@ -328,14 +328,14 @@ open class HorizontalBarChartRenderer(
px += iconsOffset.x
py += iconsOffset.y

Utils.drawImage(
canvas,
icon,
px.toInt(),
py.toInt(),
icon!!.intrinsicWidth,
icon.intrinsicHeight
)
icon?.let {
Utils.drawImage(
canvas,
it,
px.toInt(),
py.toInt()
)
}
}
} else {
val transformed = FloatArray(vals.size * 2)
Expand Down Expand Up @@ -416,14 +416,14 @@ open class HorizontalBarChartRenderer(
if (entry.icon != null && dataSet.isDrawIconsEnabled) {
val icon = entry.icon

Utils.drawImage(
canvas,
icon,
(x + iconsOffset.x).toInt(),
(y + iconsOffset.y).toInt(),
icon!!.intrinsicWidth,
icon.intrinsicHeight
)
icon?.let {
Utils.drawImage(
canvas,
it,
(x + iconsOffset.x).toInt(),
(y + iconsOffset.y).toInt()
)
}
}
k += 2
}
Expand Down
16 changes: 8 additions & 8 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,14 +543,14 @@ class LineChartRenderer(
if (entry.icon != null && dataSet.isDrawIconsEnabled) {
val icon = entry.icon

Utils.drawImage(
canvas,
icon,
(x + iconsOffset.x).toInt(),
(y + iconsOffset.y).toInt(),
icon!!.intrinsicWidth,
icon.intrinsicHeight
)
icon?.let {
Utils.drawImage(
canvas,
it,
(x + iconsOffset.x).toInt(),
(y + iconsOffset.y).toInt()
)
}
}
}
j += 2
Expand Down
34 changes: 16 additions & 18 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import android.graphics.Paint
import android.graphics.Paint.Align
import android.graphics.Path
import android.graphics.RectF
import android.os.Build
import android.text.Layout
import android.text.StaticLayout
import android.text.TextPaint
Expand All @@ -31,6 +30,7 @@ import kotlin.math.sin
import kotlin.math.sqrt
import kotlin.math.tan
import androidx.core.graphics.withSave
import androidx.core.graphics.createBitmap

open class PieChartRenderer(
protected var chart: PieChart, animator: ChartAnimator,
Expand Down Expand Up @@ -95,7 +95,7 @@ open class PieChartRenderer(
|| (drawBitmap.height != height)
) {
if (width > 0 && height > 0) {
drawBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_4444)
drawBitmap = createBitmap(width, height, Bitmap.Config.ARGB_4444)
mDrawBitmap = WeakReference(drawBitmap)
bitmapCanvas = Canvas(drawBitmap)
} else return
Expand All @@ -106,7 +106,7 @@ open class PieChartRenderer(
val pieData = chart.data

for (set in pieData!!.dataSets) {
if (set.isVisible && set.entryCount > 0) drawDataSet(canvas, set)
if (set.isVisible && set.entryCount > 0) drawDataSet(set)
}
}

Expand Down Expand Up @@ -171,7 +171,7 @@ open class PieChartRenderer(
return sliceSpace
}

protected fun drawDataSet(canvas: Canvas?, dataSet: IPieDataSet) {
protected fun drawDataSet(dataSet: IPieDataSet) {
var angle = 0f
val rotationAngle = chart.rotationAngle

Expand Down Expand Up @@ -588,14 +588,14 @@ open class PieChartRenderer(
var y = (labelRadius + iconsOffset.y) * sliceYBase + center.y
y += iconsOffset.x

Utils.drawImage(
this,
icon,
x.toInt(),
y.toInt(),
icon!!.intrinsicWidth,
icon.intrinsicHeight
)
icon?.let {
Utils.drawImage(
this,
it,
x.toInt(),
y.toInt()
)
}
}

xIndex++
Expand Down Expand Up @@ -725,12 +725,10 @@ open class PieChartRenderer(
val layoutHeight = centerTextLayout!!.height.toFloat()

canvas.save()
if (Build.VERSION.SDK_INT >= 18) {
val path = mDrawCenterTextPathBuffer
path.reset()
path.addOval(holeRect, Path.Direction.CW)
canvas.clipPath(path)
}
val path = mDrawCenterTextPathBuffer
path.reset()
path.addOval(holeRect, Path.Direction.CW)
canvas.clipPath(path)

canvas.translate(boundingRect.left, boundingRect.top + (boundingRect.height() - layoutHeight) / 2f)
centerTextLayout!!.draw(canvas)
Expand Down
16 changes: 8 additions & 8 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,14 @@ open class RadarChartRenderer(

pIcon.y += iconsOffset.x

Utils.drawImage(
canvas,
icon,
pIcon.x.toInt(),
pIcon.y.toInt(),
icon!!.intrinsicWidth,
icon.intrinsicHeight
)
icon?.let {
Utils.drawImage(
canvas,
it,
pIcon.x.toInt(),
pIcon.y.toInt()
)
}
}
}

Expand Down
Loading
Loading