Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MPChart to latest version - to be able to use new feats #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update MPChart to latest version - to be able to use new feats #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MPChartExample/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<activity android:name="LineChartTime" />
<activity android:name="BarChartActivity" />
<activity android:name="HorizontalBarChartActivity" />
<activity android:name="HorizontalBarNegativeChartActivity" />
<activity android:name="PieChartActivity" />
<activity android:name="PiePolylineChartActivity" />
<activity android:name="MultiLineChartActivity" />
Expand Down
31 changes: 13 additions & 18 deletions MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/BarChartActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

package com.xxmassdeveloper.mpchartexample;

import android.Manifest;
Expand Down Expand Up @@ -27,15 +28,15 @@
import com.github.mikephil.charting.data.BarDataSet;
import com.github.mikephil.charting.data.BarEntry;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
import com.github.mikephil.charting.model.GradientColor;
import com.github.mikephil.charting.utils.Fill;
import com.github.mikephil.charting.utils.MPPointF;
import com.xxmassdeveloper.mpchartexample.custom.DayAxisValueFormatter;
import com.xxmassdeveloper.mpchartexample.custom.MyValueFormatter;
import com.xxmassdeveloper.mpchartexample.custom.MyAxisValueFormatter;
import com.xxmassdeveloper.mpchartexample.custom.XYMarkerView;
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;

