@nativescript-community/ui-chart 1.2.35 → 2.0.0

package/highlight/RadarHighlighter.d.ts

@@ -2,7 +2,19 @@ import { RadarChart } from '../charts/RadarChart';
 import { RadarDataSet } from '../data/RadarDataSet';
 import { RadarEntry } from '../data/RadarEntry';
 import { PieRadarHighlighter } from './PieRadarHighlighter';
+/**
+ * Created by philipp on 12/06/16.
+ */
 export declare class RadarHighlighter extends PieRadarHighlighter<RadarEntry, RadarDataSet, RadarChart> {
     protected getClosestHighlight(index: number, x: number, y: number): any;
+    /**
+     * Returns an array of Highlight objects for the given index. The Highlight
+     * objects give information about the value at the selected index and the
+     * DataSet it belongs to. INFORMATION: This method does calculations at
+     * runtime. Do not over-use in performance critical situations.
+     *
+     * @param index
+     * @return
+     */
     protected getHighlightsAtIndex(index: any): import("./Highlight").Highlight<import("../data/Entry").Entry>[];
 }

package/highlight/RadarHighlighter.js

@@ -1,13 +1,18 @@
 import { Utils } from '../utils/Utils';
 import { PieRadarHighlighter } from './PieRadarHighlighter';
