Kotlin formatter interfaces

Author: hannesa2

MPChartLib/src/main/java/com/github/mikephil/charting/formatter/ColorFormatter.java renamed to MPChartLib/src/main/java/com/github/mikephil/charting/formatter/ColorFormatter.kt

@@ -1,17 +1,12 @@
-package com.github.mikephil.charting.formatter;
+package com.github.mikephil.charting.formatter
 
-import com.github.mikephil.charting.data.DataSet;
-import com.github.mikephil.charting.data.Entry;
-import com.github.mikephil.charting.interfaces.datasets.IDataSet;
+import com.github.mikephil.charting.data.Entry
+import com.github.mikephil.charting.interfaces.datasets.IDataSet
 
 /**
- * Interface that can be used to return a customized color instead of setting
- * colors via the setColor(...) method of the DataSet.
- *
- * @author Philipp Jahoda
+ * Interface that can be used to return a customized color instead of setting colors via the setColor(...) method of the DataSet.
  */
-public interface ColorFormatter {
-
+interface ColorFormatter {
     /**
      * Returns the color to be used for the given Entry at the given index (in the entries array)
      *
@@ -20,5 +15,5 @@ public interface ColorFormatter {
      * @param set   the DataSet the entry belongs to
      * @return
      */
-    int getColor(int index, Entry e, IDataSet set);
-}
+    fun getColor(index: Int, entry: Entry?, set: IDataSet<*>?): Int
+}

MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IAxisValueFormatter.java

@@ -0,0 +1,19 @@
+package com.github.mikephil.charting.formatter
+
+import com.github.mikephil.charting.components.AxisBase
+
+/**
+ * Custom formatter interface that allows formatting of axis labels before they are being drawn.
+ */
+interface IAxisValueFormatter {
+    /**
+     * Called when a value from an axis is to be formatted
+     * before being drawn. For performance reasons, avoid excessive calculations
+     * and memory allocations inside this method.
+     *
+     * @param value the value to be formatted
+     * @param axis  the axis the value belongs to
+     * @return
+     */
+    fun getFormattedValue(value: Float, axis: AxisBase?): String?
+}

MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IAxisValueFormatter.kt

@@ -1,24 +1,19 @@
-package com.github.mikephil.charting.formatter;
+package com.github.mikephil.charting.formatter
 
-import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
-import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider;
+import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider
+import com.github.mikephil.charting.interfaces.datasets.ILineDataSet
 
 /**
- * Interface for providing a custom logic to where the filling line of a LineDataSet
- * should end. This of course only works if setFillEnabled(...) is set to true.
- * 
- * @author Philipp Jahoda
+ * Interface for providing a custom logic to where the filling line of a LineDataSet should end. This of course only works if setFillEnabled(...) is set to true.
  */
-public interface IFillFormatter
-{
-
+interface IFillFormatter {
     /**
      * Returns the vertical (y-axis) position where the filled-line of the
      * LineDataSet should end.
-     * 
+     *
      * @param dataSet the ILineDataSet that is currently drawn
      * @param dataProvider
      * @return
      */
-    float getFillLinePosition(ILineDataSet dataSet, LineDataProvider dataProvider);
+    fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider?): Float
 }

MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IFillFormatter.java renamed to MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IFillFormatter.kt

@@ -1,19 +1,15 @@
-package com.github.mikephil.charting.formatter;
+package com.github.mikephil.charting.formatter
 
-import com.github.mikephil.charting.data.Entry;
-import com.github.mikephil.charting.utils.ViewPortHandler;
+import com.github.mikephil.charting.data.Entry
+import com.github.mikephil.charting.utils.ViewPortHandler
 
 /**
  * Interface that allows custom formatting of all values inside the chart before they are
  * being drawn to the screen. Simply create your own formatting class and let
  * it implement IValueFormatter. Then override the getFormattedValue(...) method
  * and return whatever you want.
- *
- * @author Philipp Jahoda
  */
-public interface IValueFormatter
-{
-
+interface IValueFormatter {
     /**
      * Called when a value (from labels inside the chart) is formatted
      * before being drawn. For performance reasons, avoid excessive calculations
@@ -25,5 +21,5 @@ public interface IValueFormatter
      * @param viewPortHandler provides information about the current chart state (scale, translation, ...)
      * @return the formatted label ready for being drawn
      */
-    String getFormattedValue(float value, Entry entry, int dataSetIndex, ViewPortHandler viewPortHandler);
+    fun getFormattedValue(value: Float, entry: Entry?, dataSetIndex: Int, viewPortHandler: ViewPortHandler?): String?
 }