Skip to content

Commit a7a3498

Browse files
committed
Minor fixes.
1 parent 98824fc commit a7a3498

File tree

7 files changed

+20
-23
lines changed

7 files changed

+20
-23
lines changed

MPChartExample/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.xxmassdeveloper.mpchartexample"
4-
android:versionCode="27"
5-
android:versionName="1.7.0" >
4+
android:versionCode="28"
5+
android:versionName="1.7.1" >
66

77
<uses-sdk
88
android:minSdkVersion="8"

MPChartExample/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId 'com.xxmassdeveloper.mpchartexample'
88
minSdkVersion 16
99
targetSdkVersion 19
10-
versionCode 27
11-
versionName '1.7.0'
10+
versionCode 28
11+
versionName '1.7.1'
1212

1313
sourceSets {
1414
main {
Binary file not shown.

MPChartExample/project.properties

-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@
1212

1313
# Project target.
1414
target=android-19
15-
android.library.reference.1=../MPChartLib

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

+6-7
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
import com.github.mikephil.charting.interfaces.OnChartValueSelectedListener;
2525
import com.github.mikephil.charting.utils.Legend;
2626
import com.github.mikephil.charting.utils.Legend.LegendForm;
27-
import com.github.mikephil.charting.utils.LimitLine.LimitLabelPosition;
28-
import com.github.mikephil.charting.utils.Highlight;
2927
import com.github.mikephil.charting.utils.LimitLine;
28+
import com.github.mikephil.charting.utils.LimitLine.LimitLabelPosition;
3029
import com.github.mikephil.charting.utils.XLabels;
3130
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
3231

@@ -126,11 +125,11 @@ protected void onCreate(Bundle savedInstanceState) {
126125

127126
mChart.animateX(2500);
128127

129-
// // restrain the maximum scale-out factor
130-
// mChart.setScaleMinima(3f, 3f);
131-
//
132-
// // center the view to a specific position inside the chart
133-
// mChart.centerViewPort(10, 50);
128+
// // restrain the maximum scale-out factor
129+
// mChart.setScaleMinima(3f, 3f);
130+
//
131+
// // center the view to a specific position inside the chart
132+
// mChart.centerViewPort(10, 50);
134133

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

MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -929,18 +929,18 @@ private void drawLimitLines() {
929929

930930
if (limitLines == null)
931931
return;
932-
933-
float [] pts = new float[4];
932+
933+
float[] pts = new float[4];
934934

935935
for (int i = 0; i < limitLines.size(); i++) {
936936

937937
LimitLine l = limitLines.get(i);
938-
938+
939939
pts[1] = l.getLimit();
940940
pts[3] = l.getLimit();
941941

942942
transformPointArray(pts);
943-
943+
944944
pts[0] = 0;
945945
pts[2] = getWidth();
946946

@@ -1884,10 +1884,10 @@ public boolean isFullyZoomedOut() {
18841884
* @return
18851885
*/
18861886
public boolean isFullyZoomedOutY() {
1887-
if (mScaleY <= mMinScaleY)
1888-
return true;
1889-
else
1887+
if (mScaleY > mMinScaleY || mMinScaleY > 1f)
18901888
return false;
1889+
else
1890+
return true;
18911891
}
18921892

18931893
/**
@@ -1897,10 +1897,10 @@ public boolean isFullyZoomedOutY() {
18971897
* @return
18981898
*/
18991899
public boolean isFullyZoomedOutX() {
1900-
if (mScaleX <= mMinScaleX)
1901-
return true;
1902-
else
1900+
if (mScaleX > mMinScaleX || mMinScaleX > 1f)
19031901
return false;
1902+
else
1903+
return true;
19041904
}
19051905

19061906
/**

MPChartLib/src/com/github/mikephil/charting/listener/BarLineChartTouchListener.java

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.github.mikephil.charting.data.Entry;
1818
import com.github.mikephil.charting.interfaces.OnChartGestureListener;
1919
import com.github.mikephil.charting.utils.Highlight;
20-
import com.github.mikephil.charting.utils.MarkerView;
2120

2221
/**
2322
* TouchListener for Bar-, Line-, Scatter- and CandleStickChart with handles all

0 commit comments

Comments
 (0)