From 459fd2844f80e635b627447d5a6d09108bdc85bc Mon Sep 17 00:00:00 2001 From: Dilshodbek Date: Sat, 22 Jun 2024 02:04:43 +0500 Subject: [PATCH] bitmaputil improvement (#2485) --- .../java/org/maplibre/android/utils/BitmapUtils.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/BitmapUtils.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/BitmapUtils.java index b8a4a1971..c978f4c8f 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/BitmapUtils.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/BitmapUtils.java @@ -4,10 +4,8 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import android.graphics.PorterDuff; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.os.Build; import android.view.View; import androidx.annotation.ColorInt; @@ -15,6 +13,7 @@ import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; +import androidx.core.content.ContextCompat; import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; @@ -180,7 +179,7 @@ public class BitmapUtils { @Nullable public static Drawable getDrawableFromRes(@NonNull Context context, @DrawableRes int drawableRes, @Nullable @ColorInt Integer tintColor) { - Drawable drawable = context.getDrawable(drawableRes); + Drawable drawable = ContextCompat.getDrawable(context, drawableRes); if (drawable == null) { return null; } @@ -189,11 +188,7 @@ public class BitmapUtils { return drawable; } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - drawable.setTint(tintColor); - } else { - drawable.mutate().setColorFilter(tintColor, PorterDuff.Mode.SRC_IN); - } + drawable.setTint(tintColor); return drawable; }