+/**
+ * Created by philipp on 12/06/16.
+ */
 export class RadarHighlighter extends PieRadarHighlighter {
     getClosestHighlight(index, x, y) {
         const highlights = this.getHighlightsAtIndex(index);
-        const distanceToCenter = this.mChart.distanceToCenter(x, y) / this.mChart.getFactor();
+        const distanceToCenter = this.mChart.distanceToCenter(x, y) / this.mChart.factor;
         let closest = null;
         let distance = Infinity;
         for (let i = 0; i < highlights.length; i++) {
             const high = highlights[i];
+            // const set = this.mChart.data.getDataSetByIndex(high.dataSetIndex);
+            // const yProperty = set.yProperty;
             const cdistance = Math.abs(high.y - distanceToCenter);
             if (cdistance < distance) {
                 closest = high;
@@ -16,19 +21,28 @@ export class RadarHighlighter extends PieRadarHighlighter {
         }
         return closest;
     }
+    /**
+     * Returns an array of Highlight objects for the given index. The Highlight
+     * objects give information about the value at the selected index and the
+     * DataSet it belongs to. INFORMATION: This method does calculations at
+     * runtime. Do not over-use in performance critical situations.
+     *
+     * @param index
+     * @return
+     */
     getHighlightsAtIndex(index) {
         this.mHighlightBuffer = [];
-        const phaseX = this.mChart.getAnimator().getPhaseX();
-        const phaseY = this.mChart.getAnimator().getPhaseY();
-        const sliceangle = this.mChart.getSliceAngle();
-        const factor = this.mChart.getFactor();
+        const phaseX = this.mChart.animator.phaseX;
+        const phaseY = this.mChart.animator.phaseY;
+        const sliceangle = this.mChart.sliceAngle;
+        const factor = this.mChart.factor;
         const pOut = { x: 0, y: 0 };
-        for (let i = 0; i < this.mChart.getData().getDataSetCount(); i++) {
-            const dataSet = this.mChart.getData().getDataSetByIndex(i);
+        for (let i = 0; i < this.mChart.data.dataSetCount; i++) {
+            const dataSet = this.mChart.data.getDataSetByIndex(i);
             const yKey = dataSet.yProperty;
             const entry = dataSet.getEntryForIndex(index);
-            const y = entry[yKey] - this.mChart.getYChartMin();
-            Utils.getPosition(this.mChart.getCenterOffsets(), y * factor * phaseY, sliceangle * index * phaseX + this.mChart.getRotationAngle(), pOut);
+            const y = entry[yKey] - this.mChart.yChartMin;
+            Utils.getPosition(this.mChart.centerOffsets, y * factor * phaseY, sliceangle * index * phaseX + this.mChart.rotationAngle, pOut);
             this.mHighlightBuffer.push({
                 entry,
                 x: index,
@@ -36,7 +50,7 @@ export class RadarHighlighter extends PieRadarHighlighter {
                 xPx: pOut.x,
                 yPx: pOut.y,
                 dataSetIndex: i,
-                axis: dataSet.getAxisDependency(),
+                axis: dataSet.axisDependency
             });
         }
         return this.mHighlightBuffer;

package/highlight/RadarHighlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"RadarHighlighter.js","sourceRoot":"../src/","sources":["highlight/RadarHighlighter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,OAAO,gBAAiB,SAAQ,mBAAyD;IACjF,mBAAmB,CAAC,KAAa,EAAE,CAAS,EAAE,CAAS;QAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAEpD,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QAEtF,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,IAAI,QAAQ,GAAG,QAAQ,CAAC;QAExB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACxC,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAG3B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC;YACtD,IAAI,SAAS,GAAG,QAAQ,EAAE;gBACtB,OAAO,GAAG,IAAI,CAAC;gBACf,QAAQ,GAAG,SAAS,CAAC;aACxB;SACJ;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAUS,oBAAoB,CAAC,KAAK;QAChC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAE3B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,CAAC;QACrD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,CAAC;QACrD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QAEvC,MAAM,IAAI,GAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;YAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAC3D,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC;YAE/B,MAAM,KAAK,GAAG,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAE9C,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;YAEnD,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,IAAI,CAAC,CAAC;YAE3I,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBACvB,KAAK;gBACL,CAAC,EAAE,KAAK;gBACR,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC;gBACd,GAAG,EAAE,IAAI,CAAC,CAAC;gBACX,GAAG,EAAE,IAAI,CAAC,CAAC;gBACX,YAAY,EAAE,CAAC;gBACf,IAAI,EAAE,OAAO,CAAC,iBAAiB,EAAE;aACpC,CAAC,CAAC;SACN;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;CACJ"}
+{"version":3,"file":"RadarHighlighter.js","sourceRoot":"","sources":["../../../src/ui-chart/highlight/RadarHighlighter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D;;GAEG;AACH,MAAM,OAAO,gBAAiB,SAAQ,mBAAyD;IACjF,mBAAmB,CAAC,KAAa,EAAE,CAAS,EAAE,CAAS;QAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAEpD,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAEjF,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,IAAI,QAAQ,GAAG,QAAQ,CAAC;QAExB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACzC,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAC3B,qEAAqE;YACrE,mCAAmC;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC;YACtD,IAAI,SAAS,GAAG,QAAQ,EAAE,CAAC;gBACvB,OAAO,GAAG,IAAI,CAAC;gBACf,QAAQ,GAAG,SAAS,CAAC;YACzB,CAAC;QACL,CAAC;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IACD;;;;;;;;OAQG;IACO,oBAAoB,CAAC,KAAK;QAChC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAE3B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAElC,MAAM,IAAI,GAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC;YACrD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YACtD,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC;YAE/B,MAAM,KAAK,GAAG,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAE9C,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;YAE9C,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YAEjI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBACvB,KAAK;gBACL,CAAC,EAAE,KAAK;gBACR,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC;gBACd,GAAG,EAAE,IAAI,CAAC,CAAC;gBACX,GAAG,EAAE,IAAI,CAAC,CAAC;gBACX,YAAY,EAAE,CAAC;gBACf,IAAI,EAAE,OAAO,CAAC,cAAc;aAC/B,CAAC,CAAC;QACP,CAAC;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;CACJ"}

package/index.d.ts

@@ -0,0 +1,11 @@
+export { BarChart } from './charts/BarChart';
+export { HorizontalBarChart } from './charts/HorizontalBarChart';
+export { LineChart } from './charts/LineChart';
+export { PieChart } from './charts/PieChart';
+export { RadarChart } from './charts/RadarChart';
+export { ScatterChart } from './charts/ScatterChart';
+export { BubbleChart } from './charts/BubbleChart';
+export { CandleStickChart } from './charts/CandleStickChart';
+export { CombinedChart } from './charts/CombinedChart';
+export { ChartTraceCategory } from './utils/Utils';
+export declare function install(): void;

package/index.js

@@ -0,0 +1,15 @@
+export { BarChart } from './charts/BarChart';
+export { HorizontalBarChart } from './charts/HorizontalBarChart';
+export { LineChart } from './charts/LineChart';
+export { PieChart } from './charts/PieChart';
+export { RadarChart } from './charts/RadarChart';
+export { ScatterChart } from './charts/ScatterChart';
+export { BubbleChart } from './charts/BubbleChart';
+export { CandleStickChart } from './charts/CandleStickChart';
+export { CombinedChart } from './charts/CombinedChart';
+import { install as installGestures } from '@nativescript-community/gesturehandler';
+export { ChartTraceCategory } from './utils/Utils';
+export function install() {
+    installGestures();
+}
+//# sourceMappingURL=index.js.map

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ui-chart/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,MAAM,UAAU,OAAO;IACnB,eAAe,EAAE,CAAC;AACtB,CAAC"}

package/interfaces/dataprovider/BarDataProvider.d.ts

@@ -2,8 +2,8 @@ import { BarLineScatterCandleBubbleDataProvider } from './BarLineScatterCandleBu
 import { BarData } from '../../data/BarData';
 
 export interface BarDataProvider extends BarLineScatterCandleBubbleDataProvider {
-    getBarData(): BarData;
-    isDrawBarShadowEnabled(): boolean;
-    isDrawValueAboveBarEnabled(): boolean;
-    isHighlightFullBarEnabled(): boolean;
+    barData: BarData;
+    drawBarShadowEnabled: boolean;
+    drawValueAboveBarEnabled: boolean;
+    highlightFullBarEnabled: boolean;
 }

package/interfaces/dataprovider/BarLineScatterCandleBubbleDataProvider.d.ts

@@ -2,13 +2,18 @@ import { ChartInterface } from './ChartInterface';
 import { BarLineScatterCandleBubbleData } from '../../data/BarLineScatterCandleBubbleData';
 import { AxisDependency } from '../../components/YAxis';
 import { Transformer } from '../../utils/Transformer';
+import { MPPointF } from '@nativescript-community/ui-chart/utils/MPPointF';
+import { Entry } from '@nativescript-community/ui-chart/data/Entry';
+import { IDataSet } from '../datasets/IDataSet';
 
 export interface BarLineScatterCandleBubbleDataProvider extends ChartInterface {
     getTransformer(axis?: AxisDependency): Transformer;
+    getPixelForEntry(set: IDataSet<Entry>, entry: Entry, index): MPPointF;
+    readonly transformer: Transformer;
     isInverted(axis: AxisDependency);
 
-    getLowestVisibleX();
-    getHighestVisibleX();
+    lowestVisibleX;
+    highestVisibleX;
 
-    getData(): BarLineScatterCandleBubbleData<any, any>;
+    data: BarLineScatterCandleBubbleData<any, any>;
 }

package/interfaces/dataprovider/BubbleDataProvider.d.ts

@@ -2,5 +2,5 @@ import { BubbleData } from '../../data/BubbleData';
 import { BarLineScatterCandleBubbleDataProvider } from './BarLineScatterCandleBubbleDataProvider';
 
 export interface BubbleDataProvider extends BarLineScatterCandleBubbleDataProvider {
-    getBubbleData(): BubbleData;
+    bubbleData: BubbleData;
 }

package/interfaces/dataprovider/CandleDataProvider.d.ts

@@ -2,5 +2,5 @@ import { CandleData } from '../../data/CandleData';
 import { BarLineScatterCandleBubbleDataProvider } from './BarLineScatterCandleBubbleDataProvider';
 
 export interface CandleDataProvider extends BarLineScatterCandleBubbleDataProvider {
-    getCandleData(): CandleData;
+    candleData: CandleData;
 }

package/interfaces/dataprovider/ChartInterface.d.ts

@@ -12,54 +12,49 @@ import { Rect } from '@nativescript-community/ui-canvas';
 export interface ChartInterface {
     /**
      * Returns the minimum x value of the chart, regardless of zoom or translation.
-     *
-     * @return
      */
-    getXChartMin();
+    xChartMin: number;
 
     /**
      * Returns the maximum x value of the chart, regardless of zoom or translation.
-     *
-     * @return
      */
-    getXChartMax();
+    xChartMax: number;
 
-    getXRange();
+    xRange: number;
 
     /**
      * Returns the minimum y value of the chart, regardless of zoom or translation.
-     *
-     * @return
      */
-    getYChartMin();
+    yChartMin: number;
 
     /**
      * Returns the maximum y value of the chart, regardless of zoom or translation.
-     *
-     * @return
      */
-    getYChartMax();
+    yChartMax: number;
 
     /**
      * Returns the maximum distance in scren dp a touch can be away from an entry to cause it to get highlighted.
-     *
-     * @return
      */
-    getMaxHighlightDistance();
+    maxHighlightDistance: number;
+
+    /**
+     * Wether to filter highlights by axis. Default is true
+     */
+    highlightsFilterByAxis: boolean;
 
     getMeasuredWidth();
 
     getMeasuredHeight();
 
-    getCenterOfView(): MPPointF;
+    centerOfView: MPPointF;
 
-    getCenterOffsets(): MPPointF;
+    centerOffsets: MPPointF;
 
-    getContentRect(): Rect;
+    contentRect: Rect;
 
-    getDefaultValueFormatter(): ValueFormatter;
+    defaultValueFormatter: ValueFormatter;
 
-    getData(): ChartData<any, any>;
+    data: ChartData<any, any>;
 
-    getMaxVisibleCount();
+    maxVisibleValueCount: number;
 }

package/interfaces/dataprovider/CombinedDataProvider.d.ts

@@ -9,5 +9,5 @@ import { BarDataProvider } from './BarDataProvider';
  * Created by philipp on 11/06/16.
  */
 export interface CombinedDataProvider extends LineDataProvider, BarDataProvider, BubbleDataProvider, CandleDataProvider, ScatterDataProvider {
-    getCombinedData(): CombinedData;
+    combinedData: CombinedData;
 }

package/interfaces/dataprovider/LineDataProvider.d.ts

@@ -3,7 +3,7 @@ import { BarLineScatterCandleBubbleDataProvider } from './BarLineScatterCandleBu
 import { AxisDependency } from '../../components/YAxis';
 
 export interface LineDataProvider extends BarLineScatterCandleBubbleDataProvider {
-    getLineData(): LineData;
+    lineData: LineData;
 
     getAxis(dependency: AxisDependency);
 }

package/interfaces/dataprovider/ScatterDataProvider.d.ts

@@ -2,5 +2,5 @@ import { ScatterData } from '../../data/ScatterData';
 import { BarLineScatterCandleBubbleDataProvider } from './BarLineScatterCandleBubbleDataProvider';
 
 export interface ScatterDataProvider extends BarLineScatterCandleBubbleDataProvider {
-    getScatterData(): ScatterData;
+    scatterData: ScatterData;
 }

package/interfaces/datasets/IBarDataSet.d.ts

@@ -7,55 +7,41 @@ import { IBarLineScatterCandleBubbleDataSet } from './IBarLineScatterCandleBubbl
 export interface IBarDataSet extends IBarLineScatterCandleBubbleDataSet<BarEntry> {
     /**
      * Returns true if this DataSet is stacked (stacksize > 1) or not.
-     *
-     * @return
      */
-    isStacked(): boolean;
+    readonly stacked: boolean;
 
     /**
      * Returns the maximum number of bars that can be stacked upon another in
      * this DataSet. This should return 1 for non stacked bars, and > 1 for stacked bars.
-     *
-     * @return
      */
-    getStackSize();
+    stackSize: number;
 
     /**
      * Returns the color used for drawing the bar-shadows. The bar shadows is a
      * surface behind the bar that indicates the maximum value.
-     *
-     * @return
      */
-    getBarShadowColor();
+    barShadowColor: string | Color;
 
     /**
      * Returns the width used for drawing borders around the bars.
-     * If borderWidth == 0, no border will be drawn.
-     *
-     * @return
+     * If borderWidth === 0, no border will be drawn.
      */
-    getBarBorderWidth();
+    barBorderWidth: number;
 
     /**
      * Returns the color drawing borders around the bars.
-     *
-     * @return
      */
-    getBarBorderColor();
+    barBorderColor: string | Color;
 
     /**
      * Returns the alpha value (transparency) that is used for drawing the
      * highlight indicator.
-     *
-     * @return
      */
-    getHighLightAlpha();
+    highLightAlpha: number;
 
     /**
      * Returns the labels used for the different value-stacks in the legend.
      * This is only relevant for stacked bar entries.
-     *
-     * @return
      */
-    getStackLabels(): string[];
+    stackLabels: string[];
 }

package/interfaces/datasets/IBarLineScatterCandleBubbleDataSet.d.ts

@@ -7,8 +7,6 @@ import { IDataSet } from './IDataSet';
 export interface IBarLineScatterCandleBubbleDataSet<T extends Entry> extends IDataSet<T> {
     /**
      * Returns the color that is used for drawing the highlight indicators.
-     *
-     * @return
      */
-    getHighLightColor();
+    highlightColor: string | Color;
 }

package/interfaces/datasets/IBubbleDataSet.d.ts

@@ -11,15 +11,9 @@ export interface IBubbleDataSet extends IBarLineScatterCandleBubbleDataSet<Bubbl
      *
      * @param width
      */
-    setHighlightCircleWidth(width: number);
+    highlightCircleWidth: number;
 
-    getMaxSize(): number;
+    readonly maxSize: number;
 
-    isNormalizeSizeEnabled(): boolean;
-
-    /**
-     * Returns the width of the highlight-circle that surrounds the bubble
-     * @return
-     */
-    getHighlightCircleWidth(): number;
+    normalizeSizeEnabled: boolean;
 }

package/interfaces/datasets/ICandleDataSet.d.ts

@@ -1,78 +1,81 @@
 import { ILineScatterCandleRadarDataSet } from './ILineScatterCandleRadarDataSet';
 import { CandleEntry } from '../../data/CandleEntry';
+import { Style } from '@nativescript-community/ui-canvas';
 
 export interface ICandleDataSet extends ILineScatterCandleRadarDataSet<CandleEntry> {
     /**
-     * Returns the space that is left out on the left and right side of each
-     * candle.
+     * property to access the "high" value of an entry for this set
      *
-     * @return
      */
-    getBarSpace();
-
+    highProperty: string;
     /**
-     * Returns whether the candle bars should show?
-     * When false, only "ticks" will show
+     * property to access the "low" value of an entry for this set
      *
-     * - default: true
+     */
+    lowProperty: string;
+    /**
+     * property to access the "close" value of an entry for this set
      *
-     * @return
      */
-    getShowCandleBar();
+    closeProperty: string;
 
     /**
-     * Returns the width of the candle-shadow-line in pixels.
+     * property to access the "open" value of an entry for this set
      *
-     * @return
      */
-    getShadowWidth();
+    openProperty: string;
 
     /**
-     * Returns shadow color for all entries
-     *
-     * @return
+     * the width of the shadow of the candle
      */
-    getShadowColor();
+    shadowWidth: number;
 
     /**
-     * Returns the neutral color (for open == close)
-     *
-     * @return
+     * should the candle bars show?
+     * when false, only "ticks" will show
+     * <p/>
+     * - default: true
      */
-    getNeutralColor();
+    showCandleBar: boolean;
+    /**
+     * the space between the candle entries, default 0.1 (10%)
+     */
+    barSpace: number;
 
     /**
-     * Returns the increasing color (for open < close).
-     *
-     * @return
+     * use candle color for the shadow
      */
-    getIncreasingColor();
+    shadowColorSameAsCandle: boolean;
 
     /**
-     * Returns the decreasing color (for open > close).
-     *
-     * @return
+     * palet style when open < close
+     * increasing candlesticks are traditionally hollow
+     */
+    increasingPaintStyle: Style;
+    /**
+     * palet style when open > close
+     * descreasing candlesticks are traditionally filled
      */
-    getDecreasingColor();
+    decreasingPaintStyle: Style;
 
     /**
-     * Returns palet style when open < close
-     *
-     * @return
+     * color for open === close
      */
-    getIncreasingPaintStyle();
+    neutralColor: Color | string;
 
     /**
-     * Returns palet style when open > close
-     *
-     * @return
+     * color for open < close
      */
-    getDecreasingPaintStyle();
+    increasingColor: Color | string;
 
     /**
-     * Is the shadow color same as the candle color?
-     *
-     * @return
+     * color for open > close
+     */
+    decreasingColor: Color | string;
+
+    /**
+     * shadow line color, set -1 for backward compatibility and uses default
+     * color
      */
-    getShadowColorSameAsCandle();
+    shadowColor: Color | string;
 }