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 e72eceb2b..000000000 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinder.java +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Copyright (c) 2014-present, Facebook, Inc. - * - * 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(FabricBinding 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 f5e251532..4db39a425 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java @@ -9,11 +9,10 @@ package com.facebook.react.fabric; import com.facebook.react.bridge.JavaScriptContextHolder; import com.facebook.react.bridge.NativeMap; -import com.facebook.react.bridge.UIManager; public interface FabricBinding { - void installFabric(JavaScriptContextHolder jsContext, FabricBinder fabricBinder); + void installFabric(JavaScriptContextHolder jsContext, FabricUIManager fabricModule); void releaseEventTarget(long jsContextNativePointer, long eventTargetPointer); 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 345e214c0..87d1850e6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -60,7 +60,7 @@ import javax.annotation.Nullable; */ @SuppressWarnings("unused") // used from JNI @DoNotStrip -public class FabricUIManager implements UIManager, JSHandler, FabricBinder { +public class FabricUIManager implements UIManager, JSHandler { private static final String TAG = FabricUIManager.class.getSimpleName(); private static final boolean DEBUG = ReactBuildConfig.DEBUG || PrinterHolder.getPrinter().shouldDisplayLogMessage(ReactDebugOverlayTags.FABRIC_UI_MANAGER); @@ -98,7 +98,6 @@ public class FabricUIManager implements UIManager, JSHandler, FabricBinder { mJSContext = jsContext; } - @Override public void setBinding(FabricBinding binding) { mBinding = binding; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/FabricJSCBinding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/FabricJSCBinding.java index fb1748204..92e82d41e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/FabricJSCBinding.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsc/FabricJSCBinding.java @@ -10,8 +10,6 @@ package com.facebook.react.fabric.jsc; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.JavaScriptContextHolder; -import com.facebook.react.bridge.UIManager; -import com.facebook.react.fabric.FabricBinder; import com.facebook.react.fabric.FabricBinding; import com.facebook.react.fabric.FabricUIManager; import com.facebook.react.bridge.NativeMap; @@ -60,7 +58,7 @@ public class FabricJSCBinding implements FabricBinding { } @Override - public void installFabric(JavaScriptContextHolder jsContext, FabricBinder fabricModule) { + public void installFabric(JavaScriptContextHolder jsContext, FabricUIManager fabricModule) { fabricModule.setBinding(this); installFabric(jsContext.get(), fabricModule); }