refactor(EasingFunction): Simplified EasingFunction

almic · almic · commit 35c9fc937ecd · 2018-04-30T12:24:18.000-06:00
EasingFunction has been simplified greatly, and I've added a MUCH needed
annotation to relevant methods.

Easing.EasingOptions has been deprecated, as well as any methods using
them. Converting is as simple as deleting the "EasingOptions" part.

A new signature is available for animateXY()!

You are now able to pass one EasingFunction to animateXY() if you want
both axes to be animated the same way.

Quietly included are some gradle build updates, incrementing the
appcompat version to 27.1.1, and using the new `javacompiler` to avoid
deprecation of `javacompile`
diff --git a/MPChartExample/build.gradle b/MPChartExample/build.gradle
@@ -59,7 +59,7 @@ dependencies {
     implementation 'com.github.PhilJay:MPAndroidChart-Realm:v2.0.2@aar'
 
     implementation project(':MPChartLib')
-    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
     //compile 'io.realm:realm-android:0.87.5' // dependency for realm-database API (http://realm.io)
     //compile 'com.github.PhilJay:MPAndroidChart:v2.2.5'
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/HalfPieChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/HalfPieChartActivity.java
@@ -68,7 +68,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setData(4, 100);
 
-        mChart.animateY(1400, Easing.EasingOption.EaseInOutQuad);
+        mChart.animateY(1400, Easing.EaseInOutQuad);
 
         Legend l = mChart.getLegend();
         l.setVerticalAlignment(Legend.LegendVerticalAlignment.TOP);
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java
@@ -302,7 +302,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 break;
             }
             case R.id.animateY: {
-                mChart.animateY(3000, Easing.EasingOption.EaseInCubic);
+                mChart.animateY(3000, Easing.EaseInCubic);
                 break;
             }
             case R.id.animateXY: {
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/PieChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/PieChartActivity.java
@@ -90,7 +90,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setData(4, 100);
 
-        mChart.animateY(1400, Easing.EasingOption.EaseInOutQuad);
+        mChart.animateY(1400, Easing.EaseInOutQuad);
         // mChart.spin(2000, 0, 360);
 
         mSeekBarX.setOnSeekBarChangeListener(this);
@@ -179,8 +179,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 break;
             }
             case R.id.actionToggleSpin: {
-                mChart.spin(1000, mChart.getRotationAngle(), mChart.getRotationAngle() + 360, Easing.EasingOption
-                        .EaseInCubic);
+                mChart.spin(1000, mChart.getRotationAngle(), mChart.getRotationAngle() + 360, Easing.EaseInCubic);
                 break;
             }
         }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/PiePolylineChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/PiePolylineChartActivity.java
@@ -38,7 +38,7 @@ public class PiePolylineChartActivity extends DemoBase implements OnSeekBarChang
     private PieChart mChart;
     private SeekBar mSeekBarX, mSeekBarY;
     private TextView tvX, tvY;
-    
+
     private Typeface tf;
 
     @Override
@@ -97,7 +97,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setData(4, 100);
 
-        mChart.animateY(1400, Easing.EasingOption.EaseInOutQuad);
+        mChart.animateY(1400, Easing.EaseInOutQuad);
         // mChart.spin(2000, 0, 360);
 
         Legend l = mChart.getLegend();
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/RadarChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/RadarChartActivity.java
@@ -62,10 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setData();
 
-        mChart.animateXY(
-                1400, 1400,
-                Easing.EasingOption.EaseInOutQuad,
-                Easing.EasingOption.EaseInOutQuad);
+        mChart.animateXY(1400, 1400, Easing.EaseInOutQuad);
 
         XAxis xAxis = mChart.getXAxis();
         xAxis.setTypeface(mTfLight);
@@ -193,8 +190,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 break;
             }
             case R.id.actionToggleSpin: {
-                mChart.spin(2000, mChart.getRotationAngle(), mChart.getRotationAngle() + 360, Easing.EasingOption
-                        .EaseInCubic);
+                mChart.spin(2000, mChart.getRotationAngle(), mChart.getRotationAngle() + 360, Easing.EaseInCubic);
                 break;
             }
         }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityBar.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityBar.java
