fix: bunch of fixes. Changed default values

Author: farfromrefug

package.json

@@ -42,7 +42,7 @@
         "cpy-cli": "^3.0.0",
         "husky": "^4.0.7",
         "lerna": "^3.20.2",
-        "nativescript-canvas": "2.1.16",
+        "nativescript-canvas": "2.1.17",
         "nativescript-gesturehandler": "^0.1.4",
         "nativescript-tween": "0.0.5",
         "npm-watch": "^0.6.0",

plugin/package.json

@@ -25,7 +25,7 @@
     "homepage": "https://github.com/Akylas/nativescript-chart",
     "readmeFilename": "README.md",
     "dependencies": {
-        "nativescript-canvas": "^2.1.16",
+        "nativescript-canvas": "^2.1.17",
         "nativescript-gesturehandler": "^0.1.4",
         "nativescript-tween": "^0.0.5",
         "number-format.js": "^2.0.9"

src/charting/charts/BarLineChartBase.ts

@@ -143,7 +143,7 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
         this.mGridBackgroundPaint = new Paint();
         this.mGridBackgroundPaint.setStyle(Style.FILL);
         // this.mGridBackgroundPaint.setColor(Color.WHITE);
-        this.mGridBackgroundPaint.setColor(new Color(255, 240, 240, 240)); // light
+        this.mGridBackgroundPaint.setColor('#F0F0F0'); // light
         // grey
 
         this.mBorderPaint = new Paint();

src/charting/charts/Chart.ts

@@ -176,7 +176,7 @@ export abstract class Chart<U extends Entry, D extends IDataSet<U>, T extends Ch
         // Utils.init(this._context);
         this.mMaxHighlightDistance = Utils.convertDpToPixel(500);
 
-        this.mDescription = new Description();
+        // this.mDescription = new Description();
         this.mLegend = new Legend();
 
         this.mLegendRenderer = new LegendRenderer(this.mViewPortHandler, this.mLegend);
@@ -188,7 +188,7 @@ export abstract class Chart<U extends Entry, D extends IDataSet<U>, T extends Ch
 
         this.mInfoPaint = new Paint();
         this.mInfoPaint.setAntiAlias(true);
-        this.mInfoPaint.setColor(new Color(255, 247, 189, 51)); // orange
+        this.mInfoPaint.setColor('#F7BD33'); // orange
         this.mInfoPaint.setTextAlign(Align.CENTER);
         this.mInfoPaint.setTextSize(12);
 

src/charting/components/LimitLine.ts

@@ -24,7 +24,7 @@ export class LimitLine extends ComponentBase {
     private mLineWidth = 2;
 
     /** the color of the limit line */
-    private mLineColor = 'new Color(237, 91, 91)';
+    private mLineColor = '#ED5B5B';
 
     /** the style of the label text */
     private mTextStyle = Style.FILL_AND_STROKE;

src/charting/components/YAxis.ts

@@ -63,7 +63,7 @@ export class YAxis extends AxisBase {
     /**
      * Color of the zero line
      */
-    protected mZeroLineColor = new Color('gray');
+    protected mZeroLineColor = 'gray';
 
     /**
      * Width of the zero line in pixels

src/charting/data/BarDataSet.ts

@@ -13,11 +13,11 @@ export class BarDataSet extends BarLineScatterCandleBubbleDataSet<BarEntry> impl
     /**
      * the color used for drawing the bar shadows
      */
-    private mBarShadowColor = new Color(255, 215, 215, 215);
+    private mBarShadowColor = '#D7D7D7';
 
     private mBarBorderWidth = 0.0;
 
-    private mBarBorderColor = new Color('black');
+    private mBarBorderColor = 'black';
 
     /**
      * the alpha value used to draw the highlight indicator bar
@@ -37,7 +37,7 @@ export class BarDataSet extends BarLineScatterCandleBubbleDataSet<BarEntry> impl
     constructor(yVals, label) {
         super(yVals, label);
 
-        this.mHighLightColor = new Color(255, 0, 0, 0);
+        this.mHighLightColor = 'black';
 
         this.calcStackSize(yVals);
         this.calcEntryCountIncludingStacks(yVals);

src/charting/data/BarLineScatterCandleBubbleDataSet.ts

@@ -12,7 +12,7 @@ export abstract class BarLineScatterCandleBubbleDataSet<T extends Entry> extends
     /**
      * default highlight color
      */
-    mHighLightColor = new Color(255, 255, 187, 115);
+    mHighLightColor: string | Color = '#FFBB73';
 
     // constructor(yVals, label) {
     //     super(yVals, label);

src/charting/data/BaseDataSet.ts

@@ -89,7 +89,7 @@ export abstract class BaseDataSet<T extends Entry> implements IDataSet<T> {
     /**
      * if true, y-values are drawn on the chart
      */
-    protected mDrawValues = true;
+    protected mDrawValues = false;
 
     /**
      * if true, y-icons are drawn on the chart
@@ -127,8 +127,8 @@ export abstract class BaseDataSet<T extends Entry> implements IDataSet<T> {
         }
 
         // default color
-        this.mColors.push(new Color(255, 140, 234, 255));
-        this.mValueColors.push(new Color('black'));
+        this.mColors.push('#8CEAFF');
+        this.mValueColors.push('black');
         this.mLabel = label;
     }
 
@@ -184,7 +184,7 @@ export abstract class BaseDataSet<T extends Entry> implements IDataSet<T> {
      *
      * @param color
      */
-    public addColor(color) {
+    public addColor(color: string | Color) {
         if (this.mColors == null) this.mColors = [];
         this.mColors.push(color);
     }
@@ -214,12 +214,13 @@ export abstract class BaseDataSet<T extends Entry> implements IDataSet<T> {
      * @param color
      * @param alpha from 0-255
      */
-    public setColor(color: Color, alpha?: number) {
+    public setColor(color: string | Color, alpha?: number) {
         this.resetColors();
         if (alpha === undefined) {
             this.mColors.push(color);
         } else {
-            this.mColors.push(new Color(color.r, color.g, color.b, alpha));
+            const actColor = color instanceof Color ? color: new Color(color)
+            this.mColors.push(new Color(actColor.r, actColor.g, actColor.b, alpha));
         }
     }
 

src/charting/data/LineRadarDataSet.ts

@@ -13,7 +13,7 @@ export abstract class LineRadarDataSet<T extends Entry> extends LineScatterCandl
     /**
      * the color that is used for filling the line surface
      */
-    private mFillColor = new Color(255, 140, 234, 255); // rgb(140,234,255)
+    private mFillColor: string | Color = '#8CEAFF'; // rgb(140,234,255)
 
     /**
      * the drawable to be used for filling the line surface
@@ -45,7 +45,7 @@ export abstract class LineRadarDataSet<T extends Entry> extends LineScatterCandl
      *
      * @param color
      */
-    public setFillColor(color) {
+    public setFillColor(color: string | Color) {
         this.mFillColor = color;
         this.mFillDrawable = null;
     }

src/charting/renderer/DataRenderer.ts

@@ -50,15 +50,15 @@ export abstract class DataRenderer extends Renderer {
         this.mDrawPaint.setDither(true);
         this.mValuePaint = new Paint();
         this.mValuePaint.setAntiAlias(true);
-        this.mValuePaint.setColor(new Color(255, 63, 63, 63));
+        this.mValuePaint.setColor('#3F3F3F');
         this.mValuePaint.setTextAlign(Align.CENTER);
         this.mValuePaint.setTextSize(9);
 
         this.mHighlightPaint = new Paint();
         this.mHighlightPaint.setAntiAlias(true);
         this.mHighlightPaint.setStyle(Style.STROKE);
         this.mHighlightPaint.setStrokeWidth(2);
-        this.mHighlightPaint.setColor(new Color(255, 255, 187, 115));
+        this.mHighlightPaint.setColor('#FFBB73');
     }
 
     protected isDrawingValuesAllowed(chart: ChartInterface) {

src/charting/renderer/LineRadarRenderer.ts

@@ -55,8 +55,12 @@ export abstract class LineRadarRenderer extends LineScatterCandleRadarRenderer {
      * @param fillColor
      * @param fillAlpha
      */
-    protected drawFilledPath(c: Canvas, filledPath: Path, fillColor: Color, fillAlpha: number) {
-        const color = new Color(fillAlpha, fillColor.r, fillColor.g, fillColor.b);
+    protected drawFilledPath(c: Canvas, filledPath: Path, fillColor: Color | string, fillAlpha: number = 1) {
+        let color = fillColor;
+        if (fillAlpha < 1) {
+            fillColor = fillColor instanceof  Color ? fillColor : new Color(fillColor);
+            color = new Color(fillAlpha, fillColor.r, fillColor.g, fillColor.b);
+        }
         // let color = (fillAlpha << 24) | (fillColor & 0xffffff);
 
         if (this.clipPathSupported()) {

src/charting/utils/ColorTemplate.ts

@@ -23,20 +23,20 @@ export class ColorTemplate {
      * THE COLOR THEMES ARE PREDEFINED (predefined color integer arrays), FEEL
      * FREE TO CREATE YOUR OWN WITH AS MANY DIFFERENT COLORS AS YOU WANT
      */
-    public static LIBERTY_COLORS = [new Color(255, 207, 248, 246), new Color(255, 148, 212, 212), new Color(255, 136, 180, 187), new Color(255, 118, 174, 175), new Color(255, 42, 109, 130)];
-    public static JOYFUL_COLORS = [new Color(255, 217, 80, 138), new Color(255, 254, 149, 7), new Color(255, 254, 247, 120), new Color(255, 106, 167, 134), new Color(255, 53, 194, 209)];
-    public static PASTEL_COLORS = [new Color(255, 64, 89, 128), new Color(255, 149, 165, 124), new Color(255, 217, 184, 162), new Color(255, 191, 134, 134), new Color(255, 179, 48, 80)];
-    public static COLORFUL_COLORS = [new Color(255, 193, 37, 82), new Color(255, 255, 102, 0), new Color(255, 245, 199, 0), new Color(255, 106, 150, 31), new Color(255, 179, 100, 53)];
-    public static VORDIPLOM_COLORS = [new Color(255, 192, 255, 140), new Color(255, 255, 247, 140), new Color(255, 255, 208, 140), new Color(255, 140, 234, 255), new Color(255, 255, 140, 157)];
-    public static MATERIAL_COLORS = [new Color('#2ecc71'), new Color('#f1c40f'), new Color('#e74c3c'), new Color('#3498db')];
+    public static LIBERTY_COLORS = ['rgb(207, 248, 246)', 'rgb(148, 212, 212)', 'rgb(136, 180, 187)', 'rgb(118, 174, 175)', 'rgb(42, 109, 130)'];
+    public static JOYFUL_COLORS = ['rgb(217, 80, 138)', 'rgb(254, 149, 7)', 'rgb(254, 247, 120)', 'rgb(106, 167, 134)', 'rgb(53, 194, 209)'];
+    public static PASTEL_COLORS = ['rgb(64, 89, 128)', 'rgb(149, 165, 124)', 'rgb(217, 184, 162)', 'rgb(191, 134, 134)', 'rgb(179, 48, 80)'];
+    public static COLORFUL_COLORS = ['rgb(193, 37, 82)', 'rgb(255, 102, 0)', 'rgb(245, 199, 0)', 'rgb(106, 150, 31)', 'rgb(179, 100, 53)'];
+    public static VORDIPLOM_COLORS = ['rgb(192, 255, 140)', 'rgb(255, 247, 140)', 'rgb(255, 208, 140)', 'rgb(140, 234, 255)', 'rgb(255, 140, 157)'];
+    public static MATERIAL_COLORS = ['#2ecc71', '#f1c40f', '#e74c3c', '#3498db'];
 
     /**
      * Returns the Android ICS holo blue light color.
      *
      * @return
      */
     public static getHoloBlue() {
-        return new Color(255, 51, 181, 229);
+        return 'rgb(51, 181, 229)';
     }
 
     /**