Kotlin components

Author: hannesa2

MPChartLib/src/main/java/com/github/mikephil/charting/components/IMarker.java

@@ -0,0 +1,45 @@
+package com.github.mikephil.charting.components
+
+import android.graphics.Canvas
+import com.github.mikephil.charting.data.Entry
+import com.github.mikephil.charting.highlight.Highlight
+import com.github.mikephil.charting.utils.MPPointF
+
+interface IMarker {
+    /**
+     * @return The desired (general) offset you wish the IMarker to have on the x- and y-axis.
+     * By returning x: -(width / 2) you will center the IMarker horizontally.
+     * By returning y: -(height / 2) you will center the IMarker vertically.
+     */
+    val offset: MPPointF
+
+    /**
+     * @return The offset for drawing at the specific `point`. This allows conditional adjusting of the Marker position.
+     * If you have no adjustments to make, return getOffset().
+     *
+     * @param posX This is the X position at which the marker wants to be drawn.
+     * You can adjust the offset conditionally based on this argument.
+     * @param posY This is the X position at which the marker wants to be drawn.
+     * You can adjust the offset conditionally based on this argument.
+     */
+    fun getOffsetForDrawingAtPoint(posX: Float, posY: Float): MPPointF?
+
+    /**
+     * This method enables a specified custom IMarker to update it's content every time the IMarker is redrawn.
+     *
+     * @param entry         The Entry the IMarker belongs to. This can also be any subclass of Entry, like BarEntry or
+     * CandleEntry, simply cast it at runtime.
+     * @param highlight The highlight object contains information about the highlighted value such as it's dataset-index, the
+     * selected range or stack-index (only stacked bar entries).
+     */
+    fun refreshContent(entry: Entry, highlight: Highlight)
+
+    /**
+     * Draws the IMarker on the given position on the screen with the given Canvas object.
+     *
+     * @param canvas
+     * @param posX
+     * @param posY
+     */
+    fun draw(canvas: Canvas, posX: Float, posY: Float)
+}

MPChartLib/src/main/java/com/github/mikephil/charting/components/IMarker.kt

@@ -128,7 +128,7 @@ public MPPointF getOffsetForDrawingAtPoint(float posX, float posY) {
     }
 
     @Override
-    public void refreshContent(Entry e, Highlight highlight) {
+    public void refreshContent(Entry entry, Highlight highlight) {
 
     }
 

MPChartLib/src/main/java/com/github/mikephil/charting/components/MarkerImage.java

@@ -107,7 +107,7 @@ public MPPointF getOffsetForDrawingAtPoint(float posX, float posY) {
     }
 
     @Override
-    public void refreshContent(Entry e, Highlight highlight) {
+    public void refreshContent(Entry entry, Highlight highlight) {
 
         measure(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
                 MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));

MPChartLib/src/main/java/com/github/mikephil/charting/components/MarkerView.java

@@ -20,17 +20,17 @@ class MyMarkerView(context: Context?, layoutResource: Int) : MarkerView(context,
 
     // runs every time the MarkerView is redrawn, can be used to update the
     // content (user-interface)
-    override fun refreshContent(e: Entry, highlight: Highlight?) {
-        if (e is CandleEntry) {
-            tvContent.text = e.high.formatNumber(0, true)
+
+    override fun refreshContent(entry: Entry, highlight: Highlight) {
+        if (entry is CandleEntry) {
+            tvContent.text = entry.high.formatNumber(0, true)
         } else {
-            tvContent.text = e.y.formatNumber(0, true)
+            tvContent.text = entry.y.formatNumber(0, true)
         }
 
-        super.refreshContent(e, highlight)
+        super.refreshContent(entry, highlight)
     }
 
-    override fun getOffset(): MPPointF {
-        return MPPointF(-(width / 2).toFloat(), -height.toFloat())
-    }
+    override val offset: MPPointF
+        get() = MPPointF(-(width / 2).toFloat(), -height.toFloat())
 }

app/src/main/kotlin/info/appdev/chartexample/custom/MyMarkerView.kt

@@ -25,13 +25,12 @@ class RadarMarkerView(context: Context, layoutResource: Int) : MarkerView(contex
 
     // runs every time the MarkerView is redrawn, can be used to update the
     // content (user-interface)
-    override fun refreshContent(e: Entry, highlight: Highlight?) {
-        tvContent.text = String.format("%s %%", format.format(e.y.toDouble()))
+    override fun refreshContent(entry: Entry, highlight: Highlight) {
+        tvContent.text = String.format("%s %%", format.format(entry.y.toDouble()))
 
-        super.refreshContent(e, highlight)
+        super.refreshContent(entry, highlight)
     }
 
-    override fun getOffset(): MPPointF {
-        return MPPointF(-(width / 2).toFloat(), (-height - 10).toFloat())
-    }
+    override val offset: MPPointF
+        get() = MPPointF(-(width / 2).toFloat(), (-height - 10).toFloat())
 }

app/src/main/kotlin/info/appdev/chartexample/custom/RadarMarkerView.kt

@@ -8,7 +8,6 @@ import com.github.mikephil.charting.data.BarEntry
 import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.highlight.Highlight
 import com.github.mikephil.charting.utils.MPPointF
-import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.formatNumber
 import info.appdev.chartexample.R
 
@@ -27,18 +26,17 @@ class StackedBarsMarkerView(context: Context?, layoutResource: Int) : MarkerView
 
             if (entry.yVals != null) {
                 // draw the stack value
-                tvContent.text = entry.yVals!![highlight.stackIndex].formatNumber( 0, true)
+                tvContent.text = entry.yVals!![highlight.stackIndex].formatNumber(0, true)
             } else {
-                tvContent.text = entry.y.formatNumber( 0, true)
+                tvContent.text = entry.y.formatNumber(0, true)
             }
         } else {
-            tvContent.text = entry.y.formatNumber( 0, true)
+            tvContent.text = entry.y.formatNumber(0, true)
         }
 
         super.refreshContent(entry, highlight)
     }
 
-    override fun getOffset(): MPPointF {
-        return MPPointF(-(width / 2).toFloat(), -height.toFloat())
-    }
+    override val offset: MPPointF
+        get() = MPPointF(-(width / 2).toFloat(), -height.toFloat())
 }

app/src/main/kotlin/info/appdev/chartexample/custom/StackedBarsMarkerView.kt

@@ -21,13 +21,12 @@ class XYMarkerView(context: Context?, private val xAxisValueFormatter: IAxisValu
     private val format: DecimalFormat = DecimalFormat("###.0")
 
     // runs every time the MarkerView is redrawn, can be used to update the content (user-interface)
-    override fun refreshContent(e: Entry, highlight: Highlight?) {
-        tvContent.text = String.format("x: %s, y: %s", xAxisValueFormatter.getFormattedValue(e.x, null), format.format(e.y.toDouble()))
+    override fun refreshContent(entry: Entry, highlight: Highlight) {
+        tvContent.text = String.format("x: %s, y: %s", xAxisValueFormatter.getFormattedValue(entry.x, null), format.format(entry.y.toDouble()))
 
-        super.refreshContent(e, highlight)
+        super.refreshContent(entry, highlight)
     }
 
-    override fun getOffset(): MPPointF {
-        return MPPointF(-(width / 2).toFloat(), -height.toFloat())
-    }
+    override val offset: MPPointF
+        get() = MPPointF(-(width / 2).toFloat(), -height.toFloat())
 }