Skip to content

Cosmetic #532

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 1 commit into from
Dec 22, 2025
Merged

Cosmetic #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,13 +435,13 @@ public float getYChartMin() {
* Applys a spin animation to the Chart.
*/
@SuppressLint("NewApi")
public void spin(int durationmillis, float fromangle, float toangle, EasingFunction easing) {
public void spin(int durationMillis, float fromangle, float toangle, EasingFunction easing) {

setRotationAngle(fromangle);

ObjectAnimator spinAnimator = ObjectAnimator.ofFloat(this, "rotationAngle", fromangle,
toangle);
spinAnimator.setDuration(durationmillis);
spinAnimator.setDuration(durationMillis);
spinAnimator.setInterpolator(easing);

spinAnimator.addUpdateListener(new AnimatorUpdateListener() {
Expand Down
53 changes: 24 additions & 29 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import com.github.mikephil.charting.utils.ViewPortHandler
import com.github.mikephil.charting.utils.convertDpToPixel
import kotlin.math.min

/** @noinspection unused
*/
@Suppress("unused")
class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, viewPortHandler: ViewPortHandler) :
BarChartRenderer(chart, animator, viewPortHandler) {
private val mBarShadowRectBuffer = RectF()
Expand All @@ -41,7 +40,6 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, v
barBorderPaint.color = dataSet.barBorderColor
barBorderPaint.strokeWidth = dataSet.barBorderWidth.convertDpToPixel()
shadowPaint.color = dataSet.barShadowColor
val drawBorder = dataSet.barBorderWidth > 0f
val phaseX = animator.phaseX
val phaseY = animator.phaseY

Expand Down Expand Up @@ -89,7 +87,7 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, v
trans!!.pointValuesToPixel(buffer.buffer)

// if multiple colors has been assigned to Bar Chart
dataSet.colors?.let {
dataSet.colors.let {
if (it.size > 1) {
var j = 0
while (j < buffer.size()) {
Expand Down Expand Up @@ -208,28 +206,24 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, v
paintRender.color = dataSet.getColorByIndex(j / 4)
}

paintRender.setShader(
LinearGradient(
buffer.buffer[j],
buffer.buffer[j + 3],
buffer.buffer[j],
buffer.buffer[j + 1],
dataSet.getColorByIndex(j / 4),
dataSet.getColorByIndex(j / 4),
Shader.TileMode.MIRROR
)
paintRender.shader = LinearGradient(
buffer.buffer[j],
buffer.buffer[j + 3],
buffer.buffer[j],
buffer.buffer[j + 1],
dataSet.getColorByIndex(j / 4),
dataSet.getColorByIndex(j / 4),
Shader.TileMode.MIRROR
)

paintRender.setShader(
LinearGradient(
buffer.buffer[j],
buffer.buffer[j + 3],
buffer.buffer[j],
buffer.buffer[j + 1],
dataSet.getColorByIndex(j / 4),
dataSet.getColorByIndex(j / 4),
Shader.TileMode.MIRROR
)
paintRender.shader = LinearGradient(
buffer.buffer[j],
buffer.buffer[j + 3],
buffer.buffer[j],
buffer.buffer[j + 1],
dataSet.getColorByIndex(j / 4),
dataSet.getColorByIndex(j / 4),
Shader.TileMode.MIRROR
)

dataSet.getEntryForIndex(j / 4)?.let { barEntry ->
Expand All @@ -239,15 +233,15 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, v
RectF(
buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
buffer.buffer[j + 3]
), roundedNegativeDataSetRadius, roundedNegativeDataSetRadius, true, true, true, true
), roundedNegativeDataSetRadius, roundedNegativeDataSetRadius, tl = true, tr = true, br = true, bl = true
)
canvas.drawPath(path2, paintRender)
} else if ((barEntry.y > 0 && roundedPositiveDataSetRadius > 0)) {
val path2 = roundRect(
RectF(
buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
buffer.buffer[j + 3]
), roundedPositiveDataSetRadius, roundedPositiveDataSetRadius, true, true, true, true
), roundedPositiveDataSetRadius, roundedPositiveDataSetRadius, tl = true, tr = true, br = true, bl = true
)
canvas.drawPath(path2, paintRender)
} else {
Expand Down Expand Up @@ -294,8 +288,8 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, v
} else {
val range = barEntry.ranges[high.stackIndex]

y1 = range?.from ?: 0f
y2 = range?.to ?: 0f
y1 = range.from
y2 = range.to
}
} else {
y1 = barEntry.y
Expand All @@ -310,14 +304,15 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, v
RectF(
barRect.left, barRect.top, barRect.right,
barRect.bottom
), mRadius, mRadius, true, true, true, true
), mRadius, mRadius, tl = true, tr = true, br = true, bl = true
)

canvas.drawPath(path2, paintHighlight)
}
}
}

@Suppress("SameParameterValue")
private fun roundRect(rect: RectF, rx: Float, ry: Float, tl: Boolean, tr: Boolean, br: Boolean, bl: Boolean): Path {
var rx = rx
var ry = ry
Expand Down
Loading