Working prototype

Author: zacharee

MPChartLib/build.gradle

@@ -28,8 +28,11 @@ android {
         consumerProguardFiles 'proguard-lib.pro'
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
+    kotlinOptions {
+        jvmTarget = "21"
     }
     buildTypes {
         release {

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

@@ -53,9 +53,7 @@ open class BarChart : BarLineChartBase<BarEntry, IBarDataSet, BarData>, BarDataP
 
     constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
 
-    override fun init() {
-        super.init()
-
+    init {
         mRenderer = BarChartRenderer(this, mAnimator, viewPortHandler, mDrawRoundedBars, mRoundedBarRadius)
 
         setHighlighter(BarHighlighter(this))
@@ -201,8 +199,8 @@ open class BarChart : BarLineChartBase<BarEntry, IBarDataSet, BarData>, BarDataP
      * @param dataSetIndex
      * @param dataIndex   the index inside the stack - only relevant for stacked entries
      */
-    override fun highlightValue(x: Float, dataSetIndex: Int, dataIndex: Int) {
-        highlightValue(Highlight(x, dataSetIndex, dataIndex), false)
+    override fun highlightValue(x: Float, y: Float, dataSetIndex: Int, dataIndex: Int, callListener: Boolean) {
+        super.highlightValue(Highlight(x, dataSetIndex, dataIndex), false)
     }
 
     override val barData: BarData?
@@ -245,7 +243,7 @@ open class BarChart : BarLineChartBase<BarEntry, IBarDataSet, BarData>, BarDataP
     fun setRoundedBarRadius(mRoundedBarRadius: Float) {
         this.mRoundedBarRadius = mRoundedBarRadius
         this.mDrawRoundedBars = true
-        init()
+        mRenderer = BarChartRenderer(this, mAnimator, viewPortHandler, mDrawRoundedBars, mRoundedBarRadius)
     }
 
     override val accessibilityDescription: String?

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

@@ -252,9 +252,7 @@ abstract class BarLineChartBase<E: Entry, D : IBarLineScatterCandleBubbleDataSet
 
     constructor(context: Context) : super(context)
 
-    override fun init() {
-        super.init()
-
+    init {
         setHighlighter(ChartHighlighter(this))
 
         mChartTouchListener = BarLineChartTouchListener(this, viewPortHandler.matrixTouch, 3f)

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

@@ -23,9 +23,7 @@ class BubbleChart : BarLineChartBase<BubbleEntry, IBubbleDataSet, BubbleData>, B
 
     constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
 
-    override fun init() {
-        super.init()
-
+    init {
         mRenderer = BubbleChartRenderer(this, mAnimator, viewPortHandler)
     }
 

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

@@ -20,9 +20,7 @@ class CandleStickChart : BarLineChartBase<CandleEntry, ICandleDataSet, CandleDat
 
     constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
 
-    override fun init() {
-        super.init()
-
+    init {
         mRenderer = CandleStickChartRenderer(this, mAnimator, viewPortHandler)
 
         xAxis.spaceMin = 0.5f

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

@@ -69,14 +69,6 @@ abstract class Chart<E: Entry, D: IDataSet<E>, T : ChartData<E, D>> : ViewGroup,
      */
     var isLogEnabled: Boolean = false
 
-    @Suppress("UsePropertyAccessSyntax")
-    override val width: Int
-        get() = getWidth()
-
-    @Suppress("UsePropertyAccessSyntax")
-    override val height: Int
-        get() = getHeight()
-
     /**
      * object that holds all data that was originally set for the chart, before
      * it was modified or any filtering algorithms had been applied
@@ -235,27 +227,29 @@ abstract class Chart<E: Entry, D: IDataSet<E>, T : ChartData<E, D>> : ViewGroup,
      * default constructor for initialization in code
      */
     constructor(context: Context) : super(context) {
-        init()
     }
 
     /**
      * constructor for initialization in xml
      */
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
-        init()
     }
 
     /**
      * even more awesome constructor
      */
     constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle) {
-        init()
     }
 
+    /**
+     * The maximum distance in dp away from an entry causing it to highlight.
+     */
+    protected var mMaxHighlightDistance: Float = 0f
+
     /**
      * initialize all paints and stuff
      */
-    protected open fun init() {
+    init {
         setWillNotDraw(false)
 
         // initialize the utils
@@ -476,11 +470,6 @@ abstract class Chart<E: Entry, D: IDataSet<E>, T : ChartData<E, D>> : ViewGroup,
     var highlighted: Array<Highlight>? = null
         protected set
 
-    /**
-     * The maximum distance in dp away from an entry causing it to highlight.
-     */
-    protected var mMaxHighlightDistance: Float = 0f
-
     override val maxHighlightDistance: Float
         get() = mMaxHighlightDistance
 
@@ -535,52 +524,6 @@ abstract class Chart<E: Entry, D: IDataSet<E>, T : ChartData<E, D>> : ViewGroup,
         highlightValues(highs.toTypedArray<Highlight>())
     }
 
-    /**
-     * Highlights any y-value at the given x-value in the given DataSet.
-     * Provide -1 as the dataSetIndex to undo all highlighting.
-     * This method will call the listener.
-     * @param x            The x-value to highlight
-     * @param dataSetIndex The dataset index to search in
-     * @param dataIndex    The data index to search in (only used in CombinedChartView currently)
-     */
-    open fun highlightValue(x: Float, dataSetIndex: Int, dataIndex: Int) {
-        highlightValue(x, dataSetIndex, dataIndex, true)
-    }
-
-    /**
-     * Highlights any y-value at the given x-value in the given DataSet.
-     * Provide -1 as the dataSetIndex to undo all highlighting.
-     *
-     * @param x            The x-value to highlight
-     * @param dataSetIndex The dataset index to search in
-     * @param dataIndex    The data index to search in (only used in CombinedChartView currently)
-     * @param callListener Should the listener be called for this change
-     */
-    /**
-     * Highlights any y-value at the given x-value in the given DataSet.
-     * Provide -1 as the dataSetIndex to undo all highlighting.
-     * This method will call the listener.
-     *
-     * @param x            The x-value to highlight
-     * @param dataSetIndex The dataset index to search in
-     */
-    @JvmOverloads
-    fun highlightValue(x: Float, dataSetIndex: Int, dataIndex: Int = -1, callListener: Boolean = true) {
-        highlightValue(x, Float.Companion.NaN, dataSetIndex, dataIndex, callListener)
-    }
-
-    /**
-     * Highlights any y-value at the given x-value in the given DataSet.
-     * Provide -1 as the dataSetIndex to undo all highlighting.
-     *
-     * @param x            The x-value to highlight
-     * @param dataSetIndex The dataset index to search in
-     * @param callListener Should the listener be called for this change
-     */
-    fun highlightValue(x: Float, dataSetIndex: Int, callListener: Boolean) {
-        highlightValue(x, Float.Companion.NaN, dataSetIndex, -1, callListener)
-    }
-
     /**
      * Highlights any y-value at the given x-value in the given DataSet.
      * Provide -1 as the dataSetIndex to undo all highlighting.
@@ -611,7 +554,7 @@ abstract class Chart<E: Entry, D: IDataSet<E>, T : ChartData<E, D>> : ViewGroup,
      * @param dataIndex    The data index to search in (only used in CombinedChartView currently)
      */
     @JvmOverloads
-    fun highlightValue(x: Float, y: Float, dataSetIndex: Int, dataIndex: Int = -1, callListener: Boolean = true) {
+    open fun highlightValue(x: Float, y: Float = Float.NaN, dataSetIndex: Int = -1, dataIndex: Int = -1, callListener: Boolean = true) {
         if (dataSetIndex < 0 || mData.let { it != null && dataSetIndex >= it.dataSetCount }) {
             highlightValue(null, callListener)
         } else {
@@ -1153,7 +1096,7 @@ abstract class Chart<E: Entry, D: IDataSet<E>, T : ChartData<E, D>> : ViewGroup,
     /**
      * Returns the ChartData object that has been set for the chart.
      */
-    override val data: ChartData<E, D>?
+    override val data: T?
         get() = mData
 
     var renderer: DataRenderer?

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

@@ -61,9 +61,7 @@ open class CombinedChart : BarLineChartBase<Entry, IBarLineScatterCandleBubbleDa
 
     constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
 
-    override fun init() {
-        super.init()
-
+    init {
         setHighlighter(CombinedHighlighter(this, this))
 
         // Old default behaviour

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

@@ -36,11 +36,9 @@ class HorizontalBarChart : BarChart {
 
     constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
 
-    override fun init() {
+    init {
         viewPortHandler = HorizontalViewPortHandler()
 
-        super.init()
-
         mLeftAxisTransformer = TransformerHorizontalBarChart(viewPortHandler)
         mRightAxisTransformer = TransformerHorizontalBarChart(viewPortHandler)
 

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

@@ -14,8 +14,7 @@ open class LineChart : BarLineChartBase<Entry, ILineDataSet, LineData>, LineData
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
     constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
 
-    override fun init() {
-        super.init()
+    init {
         mRenderer = LineChartRenderer(this, mAnimator, viewPortHandler)
     }
 

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

@@ -202,9 +202,7 @@ open class PieChart : PieRadarChartBase<PieEntry, IPieDataSet, PieData> {
 
     constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
 
-    override fun init() {
-        super.init()
-
+    init {
         mRenderer = PieChartRenderer(this, mAnimator, viewPortHandler)
 
         highlighter = PieHighlighter(this)