Merge pull request #387 from AppDevNext/markers-list

Modified and expanded, made more flexible marker interaction interface

Author: hannesa2

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

@@ -52,8 +52,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
-
-import androidx.annotation.NonNull;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Baseclass of all Chart-Views.
@@ -172,11 +172,6 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
 	 */
 	private float mExtraTopOffset = 0.f, mExtraRightOffset = 0.f, mExtraBottomOffset = 0.f, mExtraLeftOffset = 0.f;
 
-	/**
-     * Tag for logging accessibility related content
-     */
-    private String TAG = "abilityTag";
-
     /**
      * Additional data on top of dynamically generated description. This can be set by the user.
      */
@@ -543,12 +538,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,19 +747,21 @@ public ChartTouchListener getOnTouchListener() {
 	/**
 	 * the view that represents the marker
 	 */
-	protected IMarker mMarker;
+	protected List<IMarker> mMarkers = new ArrayList<>();
 
 	/**
 	 * 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;
 		}
 
-		for (Highlight highlight : mIndicesToHighlight) {
+		for (int i = 0; i < mIndicesToHighlight.length; i++) {
+
+			Highlight highlight = mIndicesToHighlight[i];
 
 			// When changing data sets and calling animation functions, sometimes an erroneous highlight is generated
 			// on the dataset that is removed. Null check to prevent crash
@@ -771,7 +773,7 @@ protected void drawMarkers(Canvas canvas) {
 			Entry e = mData.getEntryForHighlight(highlight);
 
 			// make sure entry not null before using it
-			if (e == null || set == null) {
+			if (e == null) {
 				continue;
 			}
 
@@ -789,10 +791,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 +1140,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.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 +1164,7 @@ public void setMarkerView(IMarker v) {
 	}
 
 	@Deprecated
-	public IMarker getMarkerView() {
+	public List<IMarker> getMarkerView() {
 		return getMarker();
 	}
 
@@ -1690,7 +1698,7 @@ public void setAccessibilitySummaryDescription(String accessibilitySummaryDescri
     public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
 
         boolean completed = super.dispatchPopulateAccessibilityEvent(event);
-        Log.d(TAG, "Dispatch called for Chart <View> and completed as " + completed);
+        Log.d(LOG_TAG, "Dispatch called for Chart <View> and completed as " + completed);
 
         event.getText().add(getAccessibilityDescription());
 

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,12 +232,13 @@ 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;
 		}
 
-		for (Highlight highlight : mIndicesToHighlight) {
+		for (int i = 0; i < mIndicesToHighlight.length; i++) {
 
+			Highlight highlight = mIndicesToHighlight[i];
 			IDataSet set = mData.getDataSetByHighlight(highlight);
 
 			Entry e = mData.getEntryForHighlight(highlight);
@@ -259,10 +261,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]);
 		}
 	}
 

app/src/main/java/info/appdev/chartexample/LineChartActivity.kt

@@ -62,7 +62,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec
 
         // Set the marker to the chart
         mv.chartView = binding.chart1
-        binding.chart1.marker = mv
+        binding.chart1.marker.add(mv)
 
         // enable scaling and dragging
         binding.chart1.isDragEnabled = true

app/src/main/java/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt

@@ -81,7 +81,7 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener,
         // to use for it
         val mv = MyMarkerView(this, R.layout.custom_marker_view)
         mv.chartView = mChart // For bounds control
-        mChart!!.marker = mv // Set the marker to the chart
+        mChart!!.marker.add(mv) // Set the marker to the chart
 
         // x-axis limit line
         val llXAxis = LimitLine(10f, "Index 10")