Skip to content

Commit 6a60e2c

Browse files
committed
Merged recent PRs.
1 parent c7b6e07 commit 6a60e2c

5 files changed

Lines changed: 11 additions & 7 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ protected void onCreate(Bundle savedInstanceState) {
5858
mChart = (PieChart) findViewById(R.id.chart1);
5959
mChart.setUsePercentValues(true);
6060
mChart.setDescription("");
61+
62+
mChart.setDragDecelerationFrictionCoef(0.99f);
6163

6264
tf = Typeface.createFromAsset(getAssets(), "OpenSans-Regular.ttf");
6365

‎MPChartLib/src/com/github/mikephil/charting/charts/PieRadarChartBase.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public boolean onTouchEvent(MotionEvent event) {
8181
public void computeScroll() {
8282

8383
if (mListener instanceof PieRadarChartTouchListener)
84-
((PieRadarChartTouchListener)mListener).computeScroll();
84+
((PieRadarChartTouchListener) mListener).computeScroll();
8585
}
8686

8787
@Override
@@ -442,7 +442,6 @@ public List<SelInfo> getYValsAtIndex(int xIndex) {
442442
*/
443443
/** CODE BELOW THIS RELATED TO ANIMATION */
444444

445-
446445
/**
447446
* Applys a spin animation to the Chart.
448447
*
@@ -458,7 +457,8 @@ public void spin(int durationmillis, float fromangle, float toangle, Easing.Easi
458457

459458
setRotationAngle(fromangle);
460459

461-
ObjectAnimator spinAnimator = ObjectAnimator.ofFloat(this, "rotationAngle", fromangle, toangle);
460+
ObjectAnimator spinAnimator = ObjectAnimator.ofFloat(this, "rotationAngle", fromangle,
461+
toangle);
462462
spinAnimator.setDuration(durationmillis);
463463
spinAnimator.setInterpolator(Easing.getEasingFunctionFromOption(easing));
464464

‎MPChartLib/src/com/github/mikephil/charting/listener/PieRadarChartTouchListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class PieRadarChartTouchListener extends SimpleOnGestureListener implemen
4141

4242
private GestureDetector mGestureDetector;
4343

44-
private ArrayList<AngularVelocitySample> _velocitySamples = new ArrayList<>();
44+
private ArrayList<AngularVelocitySample> _velocitySamples = new ArrayList<AngularVelocitySample>();
4545

4646
private long mDecelerationLastTime = 0;
4747
private float mDecelerationAngularVelocity = 0.f;

‎MPChartLib/src/com/github/mikephil/charting/utils/LargeValueFormatter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ public LargeValueFormatter() {
3131
* Creates a formatter that appends a specified text to the result string
3232
* @param text a text that will be appended
3333
*/
34-
public LargeValueFormatter(String text) {
34+
public LargeValueFormatter(String appendix) {
3535
this();
36-
mText = text;
36+
mText = appendix;
3737
}
3838

3939
@Override
4040
public String getFormattedValue(float value) {
41-
return makePretty(value) + " " + mText;
41+
return makePretty(value) + mText;
4242
}
4343

4444
/**

‎MPChartLib/src/com/github/mikephil/charting/utils/Utils.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
import android.view.VelocityTracker;
1515
import android.view.View;
1616
import android.view.ViewConfiguration;
17+
1718
import com.github.mikephil.charting.components.YAxis.AxisDependency;
19+
1820
import java.text.DecimalFormat;
1921
import java.util.List;
2022

0 commit comments

Comments
 (0)