Minor fixes.

PhilJay · Oct 17, 2014 · a7a3498 · a7a3498
1 parent 98824fc
commit a7a3498
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 23 deletions.
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="27"
-    android:versionName="1.7.0" >
+    android:versionCode="28"
+    android:versionName="1.7.1" >
 
     <uses-sdk
         android:minSdkVersion="8"

diff --git a/MPChartExample/build.gradle b/MPChartExample/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId 'com.xxmassdeveloper.mpchartexample'
         minSdkVersion 16
         targetSdkVersion 19
-        versionCode 27
-        versionName '1.7.0'
+        versionCode 28
+        versionName '1.7.1'
 
         sourceSets {
             main {

diff --git a/MPChartExample/libs/mpandroidchartlibrary-1-7-1.jar b/MPChartExample/libs/mpandroidchartlibrary-1-7-1.jar
diff --git a/MPChartExample/project.properties b/MPChartExample/project.properties
@@ -12,4 +12,3 @@
 
 # Project target.
 target=android-19
-android.library.reference.1=../MPChartLib
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity.java
@@ -24,9 +24,8 @@
 import com.github.mikephil.charting.interfaces.OnChartValueSelectedListener;
 import com.github.mikephil.charting.utils.Legend;
 import com.github.mikephil.charting.utils.Legend.LegendForm;
-import com.github.mikephil.charting.utils.LimitLine.LimitLabelPosition;
-import com.github.mikephil.charting.utils.Highlight;
 import com.github.mikephil.charting.utils.LimitLine;
+import com.github.mikephil.charting.utils.LimitLine.LimitLabelPosition;
 import com.github.mikephil.charting.utils.XLabels;
 import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
 
@@ -126,11 +125,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mChart.animateX(2500);
 
-        // // restrain the maximum scale-out factor
-        // mChart.setScaleMinima(3f, 3f);
-        //
-        // // center the view to a specific position inside the chart
-        // mChart.centerViewPort(10, 50);
+//         // restrain the maximum scale-out factor
+//         mChart.setScaleMinima(3f, 3f);
+//        
+//         // center the view to a specific position inside the chart
+//         mChart.centerViewPort(10, 50);
 
         // get the legend (only possible after setting data)
         Legend l = mChart.getLegend();

diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java b/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java
@@ -929,18 +929,18 @@ private void drawLimitLines() {
 
         if (limitLines == null)
             return;
-        
-        float [] pts = new float[4];
+
+        float[] pts = new float[4];
 
         for (int i = 0; i < limitLines.size(); i++) {
 
             LimitLine l = limitLines.get(i);
-            
+
             pts[1] = l.getLimit();
             pts[3] = l.getLimit();
 
             transformPointArray(pts);
-            
+
             pts[0] = 0;
             pts[2] = getWidth();
 
@@ -1884,10 +1884,10 @@ public boolean isFullyZoomedOut() {
      * @return
      */
     public boolean isFullyZoomedOutY() {
-        if (mScaleY <= mMinScaleY)
-            return true;
-        else
+        if (mScaleY > mMinScaleY || mMinScaleY > 1f)
             return false;
+        else
+            return true;
     }
 
     /**
@@ -1897,10 +1897,10 @@ public boolean isFullyZoomedOutY() {
      * @return
      */
     public boolean isFullyZoomedOutX() {
-        if (mScaleX <= mMinScaleX)
-            return true;
-        else
+        if (mScaleX > mMinScaleX || mMinScaleX > 1f)
             return false;
+        else
+            return true;
     }
 
     /**

diff --git a/MPChartLib/src/com/github/mikephil/charting/listener/BarLineChartTouchListener.java b/MPChartLib/src/com/github/mikephil/charting/listener/BarLineChartTouchListener.java
@@ -17,7 +17,6 @@
 import com.github.mikephil.charting.data.Entry;
 import com.github.mikephil.charting.interfaces.OnChartGestureListener;
 import com.github.mikephil.charting.utils.Highlight;
-import com.github.mikephil.charting.utils.MarkerView;
 
 /**
  * TouchListener for Bar-, Line-, Scatter- and CandleStickChart with handles all