From a679f592cd1803e8f3b847c858bb7117a1e1b1f2 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Tue, 2 Jul 2019 14:40:01 -0700 Subject: [PATCH] Remove warnings in some RN Android classes Summary: I've been analyzing some issue in RN Android code and I noticed some warnings to clean up Reviewed By: ejanzer Differential Revision: D16060522 fbshipit-source-id: 327fa86c24c7dd67ac2376bbd2f0ca4339f106d1 --- .../facebook/react/uimanager/BaseViewManager.java | 11 ++++++----- .../react/uimanager/NativeViewHierarchyManager.java | 4 +--- .../com/facebook/react/uimanager/ViewManager.java | 2 +- .../facebook/react/views/view/ReactViewManager.java | 12 +++++++----- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java index 4abdb9b29a9..a74994f6fac 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java @@ -22,6 +22,7 @@ import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.util.ReactFindViewUtil; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -66,7 +67,7 @@ public abstract class BaseViewManager sStateDescription = new HashMap(); + public static final Map sStateDescription = new HashMap<>(); static { sStateDescription.put("busy", R.string.state_busy_description); @@ -112,7 +113,7 @@ public abstract class BaseViewManager contentDescription = new ArrayList(); + final List contentDescription = new ArrayList<>(); if (accessibilityLabel != null) { contentDescription.add(accessibilityLabel); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java index 3fe3ba2e6b9..75beaa5437a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java @@ -32,8 +32,6 @@ import com.facebook.react.uimanager.layoutanimation.LayoutAnimationListener; import com.facebook.systrace.Systrace; import com.facebook.systrace.SystraceMessage; import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; @@ -74,7 +72,7 @@ public class NativeViewHierarchyManager { private final JSResponderHandler mJSResponderHandler = new JSResponderHandler(); private final RootViewManager mRootViewManager; private final LayoutAnimationController mLayoutAnimator = new LayoutAnimationController(); - private final Map mTagsToPendingIndicesToDelete = new HashMap<>(); + private final SparseArray mTagsToPendingIndicesToDelete = new SparseArray<>(); private final int[] mDroppedViewArray = new int[100]; private boolean mLayoutAnimationEnabled; diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java index b371db77925..d422598ffb8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java @@ -171,7 +171,7 @@ public abstract class ViewManager /** * Subclasses may use this method to receive events/commands directly from JS through the {@link * UIManager}. Good example of such a command would be {@code scrollTo} request with coordinates - * for a {@link ScrollView} instance. + * for a {@link ReactScrollView} instance. * * @param root View instance that should receive the command * @param commandId code of the command diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java index fb383e3dd2d..7acaf8c48af 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java @@ -10,6 +10,8 @@ import android.annotation.TargetApi; import android.graphics.Rect; import android.os.Build; import android.view.View; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReadableArray; @@ -30,7 +32,6 @@ import com.facebook.react.uimanager.events.EventDispatcher; import com.facebook.yoga.YogaConstants; import java.util.Locale; import java.util.Map; -import javax.annotation.Nullable; /** View manager for AndroidViews (plain React Views). */ @ReactModule(name = ReactViewManager.REACT_CLASS) @@ -49,6 +50,7 @@ public class ReactViewManager extends ViewGroupManager { }; private static final int CMD_HOTSPOT_UPDATE = 1; private static final int CMD_SET_PRESSED = 2; + private static final String HOTSPOT_UPDATE_KEY = "hotspotUpdate"; @ReactProp(name = "accessible") public void setAccessible(ReactViewGroup view, boolean accessible) { @@ -267,12 +269,12 @@ public class ReactViewManager extends ViewGroupManager { } @Override - public void setOpacity(ReactViewGroup view, float opacity) { + public void setOpacity(@NonNull ReactViewGroup view, float opacity) { view.setOpacityIfPossible(opacity); } @Override - public void setTransform(ReactViewGroup view, ReadableArray matrix) { + public void setTransform(@NonNull ReactViewGroup view, @Nullable ReadableArray matrix) { super.setTransform(view, matrix); view.setBackfaceVisibilityDependantOpacity(); } @@ -289,7 +291,7 @@ public class ReactViewManager extends ViewGroupManager { @Override public Map getCommandsMap() { - return MapBuilder.of("hotspotUpdate", CMD_HOTSPOT_UPDATE, "setPressed", CMD_SET_PRESSED); + return MapBuilder.of(HOTSPOT_UPDATE_KEY, CMD_HOTSPOT_UPDATE, "setPressed", CMD_SET_PRESSED); } @Override @@ -311,7 +313,7 @@ public class ReactViewManager extends ViewGroupManager { @Override public void receiveCommand(ReactViewGroup root, String commandId, @Nullable ReadableArray args) { switch (commandId) { - case "hotspotUpdate": + case HOTSPOT_UPDATE_KEY: { handleHotspotUpdate(root, args); break;