diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinder.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinder.java deleted file mode 100644 index c3bd8d5de46..00000000000 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinder.java +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react.fabric; - -public interface FabricBinder { - - void setBinding(T binding); - -} diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java index ce79198f5c0..07697375d6d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java @@ -16,7 +16,7 @@ public interface FabricBinding { // TODO: T31905686 change types of UIManager and EventBeatManager when moving to OSS void register( JavaScriptContextHolder jsContext, - FabricBinder fabricBinder, + FabricUIManager fabricUIManager, EventBeatManager eventBeatManager, MessageQueueThread jsMessageQueueThread, ComponentFactoryDelegate componentFactoryDelegate); diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java index 4b484ac2540..0f64f671b0b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java @@ -36,7 +36,7 @@ public class FabricJSIModuleProvider implements JSIModuleProvider { public UIManager get() { final EventBeatManager eventBeatManager = new EventBeatManager(mJSContext, mReactApplicationContext); - final UIManager uiManager = createUIManager(eventBeatManager); + final FabricUIManager uiManager = createUIManager(eventBeatManager); Systrace.beginSection( Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.registerBinding"); final FabricBinding binding = new Binding(); @@ -45,13 +45,13 @@ public class FabricJSIModuleProvider implements JSIModuleProvider { .getCatalystInstance() .getReactQueueConfiguration() .getJSQueueThread(); - binding.register(mJSContext, (FabricBinder) uiManager, eventBeatManager, jsMessageQueueThread, + binding.register(mJSContext, uiManager, eventBeatManager, jsMessageQueueThread, mComponentFactoryDelegate); Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE); return uiManager; } - private UIManager createUIManager(EventBeatManager eventBeatManager) { + private FabricUIManager createUIManager(EventBeatManager eventBeatManager) { Systrace.beginSection( Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.createUIManager"); UIManagerModule nativeModule = mReactApplicationContext.getNativeModule(UIManagerModule.class); 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 d685559691d..581274f7041 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -64,7 +64,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @SuppressLint("MissingNativeLoadLibrary") -public class FabricUIManager implements UIManager, FabricBinder, LifecycleEventListener { +public class FabricUIManager implements UIManager, LifecycleEventListener { private static final String TAG = FabricUIManager.class.getSimpleName(); @@ -310,7 +310,6 @@ public class FabricUIManager implements UIManager, FabricBinder, Lifecy } } - @Override public void setBinding(Binding binding) { mBinding = binding; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/Binding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/Binding.java index 19ac38fcc79..155440b137e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/Binding.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/Binding.java @@ -12,8 +12,8 @@ import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.JavaScriptContextHolder; import com.facebook.react.bridge.NativeMap; import com.facebook.react.bridge.queue.MessageQueueThread; -import com.facebook.react.fabric.FabricBinder; import com.facebook.react.fabric.FabricBinding; +import com.facebook.react.fabric.FabricUIManager; import com.facebook.react.uimanager.PixelUtil; @DoNotStrip @@ -53,13 +53,13 @@ public class Binding implements FabricBinding { @Override public void register( JavaScriptContextHolder jsContext, - FabricBinder fabricModule, + FabricUIManager fabricUIManager, EventBeatManager eventBeatManager, MessageQueueThread jsMessageQueueThread, ComponentFactoryDelegate componentFactoryDelegate) { - fabricModule.setBinding(this); + fabricUIManager.setBinding(this); installFabricUIManager( - jsContext.get(), fabricModule, eventBeatManager, jsMessageQueueThread, componentFactoryDelegate); + jsContext.get(), fabricUIManager, eventBeatManager, jsMessageQueueThread, componentFactoryDelegate); setPixelDensity(PixelUtil.getDisplayMetricDensity()); }