Improved animations, added nineoldandroids library (special thanks to Jake Wharton).

PhilJay · PhilJay · commit 3e0fc2e29ade · 2014-08-18T12:02:39.000+02:00
diff --git a/MPChartExample/AndroidManifest.xml b/MPChartExample/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xxmassdeveloper.mpchartexample"
-    android:versionCode="10"
-    android:versionName="1.1.2" >
+    android:versionCode="11"
+    android:versionName="1.2.1" >
 
     <uses-sdk
         android:minSdkVersion="9"
diff --git a/MPChartExample/build.gradle b/MPChartExample/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId 'com.xxmassdeveloper.mpchartexample'
         minSdkVersion 16
         targetSdkVersion 19
-        versionCode 10
-        versionName '1.1.2'
+        versionCode 11
+        versionName '1.2.1'
 
         sourceSets {
             main {
diff --git a/MPChartExample/res/menu/bar.xml b/MPChartExample/res/menu/bar.xml
@@ -1,27 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/actionToggleValues" android:title="Toggle Values"></item>
-    <item android:id="@+id/actionToggleHighlight" android:title="Toggle Highlight"></item>
-    <item android:id="@+id/actionToggleHighlightArrow" android:title="Toggle Highlight Arrow"></item>
-    <item android:id="@+id/actionToggle3D" android:title="Toggle 3D"></item>
-        <item
+
+    <item
+        android:id="@+id/actionToggleValues"
+        android:title="Toggle Values">
+    </item>
+    <item
+        android:id="@+id/actionToggleHighlight"
+        android:title="Toggle Highlight">
+    </item>
+    <item
+        android:id="@+id/actionToggleHighlightArrow"
+        android:title="Toggle Highlight Arrow">
+    </item>
+    <item
+        android:id="@+id/actionToggle3D"
+        android:title="Toggle 3D">
+    </item>
+    <item
         android:id="@+id/animateX"
         android:title="Animate X">
     </item>
-        <item
+    <item
         android:id="@+id/animateY"
         android:title="Animate Y">
     </item>
-    <item android:id="@+id/animateXY" android:title="Animate XY"></item>
-    <item android:id="@+id/actionToggleStartzero" android:title="Toggle StartZero"></item>
- <item android:id="@+id/actionToggleAdjustXLegend" android:title="Toggle AdjustXLegend"></item>
-     <item
+    <item
+        android:id="@+id/animateXY"
+        android:title="Animate XY">
+    </item>
+    <item
+        android:id="@+id/actionToggleStartzero"
+        android:title="Toggle StartZero">
+    </item>
+    <item
+        android:id="@+id/actionToggleAdjustXLegend"
+        android:title="Toggle AdjustXLegend">
+    </item>
+    <item
         android:id="@+id/actionToggleFilter"
         android:title="Toggle filter">
     </item>
- <item android:id="@+id/actionSave" android:title="Save to Gallery"></item>
- <item
+    <item
+        android:id="@+id/actionSave"
+        android:title="Save to Gallery">
+    </item>
+    <item
         android:id="@+id/actionTogglePinch"
         android:title="Toggle PinchZoom">
     </item>
-</menu>
+
+</menu>
diff --git a/MPChartExample/res/menu/scatter.xml b/MPChartExample/res/menu/scatter.xml
@@ -17,14 +17,18 @@
         android:id="@+id/actionToggleAdjustXLegend"
         android:title="Toggle AdjustXLegend">
     </item>
-        <item
+    <item
         android:id="@+id/animateX"
         android:title="Animate X">
     </item>
-        <item
+    <item
         android:id="@+id/animateY"
         android:title="Animate Y">
     </item>
+    <item
+        android:id="@+id/animateXY"
+        android:title="Animate XY">
+    </item>
     <item
         android:id="@+id/actionToggleFilter"
         android:title="Toggle filter">
@@ -33,8 +37,9 @@
         android:id="@+id/actionSave"
         android:title="Save to Gallery">
     </item>
-<item
+    <item
         android:id="@+id/actionTogglePinch"
         android:title="Toggle PinchZoom">
     </item>
+
 </menu>
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/AnotherBarActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/AnotherBarActivity.java
@@ -81,6 +81,9 @@ protected void onCreate(Bundle savedInstanceState) {
         // setting data
         mSeekBarX.setProgress(10);
         mSeekBarY.setProgress(100);
+        
+        // add a nice and smooth animation
+        mChart.animateY(2500);
 
 //        Legend l = mChart.getLegend();
 //        l.setPosition(LegendPosition.BELOW_CHART_CENTER);
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java
@@ -243,7 +243,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
 
         for (int i = 0; i < mSeekBarX.getProgress()+1; i++) {
             float mult = (mSeekBarY.getProgress() + 1);
-            float val = (float) (Math.random() * mult) - 50;
+            float val = (float) (Math.random() * mult) + 3;
             yVals1.add(new Entry(val, i));
         }
 
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivityMultiDataset.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivityMultiDataset.java
@@ -148,6 +148,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.saveToPath("title" + System.currentTimeMillis(), "");
                 break;
             }
+            case R.id.animateX: {
+                mChart.animateX(3000);
+                break;
+            }
+            case R.id.animateY: {
+                mChart.animateY(3000);
+                break;
+            }
+            case R.id.animateXY: {
+
+                mChart.animateXY(3000, 3000);
+                break;
+            }
         }
         return true;
     }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/InvertedLineChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/InvertedLineChartActivity.java
