Maintenance

library/build.gradle

@@ -4,12 +4,12 @@ apply plugin: 'android-maven'
 group='com.github.Paroca72'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 29
-        versionCode 630
-        versionName '3.5.4'
+        targetSdkVersion 30
+        versionCode 640
+        versionName '3.6.0'
     }
     buildTypes {
         release {

library/src/main/java/com/sccomponents/gauges/library/ScArcGauge.java

@@ -2,10 +2,8 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.Matrix;
 import android.graphics.Path;
 import android.graphics.RectF;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.util.AttributeSet;

library/src/main/java/com/sccomponents/gauges/library/ScBase.java

@@ -4,9 +4,7 @@
 import android.graphics.RectF;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.view.Display;
 import android.view.View;
-import android.view.WindowManager;
 
 /**
  * The base class.
@@ -36,30 +34,6 @@ public ScBase(Context context, AttributeSet attrs, int defStyleAttr) {
     }
 
 
-    // ***************************************************************************************
-    // Privates methods
-
-    /**
-     * Get the display metric.
-     * This method is used for screen measure conversion.
-     * @param context   the current context
-     * @return          the display metrics
-     */
-    private DisplayMetrics getDisplayMetrics(Context context) {
-        // Get the window manager from the window service
-        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        assert wm != null;
-
-        // Create the variable holder and inject the values
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        Display display = wm.getDefaultDisplay();
-        display.getMetrics(displayMetrics);
-
-        // Return
-        return displayMetrics;
-    }
-
-
     // ***************************************************************************************
     // Public methods
 
@@ -70,9 +44,8 @@ private DisplayMetrics getDisplayMetrics(Context context) {
      */
     @SuppressWarnings("unused")
     public float dipToPixel(float dip) {
-        // Get the display metrics
-        DisplayMetrics metrics = this.getDisplayMetrics(this.getContext());
-        // Calc the conversion by the screen density
+        // Calc the conversion using the screen density
+        DisplayMetrics metrics = this.getResources().getDisplayMetrics();
         return dip * metrics.density;
     }
 
@@ -96,10 +69,7 @@ public static float valueRangeLimit(float value, float startValue, float endValu
 
         // If is over the limit return the normalized value
         if (value < min) return min;
-        if (value > max) return max;
-
-        // Else return the original value
-        return value;
+        return Math.min(value, max);
     }
 
     /**

library/src/main/java/com/sccomponents/gauges/library/ScCopier.java

@@ -25,7 +25,7 @@
  * @version 3.5.0
  * @since 2016-05-26
  */
-@SuppressWarnings({"WeakerAccess"})
+@SuppressWarnings({"FieldMayBeFinal"})
 public class ScCopier extends ScFeature {
 
     // ***************************************************************************************

library/src/main/java/com/sccomponents/gauges/library/ScFeature.java

@@ -32,7 +32,7 @@
  * @version 3.5.0
  * @since 2016-05-26
  */
-@SuppressWarnings({"WeakerAccess"})
+@SuppressWarnings({"FieldMayBeFinal"})
 public abstract class ScFeature {
 
     // ***************************************************************************************
@@ -256,7 +256,7 @@ protected int getColor(int[] colors, float ratio, boolean isSmooth) {
      * @param defaultValue  the default value
      * @return              the value
      */
-    @SuppressWarnings("all")
+    @SuppressWarnings("SameParameterValue")
     protected float getValue(float[] values, float ratio, boolean isSmooth, float defaultValue) {
         // Check
         if (values == null)
@@ -983,7 +983,7 @@ public void setOnPropertyChangedListener(OnPropertyChangedListener listener) {
     /**
      * This is a structure to hold the feature information before draw a contour
      */
-    @SuppressWarnings({"unused"})
+    @SuppressWarnings("InnerClassMayBeStatic")
     public class ContourInfo {
 
         // ***************************************************************************************

library/src/main/java/com/sccomponents/gauges/library/ScGauge.java

@@ -105,6 +105,7 @@
  * @since 2016-05-26
  * -----------------------------------------------------------------------------------------------
  */
+@SuppressWarnings("FieldMayBeFinal")
 public abstract class ScGauge extends ScDrawer
         implements ScFeature.OnPropertyChangedListener {
 
@@ -209,6 +210,7 @@ public void onAnimationUpdate(ValueAnimator valueAnimator) {
     // ***************************************************************************************
     // Classes
 
+    @SuppressWarnings("InnerClassMayBeStatic")
     class AnimationStarter implements Runnable {
         private ValueAnimator animator;
         private float lastValue;
@@ -725,7 +727,7 @@ private float[] splitToWidths(String source) {
         // Cycle all token
         for (int index = 0; index < tokens.length; index++) {
             // Try to convert
-            float value = Float.valueOf(tokens[index]);
+            float value = Float.parseFloat(tokens[index]);
             widths[index] = this.dipToPixel(value);
         }
 

library/src/main/java/com/sccomponents/gauges/library/ScLabeler.java

@@ -13,6 +13,7 @@
  * @version 3.5.0
  * @since 2018-08-13
  */
+@SuppressWarnings("FieldMayBeFinal")
 public class ScLabeler extends ScWriter {
 
     // ***************************************************************************************

library/src/main/java/com/sccomponents/gauges/library/ScNotches.java

@@ -25,6 +25,7 @@
  * @version 3.6.0
  * @since 2016-05-30
  */
+@SuppressWarnings("FieldMayBeFinal")
 public class ScNotches extends ScRepetitions {
 
     // ***************************************************************************************

library/src/main/java/com/sccomponents/gauges/library/ScPathMeasure.java

@@ -18,7 +18,6 @@
  * @version 3.5.0
  * @since 2016-05-26
  */
-@SuppressWarnings({"WeakerAccess"})
 public class ScPathMeasure extends PathMeasure {
 
     // ***************************************************************************************

library/src/main/java/com/sccomponents/gauges/library/ScPointer.java

@@ -10,6 +10,7 @@
  * @version 3.5.0
  * @since 2016-05-26
  */
+@SuppressWarnings("FieldMayBeFinal")
 public class ScPointer extends ScNotches {
 
     // ***************************************************************************************

library/src/main/java/com/sccomponents/gauges/library/ScRepetitions.java

@@ -17,7 +17,7 @@
  * @since 2016-05-26
  */
 
-@SuppressWarnings({"WeakerAccess"})
+@SuppressWarnings("FieldMayBeFinal")
 public abstract class ScRepetitions extends ScFeature {
 
     // ***************************************************************************************
@@ -358,7 +358,10 @@ public void setEdges(Positions value) {
      */
     @SuppressWarnings("unused")
     public void setRepetitions(int value) {
-        value = value < 0 ? 0: value;
+        // Exclude negative numbers
+        value = Math.max(value, 0);
+
+        // Apply
         if (this.mRepetitions != value) {
             this.mSpaceBetween = 0.0f;
             this.mRepetitions = value;
@@ -511,7 +514,7 @@ public void setOnDrawRepetitionListener(OnDrawRepetitionListener listener) {
     /**
      * This is a structure to hold the feature information before draw it
      */
-    @SuppressWarnings({"unused"})
+    @SuppressWarnings({"unused", "InnerClassMayBeStatic"})
     public class RepetitionInfo {
 
         // ***************************************************************************************

library/src/main/java/com/sccomponents/gauges/library/ScWriter.java

@@ -19,6 +19,7 @@
  * @version 3.5.0
  * @since 2016-05-26
  */
+@SuppressWarnings("FieldMayBeFinal")
 public class ScWriter extends ScRepetitions {
 
     // ***************************************************************************************
@@ -206,7 +207,7 @@ private int getTextWidth(String text) {
      */
     private float getInternalLetterSpacing() {
         float letterSpacing = this.getPainter().getTextSize() * this.mLetterSpacing;
-        return letterSpacing < 1.0f ? 1.0f: letterSpacing;
+        return Math.max(letterSpacing, 1.0f);
     }
 
     /**