diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 3e0f804219c135..d391da8576cef9 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -370,7 +370,8 @@ dependencies { api("com.facebook.infer.annotation:infer-annotation:0.18.0") api("com.facebook.yoga:proguard-annotations:1.19.0") api("javax.inject:javax.inject:1") - api("androidx.appcompat:appcompat:1.0.2") + api("androidx.appcompat:appcompat:${APPCOMPAT_VERSION}") + api("androidx.appcompat:appcompat-resources:${APPCOMPAT_VERSION}") api("androidx.autofill:autofill:1.1.0") api("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0") api("com.facebook.fresco:fresco:${FRESCO_VERSION}") diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index 66206964b121f7..a93702dfcb8fe1 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -11,6 +11,7 @@ ROBOLECTRIC_VERSION=4.4 JUNIT_VERSION=4.12 ANDROIDX_TEST_VERSION=1.1.0 +APPCOMPAT_VERSION=1.4.1 FRESCO_VERSION=2.5.0 OKHTTP_VERSION=4.9.2 SO_LOADER_VERSION=0.10.3 diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java index b4827f6bb285a2..0feca8e98ba120 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java @@ -323,7 +323,7 @@ public View getContentView() { } public boolean isShowing() { - return mDialog.isShowing(); + return mDialog != null && mDialog.isShowing(); } public void show() {