Modified and expanded, made more flexible marker interaction interface

Author: devnullorthrow

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

@@ -52,6 +52,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import androidx.annotation.NonNull;
 
@@ -543,12 +545,17 @@ public void highlightValues(Highlight[] highs) {
 		invalidate();
 	}
 
-	/**
-	 * 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
+	public void highlightValues(List<Highlight> highs, List<IMarker> markers) {
+        if (highs.size() != markers.size()) throw new IllegalArgumentException("Markers and highs must be mutually corresponding. High size = " + highs.size() + " Markers size = " + markers.size());
+        setMarkers(markers);
+        highlightValues(highs.toArray(new Highlight[0]));
+    }
+
+    /**
+     * 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)
 	 */
@@ -747,15 +754,15 @@ public ChartTouchListener getOnTouchListener() {
 	/**
 	 * the view that represents the marker
 	 */
-	protected IMarker mMarker;
+	protected List<IMarker> mMarkers;
 
 	/**
 	 * draws all MarkerViews on the highlighted positions
 	 */
 	protected void drawMarkers(Canvas canvas) {
 
 		// if there is no marker view or drawing marker is disabled
-		if (mMarker == null || !isDrawMarkersEnabled() || !valuesToHighlight()) {
+		if (mMarkers == null || !isDrawMarkersEnabled() || !valuesToHighlight()) {
 			return;
 		}
 
@@ -789,10 +796,12 @@ protected void drawMarkers(Canvas canvas) {
 			}
 
 			// callbacks to update the content
-			mMarker.refreshContent(e, highlight);
+			int markerIndex = i % mMarkers.size();
+            IMarker markerItem = mMarkers.get(markerIndex);
+            markerItem.refreshContent(e, highlight);
 
 			// draw the marker
-			mMarker.draw(canvas, pos[0], pos[1]);
+			markerItem.draw(canvas, pos[0], pos[1]);
 		}
 	}
 
@@ -1136,18 +1145,22 @@ public void setTouchEnabled(boolean enabled) {
 		this.mTouchEnabled = enabled;
 	}
 
-	/**
-	 * sets the marker that is displayed when a value is clicked on the chart
-	 */
-	public void setMarker(IMarker marker) {
-		mMarker = marker;
-	}
+	public void setMarkers(List<IMarker> marker) {
+        mMarkers = marker;
+    }
 
-	/**
+    /**
+     * sets the marker that is displayed when a value is clicked on the chart
+     */
+	public void setMarker(IMarker marker) {
+		setMarkers(Collections.unmodifiableList(Collections.singletonList(marker)));
+    }
+    /**
 	 * returns the marker that is set as a marker view for the chart
+
 	 */
-	public IMarker getMarker() {
-		return mMarker;
+	public List<IMarker> getMarker() {
+		return mMarkers;
 	}
 
 	@Deprecated
@@ -1156,7 +1169,7 @@ public void setMarkerView(IMarker v) {
 	}
 
 	@Deprecated
-	public IMarker getMarkerView() {
+	public List<IMarker> getMarkerView() {
 		return getMarker();
 	}
 

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

@@ -6,6 +6,7 @@
 import android.util.AttributeSet;
 import android.util.Log;
 
+import com.github.mikephil.charting.components.IMarker;
 import com.github.mikephil.charting.data.BarData;
 import com.github.mikephil.charting.data.BubbleData;
 import com.github.mikephil.charting.data.CandleData;
@@ -231,7 +232,7 @@ public void setDrawOrder(DrawOrder[] order) {
 	protected void drawMarkers(Canvas canvas) {
 
 		// if there is no marker view or drawing marker is disabled
-		if (mMarker == null || !isDrawMarkersEnabled() || !valuesToHighlight()) {
+		if (mMarkers == null || !isDrawMarkersEnabled() || !valuesToHighlight()) {
 			return;
 		}
 
@@ -259,10 +260,11 @@ protected void drawMarkers(Canvas canvas) {
 			}
 
 			// callbacks to update the content
-			mMarker.refreshContent(e, highlight);
+			IMarker markerItem =  mMarkers.get(i % mMarkers.size());
+            markerItem.refreshContent(e, highlight);
 
 			// draw the marker
-			mMarker.draw(canvas, pos[0], pos[1]);
+			markerItem.draw(canvas, pos[0], pos[1]);
 		}
 	}