Merge pull request #217 from AppDevNext/ChangeColors

Avoid color red in screenshots
AppDevNext · May 11, 2024 · f7ba7bb · f7ba7bb
2 parents d4cf1fc + 930e446
commit f7ba7bb
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 8 deletions.
diff --git a/MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/BarChartActivitySinus.java b/MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/BarChartActivitySinus.java
@@ -128,7 +128,7 @@ private void setData(int count) {
             chart.notifyDataSetChanged();
         } else {
             set = new BarDataSet(entries, "Sinus Function");
-            set.setColor(Color.rgb(240, 120, 124));
+            set.setColor(Color.BLUE);
         }
 
         BarData data = new BarData(set);

diff --git a/...artExample/src/main/java/com/xxmassdeveloper/mpchartexample/CandleStickChartActivity.java b/...artExample/src/main/java/com/xxmassdeveloper/mpchartexample/CandleStickChartActivity.java
@@ -130,7 +130,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
 //        set1.setColor(Color.rgb(80, 80, 80));
         set1.setShadowColor(Color.DKGRAY);
         set1.setShadowWidth(0.7f);
-        set1.setDecreasingColor(Color.RED);
+        set1.setDecreasingColor(Color.BLUE);
         set1.setDecreasingPaintStyle(Paint.Style.FILL);
         set1.setIncreasingColor(Color.rgb(122, 242, 84));
         set1.setIncreasingPaintStyle(Paint.Style.STROKE);

diff --git a/MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/DataTools.kt b/MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/DataTools.kt
@@ -203,7 +203,7 @@ class DataTools {
                 // set color of filled area
                 if (Utils.getSDKInt() >= 18) {
                     // drawables only supported on api level 18 and above
-                    val drawable = ContextCompat.getDrawable(context, R.drawable.fade_red)
+                    val drawable = ContextCompat.getDrawable(context, R.drawable.fade_blue)
                     lineDataSet0.fillDrawable = drawable
                 } else {
                     lineDataSet0.fillColor = Color.BLACK

diff --git a/...rtExample/src/main/java/com/xxmassdeveloper/mpchartexample/LineChartDualAxisActivity.java b/...rtExample/src/main/java/com/xxmassdeveloper/mpchartexample/LineChartDualAxisActivity.java
@@ -125,7 +125,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         YAxis rightAxis = chart.getAxisRight();
         rightAxis.setTypeface(tfLight);
-        rightAxis.setTextColor(Color.RED);
+        rightAxis.setTextColor(Color.MAGENTA);
         rightAxis.setAxisMaximum(900);
         rightAxis.setAxisMinimum(-200);
         rightAxis.setDrawGridLines(false);
@@ -190,12 +190,12 @@ private void setData(int count, float range) {
             // create a dataset and give it a type
             set2 = new LineDataSet(values2, "DataSet 2");
             set2.setAxisDependency(AxisDependency.RIGHT);
-            set2.setColor(Color.RED);
+            set2.setColor(Color.MAGENTA);
             set2.setCircleColor(Color.WHITE);
             set2.setLineWidth(2f);
             set2.setCircleRadius(3f);
             set2.setFillAlpha(65);
-            set2.setFillColor(Color.RED);
+            set2.setFillColor(Color.BLUE);
             set2.setDrawCircleHole(false);
             set2.setHighLightColor(Color.rgb(244, 117, 117));
             //set2.setFillFormatter(new MyFillFormatter(900f));

diff --git a/...le/src/main/java/com/xxmassdeveloper/mpchartexample/SpecificPositionsLineChartActivity.kt b/...le/src/main/java/com/xxmassdeveloper/mpchartexample/SpecificPositionsLineChartActivity.kt
@@ -276,7 +276,7 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener,
             set1.formSize = 15f
             if (Utils.getSDKInt() >= 18) {
                 // fill drawable only supported on api level 18 and above
-                val drawable = ContextCompat.getDrawable(this, R.drawable.fade_red)
+                val drawable = ContextCompat.getDrawable(this, R.drawable.fade_blue)
                 set1.fillDrawable = drawable
             } else {
                 set1.fillColor = Color.BLACK

diff --git a/...xample/src/main/res/drawable/fade_red.xml → ...ample/src/main/res/drawable/fade_blue.xml b/...xample/src/main/res/drawable/fade_red.xml → ...ample/src/main/res/drawable/fade_blue.xml
@@ -3,5 +3,5 @@
     <gradient
         android:angle="90"
         android:startColor="#00ff0000"
-        android:endColor="#ffff0000" />
+        android:endColor="#ff0000ff" />
 </shape>
diff --git a/screenshotsToCompare/StartTest_smokeTestStart-1-LineChartActivity1.png b/screenshotsToCompare/StartTest_smokeTestStart-1-LineChartActivity1.png
diff --git a/screenshotsToCompare/StartTest_smokeTestStart-18-BarChartActivitySinus.png b/screenshotsToCompare/StartTest_smokeTestStart-18-BarChartActivitySinus.png
diff --git a/...otsToCompare/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity.png b/...otsToCompare/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity.png
diff --git a/screenshotsToCompare/StartTest_smokeTestStart-28-CandleStickChartActivity.png b/screenshotsToCompare/StartTest_smokeTestStart-28-CandleStickChartActivity.png
diff --git a/screenshotsToCompare/StartTest_smokeTestStart-3-LineChartDualAxisActivity.png b/screenshotsToCompare/StartTest_smokeTestStart-3-LineChartDualAxisActivity.png