Merge pull request #443 from AppDevNext/UtilsRestructure

Utils restructure

Author: hannesa2

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

@@ -36,6 +36,8 @@
 import com.github.mikephil.charting.utils.Transformer;
 import com.github.mikephil.charting.utils.Utils;
 
+import androidx.annotation.NonNull;
+
 /**
  * Base-class of LineChart, BarChart, ScatterChart and CandleStickChart.
  *
@@ -191,7 +193,7 @@ protected void init() {
     private long drawCycles = 0;
 
     @Override
-    protected void onDraw(Canvas canvas) {
+    protected void onDraw(@NonNull Canvas canvas) {
         super.onDraw(canvas);
 
         if (mData == null)
@@ -465,7 +467,7 @@ protected void calculateLegendOffsets(RectF offsets) {
         }
     }
 
-    private RectF mOffsetsBuffer = new RectF();
+    private final RectF mOffsetsBuffer = new RectF();
 
     @Override
     public void calculateOffsets() {
@@ -528,7 +530,7 @@ public void calculateOffsets() {
             if (mLogEnabled) {
                 Log.i(LOG_TAG, "offsetLeft: " + offsetLeft + ", offsetTop: " + offsetTop
                         + ", offsetRight: " + offsetRight + ", offsetBottom: " + offsetBottom);
-                Log.i(LOG_TAG, "Content: " + mViewPortHandler.getContentRect().toString());
+                Log.i(LOG_TAG, "Content: " + mViewPortHandler.getContentRect());
             }
         }
 
@@ -1610,10 +1612,8 @@ public float getYChartMin() {
     public boolean isAnyAxisInverted() {
         if (mAxisLeft.isInverted())
             return true;
-        if (mAxisRight.isInverted())
-            return true;
-        return false;
-    }
+		return mAxisRight.isInverted();
+	}
 
     /**
      * Flag that indicates if auto scaling on the y axis is enabled. This is

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

@@ -2,19 +2,15 @@
 
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
-import android.content.ContentValues;
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.Bitmap.CompressFormat;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.RectF;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.os.Environment;
-import android.provider.MediaStore.Images;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -48,14 +44,12 @@
 import com.github.mikephil.charting.utils.Utils;
 import com.github.mikephil.charting.utils.ViewPortHandler;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 /**
  * Baseclass of all Chart-Views.
  *
@@ -210,13 +204,9 @@ protected void init() {
 		setWillNotDraw(false);
 		// setLayerType(View.LAYER_TYPE_HARDWARE, null);
 
-		mAnimator = new ChartAnimator(new AnimatorUpdateListener() {
-
-			@Override
-			public void onAnimationUpdate(ValueAnimator animation) {
-				// ViewCompat.postInvalidateOnAnimation(Chart.this);
-				postInvalidate();
-			}
+		mAnimator = new ChartAnimator(animation -> {
+			// ViewCompat.postInvalidateOnAnimation(Chart.this);
+			postInvalidate();
 		});
 
 		// initialize the utils
@@ -387,7 +377,7 @@ protected void setupDefaultFormatter(float min, float max) {
 	private boolean mOffsetsCalculated = false;
 
 	@Override
-	protected void onDraw(Canvas canvas) {
+	protected void onDraw(@NonNull Canvas canvas) {
 		// super.onDraw(canvas);
 
 		if (mData == null) {
@@ -404,7 +394,7 @@ protected void onDraw(Canvas canvas) {
 						break;
 
 					case RIGHT:
-						pt.x *= 2.0;
+						pt.x *= 2.0F;
 						canvas.drawText(mNoDataText, pt.x, pt.y, mInfoPaint);
 						break;
 
@@ -1289,14 +1279,12 @@ public void setPaint(Paint p, int which) {
 	 * @param which e.g. Chart.PAINT_LEGEND_LABEL
 	 */
 	public Paint getPaint(int which) {
-		switch (which) {
-			case PAINT_INFO:
-				return mInfoPaint;
-			case PAINT_DESCRIPTION:
-				return mDescPaint;
-		}
+		return switch (which) {
+			case PAINT_INFO -> mInfoPaint;
+			case PAINT_DESCRIPTION -> mDescPaint;
+			default -> null;
+		};
 
-		return null;
 	}
 
 	@Deprecated