Expand Down Expand Up @@ -85,7 +86,7 @@ protected void onCreate(Bundle savedInstanceState) {
chart.setDrawGridBackground(false);
// chart.setDrawYLabels(false);

ValueFormatter xAxisFormatter = new DayAxisValueFormatter(chart);
IAxisValueFormatter xAxisFormatter = new DayAxisValueFormatter(chart);

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

ValueFormatter custom = new MyValueFormatter("$");
IAxisValueFormatter custom = new MyAxisValueFormatter();

YAxis leftAxis = chart.getAxisLeft();
leftAxis.setTypeface(tfLight);
Expand Down Expand Up @@ -164,12 +165,6 @@ private void setData(int count, float range) {

set1.setDrawIcons(false);

// set1.setColors(ColorTemplate.MATERIAL_COLORS);

/*int startColor = ContextCompat.getColor(this, android.R.color.holo_blue_dark);
int endColor = ContextCompat.getColor(this, android.R.color.holo_blue_bright);
set1.setGradientColor(startColor, endColor);*/

int startColor1 = ContextCompat.getColor(this, android.R.color.holo_orange_light);
int startColor2 = ContextCompat.getColor(this, android.R.color.holo_blue_light);
int startColor3 = ContextCompat.getColor(this, android.R.color.holo_orange_light);
Expand All @@ -181,14 +176,14 @@ private void setData(int count, float range) {
int endColor4 = ContextCompat.getColor(this, android.R.color.holo_red_dark);
int endColor5 = ContextCompat.getColor(this, android.R.color.holo_orange_dark);

List<GradientColor> gradientColors = new ArrayList<>();
gradientColors.add(new GradientColor(startColor1, endColor1));
gradientColors.add(new GradientColor(startColor2, endColor2));
gradientColors.add(new GradientColor(startColor3, endColor3));
gradientColors.add(new GradientColor(startColor4, endColor4));
gradientColors.add(new GradientColor(startColor5, endColor5));
List<Fill> gradientFills = new ArrayList<>();
gradientFills.add(new Fill(startColor1, endColor1));
gradientFills.add(new Fill(startColor2, endColor2));
gradientFills.add(new Fill(startColor3, endColor3));
gradientFills.add(new Fill(startColor4, endColor4));
gradientFills.add(new Fill(startColor5, endColor5));

set1.setGradientColors(gradientColors);
set1.setFills(gradientFills);

ArrayList<IBarDataSet> dataSets = new ArrayList<>();
dataSets.add(set1);
Expand Down
8 changes: 5 additions & 3 deletions ...xample/src/main/java/com/xxmassdeveloper/mpchartexample/BarChartActivityMultiDataset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

package com.xxmassdeveloper.mpchartexample;

import android.Manifest;
Expand All @@ -16,15 +17,16 @@
import android.widget.TextView;

import com.github.mikephil.charting.charts.BarChart;
import com.github.mikephil.charting.components.AxisBase;
import com.github.mikephil.charting.components.Legend;
import com.github.mikephil.charting.components.XAxis;
import com.github.mikephil.charting.components.YAxis;
import com.github.mikephil.charting.data.BarData;
import com.github.mikephil.charting.data.BarDataSet;
import com.github.mikephil.charting.data.BarEntry;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.formatter.LargeValueFormatter;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
Expand Down Expand Up @@ -98,9 +100,9 @@ protected void onCreate(Bundle savedInstanceState) {
xAxis.setTypeface(tfLight);
xAxis.setGranularity(1f);
xAxis.setCenterAxisLabels(true);
xAxis.setValueFormatter(new ValueFormatter() {
xAxis.setValueFormatter(new IAxisValueFormatter() {
@Override
public String getFormattedValue(float value) {
public String getFormattedValue(float value, AxisBase axis) {
return String.valueOf((int) value);
}
});
Expand Down
19 changes: 12 additions & 7 deletions ...artExample/src/main/java/com/xxmassdeveloper/mpchartexample/BarChartPositiveNegative.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

package com.xxmassdeveloper.mpchartexample;

import android.content.Intent;
Expand All @@ -9,13 +10,17 @@
import android.view.WindowManager;

import com.github.mikephil.charting.charts.BarChart;
import com.github.mikephil.charting.components.AxisBase;
import com.github.mikephil.charting.components.XAxis;
import com.github.mikephil.charting.components.XAxis.XAxisPosition;
import com.github.mikephil.charting.components.YAxis;
import com.github.mikephil.charting.data.BarData;
import com.github.mikephil.charting.data.BarDataSet;
import com.github.mikephil.charting.data.BarEntry;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import com.github.mikephil.charting.utils.ViewPortHandler;
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;

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

xAxis.setValueFormatter(new ValueFormatter() {
xAxis.setValueFormatter(new IAxisValueFormatter() {
@Override
public String getFormattedValue(float value) {
public String getFormattedValue(float value, AxisBase axis) {
return data.get(Math.min(Math.max((int) value, 0), data.size()-1)).xAxisValue;
}
});
Expand Down Expand Up @@ -130,7 +135,7 @@ private void setData(List<Data> dataList) {
BarData data = new BarData(set);
data.setValueTextSize(13f);
data.setValueTypeface(tfRegular);
data.setValueFormatter(new Formatter());
data.setValueFormatter(new ValueFormatter());
data.setBarWidth(0.8f);

chart.setData(data);
Expand All @@ -154,17 +159,17 @@ private class Data {
}
}

private class Formatter extends ValueFormatter
private class ValueFormatter implements IValueFormatter
{

private final DecimalFormat mFormat;

Formatter() {
ValueFormatter() {
mFormat = new DecimalFormat("######.0");
}

@Override
public String getFormattedValue(float value) {
public String getFormattedValue(float value, Entry entry, int dataSetIndex, ViewPortHandler viewPortHandler) {
return mFormat.format(value);
}
}
Expand Down
8 changes: 5 additions & 3 deletions MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/CombinedChartActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

package com.xxmassdeveloper.mpchartexample;

import android.content.Intent;
Expand All @@ -10,6 +11,7 @@

import com.github.mikephil.charting.charts.CombinedChart;
import com.github.mikephil.charting.charts.CombinedChart.DrawOrder;
import com.github.mikephil.charting.components.AxisBase;
import com.github.mikephil.charting.components.Legend;
import com.github.mikephil.charting.components.XAxis;
import com.github.mikephil.charting.components.XAxis.XAxisPosition;
Expand All @@ -29,7 +31,7 @@
import com.github.mikephil.charting.data.LineDataSet;
import com.github.mikephil.charting.data.ScatterData;
import com.github.mikephil.charting.data.ScatterDataSet;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
import com.github.mikephil.charting.utils.ColorTemplate;
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
Expand Down Expand Up @@ -81,9 +83,9 @@ protected void onCreate(Bundle savedInstanceState) {
xAxis.setPosition(XAxisPosition.BOTH_SIDED);
xAxis.setAxisMinimum(0f);
xAxis.setGranularity(1f);
xAxis.setValueFormatter(new ValueFormatter() {
xAxis.setValueFormatter(new IAxisValueFormatter() {
@Override
public String getFormattedValue(float value) {
public String getFormattedValue(float value, AxisBase axis) {
return months[(int) value % months.length];
}
});
Expand Down
Loading