From 858ccfc9c82a45dc386a48ea1b1944c2d1b22061 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Sun, 27 Feb 2022 22:23:48 -0800 Subject: [PATCH] Refactor to reuse EmptyReactNativeConfig from ReactNativeConfig Summary: Quick refactor to reuse EmptyReactNativeConfig from ReactNativeConfig changelog: [internal] internal Reviewed By: genkikondo Differential Revision: D34283060 fbshipit-source-id: 32400d5ed6defd9f82953dc49ae365598db71bbc --- .../react/fabric/ReactNativeConfig.java | 23 +------------------ .../react/uiapp/RNTesterApplication.java | 1 - .../MainApplicationReactNativeHost.java | 3 +-- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/ReactNativeConfig.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/ReactNativeConfig.java index 390e4ebd1be..9309b114a84 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/ReactNativeConfig.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/ReactNativeConfig.java @@ -23,28 +23,7 @@ import com.facebook.proguard.annotations.DoNotStrip; @DoNotStrip public interface ReactNativeConfig { - public final ReactNativeConfig DefaultValuesReactNativeConfig = - new ReactNativeConfig() { - @Override - public boolean getBool(@NonNull String param) { - return false; - } - - @Override - public long getInt64(@NonNull String param) { - return 0; - } - - @Override - public String getString(@NonNull String param) { - return null; - } - - @Override - public double getDouble(@NonNull String param) { - return 0; - } - }; + public final ReactNativeConfig DefaultValuesReactNativeConfig = new EmptyReactNativeConfig(); /** * Get a boolean param by string name. Default should be false. diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java index 057823d8e9f..fe85e07adb8 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java @@ -171,7 +171,6 @@ public class RNTesterApplication extends Application implements ReactApplication return new FabricJSIModuleProvider( reactApplicationContext, componentFactory, - // TODO: T71362667 add ReactNativeConfig's support in RNTester ReactNativeConfig.DefaultValuesReactNativeConfig, viewManagerRegistry); } diff --git a/template/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java b/template/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java index f555e36448c..a0d5eb65049 100644 --- a/template/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java +++ b/template/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java @@ -16,7 +16,6 @@ import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.UIManager; import com.facebook.react.fabric.ComponentFactory; import com.facebook.react.fabric.CoreComponentsRegistry; -import com.facebook.react.fabric.EmptyReactNativeConfig; import com.facebook.react.fabric.FabricJSIModuleProvider; import com.facebook.react.uimanager.ViewManagerRegistry; import com.helloworld.BuildConfig; @@ -105,7 +104,7 @@ public class MainApplicationReactNativeHost extends ReactNativeHost { return new FabricJSIModuleProvider( reactApplicationContext, componentFactory, - new EmptyReactNativeConfig(), + ReactNativeConfig.DefaultValuesReactNativeConfig, viewManagerRegistry); } });