Skip to content

Commit f7ba7bb

Browse files
authored
Merge pull request #217 from AppDevNext/ChangeColors
Avoid color red in screenshots
2 parents d4cf1fc + 930e446 commit f7ba7bb

11 files changed

+8
-8
lines changed

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/BarChartActivitySinus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private void setData(int count) {
128128
chart.notifyDataSetChanged();
129129
} else {
130130
set = new BarDataSet(entries, "Sinus Function");
131-
set.setColor(Color.rgb(240, 120, 124));
131+
set.setColor(Color.BLUE);
132132
}
133133

134134
BarData data = new BarData(set);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/CandleStickChartActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
130130
// set1.setColor(Color.rgb(80, 80, 80));
131131
set1.setShadowColor(Color.DKGRAY);
132132
set1.setShadowWidth(0.7f);
133-
set1.setDecreasingColor(Color.RED);
133+
set1.setDecreasingColor(Color.BLUE);
134134
set1.setDecreasingPaintStyle(Paint.Style.FILL);
135135
set1.setIncreasingColor(Color.rgb(122, 242, 84));
136136
set1.setIncreasingPaintStyle(Paint.Style.STROKE);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/DataTools.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class DataTools {
203203
// set color of filled area
204204
if (Utils.getSDKInt() >= 18) {
205205
// drawables only supported on api level 18 and above
206-
val drawable = ContextCompat.getDrawable(context, R.drawable.fade_red)
206+
val drawable = ContextCompat.getDrawable(context, R.drawable.fade_blue)
207207
lineDataSet0.fillDrawable = drawable
208208
} else {
209209
lineDataSet0.fillColor = Color.BLACK

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/LineChartDualAxisActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ protected void onCreate(Bundle savedInstanceState) {
125125

126126
YAxis rightAxis = chart.getAxisRight();
127127
rightAxis.setTypeface(tfLight);
128-
rightAxis.setTextColor(Color.RED);
128+
rightAxis.setTextColor(Color.MAGENTA);
129129
rightAxis.setAxisMaximum(900);
130130
rightAxis.setAxisMinimum(-200);
131131
rightAxis.setDrawGridLines(false);
@@ -190,12 +190,12 @@ private void setData(int count, float range) {
190190
// create a dataset and give it a type
191191
set2 = new LineDataSet(values2, "DataSet 2");
192192
set2.setAxisDependency(AxisDependency.RIGHT);
193-
set2.setColor(Color.RED);
193+
set2.setColor(Color.MAGENTA);
194194
set2.setCircleColor(Color.WHITE);
195195
set2.setLineWidth(2f);
196196
set2.setCircleRadius(3f);
197197
set2.setFillAlpha(65);
198-
set2.setFillColor(Color.RED);
198+
set2.setFillColor(Color.BLUE);
199199
set2.setDrawCircleHole(false);
200200
set2.setHighLightColor(Color.rgb(244, 117, 117));
201201
//set2.setFillFormatter(new MyFillFormatter(900f));

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/SpecificPositionsLineChartActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener,
276276
set1.formSize = 15f
277277
if (Utils.getSDKInt() >= 18) {
278278
// fill drawable only supported on api level 18 and above
279-
val drawable = ContextCompat.getDrawable(this, R.drawable.fade_red)
279+
val drawable = ContextCompat.getDrawable(this, R.drawable.fade_blue)
280280
set1.fillDrawable = drawable
281281
} else {
282282
set1.fillColor = Color.BLACK

MPChartExample/src/main/res/drawable/fade_red.xml renamed to MPChartExample/src/main/res/drawable/fade_blue.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<gradient
44
android:angle="90"
55
android:startColor="#00ff0000"
6-
android:endColor="#ffff0000" />
6+
android:endColor="#ff0000ff" />
77
</shape>
294 Bytes
Loading
-71 Bytes
Loading
198 Bytes
Loading
33 Bytes
Loading

0 commit comments

Comments
 (0)