Skip to content

Commit 75cc593

Browse files
committed
Worked on simplifying animation easing.
1 parent b6edbec commit 75cc593

14 files changed

Lines changed: 541 additions & 700 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ protected void onCreate(Bundle savedInstanceState) {
141141
// mChart.centerViewTo(20, 50, AxisDependency.LEFT);
142142

143143
mChart.animateX(2500);
144+
// mChart.invalidate();
144145

145146
// get the legend (only possible after setting data)
146147
Legend l = mChart.getLegend();

MPChartExample/src/com/xxmassdeveloper/mpchartexample/ListViewBarChartActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import android.widget.ArrayAdapter;
1313
import android.widget.ListView;
1414

15+
import com.github.mikephil.charting.animation.AnimationEasing;
1516
import com.github.mikephil.charting.charts.BarChart;
1617
import com.github.mikephil.charting.components.XAxis;
1718
import com.github.mikephil.charting.components.XAxis.XAxisPosition;
@@ -110,7 +111,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
110111

111112
// do not forget to refresh the chart
112113
// holder.chart.invalidate();
113-
holder.chart.animateY(700);
114+
holder.chart.animateY(700, AnimationEasing.EasingFunctions.EaseInCubic);
114115

115116
return convertView;
116117
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.github.mikephil.charting.data.PieData;
2121
import com.github.mikephil.charting.data.PieDataSet;
2222
import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
23-
import com.github.mikephil.charting.animation.AnimationEasing;
2423
import com.github.mikephil.charting.utils.ColorTemplate;
2524
import com.github.mikephil.charting.utils.Highlight;
2625
import com.github.mikephil.charting.utils.PercentFormatter;
@@ -89,7 +88,7 @@ protected void onCreate(Bundle savedInstanceState) {
8988

9089
setData(3, 100);
9190

92-
mChart.animateXY(1500, 1500, AnimationEasing.EasingOption.EaseOutBack);
91+
mChart.animateXY(1500, 1500);
9392
// mChart.spin(2000, 0, 360);
9493

9594
Legend l = mChart.getLegend();

MPChartExample/src/com/xxmassdeveloper/mpchartexample/RadarChartActivitry.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.view.WindowManager;
99
import android.widget.Toast;
1010

11+
import com.github.mikephil.charting.animation.AnimationEasing;
1112
import com.github.mikephil.charting.charts.RadarChart;
1213
import com.github.mikephil.charting.components.Legend;
1314
import com.github.mikephil.charting.components.Legend.LegendPosition;
@@ -139,7 +140,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
139140
break;
140141
}
141142
case R.id.actionToggleSpin: {
142-
mChart.spin(2000, mChart.getRotationAngle(), mChart.getRotationAngle() + 360);
143+
mChart.spin(2000, mChart.getRotationAngle(), mChart.getRotationAngle() + 360, AnimationEasing.EasingFunctions.EaseInCubic);
143144
break;
144145
}
145146
}
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
package com.xxmassdeveloper.mpchartexample.custom;
33

4-
import com.github.mikephil.charting.animation.AnimationEasing.EasingFunction;
4+
import com.github.mikephil.charting.animation.EasingFunction;
55

66
/**
77
* Example of a custom made animation EasingFunction.
@@ -11,10 +11,8 @@
1111
public class MyEasingFunction implements EasingFunction {
1212

1313
@Override
14-
public float ease(long elapsed, long duration) {
15-
14+
public float getInterpolation(float input) {
1615
// do awesome stuff here, this is just linear easing
17-
return elapsed / (float) duration;
16+
return input;
1817
}
19-
2018
}

0 commit comments

Comments
 (0)