From b1b6501ac9473b50db73e82b59f6b00dc3467fc8 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Tue, 2 Jul 2019 14:40:01 -0700 Subject: [PATCH] NIT: rename FabricUIManager.scheduleMountItems -> FabricUIManager.scheduleMountItem Summary: The method FabricUIManager.scheduleMountItems receives only one MountItem, is makes more sense to be called FabricUIManager.scheduleMountItem Reviewed By: JoshuaGross, makovkastar Differential Revision: D16062749 fbshipit-source-id: a27063be33b644af83ede6a9198edbfb1c3296e1 --- .../java/com/facebook/react/fabric/FabricUIManager.java | 8 ++++---- .../main/java/com/facebook/react/fabric/jni/Binding.cpp | 2 +- .../src/main/java/com/facebook/react/views/view/BUCK | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index 4786eec204b..2bfde7ec28f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -328,7 +328,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { public void synchronouslyUpdateViewOnUIThread(int reactTag, ReadableMap props) { long time = SystemClock.uptimeMillis(); try { - scheduleMountItems(updatePropsMountItem(reactTag, props), time, 0, time, time); + scheduleMountItem(updatePropsMountItem(reactTag, props), time, 0, time, time); } catch (Exception ex) { // ignore exceptions for now // TODO T42943890: Fix animations in Fabric and remove this try/catch @@ -341,8 +341,8 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { */ @DoNotStrip @SuppressWarnings("unused") - private void scheduleMountItems( - final MountItem mountItems, + private void scheduleMountItem( + final MountItem mountItem, long commitStartTime, long layoutTime, long finishTransactionStartTime, @@ -355,7 +355,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { mFinishTransactionTime = SystemClock.uptimeMillis() - finishTransactionStartTime; mDispatchViewUpdatesTime = SystemClock.uptimeMillis(); synchronized (mMountItemsLock) { - mMountItems.add(mountItems); + mMountItems.add(mountItem); } if (UiThreadUtil.isOnUiThread()) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp index 4b54b40b364..6280960556a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp @@ -608,7 +608,7 @@ void Binding::schedulerDidFinishTransaction( static auto scheduleMountItems = jni::findClassStatic(UIManagerJavaDescriptor) ->getMethod( - "scheduleMountItems"); + "scheduleMountItem"); long finishTransactionEndTime = getTime(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK index c4f3a6e88b4..3eec5c6bf13 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK @@ -5,7 +5,6 @@ rn_android_library( srcs = glob(["*.java"]), is_androidx = True, provided_deps = [ - react_native_dep("third-party/android/androidx:annotation"), react_native_dep("third-party/android/androidx:core"), react_native_dep("third-party/android/androidx:fragment"), react_native_dep("third-party/android/androidx:legacy-support-core-ui"), @@ -16,6 +15,7 @@ rn_android_library( ], deps = [ YOGA_TARGET, + react_native_dep("third-party/android/androidx:annotation"), react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"),