@@ -64,6 +64,6 @@ private void setData() {
         // set data
         mChart.setData(data);
         mChart.setFitBars(true);
-        mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);
+        mChart.animateY(1400, Easing.EaseInOutQuart);
     }
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityBubble.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityBubble.java
@@ -66,6 +66,6 @@ private void setData() {
 
         // set data
         mChart.setData(data);
-        mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);
+        mChart.animateY(1400, Easing.EaseInOutQuart);
     }
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityCandle.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityCandle.java
@@ -72,6 +72,6 @@ private void setData() {
 
         // set data
         mChart.setData(data);
-        mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);
+        mChart.animateY(1400, Easing.EaseInOutQuart);
     }
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityHorizontalBar.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityHorizontalBar.java
@@ -69,6 +69,6 @@ private void setData() {
 
         // set data
         mChart.setData(data);
-        mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);
+        mChart.animateY(1400, Easing.EaseInOutQuart);
     }
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityLine.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityLine.java
@@ -73,6 +73,6 @@ private void setData() {
 
         // set data
         mChart.setData(data);
-        mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);
+        mChart.animateY(1400, Easing.EaseInOutQuart);
     }
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityScatter.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityScatter.java
@@ -68,6 +68,6 @@ private void setData() {
 
         // set data
         mChart.setData(data);
-        mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);
+        mChart.animateY(1400, Easing.EaseInOutQuart);
     }
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmWikiExample.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmWikiExample.java
@@ -112,7 +112,7 @@ public String getFormattedValue(float value, AxisBase axis) {
 
         // set data
         lineChart.setData(lineData);
-        lineChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);
+        lineChart.animateY(1400, Easing.EaseInOutQuart);
 
 
         // BAR-CHART
@@ -128,6 +128,6 @@ public String getFormattedValue(float value, AxisBase axis) {
 
         barChart.setData(barData);
         barChart.setFitBars(true);
-        barChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);
+        barChart.animateY(1400, Easing.EaseInOutQuart);
     }
 }
