Skip to content

Commit 8c92fcd

Browse files
danielgindidanielgindi
authored
Merge pull request #5011 from danielgindi/fix/value_formatter
Revert: e5b6619 - bring back polymorphism to value formatters
2 parents 8e4dccf + bc0be2c commit 8c92fcd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+340
-418
lines changed

‎.gitignore‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
bin/
1313
gen/
1414
generated/
15+
docs/
1516
finalOutput/
1617
projectFilesBackup/
1718

@@ -23,8 +24,6 @@ local.properties
2324
# Eclipse project files
2425
.classpath
2526
.project
26-
.settings/
27-
.vscode/
2827

2928
# Proguard folder generated by Eclipse
3029
proguard/
@@ -33,8 +32,7 @@ proguard/
3332
*.iml
3433
*.ipr
3534
*.iws
36-
/.idea/*
37-
!/.idea/runConfigurations
35+
.idea/
3836

3937
.directory
4038

‎MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/BarChartActivity.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
package com.xxmassdeveloper.mpchartexample;
23

34
import android.Manifest;
@@ -27,15 +28,15 @@
2728
import com.github.mikephil.charting.data.BarDataSet;
2829
import com.github.mikephil.charting.data.BarEntry;
2930
import com.github.mikephil.charting.data.Entry;
30-
import com.github.mikephil.charting.formatter.ValueFormatter;
31+
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
3132
import com.github.mikephil.charting.highlight.Highlight;
3233
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
3334
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
3435
import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
3536
import com.github.mikephil.charting.utils.Fill;
3637
import com.github.mikephil.charting.utils.MPPointF;
3738
import com.xxmassdeveloper.mpchartexample.custom.DayAxisValueFormatter;
38-
import com.xxmassdeveloper.mpchartexample.custom.MyValueFormatter;
39+
import com.xxmassdeveloper.mpchartexample.custom.MyAxisValueFormatter;
3940
import com.xxmassdeveloper.mpchartexample.custom.XYMarkerView;
4041
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
4142

@@ -85,7 +86,7 @@ protected void onCreate(Bundle savedInstanceState) {
8586
chart.setDrawGridBackground(false);
8687
// chart.setDrawYLabels(false);
8788

88-
ValueFormatter xAxisFormatter = new DayAxisValueFormatter(chart);
89+
IAxisValueFormatter xAxisFormatter = new DayAxisValueFormatter(chart);
8990

9091
XAxis xAxis = chart.getXAxis();
9192
xAxis.setPosition(XAxisPosition.BOTTOM);
@@ -95,7 +96,7 @@ protected void onCreate(Bundle savedInstanceState) {
9596
xAxis.setLabelCount(7);
9697
xAxis.setValueFormatter(xAxisFormatter);
9798

98-
ValueFormatter custom = new MyValueFormatter("$");
99+
IAxisValueFormatter custom = new MyAxisValueFormatter();
99100

100101
YAxis leftAxis = chart.getAxisLeft();
101102
leftAxis.setTypeface(tfLight);

‎MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/BarChartActivityMultiDataset.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
package com.xxmassdeveloper.mpchartexample;
23

34
import android.Manifest;
@@ -16,15 +17,16 @@
1617
import android.widget.TextView;
1718

1819
import com.github.mikephil.charting.charts.BarChart;
20+
import com.github.mikephil.charting.components.AxisBase;
1921
import com.github.mikephil.charting.components.Legend;
2022
import com.github.mikephil.charting.components.XAxis;
2123
import com.github.mikephil.charting.components.YAxis;
2224
import com.github.mikephil.charting.data.BarData;
2325
import com.github.mikephil.charting.data.BarDataSet;
2426
import com.github.mikephil.charting.data.BarEntry;
2527
import com.github.mikephil.charting.data.Entry;
28+
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
2629
import com.github.mikephil.charting.formatter.LargeValueFormatter;
27-
import com.github.mikephil.charting.formatter.ValueFormatter;
2830
import com.github.mikephil.charting.highlight.Highlight;
2931
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
3032
import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
@@ -98,9 +100,9 @@ protected void onCreate(Bundle savedInstanceState) {
98100
xAxis.setTypeface(tfLight);
99101
xAxis.setGranularity(1f);
100102
xAxis.setCenterAxisLabels(true);
101-
xAxis.setValueFormatter(new ValueFormatter() {
103+
xAxis.setValueFormatter(new IAxisValueFormatter() {
102104
@Override
103-
public String getFormattedValue(float value) {
105+
public String getFormattedValue(float value, AxisBase axis) {
104106
return String.valueOf((int) value);
105107
}
106108
});

‎MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/BarChartPositiveNegative.java‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
package com.xxmassdeveloper.mpchartexample;
23

34
import android.content.Intent;
@@ -9,13 +10,17 @@
910
import android.view.WindowManager;
1011

1112
import com.github.mikephil.charting.charts.BarChart;
13+
import com.github.mikephil.charting.components.AxisBase;
1214
import com.github.mikephil.charting.components.XAxis;
1315
import com.github.mikephil.charting.components.XAxis.XAxisPosition;
1416
import com.github.mikephil.charting.components.YAxis;
1517
import com.github.mikephil.charting.data.BarData;
1618
import com.github.mikephil.charting.data.BarDataSet;
1719
import com.github.mikephil.charting.data.BarEntry;
18-
import com.github.mikephil.charting.formatter.ValueFormatter;
20+
import com.github.mikephil.charting.data.Entry;
21+
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
22+
import com.github.mikephil.charting.formatter.IValueFormatter;
23+
import com.github.mikephil.charting.utils.ViewPortHandler;
1924
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
2025

2126
import java.text.DecimalFormat;
@@ -83,9 +88,9 @@ protected void onCreate(Bundle savedInstanceState) {
8388
data.add(new Data(3f, -442.3f, "01-01"));
8489
data.add(new Data(4f, -2280.1f, "01-02"));
8590

86-
xAxis.setValueFormatter(new ValueFormatter() {
91+
xAxis.setValueFormatter(new IAxisValueFormatter() {
8792
@Override
88-
public String getFormattedValue(float value) {
93+
public String getFormattedValue(float value, AxisBase axis) {
8994
return data.get(Math.min(Math.max((int) value, 0), data.size()-1)).xAxisValue;
9095
}
9196
});
@@ -130,7 +135,7 @@ private void setData(List<Data> dataList) {
130135
BarData data = new BarData(set);
131136
data.setValueTextSize(13f);
132137
data.setValueTypeface(tfRegular);
133-
data.setValueFormatter(new Formatter());
138+
data.setValueFormatter(new ValueFormatter());
134139
data.setBarWidth(0.8f);
135140

136141
chart.setData(data);
@@ -154,17 +159,17 @@ private class Data {
154159
}
155160
}
156161

157-
private class Formatter extends ValueFormatter
162+
private class ValueFormatter implements IValueFormatter
158163
{
159164

160165
private final DecimalFormat mFormat;
161166

162-
Formatter() {
167+
ValueFormatter() {
163168
mFormat = new DecimalFormat("######.0");
164169
}
165170

166171
@Override
167-
public String getFormattedValue(float value) {
172+
public String getFormattedValue(float value, Entry entry, int dataSetIndex, ViewPortHandler viewPortHandler) {
168173
return mFormat.format(value);
169174
}
170175
}

‎MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/CombinedChartActivity.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
package com.xxmassdeveloper.mpchartexample;
23

34
import android.content.Intent;
@@ -10,6 +11,7 @@
1011

1112
import com.github.mikephil.charting.charts.CombinedChart;
1213
import com.github.mikephil.charting.charts.CombinedChart.DrawOrder;
14+
import com.github.mikephil.charting.components.AxisBase;
1315
import com.github.mikephil.charting.components.Legend;
1416
import com.github.mikephil.charting.components.XAxis;
1517
import com.github.mikephil.charting.components.XAxis.XAxisPosition;
@@ -29,7 +31,7 @@
2931
import com.github.mikephil.charting.data.LineDataSet;
3032
import com.github.mikephil.charting.data.ScatterData;
3133
import com.github.mikephil.charting.data.ScatterDataSet;
32-
import com.github.mikephil.charting.formatter.ValueFormatter;
34+
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
3335
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
3436
import com.github.mikephil.charting.utils.ColorTemplate;
3537
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
@@ -81,9 +83,9 @@ protected void onCreate(Bundle savedInstanceState) {
8183
xAxis.setPosition(XAxisPosition.BOTH_SIDED);
8284
xAxis.setAxisMinimum(0f);
8385
xAxis.setGranularity(1f);
84-
xAxis.setValueFormatter(new ValueFormatter() {
86+
xAxis.setValueFormatter(new IAxisValueFormatter() {
8587
@Override
86-
public String getFormattedValue(float value) {
88+
public String getFormattedValue(float value, AxisBase axis) {
8789
return months[(int) value % months.length];
8890
}
8991
});

‎MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/LineChartTime.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
package com.xxmassdeveloper.mpchartexample;
23

34
import android.Manifest;
@@ -15,14 +16,15 @@
1516
import android.widget.TextView;
1617

1718
import com.github.mikephil.charting.charts.LineChart;
19+
import com.github.mikephil.charting.components.AxisBase;
1820
import com.github.mikephil.charting.components.Legend;
1921
import com.github.mikephil.charting.components.XAxis;
2022
import com.github.mikephil.charting.components.YAxis;
2123
import com.github.mikephil.charting.components.YAxis.AxisDependency;
2224
import com.github.mikephil.charting.data.Entry;
2325
import com.github.mikephil.charting.data.LineData;
2426
import com.github.mikephil.charting.data.LineDataSet;
25-
import com.github.mikephil.charting.formatter.ValueFormatter;
27+
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
2628
import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
2729
import com.github.mikephil.charting.utils.ColorTemplate;
2830
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
@@ -90,12 +92,12 @@ protected void onCreate(Bundle savedInstanceState) {
9092
xAxis.setTextColor(Color.rgb(255, 192, 56));
9193
xAxis.setCenterAxisLabels(true);
9294
xAxis.setGranularity(1f); // one hour
93-
xAxis.setValueFormatter(new ValueFormatter() {
95+
xAxis.setValueFormatter(new IAxisValueFormatter() {
9496

9597
private final SimpleDateFormat mFormat = new SimpleDateFormat("dd MMM HH:mm", Locale.ENGLISH);
9698

9799
@Override
98-
public String getFormattedValue(float value) {
100+
public String getFormattedValue(float value, AxisBase axis) {
99101

100102
long millis = TimeUnit.HOURS.toMillis((long) value);
101103
return mFormat.format(new Date(millis));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ private void setData(int count, float range) {
160160
//dataSet.setSelectionShift(0f);
161161

162162
PieData data = new PieData(dataSet);
163-
data.setValueFormatter(new PercentFormatter(chart));
163+
data.setValueFormatter(new PercentFormatter());
164164
data.setValueTextSize(11f);
165165
data.setValueTextColor(Color.WHITE);
166166
data.setValueTypeface(tfLight);

‎MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/RadarChartActivity.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
package com.xxmassdeveloper.mpchartexample;
23

34
import android.Manifest;
@@ -13,14 +14,15 @@
1314

1415
import com.github.mikephil.charting.animation.Easing;
1516
import com.github.mikephil.charting.charts.RadarChart;
17+
import com.github.mikephil.charting.components.AxisBase;
1618
import com.github.mikephil.charting.components.Legend;
1719
import com.github.mikephil.charting.components.MarkerView;
1820
import com.github.mikephil.charting.components.XAxis;
1921
import com.github.mikephil.charting.components.YAxis;
2022
import com.github.mikephil.charting.data.RadarData;
2123
import com.github.mikephil.charting.data.RadarDataSet;
2224
import com.github.mikephil.charting.data.RadarEntry;
23-
import com.github.mikephil.charting.formatter.ValueFormatter;
25+
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
2426
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
2527
import com.github.mikephil.charting.interfaces.datasets.IRadarDataSet;
2628
import com.xxmassdeveloper.mpchartexample.custom.RadarMarkerView;
@@ -67,12 +69,12 @@ protected void onCreate(Bundle savedInstanceState) {
6769
xAxis.setTextSize(9f);
6870
xAxis.setYOffset(0f);
6971
xAxis.setXOffset(0f);
70-
xAxis.setValueFormatter(new ValueFormatter() {
72+
xAxis.setValueFormatter(new IAxisValueFormatter() {
7173

7274
private final String[] mActivities = new String[]{"Burger", "Steak", "Salad", "Pasta", "Pizza"};
7375

7476
@Override
75-
public String getFormattedValue(float value) {
77+
public String getFormattedValue(float value, AxisBase axis) {
7678
return mActivities[(int) value % mActivities.length];
7779
}
7880
});

‎MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/StackedBarActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
import com.github.mikephil.charting.data.BarDataSet;
2525
import com.github.mikephil.charting.data.BarEntry;
2626
import com.github.mikephil.charting.data.Entry;
27-
import com.github.mikephil.charting.formatter.StackedValueFormatter;
2827
import com.github.mikephil.charting.highlight.Highlight;
2928
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
3029
import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
3130
import com.github.mikephil.charting.utils.ColorTemplate;
31+
import com.xxmassdeveloper.mpchartexample.custom.MyAxisValueFormatter;
3232
import com.xxmassdeveloper.mpchartexample.custom.MyValueFormatter;
3333
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
3434

@@ -78,7 +78,7 @@ protected void onCreate(Bundle savedInstanceState) {
7878

7979
// change the position of the y-labels
8080
YAxis leftAxis = chart.getAxisLeft();
81-
leftAxis.setValueFormatter(new MyValueFormatter("K"));
81+
leftAxis.setValueFormatter(new MyAxisValueFormatter());
8282
leftAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
8383
chart.getAxisRight().setEnabled(false);
8484

@@ -142,7 +142,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
142142
dataSets.add(set1);
143143

144144
BarData data = new BarData(dataSets);
145-
data.setValueFormatter(new StackedValueFormatter(false, "", 1));
145+
data.setValueFormatter(new MyValueFormatter());
146146
data.setValueTextColor(Color.WHITE);
147147

148148
chart.setData(data);

‎MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/StackedBarActivityNegative.java‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
package com.xxmassdeveloper.mpchartexample;
23

34
import android.Manifest;
@@ -13,6 +14,7 @@
1314
import android.view.WindowManager;
1415

1516
import com.github.mikephil.charting.charts.HorizontalBarChart;
17+
import com.github.mikephil.charting.components.AxisBase;
1618
import com.github.mikephil.charting.components.Legend;
1719
import com.github.mikephil.charting.components.XAxis;
1820
import com.github.mikephil.charting.components.XAxis.XAxisPosition;
@@ -21,10 +23,12 @@
2123
import com.github.mikephil.charting.data.BarDataSet;
2224
import com.github.mikephil.charting.data.BarEntry;
2325
import com.github.mikephil.charting.data.Entry;
24-
import com.github.mikephil.charting.formatter.ValueFormatter;
26+
import com.github.mikephil.charting.formatter.IValueFormatter;
27+
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
2528
import com.github.mikephil.charting.highlight.Highlight;
2629
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
2730
import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
31+
import com.github.mikephil.charting.utils.ViewPortHandler;
2832
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
2933

3034
import java.text.DecimalFormat;
@@ -76,12 +80,12 @@ protected void onCreate(Bundle savedInstanceState) {
7680
xAxis.setCenterAxisLabels(true);
7781
xAxis.setLabelCount(12);
7882
xAxis.setGranularity(10f);
79-
xAxis.setValueFormatter(new ValueFormatter() {
83+
xAxis.setValueFormatter(new IAxisValueFormatter() {
8084

8185
private final DecimalFormat format = new DecimalFormat("###");
8286

8387
@Override
84-
public String getFormattedValue(float value) {
88+
public String getFormattedValue(float value, AxisBase axis) {
8589
return format.format(value) + "-" + format.format(value + 10);
8690
}
8791
});
@@ -238,16 +242,23 @@ public void onNothingSelected() {
238242
Log.i("NOTING SELECTED", "");
239243
}
240244

241-
private class CustomFormatter extends ValueFormatter {
245+
private class CustomFormatter implements IValueFormatter, IAxisValueFormatter {
242246

243247
private final DecimalFormat mFormat;
244248

245249
CustomFormatter() {
246250
mFormat = new DecimalFormat("###");
247251
}
248252

253+
// data
254+
@Override
255+
public String getFormattedValue(float value, Entry entry, int dataSetIndex, ViewPortHandler viewPortHandler) {
256+
return mFormat.format(Math.abs(value)) + "m";
257+
}
258+
259+
// YAxis
249260
@Override
250-
public String getFormattedValue(float value) {
261+
public String getFormattedValue(float value, AxisBase axis) {
251262
return mFormat.format(Math.abs(value)) + "m";
252263
}
253264
}

0 commit comments

Comments
 (0)