@@ -185,6 +185,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.animateX: {
+                mChart.animateX(3000);
+                break;
+            }
+            case R.id.animateY: {
+                mChart.animateY(3000);
+                break;
+            }
+            case R.id.animateXY: {
+
+                mChart.animateXY(3000, 3000);
+                break;
+            }
             case R.id.actionTogglePinch: {
                 if (mChart.isPinchZoomEnabled())
                     mChart.setPinchZoom(false);
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ListViewBarChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ListViewBarChartActivity.java
@@ -105,7 +105,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder.chart.setData(c);
             
             // do not forget to refresh the chart
-            holder.chart.invalidate();
+//            holder.chart.invalidate();
+            holder.chart.animateY(700);
 
             return convertView;
         }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/MultiLineChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/MultiLineChartActivity.java
@@ -70,7 +70,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mSeekBarX.setProgress(45);
         mSeekBarY.setProgress(100);
-        
+
         Legend l = mChart.getLegend();
         l.setPosition(LegendPosition.RIGHT_OF_CHART);
     }
@@ -160,7 +160,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             }
             case R.id.actionToggleAdjustXLegend: {
                 XLabels xLabels = mChart.getXLabels();
-                
+
                 if (xLabels.isAdjustXLabelsEnabled())
                     xLabels.setAdjustXLabels(false);
                 else
@@ -174,6 +174,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.saveToPath("title" + System.currentTimeMillis(), "");
                 break;
             }
+            case R.id.animateX: {
+                mChart.animateX(3000);
+                break;
+            }
+            case R.id.animateY: {
+                mChart.animateY(3000);
+                break;
+            }
+            case R.id.animateXY: {
+
+                mChart.animateXY(3000, 3000);
+                break;
+            }
         }
         return true;
     }
@@ -199,13 +212,13 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
                 double val = (Math.random() * mSeekBarY.getProgress()) + 3;
                 values.add(new Entry((float) val, i));
             }
-            
-            LineDataSet d = new LineDataSet(values, "DataSet " + (z+1));
+
+            LineDataSet d = new LineDataSet(values, "DataSet " + (z + 1));
             d.setLineWidth(2.5f);
             d.setCircleSize(4f);
             dataSets.add(d);
         }
-        
+
         // make the first DataSet dashed
         dataSets.get(0).enableDashedLine(10, 10, 0);
 
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/PieChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/PieChartActivity.java
@@ -77,6 +77,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mSeekBarX.setProgress(3);
         mSeekBarY.setProgress(100);
+        
+        mChart.animateXY(1500, 1500);
 
         Legend l = mChart.getLegend();
         l.setPosition(LegendPosition.RIGHT_OF_CHART);
@@ -140,15 +142,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 break;
             }
             case R.id.animateX: {
-                mChart.animateX(3000);
+                mChart.animateX(1800);
                 break;
             }
             case R.id.animateY: {
-                mChart.animateY(3000);
+                mChart.animateY(1800);
                 break;
             }
             case R.id.animateXY: {
-                mChart.animateXY(3000, 3000);
+                mChart.animateXY(1800, 1800);
                 break;
             }
         }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScatterChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScatterChartActivity.java
@@ -149,6 +149,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.animateY(3000);
                 break;
             }
+            case R.id.animateXY: {
+
+                mChart.animateXY(3000, 3000);
+                break;
+            }
         }
         return true;
     }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/listviewitems/BarChartItem.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/listviewitems/BarChartItem.java
@@ -66,7 +66,8 @@ public View getView(int position, View convertView, Context c) {
         holder.chart.setData(mChartData);
         
         // do not forget to refresh the chart
-        holder.chart.invalidate();
+//        holder.chart.invalidate();
+        holder.chart.animateY(700);
 
         return convertView;
     }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/listviewitems/LineChartItem.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/listviewitems/LineChartItem.java
@@ -47,7 +47,8 @@ public View getView(int position, View convertView, Context c) {
         }
 
         // apply styling
-        holder.chart.setValueTypeface(mTf);
+//        holder.chart.setValueTypeface(mTf);
+        holder.chart.setDrawYValues(false);
         holder.chart.setDescription("");
         holder.chart.setDrawVerticalGrid(false);
         holder.chart.setDrawGridBackground(false);
@@ -65,7 +66,8 @@ public View getView(int position, View convertView, Context c) {
         holder.chart.setData(mChartData);
         
         // do not forget to refresh the chart
-        holder.chart.invalidate();
+//        holder.chart.invalidate();
+        holder.chart.animateX(1000);
 
         return convertView;
     }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/listviewitems/PieChartItem.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/listviewitems/PieChartItem.java
@@ -63,7 +63,8 @@ public View getView(int position, View convertView, Context c) {
         l.setPosition(LegendPosition.RIGHT_OF_CHART);
         
         // do not forget to refresh the chart
-        holder.chart.invalidate();
+//        holder.chart.invalidate();
+        holder.chart.animateXY(900, 900);
 
         return convertView;
     }
diff --git a/MPChartLib/libs/nineoldandroids-2.4.0-2.jar b/MPChartLib/libs/nineoldandroids-2.4.0-2.jar
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {`
`243`	`243`
`244`	`244`	`for (int i = 0; i < mSeekBarX.getProgress()+1; i++) {`
`245`	`245`	`float mult = (mSeekBarY.getProgress() + 1);`
`246`		`- float val = (float) (Math.random() * mult) - 50;`
	`246`	`+ float val = (float) (Math.random() * mult) + 3;`
`247`	`247`	`yVals1.add(new Entry(val, i));`
`248`	`248`	`}`
`249`	`249`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,8 @@ public View getView(int position, View convertView, ViewGroup parent) {`
`105`	`105`	`holder.chart.setData(c);`
`106`	`106`
`107`	`107`	`// do not forget to refresh the chart`
`108`		`- holder.chart.invalidate();`
	`108`	`+// holder.chart.invalidate();`
	`109`	`+ holder.chart.animateY(700);`
`109`	`110`
`110`	`111`	`return convertView;`
`111`	`112`	`}`