diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java index ef9c9956e..a9bda645c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java @@ -13,7 +13,6 @@ import java.util.Arrays; import java.util.HashSet; import com.facebook.csslayout.Spacing; -import com.facebook.react.common.SetBuilder; /** * Keys for props that need to be shared across multiple classes. diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java index 607f240bd..c70ed1735 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java @@ -12,6 +12,7 @@ package com.facebook.react.views.art; import com.facebook.csslayout.CSSMeasureMode; import com.facebook.csslayout.CSSNodeAPI; import com.facebook.csslayout.MeasureOutput; +import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.ThemedReactContext; @@ -19,10 +20,11 @@ import com.facebook.react.uimanager.ThemedReactContext; * ViewManager for ARTSurfaceView React views. Renders as a {@link ARTSurfaceView} and handles * invalidating the native view on shadow view updates happening in the underlying tree. */ +@ReactModule(name = ARTSurfaceViewManager.REACT_CLASS) public class ARTSurfaceViewManager extends BaseViewManager { - private static final String REACT_CLASS = "ARTSurfaceView"; + protected static final String REACT_CLASS = "ARTSurfaceView"; private static final CSSNodeAPI.MeasureFunction MEASURE_FUNCTION = new CSSNodeAPI.MeasureFunction() { @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/art/BUCK index dff98f832..80a26288b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/art/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/BUCK @@ -9,8 +9,9 @@ android_library( react_native_dep('third-party/java/jsr-305:jsr-305'), react_native_target('java/com/facebook/react/bridge:bridge'), react_native_target('java/com/facebook/react/common:common'), - react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), + react_native_target('java/com/facebook/react/module/annotations:annotations'), react_native_target('java/com/facebook/react/uimanager:uimanager'), + react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), ], visibility = [ 'PUBLIC', diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK index 8797a578d..df5cef585 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK @@ -10,8 +10,9 @@ android_library( react_native_dep('third-party/java/jsr-305:jsr-305'), react_native_target('java/com/facebook/react/bridge:bridge'), react_native_target('java/com/facebook/react/common:common'), - react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), + react_native_target('java/com/facebook/react/module/annotations:annotations'), react_native_target('java/com/facebook/react/uimanager:uimanager'), + react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), react_native_target('java/com/facebook/react/views/scroll:scroll'), ], visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java index 0014b9526..e61d1266e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java @@ -11,7 +11,6 @@ package com.facebook.react.views.drawer; import javax.annotation.Nullable; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Map; @@ -21,11 +20,11 @@ import android.view.Gravity; import android.view.View; import com.facebook.common.logging.FLog; - import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.common.MapBuilder; import com.facebook.react.common.ReactConstants; +import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.UIManagerModule; @@ -40,9 +39,10 @@ import com.facebook.react.views.drawer.events.DrawerStateChangedEvent; /** * View Manager for {@link ReactDrawerLayout} components. */ +@ReactModule(name = ReactDrawerLayoutManager.REACT_CLASS) public class ReactDrawerLayoutManager extends ViewGroupManager { - private static final String REACT_CLASS = "AndroidDrawerLayout"; + protected static final String REACT_CLASS = "AndroidDrawerLayout"; public static final int OPEN_DRAWER = 1; public static final int CLOSE_DRAWER = 2; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK index ae79c0d34..2d9693cd5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK @@ -8,8 +8,8 @@ android_library( name = 'imageevents', srcs = IMAGE_EVENT_FILES, deps = [ - react_native_dep('third-party/android/support-annotations:android-support-annotations'), react_native_dep('third-party/android/support/v4:lib-support-v4'), + react_native_dep('third-party/android/support-annotations:android-support-annotations'), react_native_dep('third-party/java/jsr-305:jsr-305'), react_native_target('java/com/facebook/react/bridge:bridge'), react_native_target('java/com/facebook/react/uimanager:uimanager'), @@ -29,14 +29,15 @@ android_library( react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'), react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'), react_native_dep('libraries/fresco/fresco-react-native:imagepipeline'), - react_native_dep('third-party/android/support-annotations:android-support-annotations'), react_native_dep('third-party/android/support/v4:lib-support-v4'), + react_native_dep('third-party/android/support-annotations:android-support-annotations'), react_native_dep('third-party/java/infer-annotations:infer-annotations'), react_native_dep('third-party/java/jsr-305:jsr-305'), react_native_target('java/com/facebook/react/bridge:bridge'), react_native_target('java/com/facebook/react/common:common'), - react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), + react_native_target('java/com/facebook/react/module/annotations:annotations'), react_native_target('java/com/facebook/react/uimanager:uimanager'), + react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), react_native_target('java/com/facebook/react/views/imagehelper:withmultisource'), ], visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java index 59e7617c9..3acc27778 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java @@ -22,6 +22,7 @@ import com.facebook.drawee.controller.AbstractDraweeControllerBuilder; import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.common.MapBuilder; +import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.SimpleViewManager; import com.facebook.react.uimanager.ThemedReactContext; @@ -29,9 +30,10 @@ import com.facebook.react.uimanager.ViewProps; import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.annotations.ReactPropGroup; +@ReactModule(name = ReactImageManager.REACT_CLASS) public class ReactImageManager extends SimpleViewManager { - public static final String REACT_CLASS = "RCTImageView"; + protected static final String REACT_CLASS = "RCTImageView"; @Override public String getName() { diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK index 0a3c4c98e..9b77f8d17 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK @@ -9,9 +9,10 @@ android_library( react_native_dep('third-party/java/jsr-305:jsr-305'), react_native_target('java/com/facebook/react/bridge:bridge'), react_native_target('java/com/facebook/react/common:common'), + react_native_target('java/com/facebook/react/module/annotations:annotations'), react_native_target('java/com/facebook/react/touch:touch'), - react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), react_native_target('java/com/facebook/react/uimanager:uimanager'), + react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), react_native_target('java/com/facebook/react/views/view:view'), react_native_target('res:modal'), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java index a505f80c5..220284ef3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java @@ -14,6 +14,7 @@ import java.util.Map; import android.content.DialogInterface; import com.facebook.react.common.MapBuilder; +import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.LayoutShadowNode; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.UIManagerModule; @@ -24,9 +25,10 @@ import com.facebook.react.uimanager.events.EventDispatcher; /** * View manager for {@link ReactModalHostView} components. */ +@ReactModule(name = ReactModalHostManager.REACT_CLASS) public class ReactModalHostManager extends ViewGroupManager { - private static final String REACT_CLASS = "RCTModalHostView"; + protected static final String REACT_CLASS = "RCTModalHostView"; @Override public String getName() { diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK index 24ab25dbb..179f13805 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK @@ -4,12 +4,13 @@ android_library( name = 'picker', srcs = glob(['**/*.java']), deps = [ + react_native_dep('third-party/java/infer-annotations:infer-annotations'), + react_native_dep('third-party/java/jsr-305:jsr-305'), react_native_target('java/com/facebook/react/bridge:bridge'), react_native_target('java/com/facebook/react/common:common'), + react_native_target('java/com/facebook/react/module/annotations:annotations'), react_native_target('java/com/facebook/react/uimanager:uimanager'), react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), - react_native_dep('third-party/java/jsr-305:jsr-305'), - react_native_dep('third-party/java/infer-annotations:infer-annotations'), ], visibility = [ 'PUBLIC', diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java index c86709467..cf3597d4d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java @@ -11,14 +11,16 @@ package com.facebook.react.views.picker; import android.widget.Spinner; +import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.ThemedReactContext; /** * {@link ReactPickerManager} for {@link ReactPicker} with {@link Spinner#MODE_DIALOG}. */ +@ReactModule(name = ReactDialogPickerManager.REACT_CLASS) public class ReactDialogPickerManager extends ReactPickerManager { - private static final String REACT_CLASS = "AndroidDialogPicker"; + protected static final String REACT_CLASS = "AndroidDialogPicker"; @Override public String getName() { diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java index c8be56002..ba92aa69e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java @@ -11,14 +11,16 @@ package com.facebook.react.views.picker; import android.widget.Spinner; +import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.ThemedReactContext; /** * {@link ReactPickerManager} for {@link ReactPicker} with {@link Spinner#MODE_DROPDOWN}. */ +@ReactModule(name = ReactDropdownPickerManager.REACT_CLASS) public class ReactDropdownPickerManager extends ReactPickerManager { - private static final String REACT_CLASS = "AndroidDropdownPicker"; + protected static final String REACT_CLASS = "AndroidDropdownPicker"; @Override public String getName() { diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK index 6888ecf5f..ba497182c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK @@ -9,8 +9,9 @@ android_library( react_native_dep('third-party/java/jsr-305:jsr-305'), react_native_target('java/com/facebook/react/bridge:bridge'), react_native_target('java/com/facebook/react/common:common'), - react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), + react_native_target('java/com/facebook/react/module/annotations:annotations'), react_native_target('java/com/facebook/react/uimanager:uimanager'), + react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), ], visibility = [ 'PUBLIC', diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java index 969626489..22610aaa0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java @@ -15,6 +15,7 @@ import android.content.Context; import android.widget.ProgressBar; import com.facebook.react.bridge.JSApplicationIllegalArgumentException; +import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.ThemedReactContext; @@ -26,15 +27,17 @@ import com.facebook.react.uimanager.ViewProps; * ProgressBar changes, we have to drop the existing ProgressBar (if there is one) and create a new * one with the style given. */ +@ReactModule(name = ReactProgressBarViewManager.REACT_CLASS) public class ReactProgressBarViewManager extends BaseViewManager { + protected static final String REACT_CLASS = "AndroidProgressBar"; + /* package */ static final String PROP_STYLE = "styleAttr"; /* package */ static final String PROP_INDETERMINATE = "indeterminate"; /* package */ static final String PROP_PROGRESS = "progress"; /* package */ static final String PROP_ANIMATING = "animating"; - /* package */ static final String REACT_CLASS = "AndroidProgressBar"; /* package */ static final String DEFAULT_STYLE = "Normal"; private static Object sProgressBarCtorLock = new Object(); @@ -127,5 +130,4 @@ public class ReactProgressBarViewManager extends throw new JSApplicationIllegalArgumentException("Unknown ProgressBar style: " + styleStr); } } - } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK index 22caa2763..4628dfc83 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK @@ -4,15 +4,16 @@ android_library( name = 'scroll', srcs = glob(['*.java']), deps = [ + react_native_dep('third-party/android/support/v4:lib-support-v4'), + react_native_dep('third-party/java/infer-annotations:infer-annotations'), + react_native_dep('third-party/java/jsr-305:jsr-305'), react_native_target('java/com/facebook/react/bridge:bridge'), react_native_target('java/com/facebook/react/common:common'), - react_native_target('java/com/facebook/react/views/view:view'), + react_native_target('java/com/facebook/react/module/annotations:annotations'), react_native_target('java/com/facebook/react/touch:touch'), react_native_target('java/com/facebook/react/uimanager:uimanager'), react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), - react_native_dep('third-party/java/infer-annotations:infer-annotations'), - react_native_dep('third-party/java/jsr-305:jsr-305'), - react_native_dep('third-party/android/support/v4:lib-support-v4'), + react_native_target('java/com/facebook/react/views/view:view'), ], visibility = [ 'PUBLIC', diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java index dc784f0e0..2865a94c5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java @@ -14,6 +14,7 @@ import javax.annotation.Nullable; import android.graphics.Color; import com.facebook.react.bridge.ReadableArray; +import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.ViewGroupManager; @@ -25,11 +26,13 @@ import com.facebook.react.uimanager.ReactClippingViewGroupHelper; *

Note that {@link ReactScrollView} and {@link ReactHorizontalScrollView} are exposed to JS * as a single ScrollView component, configured via the {@code horizontal} boolean property. */ +@ReactModule(name = ReactHorizontalScrollViewManager.REACT_CLASS) public class ReactHorizontalScrollViewManager extends ViewGroupManager implements ReactScrollViewCommandHelper.ScrollCommandHandler { - private static final String REACT_CLASS = "AndroidHorizontalScrollView"; + protected static final String REACT_CLASS = "AndroidHorizontalScrollView"; + private @Nullable FpsListener mFpsListener = null; public ReactHorizontalScrollViewManager() { diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java index 4fe6676f2..ba9173bcc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java @@ -17,6 +17,7 @@ import android.graphics.Color; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.common.MapBuilder; +import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.ViewGroupManager; @@ -28,11 +29,13 @@ import com.facebook.react.uimanager.ReactClippingViewGroupHelper; *

Note that {@link ReactScrollView} and {@link ReactHorizontalScrollView} are exposed to JS * as a single ScrollView component, configured via the {@code horizontal} boolean property. */ +@ReactModule(name = ReactScrollViewManager.REACT_CLASS) public class ReactScrollViewManager extends ViewGroupManager implements ReactScrollViewCommandHelper.ScrollCommandHandler { - private static final String REACT_CLASS = "RCTScrollView"; + protected static final String REACT_CLASS = "RCTScrollView"; + private @Nullable FpsListener mFpsListener = null; public ReactScrollViewManager() { diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK index 214d47a55..beb8aa615 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK @@ -4,13 +4,14 @@ android_library( name = 'swiperefresh', srcs = glob(['*.java']), deps = [ + react_native_dep('third-party/android/support/v4:lib-support-v4'), + react_native_dep('third-party/java/jsr-305:jsr-305'), react_native_target('java/com/facebook/react/bridge:bridge'), react_native_target('java/com/facebook/react/common:common'), + react_native_target('java/com/facebook/react/module/annotations:annotations'), react_native_target('java/com/facebook/react/uimanager:uimanager'), react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), react_native_target('java/com/facebook/react/views/scroll:scroll'), - react_native_dep('third-party/android/support/v4:lib-support-v4'), - react_native_dep('third-party/java/jsr-305:jsr-305'), ], visibility = [ 'PUBLIC', diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java index c3ff029b5..99b62b4a9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java @@ -19,18 +19,24 @@ import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.common.MapBuilder; +import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.UIManagerModule; import com.facebook.react.uimanager.ViewGroupManager; import com.facebook.react.uimanager.ViewProps; import com.facebook.react.uimanager.annotations.ReactProp; +import static com.facebook.react.views.swiperefresh.SwipeRefreshLayoutManager.REACT_CLASS; + /** * ViewManager for {@link ReactSwipeRefreshLayout} which allows the user to "pull to refresh" a * child view. Emits an {@code onRefresh} event when this happens. */ +@ReactModule(name = REACT_CLASS) public class SwipeRefreshLayoutManager extends ViewGroupManager { + protected static final String REACT_CLASS = "AndroidSwipeRefreshLayout"; + @Override protected ReactSwipeRefreshLayout createViewInstance(ThemedReactContext reactContext) { return new ReactSwipeRefreshLayout(reactContext); @@ -38,7 +44,7 @@ public class SwipeRefreshLayoutManager extends ViewGroupManager { - static final String REACT_CLASS = "RCTTextInlineImage"; + protected static final String REACT_CLASS = "RCTTextInlineImage"; private final @Nullable AbstractDraweeControllerBuilder mDraweeControllerBuilder; private final @Nullable Object mCallerContext; @@ -69,5 +71,4 @@ public class FrescoBasedReactTextInlineImageViewManager @Override public void updateExtraData(View root, Object extraData) { } - } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK index 056b5be1d..63c532ced 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK @@ -9,9 +9,10 @@ android_library( react_native_dep('third-party/java/jsr-305:jsr-305'), react_native_target('java/com/facebook/react/bridge:bridge'), react_native_target('java/com/facebook/react/common:common'), + react_native_target('java/com/facebook/react/module/annotations:annotations'), react_native_target('java/com/facebook/react/modules/core:core'), - react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), react_native_target('java/com/facebook/react/uimanager:uimanager'), + react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), react_native_target('java/com/facebook/react/views/imagehelper:imagehelper'), react_native_target('java/com/facebook/react/views/text:text'), react_native_target('java/com/facebook/react/views/view:view'), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java index b46bf81e7..2a2cf446c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java @@ -36,6 +36,7 @@ import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.common.MapBuilder; +import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.LayoutShadowNode; import com.facebook.react.uimanager.PixelUtil; @@ -55,9 +56,10 @@ import com.facebook.react.views.text.TextInlineImageSpan; /** * Manages instances of TextInput. */ +@ReactModule(name = ReactTextInputManager.REACT_CLASS) public class ReactTextInputManager extends BaseViewManager { - /* package */ static final String REACT_CLASS = "AndroidTextInput"; + protected static final String REACT_CLASS = "AndroidTextInput"; private static final int[] SPACING_TYPES = { Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM, @@ -778,8 +780,7 @@ public class ReactTextInputManager extends BaseViewManager { - private static final String REACT_CLASS = "AndroidViewPager"; + protected static final String REACT_CLASS = "AndroidViewPager"; public static final int COMMAND_SET_PAGE = 1; public static final int COMMAND_SET_PAGE_WITHOUT_ANIMATION = 2; @@ -43,7 +45,6 @@ public class ReactViewPagerManager extends ViewGroupManager { return new ReactViewPager(reactContext); } - @ReactProp(name = "scrollEnabled", defaultBoolean = true) public void setScrollEnabled(ReactViewPager viewPager, boolean value) { viewPager.setScrollEnabled(value); @@ -59,8 +60,7 @@ public class ReactViewPagerManager extends ViewGroupManager { return MapBuilder.of( PageScrollEvent.EVENT_NAME, MapBuilder.of("registrationName", "onPageScroll"), PageScrollStateChangedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onPageScrollStateChanged"), - PageSelectedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onPageSelected") - ); + PageSelectedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onPageSelected")); } @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/webview/BUCK index 7a9875b62..64712dff7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/BUCK @@ -5,11 +5,12 @@ android_library( srcs = glob(['**/*.java']), deps = [ react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'), + react_native_dep('third-party/java/jsr-305:jsr-305'), react_native_target('java/com/facebook/react/bridge:bridge'), + react_native_target('java/com/facebook/react/common:common'), + react_native_target('java/com/facebook/react/module/annotations:annotations'), react_native_target('java/com/facebook/react/uimanager:uimanager'), react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), - react_native_target('java/com/facebook/react/common:common'), - react_native_dep('third-party/java/jsr-305:jsr-305'), ], visibility = [ 'PUBLIC', diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java index 735f23d33..5584d2d5d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java @@ -40,6 +40,7 @@ import com.facebook.react.bridge.ReadableMapKeySetIterator; import com.facebook.react.bridge.WritableMap; import com.facebook.react.common.MapBuilder; import com.facebook.react.common.build.ReactBuildConfig; +import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.SimpleViewManager; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.UIManagerModule; @@ -76,9 +77,10 @@ import org.json.JSONException; * - canGoBack - boolean, whether there is anything on a history stack to go back * - canGoForward - boolean, whether it is possible to request GO_FORWARD command */ +@ReactModule(name = ReactWebViewManager.REACT_CLASS) public class ReactWebViewManager extends SimpleViewManager { - private static final String REACT_CLASS = "RCTWebView"; + protected static final String REACT_CLASS = "RCTWebView"; private static final String HTML_ENCODING = "UTF-8"; private static final String HTML_MIME_TYPE = "text/html; charset=utf-8";