Fixed issue concerning elevation (issue PhilJay#492, PhilJay#512).

PhilJay · PhilJay · commit 39a9d2ea2976 · 2015-05-04T17:06:24.000+02:00
diff --git a/MPChartExample/AndroidManifest.xml b/MPChartExample/AndroidManifest.xml
@@ -6,13 +6,13 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="21" />
+        android:targetSdkVersion="22" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"
         android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@drawable/ic_launcher" 
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
diff --git a/MPChartExample/project.properties b/MPChartExample/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-22
 android.library.reference.1=../MPChartLib
diff --git a/MPChartLib/project.properties b/MPChartLib/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-20
+target=android-22
 android.library=true
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java b/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java
@@ -174,7 +174,8 @@ protected void onDraw(Canvas canvas) {
         if (mDataNotSet)
             return;
 
-        long starttime = System.currentTimeMillis();calcModulus();
+        long starttime = System.currentTimeMillis();
+        calcModulus();
 
         mXAxisRenderer.calcXBounds(this, mXAxis.mAxisLabelModulus);
         mRenderer.calcXBounds(this, mXAxis.mAxisLabelModulus);
@@ -1191,14 +1192,20 @@ public int getHighestVisibleXIndex() {
      * returns the current x-scale factor
      */
     public float getScaleX() {
-        return mViewPortHandler.getScaleX();
+        if (mViewPortHandler == null)
+            return 1f;
+        else
+            return mViewPortHandler.getScaleX();
     }
 
     /**
      * returns the current y-scale factor
      */
     public float getScaleY() {
-        return mViewPortHandler.getScaleY();
+        if (mViewPortHandler == null)
+            return 1f;
+        else
+            return mViewPortHandler.getScaleY();
     }
 
     /**
diff --git a/screenshots/horizontal_barchart.png b/screenshots/horizontal_barchart.png
