Cosmetic

Author: hannesa2

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

@@ -95,15 +95,19 @@ open class BarChart : BarLineChartBase<BarData>, BarDataProvider {
             return null
         } else {
             highlighter?.let {
-                val h = it.getHighlight(x, y)
-                if (h == null || !isHighlightFullBar)
-                    return h
+                val highlight = it.getHighlight(x, y)
+                if (highlight == null || !isHighlightFullBar)
+                    return highlight
 
                 // For isHighlightFullBarEnabled, remove stackIndex
                 return Highlight(
-                    h.x, h.y,
-                    h.xPx, h.yPx,
-                    h.dataSetIndex, -1, h.axis
+                    x = highlight.x,
+                    y = highlight.y,
+                    xPx = highlight.xPx,
+                    yPx = highlight.yPx,
+                    dataSetIndex = highlight.dataSetIndex,
+                    stackIndex = -1,
+                    axis = highlight.axis
                 )
             }
         }

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

@@ -400,13 +400,13 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
 
                 // For isHighlightFullBarEnabled, remove stackIndex
                 return Highlight(
-                    highlight.x,
-                    highlight.y,
-                    highlight.xPx,
-                    highlight.yPx,
-                    highlight.dataSetIndex,
-                    -1,
-                    highlight.axis
+                    x = highlight.x,
+                    y = highlight.y,
+                    xPx = highlight.xPx,
+                    yPx = highlight.yPx,
+                    dataSetIndex = highlight.dataSetIndex,
+                    stackIndex = -1,
+                    axis = highlight.axis
                 )
             }
         }

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

@@ -49,13 +49,13 @@ open class BarHighlighter(barDataProvider: BarDataProvider) : ChartHighlighter<B
                     val pixels = provider.getTransformer(set.axisDependency)!!.getPixelForValues(high.x, ranges[stackIndex].to)
 
                     val stackedHigh = Highlight(
-                        entry.x,
-                        entry.y,
-                        pixels.x.toFloat(),
-                        pixels.y.toFloat(),
-                        high.dataSetIndex,
-                        stackIndex,
-                        high.axis
+                        x = entry.x,
+                        y = entry.y,
+                        xPx = pixels.x.toFloat(),
+                        yPx = pixels.y.toFloat(),
+                        dataSetIndex = high.dataSetIndex,
+                        stackIndex = stackIndex,
+                        axis = high.axis
                     )
 
                     PointD.recycleInstance(pixels)

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

@@ -114,7 +114,12 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider<*>>(prote
      * An array of `Highlight` objects corresponding to the selected xValue and dataSetIndex.
      */
     @Suppress("SameParameterValue")
-    protected open fun buildHighlights(set: IDataSet<*>, dataSetIndex: Int, xVal: Float, rounding: DataSet.Rounding?): MutableList<Highlight> {
+    protected open fun buildHighlights(
+        set: IDataSet<*>,
+        dataSetIndex: Int,
+        xVal: Float,
+        rounding: DataSet.Rounding?
+    ): MutableList<Highlight> {
         val highlights = ArrayList<Highlight>()
 
         var entries = set.getEntriesForXValue(xVal)
@@ -135,9 +140,12 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider<*>>(prote
 
                 highlights.add(
                     Highlight(
-                        e.x, e.y,
-                        pixels.x.toFloat(), pixels.y.toFloat(),
-                        dataSetIndex, set.axisDependency
+                        x = e.x,
+                        y = e.y,
+                        xPx = pixels.x.toFloat(),
+                        yPx = pixels.y.toFloat(),
+                        dataSetIndex = dataSetIndex,
+                        axis = set.axisDependency
                     )
                 )
             }

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

@@ -108,12 +108,12 @@ class Highlight : Serializable {
      * selected
      */
     constructor(x: Float, y: Float, xPx: Float, yPx: Float, dataSetIndex: Int, stackIndex: Int, axis: AxisDependency?) : this(
-        x,
-        y,
-        xPx,
-        yPx,
-        dataSetIndex,
-        axis
+        x = x,
+        y = y,
+        xPx = xPx,
+        yPx = yPx,
+        dataSetIndex = dataSetIndex,
+        axis = axis
     ) {
         this.stackIndex = stackIndex
     }
@@ -144,6 +144,6 @@ class Highlight : Serializable {
     }
 
     override fun toString(): String {
-        return "Highlight, x:$x y:$y dataSetIndex:$dataSetIndex stackIndex:$stackIndex (only stacked bar entry)"
+        return "Highlight, x:$x y:$y dataSetIndex:$dataSetIndex stackIndex:$stackIndex dataIndex:$dataIndex (only stacked bar entry)"
     }
 }

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

@@ -6,7 +6,7 @@ abstract class PieRadarHighlighter<T : PieRadarChartBase<*>>(protected var chart
     /**
      * buffer for storing previously highlighted values
      */
-    protected var mHighlightBuffer: MutableList<Highlight> = ArrayList()
+    protected var highlightBuffer: MutableList<Highlight> = ArrayList()
 
     override fun getHighlight(x: Float, y: Float): Highlight? {
         val touchDistanceToCenter = chartPieRadar.distanceToCenter(x, y)

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

@@ -35,7 +35,7 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>
      * runtime. Do not over-use in performance critical situations.
      */
     protected fun getHighlightsAtIndex(index: Int): MutableList<Highlight> {
-        mHighlightBuffer.clear()
+        highlightBuffer.clear()
 
         val phaseX = chartPieRadar.animator.phaseX
         val phaseY = chartPieRadar.animator.phaseY
@@ -56,9 +56,9 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>
                     sliceAngle * index * phaseX + chartPieRadar.rotationAngle, pOut
                 )
 
-                mHighlightBuffer.add(Highlight(index.toFloat(), entry.y, pOut.x, pOut.y, i, dataSet.axisDependency))
+                highlightBuffer.add(Highlight(index.toFloat(), entry.y, pOut.x, pOut.y, i, dataSet.axisDependency))
             }
         }
-        return mHighlightBuffer
+        return highlightBuffer
     }
 }