Clean up setters

Author: zacharee

MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.kt

@@ -143,53 +143,34 @@ open class BarChart : BarLineChartBase<BarEntry, IBarDataSet, BarData>, BarDataP
         getTransformer(set.axisDependency).rectValueToPixel(outputRect)
     }
 
-    /**
-     * If set to true, all values are drawn above their bars, instead of below their top.
-     *
-     */
-    fun setDrawValueAboveBar(enabled: Boolean) {
-        mDrawValueAboveBar = enabled
-    }
-
     /**
      * returns true if drawing values above bars is enabled, false if not
      *
      */
-    override val isDrawValueAboveBarEnabled: Boolean
+    override var isDrawValueAboveBarEnabled: Boolean
         get() = mDrawValueAboveBar
-
-    /**
-     * If set to true, a grey area is drawn behind each bar that indicates the maximum value. Enabling his will reduce
-     * performance by about 50%.
-     *
-     */
-    fun setDrawBarShadow(enabled: Boolean) {
-        mDrawBarShadow = enabled
-    }
+        set(value) {
+            mDrawValueAboveBar = value
+        }
 
     /**
      * returns true if drawing shadows (maxvalue) for each bar is enabled, false if not
      *
      */
-    override val isDrawBarShadowEnabled: Boolean
+    override var isDrawBarShadowEnabled: Boolean
         get() = mDrawBarShadow
-
-    /**
-     * Set this to true to make the highlight operation full-bar oriented, false to make it highlight single values (relevant
-     * only for stacked). If enabled, highlighting operations will highlight the whole bar, even if only a single stack entry
-     * was tapped.
-     * Default: false
-     *
-     */
-    fun setHighlightFullBarEnabled(enabled: Boolean) {
-        mHighlightFullBarEnabled = enabled
-    }
+        set(value) {
+            mDrawBarShadow = value
+        }
 
     /**
      * @return true the highlight operation is be full-bar oriented, false if single-value
      */
-    override val isHighlightFullBarEnabled: Boolean
+    override var isHighlightFullBarEnabled: Boolean
         get() = mHighlightFullBarEnabled
+        set(value) {
+            mHighlightFullBarEnabled = value
+        }
 
     /**
      * Highlights the value at the given x-value in the given DataSet. Provide
@@ -203,8 +184,11 @@ open class BarChart : BarLineChartBase<BarEntry, IBarDataSet, BarData>, BarDataP
         super.highlightValue(Highlight(x, dataSetIndex, dataIndex), false)
     }
 
-    override val barData: BarData?
+    override var barData: BarData?
         get() = mData
+        set(value) {
+            mData = value
+        }
 
     /**
      * Adds half of the bar width to each side of the x-axis range in order to allow the bars of the barchart to be

MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.kt

@@ -163,7 +163,7 @@ abstract class BarLineChartBase<E: Entry, D : IBarLineScatterCandleBubbleDataSet
     /**
      * flag indicating if the grid background should be drawn or not
      */
-    protected var mDrawGridBackground: Boolean = false
+    var drawGridBackground: Boolean = false
 
     /**
      * When enabled, the borders rectangle will be rendered.
@@ -172,7 +172,6 @@ abstract class BarLineChartBase<E: Entry, D : IBarLineScatterCandleBubbleDataSet
      * @return
      */
     var isDrawBordersEnabled: Boolean = false
-        protected set
 
     /**
      * When enabled, the values will be clipped to contentRect,
@@ -181,7 +180,6 @@ abstract class BarLineChartBase<E: Entry, D : IBarLineScatterCandleBubbleDataSet
      * @return
      */
     var isClipValuesToContentEnabled: Boolean = false
-        protected set
 
     /**
      * When disabled, the data and/or highlights will not be clipped to contentRect. Disabling this option can
@@ -191,7 +189,6 @@ abstract class BarLineChartBase<E: Entry, D : IBarLineScatterCandleBubbleDataSet
      * @return
      */
     var isClipDataToContentEnabled: Boolean = true
