From 182812004a32b8ef1466a3a2a52f8b5b0a229c7c Mon Sep 17 00:00:00 2001 From: Scott Beca Date: Wed, 5 Jun 2019 21:44:52 +1000 Subject: [PATCH 1/2] Fix Android deprecation warning --- android/build.gradle | 3 +++ .../imageSequence/RCTResourceDrawableIdHelper.java | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 151607d..99e8c3a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,6 +25,9 @@ android { } } +def supportLibVersion = getExtOrDefault('supportLibVersion', "28.0.0") + dependencies { + implementation "com.android.support:support-compat:$supportLibVersion" compile 'com.facebook.react:react-native:+' } \ No newline at end of file diff --git a/android/src/main/java/dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java b/android/src/main/java/dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java index dee659a..fe06664 100644 --- a/android/src/main/java/dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java +++ b/android/src/main/java/dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java @@ -3,11 +3,13 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.net.Uri; -import com.facebook.common.util.UriUtil; +import android.support.v4.content.ContextCompat; -import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; +import javax.annotation.Nullable; + +import com.facebook.common.util.UriUtil; public class RCTResourceDrawableIdHelper { @@ -36,7 +38,7 @@ public int getResourceDrawableId(Context context, @Nullable String name) { public @Nullable Drawable getResourceDrawable(Context context, @Nullable String name) { int resId = getResourceDrawableId(context, name); - return resId > 0 ? context.getResources().getDrawable(resId) : null; + return resId > 0 ? ContextCompat.getDrawable(context, resId) : null; } public Uri getResourceDrawableUri(Context context, @Nullable String name) { From 69fabadc0a933eedd385009373e79fb5b9f4000b Mon Sep 17 00:00:00 2001 From: Scott Beca Date: Thu, 28 Nov 2019 10:58:15 +1100 Subject: [PATCH 2/2] Use AndroidX support library --- android/build.gradle | 3 --- .../dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 99e8c3a..151607d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,9 +25,6 @@ android { } } -def supportLibVersion = getExtOrDefault('supportLibVersion', "28.0.0") - dependencies { - implementation "com.android.support:support-compat:$supportLibVersion" compile 'com.facebook.react:react-native:+' } \ No newline at end of file diff --git a/android/src/main/java/dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java b/android/src/main/java/dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java index fe06664..7830805 100644 --- a/android/src/main/java/dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java +++ b/android/src/main/java/dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java @@ -3,7 +3,7 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import java.util.HashMap; import java.util.Map;