Restructure provider inheritence

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

@@ -19,7 +19,7 @@
 import com.github.mikephil.charting.data.Entry;
 import com.github.mikephil.charting.highlight.ChartHighlighter;
 import com.github.mikephil.charting.highlight.Highlight;
-import com.github.mikephil.charting.interfaces.dataprovider.BarLineScatterCandleBubbleDataProvider;
+import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider;
 import com.github.mikephil.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet;
 import com.github.mikephil.charting.jobs.AnimatedMoveViewJob;
 import com.github.mikephil.charting.jobs.AnimatedZoomJob;

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

@@ -30,7 +30,7 @@
 import com.github.mikephil.charting.highlight.ChartHighlighter;
 import com.github.mikephil.charting.highlight.Highlight;
 import com.github.mikephil.charting.highlight.IHighlighter;
-import com.github.mikephil.charting.interfaces.dataprovider.ChartInterface;
+import com.github.mikephil.charting.interfaces.dataprovider.base.IBaseProvider;
 import com.github.mikephil.charting.interfaces.datasets.IDataSet;
 import com.github.mikephil.charting.listener.ChartTouchListener;
 import com.github.mikephil.charting.listener.OnChartGestureListener;
@@ -55,7 +55,7 @@
  * @author Philipp Jahoda
  */
 @SuppressWarnings("unused")
