Skip to content

Commit df90695

Browse files
committed
Code cleanup, example improvements, started refactoring ColorTemplate (remove resource id's).
1 parent ba37514 commit df90695

26 files changed

Lines changed: 131 additions & 124 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
222222
}
223223

224224
BarDataSet set1 = new BarDataSet(yVals1, "Data Set");
225-
set1.setColors(ColorTemplate.createColors(getApplicationContext(),
226-
ColorTemplate.VORDIPLOM_COLORS));
225+
set1.setColors(ColorTemplate.VORDIPLOM_COLORS);
227226

228227
ArrayList<BarDataSet> dataSets = new ArrayList<BarDataSet>();
229228
dataSets.add(set1);

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public int getViewTypeCount() {
9393
*
9494
* @return
9595
*/
96-
private ChartData generateDataLine(int cnt) {
96+
private LineData generateDataLine(int cnt) {
9797

9898
ArrayList<Entry> e1 = new ArrayList<Entry>();
9999

@@ -116,10 +116,8 @@ private ChartData generateDataLine(int cnt) {
116116
d2.setLineWidth(3f);
117117
d2.setCircleSize(5f);
118118
d2.setHighLightColor(Color.rgb(244, 117, 117));
119-
d2.setColor(getResources().getColor(R.color.vordiplom_1));
120-
d2.setCircleColor(getResources().getColor(R.color.vordiplom_1));
121-
122-
// d.setColors(ColorTemplate.VORDIPLOM_COLORS, getApplicationContext());
119+
d2.setColor(ColorTemplate.VORDIPLOM_COLORS[0]);
120+
d2.setCircleColor(ColorTemplate.VORDIPLOM_COLORS[0]);
123121

124122
ArrayList<LineDataSet> sets = new ArrayList<LineDataSet>();
125123
sets.add(d1);
@@ -134,7 +132,7 @@ private ChartData generateDataLine(int cnt) {
134132
*
135133
* @return
136134
*/
137-
private ChartData generateDataBar(int cnt) {
135+
private BarData generateDataBar(int cnt) {
138136

139137
ArrayList<BarEntry> entries = new ArrayList<BarEntry>();
140138

@@ -144,7 +142,7 @@ private ChartData generateDataBar(int cnt) {
144142

145143
BarDataSet d = new BarDataSet(entries, "New DataSet " + cnt);
146144
d.setBarSpacePercent(20f);
147-
d.setColors(ColorTemplate.VORDIPLOM_COLORS, getApplicationContext());
145+
d.setColors(ColorTemplate.VORDIPLOM_COLORS);
148146
d.setHighLightAlpha(255);
149147

150148
BarData cd = new BarData(getMonths(), d);
@@ -156,7 +154,7 @@ private ChartData generateDataBar(int cnt) {
156154
*
157155
* @return
158156
*/
159-
private ChartData generateDataPie(int cnt) {
157+
private PieData generateDataPie(int cnt) {
160158

161159
ArrayList<Entry> entries = new ArrayList<Entry>();
162160

@@ -168,7 +166,7 @@ private ChartData generateDataPie(int cnt) {
168166

169167
// space between slices
170168
d.setSliceSpace(5f);
171-
d.setColors(ColorTemplate.VORDIPLOM_COLORS, getApplicationContext());
169+
d.setColors(ColorTemplate.VORDIPLOM_COLORS);
172170

173171
PieData cd = new PieData(getQuarters(), d);
174172
return cd;

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.github.mikephil.charting.data.filter.Approximator;
1818
import com.github.mikephil.charting.data.filter.Approximator.ApproximatorType;
1919
import com.github.mikephil.charting.interfaces.OnChartValueSelectedListener;
20+
import com.github.mikephil.charting.utils.ColorTemplate;
2021
import com.github.mikephil.charting.utils.Legend;
2122
import com.github.mikephil.charting.utils.Legend.LegendPosition;
2223
import com.github.mikephil.charting.utils.XLabels;
@@ -189,8 +190,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
189190
}
190191
return true;
191192
}
192-
193-
private int[] mColors = new int[] { R.color.vordiplom_1, R.color.vordiplom_2, R.color.vordiplom_3 };
193+
194+
private int[] mColors = new int[] {
195+
ColorTemplate.VORDIPLOM_COLORS[0],
196+
ColorTemplate.VORDIPLOM_COLORS[1],
197+
ColorTemplate.VORDIPLOM_COLORS[2]
198+
};
194199

195200
@Override
196201
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
@@ -217,8 +222,8 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
217222
LineDataSet d = new LineDataSet(values, "DataSet " + (z + 1));
218223
d.setLineWidth(2.5f);
219224
d.setCircleSize(4f);
220-
221-
int color = getResources().getColor(mColors[z % mColors.length]);
225+
226+
int color = mColors[z % mColors.length];
222227
d.setColor(color);
223228
d.setCircleColor(color);
224229
dataSets.add(d);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
196196

197197
PieDataSet set1 = new PieDataSet(yVals1, "Election Results");
198198
set1.setSliceSpace(3f);
199-
set1.setColors(ColorTemplate.createColors(getApplicationContext(),
200-
ColorTemplate.VORDIPLOM_COLORS));
199+
set1.setColors(ColorTemplate.VORDIPLOM_COLORS);
201200

202201
PieData data = new PieData(xVals, set1);
203202
mChart.setData(data);

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.github.mikephil.charting.data.RadarDataSet;
1515
import com.github.mikephil.charting.utils.Legend;
1616
import com.github.mikephil.charting.utils.Legend.LegendPosition;
17+
import com.github.mikephil.charting.utils.ColorTemplate;
1718
import com.github.mikephil.charting.utils.XLabels;
1819
import com.github.mikephil.charting.utils.YLabels;
1920
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
@@ -38,6 +39,8 @@ protected void onCreate(Bundle savedInstanceState) {
3839
mChart.setValueTypeface(tf);
3940

4041
mChart.setDescription("");
42+
mChart.setUnit(" $");
43+
mChart.setDrawUnitsInChart(true);
4144

4245
mChart.setWebLineWidth(1.5f);
4346
mChart.setWebLineWidthInner(0.75f);
@@ -66,6 +69,7 @@ protected void onCreate(Bundle savedInstanceState) {
6669
yl.setTypeface(tf);
6770
yl.setLabelCount(5);
6871
yl.setTextSize(9f);
72+
yl.setDrawUnitsInYLabel(true);
6973

7074
// mChart.animateXY(1500, 1500);
7175

@@ -187,12 +191,12 @@ public void setData() {
187191
xVals.add(mParties[i % mParties.length]);
188192

189193
RadarDataSet set1 = new RadarDataSet(yVals1, "Set 1");
190-
set1.setColor(getResources().getColor(R.color.vordiplom_1));
194+
set1.setColor(ColorTemplate.VORDIPLOM_COLORS[0]);
191195
set1.setDrawFilled(true);
192196
set1.setLineWidth(2f);
193197

194198
RadarDataSet set2 = new RadarDataSet(yVals2, "Set 2");
195-
set2.setColor(getResources().getColor(R.color.vordiplom_5));
199+
set2.setColor(ColorTemplate.VORDIPLOM_COLORS[4]);
196200
set2.setDrawFilled(true);
197201
set2.setLineWidth(2f);
198202

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
package com.xxmassdeveloper.mpchartexample;
33

4+
import android.graphics.Typeface;
45
import android.os.Bundle;
56
import android.util.Log;
67
import android.view.Menu;
@@ -21,6 +22,7 @@
2122
import com.github.mikephil.charting.utils.Legend;
2223
import com.github.mikephil.charting.utils.Legend.LegendPosition;
2324
import com.github.mikephil.charting.utils.XLabels;
25+
import com.github.mikephil.charting.utils.YLabels;
2426
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
2527

2628
import java.util.ArrayList;
@@ -49,8 +51,14 @@ protected void onCreate(Bundle savedInstanceState) {
4951
mSeekBarY.setOnSeekBarChangeListener(this);
5052

5153
mChart = (ScatterChart) findViewById(R.id.chart1);
54+
mChart.setDescription("");
55+
56+
Typeface tf = Typeface.createFromAsset(getAssets(), "OpenSans-Regular.ttf");
57+
mChart.setValueTypeface(tf);
5258

5359
mChart.setOnChartValueSelectedListener(this);
60+
61+
mChart.setDrawGridBackground(false);
5462

5563
mChart.setTouchEnabled(true);
5664
mChart.setHighlightEnabled(true);
@@ -66,6 +74,13 @@ protected void onCreate(Bundle savedInstanceState) {
6674

6775
Legend l = mChart.getLegend();
6876
l.setPosition(LegendPosition.RIGHT_OF_CHART);
77+
l.setTypeface(tf);
78+
79+
YLabels yl = mChart.getYLabels();
80+
yl.setTypeface(tf);
81+
82+
XLabels xl = mChart.getXLabels();
83+
xl.setTypeface(tf);
6984
}
7085

7186
@Override
@@ -197,6 +212,10 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
197212
ScatterDataSet set3 = new ScatterDataSet(yVals3, "DS 3");
198213
set3.setScatterShape(ScatterShape.TRIANGLE);
199214
set3.setColor(getResources().getColor(R.color.colorful_3));
215+
216+
set1.setScatterShapeSize(8f);
217+
set2.setScatterShapeSize(8f);
218+
set3.setScatterShapeSize(8f);
200219

201220
ArrayList<ScatterDataSet> dataSets = new ArrayList<ScatterDataSet>();
202221
dataSets.add(set1); // add the datasets

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
240240
}
241241

242242
BarDataSet set1 = new BarDataSet(yVals1, "Statistics Vienna 2014");
243-
set1.setColors(ColorTemplate.createColors(getApplicationContext(),
244-
ColorTemplate.VORDIPLOM_COLORS));
243+
set1.setColors(ColorTemplate.VORDIPLOM_COLORS);
245244
set1.setStackLabels(new String[] {
246245
"Births", "Divorces", "Marriages"
247246
});

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/SimpleFragment.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ protected LineData generateLineData() {
120120
ds1.setDrawCircles(false);
121121
ds2.setDrawCircles(false);
122122

123-
ds1.setColor(getResources().getColor(R.color.vordiplom_1));
124-
ds2.setColor(getResources().getColor(R.color.vordiplom_2));
123+
ds1.setColor(ColorTemplate.VORDIPLOM_COLORS[0]);
124+
ds2.setColor(ColorTemplate.VORDIPLOM_COLORS[1]);
125125

126126
// load DataSets from textfiles in assets folders
127127
sets.add(ds1);
@@ -147,15 +147,15 @@ protected LineData getComplexity() {
147147
LineDataSet ds3 = new LineDataSet(FileUtils.loadEntriesFromAssets(getActivity().getAssets(), "square.txt"), "O(n\u00B2)");
148148
LineDataSet ds4 = new LineDataSet(FileUtils.loadEntriesFromAssets(getActivity().getAssets(), "three.txt"), "O(n\u00B3)");
149149

150-
ds1.setColor(getResources().getColor(R.color.vordiplom_1));
151-
ds2.setColor(getResources().getColor(R.color.vordiplom_2));
152-
ds3.setColor(getResources().getColor(R.color.vordiplom_3));
153-
ds4.setColor(getResources().getColor(R.color.vordiplom_4));
150+
ds1.setColor(ColorTemplate.VORDIPLOM_COLORS[0]);
151+
ds2.setColor(ColorTemplate.VORDIPLOM_COLORS[1]);
152+
ds3.setColor(ColorTemplate.VORDIPLOM_COLORS[2]);
153+
ds4.setColor(ColorTemplate.VORDIPLOM_COLORS[3]);
154154

155-
ds1.setCircleColor(getResources().getColor(R.color.vordiplom_1));
156-
ds2.setCircleColor(getResources().getColor(R.color.vordiplom_2));
157-
ds3.setCircleColor(getResources().getColor(R.color.vordiplom_3));
158-
ds4.setCircleColor(getResources().getColor(R.color.vordiplom_4));
155+
ds1.setCircleColor(ColorTemplate.VORDIPLOM_COLORS[0]);
156+
ds2.setCircleColor(ColorTemplate.VORDIPLOM_COLORS[1]);
157+
ds3.setCircleColor(ColorTemplate.VORDIPLOM_COLORS[2]);
158+
ds4.setCircleColor(ColorTemplate.VORDIPLOM_COLORS[3]);
159159

160160
ds1.setLineWidth(2.5f);
161161
ds1.setCircleSize(3f);
-339 Bytes
Binary file not shown.
-263 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)