diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTInputAccessoryViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/InputAccessoryViewManagerDelegate.java similarity index 76% rename from ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTInputAccessoryViewManagerDelegate.java rename to ReactAndroid/src/main/java/com/facebook/react/viewmanagers/InputAccessoryViewManagerDelegate.java index 38f9f246eff..93484383eca 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTInputAccessoryViewManagerDelegate.java +++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/InputAccessoryViewManagerDelegate.java @@ -15,8 +15,8 @@ import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; import com.facebook.react.uimanager.LayoutShadowNode; -public class RCTInputAccessoryViewManagerDelegate & RCTInputAccessoryViewManagerInterface> extends BaseViewManagerDelegate { - public RCTInputAccessoryViewManagerDelegate(U viewManager) { +public class InputAccessoryViewManagerDelegate & InputAccessoryViewManagerInterface> extends BaseViewManagerDelegate { + public InputAccessoryViewManagerDelegate(U viewManager) { super(viewManager); } @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTInputAccessoryViewManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/InputAccessoryViewManagerInterface.java similarity index 85% rename from ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTInputAccessoryViewManagerInterface.java rename to ReactAndroid/src/main/java/com/facebook/react/viewmanagers/InputAccessoryViewManagerInterface.java index 07d5f39534c..2fa4a4d14a3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTInputAccessoryViewManagerInterface.java +++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/InputAccessoryViewManagerInterface.java @@ -12,6 +12,6 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; -public interface RCTInputAccessoryViewManagerInterface { +public interface InputAccessoryViewManagerInterface { void setBackgroundColor(T view, @Nullable Integer value); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTMaskedViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerDelegate.java similarity index 73% rename from ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTMaskedViewManagerDelegate.java rename to ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerDelegate.java index 9fb175d5af6..1b849a5bbdf 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTMaskedViewManagerDelegate.java +++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerDelegate.java @@ -15,8 +15,8 @@ import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; import com.facebook.react.uimanager.LayoutShadowNode; -public class RCTMaskedViewManagerDelegate & RCTMaskedViewManagerInterface> extends BaseViewManagerDelegate { - public RCTMaskedViewManagerDelegate(U viewManager) { +public class MaskedViewManagerDelegate & MaskedViewManagerInterface> extends BaseViewManagerDelegate { + public MaskedViewManagerDelegate(U viewManager) { super(viewManager); } @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTMaskedViewManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerInterface.java similarity index 83% rename from ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTMaskedViewManagerInterface.java rename to ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerInterface.java index 44e8febd19e..0b930ee79c1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTMaskedViewManagerInterface.java +++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerInterface.java @@ -11,6 +11,6 @@ package com.facebook.react.viewmanagers; import android.view.View; -public interface RCTMaskedViewManagerInterface { +public interface MaskedViewManagerInterface { // No props } diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTProgressViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerDelegate.java similarity index 85% rename from ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTProgressViewManagerDelegate.java rename to ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerDelegate.java index f466c2d01a0..4e8b33449e0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTProgressViewManagerDelegate.java +++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerDelegate.java @@ -16,8 +16,8 @@ import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; import com.facebook.react.uimanager.LayoutShadowNode; -public class RCTProgressViewManagerDelegate & RCTProgressViewManagerInterface> extends BaseViewManagerDelegate { - public RCTProgressViewManagerDelegate(U viewManager) { +public class ProgressViewManagerDelegate & ProgressViewManagerInterface> extends BaseViewManagerDelegate { + public ProgressViewManagerDelegate(U viewManager) { super(viewManager); } @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTProgressViewManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerInterface.java similarity index 91% rename from ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTProgressViewManagerInterface.java rename to ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerInterface.java index 250047e92d1..bbfbdf4e31b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTProgressViewManagerInterface.java +++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerInterface.java @@ -13,7 +13,7 @@ import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableMap; -public interface RCTProgressViewManagerInterface { +public interface ProgressViewManagerInterface { void setProgressViewStyle(T view, @Nullable String value); void setProgress(T view, float value); void setProgressTintColor(T view, @Nullable Integer value); diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTSafeAreaViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerDelegate.java similarity index 77% rename from ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTSafeAreaViewManagerDelegate.java rename to ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerDelegate.java index c30912e1a29..91b24353e17 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTSafeAreaViewManagerDelegate.java +++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerDelegate.java @@ -15,8 +15,8 @@ import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; import com.facebook.react.uimanager.LayoutShadowNode; -public class RCTSafeAreaViewManagerDelegate & RCTSafeAreaViewManagerInterface> extends BaseViewManagerDelegate { - public RCTSafeAreaViewManagerDelegate(U viewManager) { +public class SafeAreaViewManagerDelegate & SafeAreaViewManagerInterface> extends BaseViewManagerDelegate { + public SafeAreaViewManagerDelegate(U viewManager) { super(viewManager); } @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTSafeAreaViewManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerInterface.java similarity index 84% rename from ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTSafeAreaViewManagerInterface.java rename to ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerInterface.java index 1018dbfa69c..073e2c01c76 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTSafeAreaViewManagerInterface.java +++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerInterface.java @@ -11,6 +11,6 @@ package com.facebook.react.viewmanagers; import android.view.View; -public interface RCTSafeAreaViewManagerInterface { +public interface SafeAreaViewManagerInterface { void setEmulateUnlessSupported(T view, boolean value); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTSegmentedControlManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerDelegate.java similarity index 84% rename from ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTSegmentedControlManagerDelegate.java rename to ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerDelegate.java index 25e1adc9a17..2618c63e218 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTSegmentedControlManagerDelegate.java +++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerDelegate.java @@ -16,8 +16,8 @@ import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; import com.facebook.react.uimanager.LayoutShadowNode; -public class RCTSegmentedControlManagerDelegate & RCTSegmentedControlManagerInterface> extends BaseViewManagerDelegate { - public RCTSegmentedControlManagerDelegate(U viewManager) { +public class SegmentedControlManagerDelegate & SegmentedControlManagerInterface> extends BaseViewManagerDelegate { + public SegmentedControlManagerDelegate(U viewManager) { super(viewManager); } @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTSegmentedControlManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerInterface.java similarity index 90% rename from ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTSegmentedControlManagerInterface.java rename to ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerInterface.java index f9e4b838f58..e6c50357616 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/RCTSegmentedControlManagerInterface.java +++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerInterface.java @@ -13,7 +13,7 @@ import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; -public interface RCTSegmentedControlManagerInterface { +public interface SegmentedControlManagerInterface { void setValues(T view, @Nullable ReadableArray value); void setSelectedIndex(T view, int value); void setEnabled(T view, boolean value); diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js index f2029611639..6a11f144354 100644 --- a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js +++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js @@ -16,7 +16,12 @@ import type { PropTypeShape, SchemaType, } from '../../CodegenSchema'; -const {getImports, toSafeJavaString} = require('./JavaHelpers'); +const { + getImports, + toSafeJavaString, + getInterfaceJavaClassName, + getDelegateJavaClassName, +} = require('./JavaHelpers'); // File path -> contents type FilesOutput = Map; @@ -254,8 +259,8 @@ module.exports = { return Object.keys(components).forEach(componentName => { const component = components[componentName]; - const className = `${componentName}ManagerDelegate`; - const interfaceClassName = `${componentName}ManagerInterface`; + const className = getDelegateJavaClassName(componentName); + const interfaceClassName = getInterfaceJavaClassName(componentName); const fileName = `${className}.java`; const imports = getDelegateImports(component); diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js index d8e63634a16..7aa9ad6e095 100644 --- a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js +++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js @@ -16,7 +16,11 @@ import type { PropTypeShape, SchemaType, } from '../../CodegenSchema'; -const {getImports, toSafeJavaString} = require('./JavaHelpers'); +const { + getImports, + toSafeJavaString, + getInterfaceJavaClassName, +} = require('./JavaHelpers'); // File path -> contents type FilesOutput = Map; @@ -190,7 +194,7 @@ module.exports = { return Object.keys(components).forEach(componentName => { const component = components[componentName]; - const className = `${componentName}ManagerInterface`; + const className = getInterfaceJavaClassName(componentName); const fileName = `${className}.java`; const imports = getImports(component); diff --git a/packages/react-native-codegen/src/generators/components/JavaHelpers.js b/packages/react-native-codegen/src/generators/components/JavaHelpers.js index 04f89398b37..aca8d2d9681 100644 --- a/packages/react-native-codegen/src/generators/components/JavaHelpers.js +++ b/packages/react-native-codegen/src/generators/components/JavaHelpers.js @@ -16,6 +16,14 @@ function upperCaseFirst(inString: string): string { return inString[0].toUpperCase() + inString.slice(1); } +function getInterfaceJavaClassName(componentName: string): string { + return `${componentName.replace(/^RCT/, '')}ManagerInterface`; +} + +function getDelegateJavaClassName(componentName: string): string { + return `${componentName.replace(/^RCT/, '')}ManagerDelegate`; +} + function toSafeJavaString( input: string, shouldUpperCaseFirst?: boolean, @@ -87,6 +95,8 @@ function getImports(component: ComponentShape): Set { } module.exports = { + getInterfaceJavaClassName, + getDelegateJavaClassName, toSafeJavaString, getImports, };