-public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Entry>>> extends ViewGroup implements ChartInterface {
+public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Entry>>> extends ViewGroup implements IBaseProvider {
 
 	public static final String LOG_TAG = "AndroidChart";
 
@@ -667,7 +667,7 @@ public void highlightValue(Highlight highlight) {
 	 */
 	public void highlightValue(Highlight high, boolean callListener) {
 
-		Entry e = null;
+		Entry entry = null;
 
 		if (high == null) {
 			mIndicesToHighlight = null;
@@ -677,8 +677,8 @@ public void highlightValue(Highlight high, boolean callListener) {
 				Log.i(LOG_TAG, "Highlighted: " + high);
 			}
 
-			e = mData.getEntryForHighlight(high);
-			if (e == null) {
+			entry = mData.getEntryForHighlight(high);
+			if (entry == null) {
 				mIndicesToHighlight = null;
 				high = null;
 			} else {
@@ -696,7 +696,7 @@ public void highlightValue(Highlight high, boolean callListener) {
 				mSelectionListener.onNothingSelected();
 			} else {
 				// notify the listener
-				mSelectionListener.onValueSelected(e, high);
+				mSelectionListener.onValueSelected(entry, high);
 			}
 		}
 
@@ -723,8 +723,8 @@ public Highlight getHighlightByTouchPoint(float x, float y) {
 	 * Set a new (e.g. custom) ChartTouchListener NOTE: make sure to
 	 * setTouchEnabled(true); if you need touch gestures on the chart
 	 */
-	public void setOnTouchListener(ChartTouchListener l) {
-		this.mChartTouchListener = l;
+	public void setOnTouchListener(ChartTouchListener touchListener) {
+		this.mChartTouchListener = touchListener;
 	}
 
 	/**
@@ -985,6 +985,16 @@ public float getYMin() {
 		return mData.getYMin();
 	}
 
+	@Override
+	public float getYChartMin() {
+		return mData.getYMin();
+	}
+
+	@Override
+	public float getYChartMax() {
+		return mData.getYMax();
+	}
+
 	@Override
 	public float getXChartMax() {
 		return mXAxis.mAxisMaximum;

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

@@ -8,9 +8,9 @@ import com.github.mikephil.charting.interfaces.datasets.ILineDataSet
  */
 open class DefaultFillFormatter : IFillFormatter {
 
-    override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider?): Float {
+    override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider): Float {
         val fillMin: Float
-        val chartMaxY = dataProvider!!.yChartMax
+        val chartMaxY = dataProvider.yChartMax
         val chartMinY = dataProvider.yChartMin
         val data = dataProvider.lineData
         fillMin = if (dataSet!!.yMax > 0 && dataSet.yMin < 0) {

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

@@ -14,5 +14,5 @@ interface IFillFormatter {
      * @param dataSet the ILineDataSet that is currently drawn
      * @param dataProvider
      */
-    fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider?): Float
+    fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider): Float
 }

MPChartLib/src/main/java/com/github/mikephil/charting/highlight/BarHighlighter.kt

@@ -6,7 +6,7 @@ import com.github.mikephil.charting.utils.MPPointD
 import kotlin.math.abs
 import kotlin.math.max
 
-open class BarHighlighter(barDataProvider: BarDataProvider?) : ChartHighlighter<BarDataProvider>(barDataProvider) {
+open class BarHighlighter(barDataProvider: BarDataProvider) : ChartHighlighter<BarDataProvider>(barDataProvider) {
     override fun getHighlight(x: Float, y: Float): Highlight? {
         val high = super.getHighlight(x, y) ?: return null
 

MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt

@@ -4,7 +4,7 @@ import com.github.mikephil.charting.components.YAxis.AxisDependency
 import com.github.mikephil.charting.data.BarLineScatterCandleBubbleData
 import com.github.mikephil.charting.data.DataSet
 import com.github.mikephil.charting.data.Entry
-import com.github.mikephil.charting.interfaces.dataprovider.BarLineScatterCandleBubbleDataProvider
+import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider
 import com.github.mikephil.charting.interfaces.datasets.IDataSet
 import com.github.mikephil.charting.utils.MPPointD
 import kotlin.math.abs

MPChartLib/src/main/java/com/github/mikephil/charting/highlight/CombinedHighlighter.kt

@@ -7,7 +7,7 @@ import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider
 import com.github.mikephil.charting.interfaces.dataprovider.CombinedDataProvider
 import com.github.mikephil.charting.interfaces.datasets.IDataSet
 
-open class CombinedHighlighter(dataProvider: CombinedDataProvider?, barChart: BarDataProvider) : ChartHighlighter<CombinedDataProvider>(dataProvider), IHighlighter {
+open class CombinedHighlighter(dataProvider: CombinedDataProvider, barChart: BarDataProvider) : ChartHighlighter<CombinedDataProvider>(dataProvider), IHighlighter {
     /**
      * bar highlighter for supporting stacked highlighting
      */

MPChartLib/src/main/java/com/github/mikephil/charting/highlight/HorizontalBarHighlighter.kt

@@ -7,7 +7,7 @@ import com.github.mikephil.charting.interfaces.datasets.IDataSet
 import com.github.mikephil.charting.utils.MPPointD
 import kotlin.math.abs
 
-class HorizontalBarHighlighter(dataProvider: BarDataProvider?) : BarHighlighter(dataProvider) {
+class HorizontalBarHighlighter(dataProvider: BarDataProvider) : BarHighlighter(dataProvider) {
     override fun getHighlight(x: Float, y: Float): Highlight? {
         val barData = provider!!.barData
 

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BarDataProvider.kt

@@ -1,6 +1,7 @@
 package com.github.mikephil.charting.interfaces.dataprovider
 
 import com.github.mikephil.charting.data.BarData
+import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider
 
 interface BarDataProvider : BarLineScatterCandleBubbleDataProvider {
     val barData: BarData

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BubbleDataProvider.kt

@@ -1,6 +1,7 @@
 package com.github.mikephil.charting.interfaces.dataprovider
 
 import com.github.mikephil.charting.data.BubbleData
+import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider
 
 interface BubbleDataProvider : BarLineScatterCandleBubbleDataProvider {
     val bubbleData: BubbleData?

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/CandleDataProvider.kt

@@ -1,6 +1,7 @@
 package com.github.mikephil.charting.interfaces.dataprovider
 
 import com.github.mikephil.charting.data.CandleData
+import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider
 
 interface CandleDataProvider : BarLineScatterCandleBubbleDataProvider {
     val candleData: CandleData?

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/LineDataProvider.kt

@@ -3,6 +3,7 @@ package com.github.mikephil.charting.interfaces.dataprovider
 import com.github.mikephil.charting.components.YAxis
 import com.github.mikephil.charting.components.YAxis.AxisDependency
 import com.github.mikephil.charting.data.LineData
+import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider
 
 interface LineDataProvider : BarLineScatterCandleBubbleDataProvider {
     val lineData: LineData

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ScatterDataProvider.kt

@@ -1,6 +1,7 @@
 package com.github.mikephil.charting.interfaces.dataprovider
 
 import com.github.mikephil.charting.data.ScatterData
+import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider
 
 interface ScatterDataProvider : BarLineScatterCandleBubbleDataProvider {
     val scatterData: ScatterData?

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/base/BarLineScatterCandleBubbleDataProvider.kt

@@ -0,0 +1,13 @@
+package com.github.mikephil.charting.interfaces.dataprovider.base
+
+import com.github.mikephil.charting.components.YAxis
+import com.github.mikephil.charting.data.BarLineScatterCandleBubbleData
+import com.github.mikephil.charting.utils.Transformer
+
+interface BarLineScatterCandleBubbleDataProvider : IBaseProvider {
+    fun getTransformer(axis: YAxis.AxisDependency?): Transformer?
+    fun isInverted(axis: YAxis.AxisDependency?): Boolean
+    val lowestVisibleX: Float
+    val highestVisibleX: Float
+    override fun getData(): BarLineScatterCandleBubbleData<*>
+}

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ChartInterface.java → MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/base/IBaseProvider.java

@@ -1,4 +1,4 @@
-package com.github.mikephil.charting.interfaces.dataprovider;
+package com.github.mikephil.charting.interfaces.dataprovider.base;
 
 import android.graphics.RectF;
 
@@ -14,7 +14,7 @@
  *
  * @author Philipp Jahoda
  */
-public interface ChartInterface {
+public interface IBaseProvider {
 
     /**
      * Returns the minimum x value of the chart, regardless of zoom or translation.
@@ -56,7 +56,7 @@ public interface ChartInterface {
     IValueFormatter getDefaultValueFormatter();
 
     @Nullable
-    ChartData getData();
+    ChartData<?> getData();
 
     int getMaxVisibleCount();
 }

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt

@@ -3,7 +3,7 @@ package com.github.mikephil.charting.renderer
 import com.github.mikephil.charting.animation.ChartAnimator
 import com.github.mikephil.charting.data.DataSet
 import com.github.mikephil.charting.data.Entry
-import com.github.mikephil.charting.interfaces.dataprovider.BarLineScatterCandleBubbleDataProvider
+import com.github.mikephil.charting.interfaces.dataprovider.base.BarLineScatterCandleBubbleDataProvider
 import com.github.mikephil.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet
 import com.github.mikephil.charting.interfaces.datasets.IDataSet
 import com.github.mikephil.charting.utils.ViewPortHandler

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/DataRenderer.kt

@@ -8,7 +8,7 @@ import com.github.mikephil.charting.animation.ChartAnimator
 import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.formatter.IValueFormatter
 import com.github.mikephil.charting.highlight.Highlight
-import com.github.mikephil.charting.interfaces.dataprovider.ChartInterface
+import com.github.mikephil.charting.interfaces.dataprovider.base.IBaseProvider
 import com.github.mikephil.charting.interfaces.datasets.IDataSet
 import com.github.mikephil.charting.utils.ViewPortHandler
 import com.github.mikephil.charting.utils.convertDpToPixel
@@ -58,7 +58,7 @@ abstract class DataRenderer(
         paintHighlight.color = Color.rgb(255, 187, 115)
     }
 
-    protected open fun isDrawingValuesAllowed(chart: ChartInterface): Boolean {
+    protected open fun isDrawingValuesAllowed(chart: IBaseProvider): Boolean {
         return chart.data!!.entryCount < chart.maxVisibleCount * viewPortHandler.scaleX
     }
 

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt

@@ -7,7 +7,7 @@ import com.github.mikephil.charting.animation.ChartAnimator
 import com.github.mikephil.charting.buffer.HorizontalBarBuffer
 import com.github.mikephil.charting.highlight.Highlight
 import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider
-import com.github.mikephil.charting.interfaces.dataprovider.ChartInterface
+import com.github.mikephil.charting.interfaces.dataprovider.base.IBaseProvider
 import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
 import com.github.mikephil.charting.utils.Fill
 import com.github.mikephil.charting.utils.MPPointF
@@ -457,7 +457,7 @@ open class HorizontalBarChartRenderer(
         high.setDraw(bar.centerY(), bar.right)
     }
 
-    override fun isDrawingValuesAllowed(chart: ChartInterface): Boolean {
+    override fun isDrawingValuesAllowed(chart: IBaseProvider): Boolean {
         return (chart.data!!.entryCount < chart.maxVisibleCount
                 * viewPortHandler.scaleY)
     }

app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt

@@ -124,7 +124,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
             set1.fillAlpha = 100
             set1.setDrawHorizontalHighlightIndicator(false)
             set1.fillFormatter = object : IFillFormatter {
-                override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider?): Float {
+                override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider): Float {
                     return binding.chart1.axisLeft.axisMinimum
                 }
             }

app/src/main/kotlin/info/appdev/chartexample/DataTools.kt

@@ -206,7 +206,7 @@ class DataTools {
             // set the filled area
             lineDataSet01.setDrawFilled(true)
             lineDataSet01.fillFormatter = object : IFillFormatter {
-                override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider?): Float {
+                override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider): Float {
                     return lineChart.axisLeft.axisMinimum
                 }
             }

app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt

@@ -111,7 +111,7 @@ class FilledLineActivity : DemoBase() {
             set1.highLightColor = Color.rgb(244, 117, 117)
             set1.isDrawCircleHoleEnabled = false
             set1.fillFormatter = object : IFillFormatter {
-                override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider?): Float {
+                override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider): Float {
                     // change the return value here to better understand the effect
                     // return 0;
                     return binding.chart1.axisLeft.axisMinimum
@@ -131,7 +131,7 @@ class FilledLineActivity : DemoBase() {
             set2.isDrawCircleHoleEnabled = false
             set2.highLightColor = Color.rgb(244, 117, 117)
             set2.fillFormatter = object : IFillFormatter {
-                override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider?): Float {
+                override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider): Float {
                     // change the return value here to better understand the effect
                     // return 600;
                     return binding.chart1.axisLeft.axisMaximum

app/src/main/kotlin/info/appdev/chartexample/formatter/MyFillFormatter.kt

@@ -6,7 +6,7 @@ import com.github.mikephil.charting.interfaces.datasets.ILineDataSet
 
 @Suppress("unused")
 class MyFillFormatter(private val fillPos: Float) : IFillFormatter {
-    override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider?): Float {
+    override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider): Float {
         // your logic could be here
         return fillPos
     }