From ca9f8dc8bca15d44d46b8b6fb5302dc071480dfc Mon Sep 17 00:00:00 2001 From: Fox2Code Date: Fri, 3 Jun 2022 20:07:50 +0200 Subject: [PATCH] Make getMonetColor compatible with all Android versions. --- .../java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java index 448dce6..0a3185d 100644 --- a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java +++ b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java @@ -13,6 +13,7 @@ import android.widget.Toast; import androidx.annotation.Keep; import androidx.annotation.RequiresApi; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; import androidx.core.graphics.ColorUtils; import com.fox2code.mmm.BuildConfig; @@ -483,7 +484,6 @@ public class AndroidacyWebAPI { /** * Return current hex string of monet theme */ - @RequiresApi(api = Build.VERSION_CODES.M) @JavascriptInterface public String getMonetColor(String id) { int nameResourceID = this.activity.getResources().getIdentifier("@android:color/" + id, @@ -492,7 +492,7 @@ public class AndroidacyWebAPI { throw new IllegalArgumentException( "No resource string found with name " + id); } else { - int color = this.activity.getColor(nameResourceID); + int color = ContextCompat.getColor(this.activity, nameResourceID); int red = Color.red(color); int blue = Color.blue(color); int green = Color.green(color);