Use Math.nextUp

Author: hannesa2

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

@@ -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
 
 /**
@@ -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
 

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

@@ -80,7 +80,6 @@ open class XAxisRenderer(
             xAxis.labelRotationAngle
         )
 
-
         xAxis.mLabelWidth = labelRotatedSize.width.roundToInt()
         xAxis.mLabelHeight = labelRotatedSize.height.roundToInt()
 

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

@@ -11,6 +11,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
 
 class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, private val chart: RadarChart) : YAxisRenderer(viewPortHandler, yAxis, null) {
@@ -77,7 +78,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
                 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
 
@@ -137,9 +138,9 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
     override fun renderAxisLabels(canvas: Canvas) {
         if (!yAxis.isEnabled || !yAxis.isDrawLabelsEnabled) return
 
-        paintAxisLabels!!.setTypeface(yAxis.typeface)
-        paintAxisLabels!!.textSize = yAxis.textSize
-        paintAxisLabels!!.color = yAxis.textColor
+        paintAxisLabels.typeface = yAxis.typeface
+        paintAxisLabels.textSize = yAxis.textSize
+        paintAxisLabels.color = yAxis.textColor
 
         val center = chart.centerOffsets
         val pOut = MPPointF.getInstance(0f, 0f)
@@ -160,7 +161,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
 
             val label = yAxis.getFormattedLabel(j)
 
-            canvas.drawText(label, pOut.x + xOffset, pOut.y, paintAxisLabels!!)
+            canvas.drawText(label, pOut.x + xOffset, pOut.y, paintAxisLabels)
         }
         MPPointF.recycleInstance(center)
         MPPointF.recycleInstance(pOut)
@@ -182,9 +183,9 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
 
             if (!l.isEnabled) continue
 
-            limitLinePaint!!.color = l.lineColor
-            limitLinePaint!!.setPathEffect(l.dashPathEffect)
-            limitLinePaint!!.strokeWidth = l.lineWidth
+            limitLinePaint.color = l.lineColor
+            limitLinePaint.pathEffect = l.dashPathEffect
+            limitLinePaint.strokeWidth = l.lineWidth
 
             val r = (l.limit - chart.yChartMin) * factor
 
@@ -200,7 +201,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
             }
             limitPath.close()
 
-            canvas.drawPath(limitPath, limitLinePaint!!)
+            canvas.drawPath(limitPath, limitLinePaint)
         }
         MPPointF.recycleInstance(center)
         MPPointF.recycleInstance(pOut)

MPChartLib/src/main/java/com/github/mikephil/charting/utils/Utils.java

@@ -208,7 +208,6 @@ public static float roundToNextSignificant(double number) {
 	 * @return
 	 */
 	public static int getDecimals(float number) {
-
 		float i = roundToNextSignificant(number);
 
 		if (Float.isInfinite(i)) {
@@ -218,22 +217,6 @@ public static int getDecimals(float number) {
 		return (int) Math.ceil(-Math.log10(i)) + 2;
 	}
 
-	/**
-	 * Replacement for the Math.nextUp(...) method that is only available in
-	 * HONEYCOMB and higher.
-	 *
-	 * @param d
-	 * @return
-	 */
-	public static double nextUp(double d) {
-		if (d == Double.POSITIVE_INFINITY) {
-			return d;
-		} else {
-			d += 0.0d;
-			return Double.longBitsToDouble(Double.doubleToRawLongBits(d) + ((d >= 0.0d) ? +1L : -1L));
-		}
-	}
-
 	/**
 	 * Returns a recyclable MPPointF instance.
 	 * Calculates the position around a center point, depending on the distance
@@ -245,7 +228,6 @@ public static double nextUp(double d) {
 	 * @return
 	 */
 	public static MPPointF getPosition(MPPointF center, float dist, float angle) {
-
 		MPPointF p = MPPointF.getInstance(0, 0);
 		getPosition(center, dist, angle, p);
 		return p;
@@ -256,8 +238,7 @@ public static void getPosition(MPPointF center, float dist, float angle, MPPoint
 		outputPoint.y = (float) (center.y + dist * Math.sin(Math.toRadians(angle)));
 	}
 
-	public static void velocityTrackerPointerUpCleanUpIfNecessary(MotionEvent ev,
-																  VelocityTracker tracker) {
+	public static void velocityTrackerPointerUpCleanUpIfNecessary(MotionEvent ev, VelocityTracker tracker) {
 
 		// Check the dot product of current velocities.
 		// If the pointer that left was opposing another velocity vector, clear.
@@ -335,7 +316,7 @@ public static void drawImage(Canvas canvas,
 	private static final Rect mDrawTextRectBuffer = new Rect();
 	private static final Paint.FontMetrics mFontMetricsBuffer = new Paint.FontMetrics();
 
-	public static void drawXAxisValue(Canvas c, String text, float x, float y,
+	public static void drawXAxisValue(Canvas canvas, String text, float x, float y,
 									  Paint paint,
 									  MPPointF anchor, float angleDegrees) {
 
@@ -378,13 +359,13 @@ public static void drawXAxisValue(Canvas c, String text, float x, float y,
 				FSize.recycleInstance(rotatedSize);
 			}
 
-			c.save();
-			c.translate(translateX, translateY);
-			c.rotate(angleDegrees);
+			canvas.save();
+			canvas.translate(translateX, translateY);
+			canvas.rotate(angleDegrees);
 
-			c.drawText(text, drawOffsetX, drawOffsetY, paint);
+			canvas.drawText(text, drawOffsetX, drawOffsetY, paint);
 
-			c.restore();
+			canvas.restore();
 		} else {
 			if (anchor.x != 0.f || anchor.y != 0.f) {
 
@@ -395,7 +376,7 @@ public static void drawXAxisValue(Canvas c, String text, float x, float y,
 			drawOffsetX += x;
 			drawOffsetY += y;
 
-			c.drawText(text, drawOffsetX, drawOffsetY, paint);
+			canvas.drawText(text, drawOffsetX, drawOffsetY, paint);
 		}
 
 		paint.setTextAlign(originalTextAlign);

MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt

@@ -2,6 +2,15 @@ package com.github.mikephil.charting.utils
 
 import android.content.Context
 import android.os.Build
+import android.util.Log.d
+import java.lang.Double
+import kotlin.Boolean
+import kotlin.Char
+import kotlin.CharArray
+import kotlin.Float
+import kotlin.Int
+import kotlin.String
+import kotlin.code
 
 fun getSDKInt() = Build.VERSION.SDK_INT