Merge pull request #483 from AppDevNext/Utils2Kotlin

Utils to Kotlin

Author: hannesa2

MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java

@@ -33,6 +33,7 @@
 import com.github.mikephil.charting.utils.MPPointF;
 import com.github.mikephil.charting.utils.Transformer;
 import com.github.mikephil.charting.utils.Utils;
+import com.github.mikephil.charting.utils.UtilsKtKt;
 
 import androidx.annotation.NonNull;
 
@@ -181,7 +182,7 @@ protected void init() {
 		mBorderPaint = new Paint();
 		mBorderPaint.setStyle(Style.STROKE);
 		mBorderPaint.setColor(Color.BLACK);
-		mBorderPaint.setStrokeWidth(Utils.convertDpToPixel(1f));
+		mBorderPaint.setStrokeWidth(UtilsKtKt.convertDpToPixel(1f));
 	}
 
 	// for performance tracking
@@ -515,7 +516,7 @@ public void calculateOffsets() {
 			offsetBottom += getExtraBottomOffset();
 			offsetLeft += getExtraLeftOffset();
 
-			float minOffset = Utils.convertDpToPixel(mMinOffset);
+			float minOffset = UtilsKtKt.convertDpToPixel(mMinOffset);
 
 			mViewPortHandler.restrainViewPort(Math.max(minOffset, offsetLeft), Math.max(minOffset, offsetTop), Math.max(minOffset, offsetRight), Math.max(minOffset, offsetBottom));
 
@@ -549,8 +550,6 @@ protected void drawGridBackground(Canvas c) {
 	 * Returns the Transformer class that contains all matrices and is
 	 * responsible for transforming values into pixels on the screen and
 	 * backwards.
-	 *
-	 * @return
 	 */
 	public Transformer getTransformer(AxisDependency which) {
 		if (which == AxisDependency.LEFT) {
@@ -1165,7 +1164,7 @@ public boolean isClipDataToContentEnabled() {
 	 * Sets the width of the border lines in dp.
 	 */
 	public void setBorderWidth(float width) {
-		mBorderPaint.setStrokeWidth(Utils.convertDpToPixel(width));
+		mBorderPaint.setStrokeWidth(UtilsKtKt.convertDpToPixel(width));
 	}
 
 	/**

MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java

@@ -40,6 +40,7 @@
 import com.github.mikephil.charting.utils.MPPointF;
 import com.github.mikephil.charting.utils.SaveUtils;
 import com.github.mikephil.charting.utils.Utils;
+import com.github.mikephil.charting.utils.UtilsKtKt;
 import com.github.mikephil.charting.utils.ViewPortHandler;
 
 import java.util.ArrayList;
@@ -209,7 +210,8 @@ protected void init() {
 
 		// initialize the utils
 		Utils.init(getContext());
-		mMaxHighlightDistance = Utils.convertDpToPixel(500f);
+		UtilsKtKt.initUtils(getContext());
+		mMaxHighlightDistance = UtilsKtKt.convertDpToPixel(500f);
 
 		mDescription = new Description();
 		mLegend = new Legend();
@@ -223,7 +225,7 @@ protected void init() {
 		mInfoPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 		mInfoPaint.setColor(Color.rgb(247, 189, 51)); // orange
 		mInfoPaint.setTextAlign(Align.CENTER);
-		mInfoPaint.setTextSize(Utils.convertDpToPixel(12f));
+		mInfoPaint.setTextSize(UtilsKtKt.convertDpToPixel(12f));
 
 		if (mLogEnabled) {
 			Log.i("", "Chart.init()");
@@ -364,7 +366,7 @@ protected void setupDefaultFormatter(float min, float max) {
 			reference = Math.abs(max - min);
 		}
 
-		int digits = Utils.getDecimals(reference);
+		int digits = UtilsKtKt.getDecimals(reference);
 
 		// setup the formatter with a new number of digits
 		mDefaultValueFormatter.setup(digits);
@@ -464,7 +466,7 @@ public float getMaxHighlightDistance() {
 	 * Default: 500dp
 	 */
 	public void setMaxHighlightDistance(float distDp) {
-		mMaxHighlightDistance = Utils.convertDpToPixel(distDp);
+		mMaxHighlightDistance = UtilsKtKt.convertDpToPixel(distDp);
 	}
 
 	/**
@@ -1031,7 +1033,7 @@ public void setExtraOffsets(float left, float top, float right, float bottom) {
 	 * Set an extra offset to be appended to the viewport's top
 	 */
 	public void setExtraTopOffset(float offset) {
-		mExtraTopOffset = Utils.convertDpToPixel(offset);
+		mExtraTopOffset = UtilsKtKt.convertDpToPixel(offset);
 	}
 
 	/**
@@ -1045,7 +1047,7 @@ public float getExtraTopOffset() {
 	 * Set an extra offset to be appended to the viewport's right
 	 */
 	public void setExtraRightOffset(float offset) {
-		mExtraRightOffset = Utils.convertDpToPixel(offset);
+		mExtraRightOffset = UtilsKtKt.convertDpToPixel(offset);
 	}
 
 	/**
@@ -1059,7 +1061,7 @@ public float getExtraRightOffset() {
 	 * Set an extra offset to be appended to the viewport's bottom
 	 */
 	public void setExtraBottomOffset(float offset) {
-		mExtraBottomOffset = Utils.convertDpToPixel(offset);
+		mExtraBottomOffset = UtilsKtKt.convertDpToPixel(offset);
 	}
 
 	/**
@@ -1073,7 +1075,7 @@ public float getExtraBottomOffset() {
 	 * Set an extra offset to be appended to the viewport's left
 	 */
 	public void setExtraLeftOffset(float offset) {
-		mExtraLeftOffset = Utils.convertDpToPixel(offset);
+		mExtraLeftOffset = UtilsKtKt.convertDpToPixel(offset);
 	}
 
 	/**
@@ -1492,7 +1494,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 	@Override
 	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-		int size = (int) Utils.convertDpToPixel(50f);
+		int size = (int) UtilsKtKt.convertDpToPixel(50f);
 		setMeasuredDimension(Math.max(getSuggestedMinimumWidth(), resolveSize(size, widthMeasureSpec)), Math.max(getSuggestedMinimumHeight(), resolveSize(size, heightMeasureSpec)));
 	}