Skip to content

Commit 35c9fc9

Browse files
almicalmic
committed
refactor(EasingFunction): Simplified EasingFunction
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`
1 parent 89d18a7 commit 35c9fc9

19 files changed

Lines changed: 524 additions & 821 deletions

‎MPChartExample/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ dependencies {
5959
implementation 'com.github.PhilJay:MPAndroidChart-Realm:v2.0.2@aar'
6060

6161
implementation project(':MPChartLib')
62-
implementation 'com.android.support:appcompat-v7:27.0.2'
62+
implementation 'com.android.support:appcompat-v7:27.1.1'
6363
//compile 'io.realm:realm-android:0.87.5' // dependency for realm-database API (http://realm.io)
6464
//compile 'com.github.PhilJay:MPAndroidChart:v2.2.5'
6565
}

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/HalfPieChartActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected void onCreate(Bundle savedInstanceState) {
6868

6969
setData(4, 100);
7070

71-
mChart.animateY(1400, Easing.EasingOption.EaseInOutQuad);
71+
mChart.animateY(1400, Easing.EaseInOutQuad);
7272

7373
Legend l = mChart.getLegend();
7474
l.setVerticalAlignment(Legend.LegendVerticalAlignment.TOP);

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
302302
break;
303303
}
304304
case R.id.animateY: {
305-
mChart.animateY(3000, Easing.EasingOption.EaseInCubic);
305+
mChart.animateY(3000, Easing.EaseInCubic);
306306
break;
307307
}
308308
case R.id.animateXY: {

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/PieChartActivity.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected void onCreate(Bundle savedInstanceState) {
9090

9191
setData(4, 100);
9292

93-
mChart.animateY(1400, Easing.EasingOption.EaseInOutQuad);
93+
mChart.animateY(1400, Easing.EaseInOutQuad);
9494
// mChart.spin(2000, 0, 360);
9595

9696
mSeekBarX.setOnSeekBarChangeListener(this);
@@ -179,8 +179,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
179179
break;
180180
}
181181
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);
184183
break;
185184
}
186185
}

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/PiePolylineChartActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class PiePolylineChartActivity extends DemoBase implements OnSeekBarChang
3838
private PieChart mChart;
3939
private SeekBar mSeekBarX, mSeekBarY;
4040
private TextView tvX, tvY;
41-
41+
4242
private Typeface tf;
4343

4444
@Override
@@ -97,7 +97,7 @@ protected void onCreate(Bundle savedInstanceState) {
9797

9898
setData(4, 100);
9999

100-
mChart.animateY(1400, Easing.EasingOption.EaseInOutQuad);
100+
mChart.animateY(1400, Easing.EaseInOutQuad);
101101
// mChart.spin(2000, 0, 360);
102102

103103
Legend l = mChart.getLegend();

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/RadarChartActivity.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
6262

6363
setData();
6464

65-
mChart.animateXY(
66-
1400, 1400,
67-
Easing.EasingOption.EaseInOutQuad,
68-
Easing.EasingOption.EaseInOutQuad);
65+
mChart.animateXY(1400, 1400, Easing.EaseInOutQuad);
6966

7067
XAxis xAxis = mChart.getXAxis();
7168
xAxis.setTypeface(mTfLight);
@@ -193,8 +190,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
193190
break;
194191
}
195192
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);
198194
break;
199195
}
200196
}

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityBar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ private void setData() {
6464
// set data
6565
mChart.setData(data);
6666
mChart.setFitBars(true);
67-
mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);
67+
mChart.animateY(1400, Easing.EaseInOutQuart);
6868
}
6969
}

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityBubble.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ private void setData() {
6666

6767
// set data
6868
mChart.setData(data);
69-
mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);
69+
mChart.animateY(1400, Easing.EaseInOutQuart);
7070
}
7171
}

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityCandle.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ private void setData() {
7272

7373
// set data
7474
mChart.setData(data);
75-
mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);
75+
mChart.animateY(1400, Easing.EaseInOutQuart);
7676
}
7777
}

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityHorizontalBar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@ private void setData() {
6969

7070
// set data
7171
mChart.setData(data);
72-
mChart.animateY(1400, Easing.EasingOption.EaseInOutQuart);
72+
mChart.animateY(1400, Easing.EaseInOutQuart);
7373
}
7474
}

0 commit comments

Comments
 (0)