From 3e9699f57c9f850073aa09efa84b432539855278 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Fri, 25 Nov 2022 18:00:26 +0100 Subject: [PATCH] Revert "resolve deprecation warning" This reverts commit 2e034e91fabae11c55f4aac59458ad3351442f27. --- .../core/graph/data/PointsWithLabelGraphSeries.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.java b/core/graph/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.java index d748969029..95e98a1226 100644 --- a/core/graph/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.java +++ b/core/graph/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.java @@ -9,11 +9,8 @@ import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import android.os.Build; import androidx.core.content.ContextCompat; -import androidx.core.graphics.BlendModeColorFilterCompat; -import androidx.core.graphics.BlendModeCompat; import com.jjoe64.graphview.GraphView; import com.jjoe64.graphview.series.BaseSeries; @@ -98,7 +95,6 @@ public class PointsWithLabelGraphSeries e * @param canvas canvas to draw on * @param isSecondScale whether it is the second scale */ - @SuppressWarnings({"deprecation"}) @Override public void draw(GraphView graphView, Canvas canvas, boolean isSecondScale) { // Convert the sp to pixels @@ -250,11 +246,7 @@ public class PointsWithLabelGraphSeries e } else if (value.getShape() == Shape.PROFILE) { Drawable drawable = ContextCompat.getDrawable(graphView.getContext(), R.drawable.ic_ribbon_profile); assert drawable != null; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - drawable.setColorFilter (BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.MULTIPLY)); - } else { - drawable.setColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY); - } + drawable.setColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY); drawable.setBounds( (int) (endX - drawable.getIntrinsicWidth() / 2), (int) (endY - drawable.getIntrinsicHeight() / 2),