Revert "Merge pull request #672 from AppDevNext/FixHighlightInCombinedChart"

This reverts commit f20d4a8, reversing
changes made to 47db49c.

Author: hannesa2

chartLib/src/main/kotlin/info/appdev/charting/charts/BarChart.kt

@@ -59,7 +59,7 @@ open class BarChart : BarLineChartBase<BarData>, BarDataProvider {
 
         dataRenderer = BarChartRenderer(this, mAnimator, viewPortHandler, mDrawRoundedBars, mRoundedBarRadius)
 
-        highlighter = BarHighlighter(this)
+        setHighlighter(BarHighlighter(this))
 
         xAxis.spaceMin = 0.5f
         xAxis.spaceMax = 0.5f

chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt

@@ -187,8 +187,7 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
 
         xAxisRenderer = XAxisRenderer(viewPortHandler, mXAxis, mLeftAxisTransformer)
 
-        if (highlighter == null) // otherwise it overwrites highlighter from successors
-            highlighter = ChartHighlighter(this)
+        setHighlighter(ChartHighlighter(this))
 
         chartTouchListener = BarLineChartTouchListener(this, viewPortHandler.matrixTouch, 3f)
 

chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt

@@ -26,6 +26,7 @@ import info.appdev.charting.data.ChartData
 import info.appdev.charting.data.Entry
 import info.appdev.charting.formatter.DefaultValueFormatter
 import info.appdev.charting.formatter.IValueFormatter
+import info.appdev.charting.highlight.ChartHighlighter
 import info.appdev.charting.highlight.Highlight
 import info.appdev.charting.highlight.IHighlighter
 import info.appdev.charting.interfaces.dataprovider.base.IBaseProvider
@@ -151,6 +152,7 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>> : ViewGroup, IBaseP
     protected var dataRenderer: DataRenderer? = null
 
     var highlighter: IHighlighter? = null
+        protected set
 
     /**
      * Returns the ViewPortHandler of the chart that is responsible for the
@@ -1044,6 +1046,10 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>> : ViewGroup, IBaseP
     /**
      * Returns a recyclable PointF instance.
      */
+    fun setHighlighter(highlighter: ChartHighlighter<*>?) {
+        this.highlighter = highlighter
+    }
+
     override val centerOfView: PointF
         get() = this.center
 

chartLib/src/main/kotlin/info/appdev/charting/charts/CombinedChart.kt

@@ -372,7 +372,7 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
                 get() = this@CombinedChart.candleData
         }
 
-        highlighter = CombinedHighlighter(this, barDataProvider)
+        setHighlighter(CombinedHighlighter(this, barDataProvider))
 
         // Old default behaviour
         this@CombinedChart.isHighlightFullBar = true

chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt

@@ -44,7 +44,7 @@ open class HorizontalBarChart : BarChart {
         mRightAxisTransformer = TransformerHorizontalBarChart(viewPortHandler)
 
         dataRenderer = HorizontalBarChartRenderer(this, mAnimator, viewPortHandler)
-        highlighter = HorizontalBarHighlighter(this)
+        setHighlighter(HorizontalBarHighlighter(this))
 
         axisRendererLeft = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisLeft, mLeftAxisTransformer)
         axisRendererRight = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisRight, mRightAxisTransformer)

chartLib/src/main/kotlin/info/appdev/charting/highlight/ChartHighlighter.kt

@@ -85,7 +85,7 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider<*>>(prote
      * @param x    touch position
      * @param y    touch position
      */
-    override fun getHighlightsAtXValue(xVal: Float, x: Float, y: Float): MutableList<Highlight>? {
+    protected open fun getHighlightsAtXValue(xVal: Float, x: Float, y: Float): MutableList<Highlight>? {
         highlightBuffer.clear()
 
         data?.let { myData ->

chartLib/src/main/kotlin/info/appdev/charting/highlight/IHighlighter.kt

@@ -5,6 +5,4 @@ interface IHighlighter {
      * Returns a Highlight object corresponding to the given x- and y- touch positions in pixels.
      */
     fun getHighlight(x: Float, y: Float): Highlight?
-
-    fun getHighlightsAtXValue(xVal: Float, x: Float, y: Float): MutableList<Highlight>?
 }

chartLib/src/main/kotlin/info/appdev/charting/highlight/PieRadarHighlighter.kt

@@ -37,10 +37,4 @@ abstract class PieRadarHighlighter<T : PieRadarChartBase<*>>(protected var chart
      * Returns the closest Highlight object of the given objects based on the touch position inside the chart.
      */
     protected abstract fun getClosestHighlight(index: Int, x: Float, y: Float): Highlight?
-
-    override fun getHighlightsAtXValue(
-        xVal: Float,
-        x: Float,
-        y: Float
-    ): MutableList<Highlight>? = null
 }