-        protected set
 
     /**
      * Gets the minimum offset (padding) around the chart, defaults to 15.f
@@ -585,7 +582,7 @@ abstract class BarLineChartBase<E: Entry, D : IBarLineScatterCandleBubbleDataSet
      * draws the grid background
      */
     protected fun drawGridBackground(c: Canvas) {
-        if (mDrawGridBackground) {
+        if (drawGridBackground) {
             // draw the grid background
 
             c.drawRect(viewPortHandler.contentRect, mGridBackgroundPaint)
@@ -1120,46 +1117,6 @@ abstract class BarLineChartBase<E: Entry, D : IBarLineScatterCandleBubbleDataSet
         this.isScaleYEnabled = enabled
     }
 
-    /**
-     * set this to true to draw the grid background, false if not
-     *
-     * @param enabled
-     */
-    fun setDrawGridBackground(enabled: Boolean) {
-        mDrawGridBackground = enabled
-    }
-
-    /**
-     * When enabled, the borders rectangle will be rendered.
-     * If this is enabled, there is no point drawing the axis-lines of x- and y-axis.
-     *
-     * @param enabled
-     */
-    fun setDrawBorders(enabled: Boolean) {
-        this.isDrawBordersEnabled = enabled
-    }
-
-    /**
-     * When enabled, the values will be clipped to contentRect,
-     * otherwise they can bleed outside the content rect.
-     *
-     * @param enabled
-     */
-    fun setClipValuesToContent(enabled: Boolean) {
-        this.isClipValuesToContentEnabled = enabled
-    }
-
-    /**
-     * When disabled, the data and/or highlights will not be clipped to contentRect. Disabling this option can
-     * be useful, when the data lies fully within the content rect, but is drawn in such a way (such as thick lines)
-     * that there is unwanted clipping.
-     *
-     * @param enabled
-     */
-    fun setClipDataToContent(enabled: Boolean) {
-        this.isClipDataToContentEnabled = enabled
-    }
-
     /**
      * Sets the width of the border lines in dp.
      *

MPChartLib/src/main/java/com/github/mikephil/charting/charts/BubbleChart.kt

@@ -27,8 +27,11 @@ class BubbleChart : BarLineChartBase<BubbleEntry, IBubbleDataSet, BubbleData>, B
         mRenderer = BubbleChartRenderer(this, mAnimator, viewPortHandler)
     }
 
-    override val bubbleData: BubbleData?
+    override var bubbleData: BubbleData?
         get() = mData
+        set(value) {
+            mData = value
+        }
 
     override val accessibilityDescription: String?
         get() = "This is bubble chart"

MPChartLib/src/main/java/com/github/mikephil/charting/charts/CandleStickChart.kt

@@ -27,8 +27,11 @@ class CandleStickChart : BarLineChartBase<CandleEntry, ICandleDataSet, CandleDat
         xAxis.spaceMax = 0.5f
     }
 
-    override val candleData: CandleData?
+    override var candleData: CandleData?
         get() = mData
+        set(value) {
+            mData = value
+        }
 
     override val accessibilityDescription: String?
         get() = "This is a candlestick chart"

MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.kt

@@ -65,7 +65,7 @@ open class CombinedChart : BarLineChartBase<Entry, IBarLineScatterCandleBubbleDa
         setHighlighter(CombinedHighlighter(this, this))
 
         // Old default behaviour
-        setHighlightFullBarEnabled(true)
+        mHighlightFullBarEnabled = true
 
         mRenderer = CombinedChartRenderer(this, mAnimator, viewPortHandler)
     }
@@ -104,57 +104,56 @@ open class CombinedChart : BarLineChartBase<Entry, IBarLineScatterCandleBubbleDa
         }
     }
 
-    override val lineData: LineData?
+    override var lineData: LineData?
         get() = mData?.lineData
+        set(value) {
+            mData?.setData(value)
+        }
 
-    override val barData: BarData?
+    override var barData: BarData?
         get() = mData?.barData
+        set(value) {
+            mData?.setData(value)
+        }
 
-    override val scatterData: ScatterData?
+    override var scatterData: ScatterData?
         get() = mData?.scatterData
+        set(value) {
+            mData?.setData(value)
+        }
 
-    override val candleData: CandleData?
+    override var candleData: CandleData?
         get() = mData?.candleData
+        set(value) {
+            mData?.setData(value)
+        }
 
-    override val bubbleData: BubbleData?
+    override var bubbleData: BubbleData?
         get() = mData?.bubbleData
+        set(value) {
+            mData?.setData(value)
+        }
 
-    override val isDrawBarShadowEnabled: Boolean
+    override var isDrawBarShadowEnabled: Boolean
         get() = mDrawBarShadow
+        set(value) {
+            mDrawBarShadow = value
+        }
 
-    override val isDrawValueAboveBarEnabled: Boolean
+    override var isDrawValueAboveBarEnabled: Boolean
         get() = mDrawValueAboveBar
-
-    /**
-     * If set to true, all values are drawn above their bars, instead of below
-     * their top.
-     */
-    fun setDrawValueAboveBar(enabled: Boolean) {
-        mDrawValueAboveBar = enabled
-    }
-
-
-    /**
-     * If set to true, a grey area is drawn behind each bar that indicates the
-     * maximum value. Enabling his will reduce performance by about 50%.
-     */
-    fun setDrawBarShadow(enabled: Boolean) {
-        mDrawBarShadow = enabled
-    }
-
-    /**
-     * Set this to true to make the highlight operation full-bar oriented,
-     * false to make it highlight single values (relevant only for stacked).
-     */
-    fun setHighlightFullBarEnabled(enabled: Boolean) {
-        mHighlightFullBarEnabled = enabled
-    }
+        set(value) {
+            mDrawValueAboveBar = value
+        }
 
     /**
      * @return true the highlight operation is be full-bar oriented, false if single-value
      */
-    override val isHighlightFullBarEnabled: Boolean
+    override var isHighlightFullBarEnabled: Boolean
         get() = mHighlightFullBarEnabled
+        set(value) {
+            mHighlightFullBarEnabled = value
+        }
 
     var drawOrder: Array<DrawOrder>
         /**

MPChartLib/src/main/java/com/github/mikephil/charting/charts/LineChart.kt

@@ -18,8 +18,11 @@ open class LineChart : BarLineChartBase<Entry, ILineDataSet, LineData>, LineData
         mRenderer = LineChartRenderer(this, mAnimator, viewPortHandler)
     }
 
-    override val lineData: LineData
-        get() = mData ?: LineData()
+    override var lineData: LineData?
+        get() = mData
+        set(value) {
+            mData = value
+        }
 
     public override fun onDetachedFromWindow() {
         // releases the bitmap in the renderer to avoid oom error
@@ -32,7 +35,7 @@ open class LineChart : BarLineChartBase<Entry, ILineDataSet, LineData>, LineData
     override val accessibilityDescription: String?
         get() {
             val lineData = lineData
-            val numberOfPoints = lineData.entryCount
+            val numberOfPoints = lineData?.entryCount ?: return null
 
             // Min and max values...
             val yAxisValueFormatter = axisLeft.valueFormatter

MPChartLib/src/main/java/com/github/mikephil/charting/charts/ScatterChart.kt

@@ -30,8 +30,11 @@ class ScatterChart : BarLineChartBase<Entry, IScatterDataSet, ScatterData>, Scat
         xAxis.spaceMax = 0.5f
     }
 
-    override val scatterData: ScatterData?
+    override var scatterData: ScatterData?
         get() = mData
+        set(value) {
+            mData = scatterData
+        }
 
     /**
      * Predefined ScatterShapes that allow the specification of a shape a ScatterDataSet should be drawn with.