diff --git a/MPChartLib/build.gradle b/MPChartLib/build.gradle
@@ -8,6 +8,7 @@ android {
     buildToolsVersion '27.0.3'
     // resourcePrefix 'mpcht'
     defaultConfig {
+        //noinspection MinSdkTooLow
         minSdkVersion 9
         targetSdkVersion 27
         versionCode 3
@@ -35,16 +36,17 @@ repositories {
 
 dependencies {
     //provided 'io.realm:realm-android:0.87.5' // "optional" dependency to realm-database API
+    implementation 'com.android.support:support-annotations:27.1.1'
     testImplementation 'junit:junit:4.12'
     testImplementation "org.mockito:mockito-core:1.10.19"
 }
 
 android.libraryVariants.all { variant ->
     def name = variant.buildType.name
     def task = project.tasks.create "jar${name.capitalize()}", Jar
-    task.dependsOn variant.javaCompile
-    task.from variant.javaCompile.destinationDir
-    artifacts.add('archives', task);
+    task.dependsOn variant.javaCompiler
+    task.from variant.javaCompiler.destinationDir
+    artifacts.add('archives', task)
 }
 
 task sourcesJar(type: Jar) {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/animation/ChartAnimator.java b/MPChartLib/src/main/java/com/github/mikephil/charting/animation/ChartAnimator.java
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/animation/Easing.java b/MPChartLib/src/main/java/com/github/mikephil/charting/animation/Easing.java
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/animation/EasingFunction.java b/MPChartLib/src/main/java/com/github/mikephil/charting/animation/EasingFunction.java
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ dependencies {`
`59`	`59`	`implementation 'com.github.PhilJay:MPAndroidChart-Realm:v2.0.2@aar'`
`60`	`60`
`61`	`61`	`implementation project(':MPChartLib')`
`62`		`- implementation 'com.android.support:appcompat-v7:27.0.2'`
	`62`	`+ implementation 'com.android.support:appcompat-v7:27.1.1'`
`63`	`63`	`//compile 'io.realm:realm-android:0.87.5' // dependency for realm-database API (http://realm.io)`
`64`	`64`	`//compile 'com.github.PhilJay:MPAndroidChart:v2.2.5'`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ public boolean onOptionsItemSelected(MenuItem item) {`
`302`	`302`	`break;`
`303`	`303`	`}`
`304`	`304`	`case R.id.animateY: {`
`305`		`- mChart.animateY(3000, Easing.EasingOption.EaseInCubic);`
	`305`	`+ mChart.animateY(3000, Easing.EaseInCubic);`
`306`	`306`	`break;`
`307`	`307`	`}`
`308`	`308`	`case R.id.animateXY: {`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ protected void onCreate(Bundle savedInstanceState) {`
`90`	`90`
`91`	`91`	`setData(4, 100);`
`92`	`92`
`93`		`- mChart.animateY(1400, Easing.EasingOption.EaseInOutQuad);`
	`93`	`+ mChart.animateY(1400, Easing.EaseInOutQuad);`
`94`	`94`	`// mChart.spin(2000, 0, 360);`
`95`	`95`
`96`	`96`	`mSeekBarX.setOnSeekBarChangeListener(this);`
`@@ -179,8 +179,7 @@ public boolean onOptionsItemSelected(MenuItem item) {`
`179`	`179`	`break;`
`180`	`180`	`}`
`181`	`181`	`case R.id.actionToggleSpin: {`
`182`		`- mChart.spin(1000, mChart.getRotationAngle(), mChart.getRotationAngle() + 360, Easing.EasingOption`
`183`		`- .EaseInCubic);`
	`182`	`+ mChart.spin(1000, mChart.getRotationAngle(), mChart.getRotationAngle() + 360, Easing.EaseInCubic);`
`184`	`183`	`break;`
`185`	`184`	`}`
`186`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {`
`62`	`62`
`63`	`63`	`setData();`
`64`	`64`
`65`		`- mChart.animateXY(`
`66`		`- 1400, 1400,`
`67`		`- Easing.EasingOption.EaseInOutQuad,`
`68`		`- Easing.EasingOption.EaseInOutQuad);`
	`65`	`+ mChart.animateXY(1400, 1400, Easing.EaseInOutQuad);`
`69`	`66`
`70`	`67`	`XAxis xAxis = mChart.getXAxis();`
`71`	`68`	`xAxis.setTypeface(mTfLight);`
`@@ -193,8 +190,7 @@ public boolean onOptionsItemSelected(MenuItem item) {`
`193`	`190`	`break;`
`194`	`191`	`}`
`195`	`192`	`case R.id.actionToggleSpin: {`
`196`		`- mChart.spin(2000, mChart.getRotationAngle(), mChart.getRotationAngle() + 360, Easing.EasingOption`
`197`		`- .EaseInCubic);`
	`193`	`+ mChart.spin(2000, mChart.getRotationAngle(), mChart.getRotationAngle() + 360, Easing.EaseInCubic);`
`198`	`194`	`break;`
`199`	`195`	`}`
`200`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,6 @@ private void setData() {`
`64`	`64`	`// set data`
`65`	`65`	`mChart.setData(data);`
`66`	`66`	`mChart.setFitBars(true);`
`67`		`- mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);`
	`67`	`+ mChart.animateY(1400, Easing.EaseInOutQuart);`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,6 @@ private void setData() {`
`66`	`66`
`67`	`67`	`// set data`
`68`	`68`	`mChart.setData(data);`
`69`		`- mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);`
	`69`	`+ mChart.animateY(1400, Easing.EaseInOutQuart);`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,6 @@ private void setData() {`
`72`	`72`
`73`	`73`	`// set data`
`74`	`74`	`mChart.setData(data);`
`75`		`- mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);`
	`75`	`+ mChart.animateY(1400, Easing.EaseInOutQuart);`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,6 @@ private void setData() {`
`69`	`69`
`70`	`70`	`// set data`
`71`	`71`	`mChart.setData(data);`
`72`		`- mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);`
	`72`	`+ mChart.animateY(1400, Easing.EaseInOutQuart);`
`73`	`73`	`}`
`74`	`74`	`}`