upgrade gradle version and refactoring code in a line that doesn't affect the program (#99)

Author: mtjin

androidplot-core/build.gradle

@@ -92,9 +92,9 @@ dependencies {
 
     implementation 'com.halfhp.fig:figlib:1.0.7'
     implementation 'com.android.support:support-annotations:28.0.0'
-    testImplementation "org.mockito:mockito-core:2.13.0"
+    testImplementation "org.mockito:mockito-core:3.0.0"
     testImplementation group: 'junit', name: 'junit', version: '4.12'
-    testImplementation "org.robolectric:robolectric:4.0.1"
+    testImplementation "org.robolectric:robolectric:4.2.1"
 
     // temp fix for:
     // https://github.com/robolectric/robolectric/issues/1932

build.gradle

@@ -38,9 +38,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
     }
 }

demoapp/src/main/java/com/androidplot/demos/BarPlotExampleActivity.java

@@ -22,6 +22,7 @@
 import java.text.ParsePosition;
 import java.util.Arrays;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -86,6 +87,7 @@ private enum SeriesSize {
 
     private Pair<Integer, XYSeries> selection;
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 

demoapp/src/main/java/com/androidplot/demos/DynamicXYPlotActivity.java

@@ -138,8 +138,8 @@ public void notifyObservers() {
         private static final int MAX_AMP_SEED = 100;
         private static final int MIN_AMP_SEED = 10;
         private static final int AMP_STEP = 1;
-        public static final int SINE1 = 0;
-        public static final int SINE2 = 1;
+        static final int SINE1 = 0;
+        static final int SINE2 = 1;
         private static final int SAMPLE_SIZE = 31;
         private int phase = 0;
         private int sinAmp = 1;
@@ -150,7 +150,7 @@ public void notifyObservers() {
             notifier = new MyObservable();
         }
 
-        public void stopThread() {
+        void stopThread() {
             keepRunning = false;
         }
 
@@ -181,18 +181,18 @@ public void run() {
             }
         }
 
-        public int getItemCount(int series) {
+        int getItemCount(int series) {
             return SAMPLE_SIZE;
         }
 
-        public Number getX(int series, int index) {
+        Number getX(int series, int index) {
             if (index >= SAMPLE_SIZE) {
                 throw new IllegalArgumentException();
             }
             return index;
         }
 
-        public Number getY(int series, int index) {
+        Number getY(int series, int index) {
             if (index >= SAMPLE_SIZE) {
                 throw new IllegalArgumentException();
             }
@@ -208,7 +208,7 @@ public Number getY(int series, int index) {
             }
         }
 
-        public void addObserver(Observer observer) {
+        void addObserver(Observer observer) {
             notifier.addObserver(observer);
         }
 
@@ -223,7 +223,7 @@ class SampleDynamicSeries implements XYSeries {
         private int seriesIndex;
         private String title;
 
-        public SampleDynamicSeries(SampleDynamicXYDatasource datasource, int seriesIndex, String title) {
+        SampleDynamicSeries(SampleDynamicXYDatasource datasource, int seriesIndex, String title) {
             this.datasource = datasource;
             this.seriesIndex = seriesIndex;
             this.title = title;

demoapp/src/main/java/com/androidplot/demos/ECGExample.java

@@ -82,7 +82,7 @@ public static class MyFadeFormatter extends AdvancedLineAndPointRenderer.Formatt
 
         private int trailSize;
 
-        public MyFadeFormatter(int trailSize) {
+        MyFadeFormatter(int trailSize) {
             this.trailSize = trailSize;
         }
 
@@ -125,7 +125,7 @@ public static class ECGModel implements XYSeries {
          * @param size Sample size contained within this model
          * @param updateFreqHz Frequency at which new samples are added to the model
          */
-        public ECGModel(int size, int updateFreqHz) {
+        ECGModel(int size, int updateFreqHz) {
             data = new Number[size];
             for(int i = 0; i < data.length; i++) {
                 data[i] = 0;
@@ -176,7 +176,7 @@ public void run() {
             });
         }
 
-        public void start(final WeakReference<AdvancedLineAndPointRenderer> rendererRef) {
+        void start(final WeakReference<AdvancedLineAndPointRenderer> rendererRef) {
             this.rendererRef = rendererRef;
             keepRunning = true;
             thread.start();

demoapp/src/main/java/com/androidplot/demos/ListViewActivity.java

@@ -78,10 +78,10 @@ protected void generateData() {
                 double bp = Math.random();
 
                 LineAndPointFormatter lpf = new LineAndPointFormatter(
-                        Color.rgb(new Double(rl * 255).intValue(),
-                                new Double(gl * 255).intValue(), new Double(bl * 255).intValue()),
-                        Color.rgb(new Double(rp * 255).intValue(),
-                                new Double(gp * 255).intValue(), new Double(bp * 255).intValue()),
+                        Color.rgb(Double.valueOf(rl * 255).intValue(),
+                                Double.valueOf(gl * 255).intValue(), Double.valueOf(bl * 255).intValue()),
+                        Color.rgb(Double.valueOf(rp * 255).intValue(),
+                                Double.valueOf(gp * 255).intValue(), Double.valueOf(bp * 255).intValue()),
                         null, null);
 
                 // for fun, configure interpolation on the formatter:

demoapp/src/main/java/com/androidplot/demos/SimplePieChartActivity.java

@@ -18,6 +18,7 @@
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.graphics.*;
 import android.os.Bundle;
@@ -52,6 +53,7 @@ public class SimplePieChartActivity extends Activity
     private Segment s3;
     private Segment s4;
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState)
     {

demoapp/src/main/java/com/androidplot/demos/TimeSeriesActivity.java

@@ -16,6 +16,7 @@
 
 package com.androidplot.demos;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.DashPathEffect;
@@ -102,6 +103,7 @@ public void onCreate(Bundle savedInstanceState) {
                     // create a simple date format that draws on the year portion of our timestamp.
                     // see http://download.oracle.com/javase/1.4.2/docs/api/java/text/SimpleDateFormat.html
                     // for a full description of SimpleDateFormat.
+                    @SuppressLint("SimpleDateFormat")
                     private final SimpleDateFormat dateFormat = new SimpleDateFormat("MMM yyyy");
 
                     @Override