Skip to content

Commit 21d0a67

Browse files
PhilJayPhilJay
committed
Started implementing animations for all chart types, almost finished.
1 parent 4a9504e commit 21d0a67

File tree

17 files changed

+531
-235
lines changed

17 files changed

+531
-235
lines changed

‎MPChartExample/res/menu/bar.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44
<item android:id="@+id/actionToggleHighlight" android:title="Toggle Highlight"></item>
55
<item android:id="@+id/actionToggleHighlightArrow" android:title="Toggle Highlight Arrow"></item>
66
<item android:id="@+id/actionToggle3D" android:title="Toggle 3D"></item>
7+
<item
8+
android:id="@+id/animateX"
9+
android:title="Animate X">
10+
</item>
11+
<item
12+
android:id="@+id/animateY"
13+
android:title="Animate Y">
14+
</item>
15+
<item android:id="@+id/animateXY" android:title="Animate XY"></item>
716
<item android:id="@+id/actionToggleStartzero" android:title="Toggle StartZero"></item>
817
<item android:id="@+id/actionToggleAdjustXLegend" android:title="Toggle AdjustXLegend"></item>
918
<item

‎MPChartExample/res/menu/line.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@
2121
android:id="@+id/actionToggleStartzero"
2222
android:title="Toggle StartZero">
2323
</item>
24+
<item
25+
android:id="@+id/animateX"
26+
android:title="Animate X">
27+
</item>
28+
<item
29+
android:id="@+id/animateY"
30+
android:title="Animate Y">
31+
</item>
32+
<item
33+
android:id="@+id/animateXY"
34+
android:title="Animate XY">
35+
</item>
2436
<item
2537
android:id="@+id/actionToggleAdjustXLegend"
2638
android:title="Toggle AdjustXLegend">

‎MPChartExample/res/menu/pie.xml‎

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,41 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
3-
<item android:id="@+id/actionToggleValues" android:title="Toggle Y-Values"></item>
4-
<item android:id="@+id/actionToggleXVals" android:title="Toggle X-Values"></item>
5-
<item android:id="@+id/actionTogglePercent" android:title="Toggle Percent"></item>
6-
<item android:id="@+id/actionToggleHole" android:title="Toggle Hole"></item>
7-
<item android:id="@+id/actionDrawCenter" android:title="Draw CenterText"></item>
8-
<item android:id="@+id/actionSave" android:title="Save to Gallery"></item>
9-
10-
</menu>
3+
4+
<item
5+
android:id="@+id/actionToggleValues"
6+
android:title="Toggle Y-Values">
7+
</item>
8+
<item
9+
android:id="@+id/actionToggleXVals"
10+
android:title="Toggle X-Values">
11+
</item>
12+
<item
13+
android:id="@+id/actionTogglePercent"
14+
android:title="Toggle Percent">
15+
</item>
16+
<item
17+
android:id="@+id/actionToggleHole"
18+
android:title="Toggle Hole">
19+
</item>
20+
<item
21+
android:id="@+id/animateX"
22+
android:title="Animate X">
23+
</item>
24+
<item
25+
android:id="@+id/animateY"
26+
android:title="Animate Y">
27+
</item>
28+
<item
29+
android:id="@+id/animateXY"
30+
android:title="Animate XY">
31+
</item>
32+
<item
33+
android:id="@+id/actionDrawCenter"
34+
android:title="Draw CenterText">
35+
</item>
36+
<item
37+
android:id="@+id/actionSave"
38+
android:title="Save to Gallery">
39+
</item>
40+
41+
</menu>

‎MPChartExample/res/menu/scatter.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
<item
1717
android:id="@+id/actionToggleAdjustXLegend"
1818
android:title="Toggle AdjustXLegend">
19+
</item>
20+
<item
21+
android:id="@+id/animateX"
22+
android:title="Animate X">
23+
</item>
24+
<item
25+
android:id="@+id/animateY"
26+
android:title="Animate Y">
1927
</item>
2028
<item
2129
android:id="@+id/actionToggleFilter"

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
162162
mChart.invalidate();
163163
break;
164164
}
165+
case R.id.animateX: {
166+
mChart.animateX(3000);
167+
break;
168+
}
169+
case R.id.animateY: {
170+
mChart.animateY(3000);
171+
break;
172+
}
173+
case R.id.animateXY: {
174+
175+
mChart.animateXY(3000, 3000);
176+
break;
177+
}
165178
case R.id.actionToggleFilter: {
166179

167180
Approximator a = new Approximator(ApproximatorType.DOUGLAS_PEUCKER, 25);

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
179179
mChart.invalidate();
180180
break;
181181
}
182+
case R.id.animateX: {
183+
mChart.animateX(3000);
184+
break;
185+
}
186+
case R.id.animateY: {
187+
mChart.animateY(3000);
188+
break;
189+
}
190+
case R.id.animateXY: {
191+
192+
mChart.animateXY(3000, 3000);
193+
break;
194+
}
182195
case R.id.actionToggleAdjustXLegend: {
183196
XLabels xLabels = mChart.getXLabels();
184197

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,18 @@ public boolean onOptionsItemSelected(MenuItem item) {
203203
mChart.invalidate();
204204
break;
205205
}
206+
case R.id.animateX: {
207+
mChart.animateX(3000);
208+
break;
209+
}
210+
case R.id.animateY: {
211+
mChart.animateY(3000);
212+
break;
213+
}
214+
case R.id.animateXY: {
215+
mChart.animateXY(3000, 3000);
216+
break;
217+
}
206218
case R.id.actionToggleAdjustXLegend: {
207219
XLabels xLabels = mChart.getXLabels();
208220

0 commit comments

Comments
 (0)