From 1aaa3d95c0af7298c4515aa81555989a2c189300 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Sat, 22 Aug 2020 01:43:55 -0700 Subject: [PATCH] Integrate AndroidProgressBarComponent into RN Tester OSS Android app Summary: This diff integratess AndroidProgressBarComponent into RN Tester OSS android app changeLog: [internal] internal Reviewed By: fkgozali Differential Revision: D23227859 fbshipit-source-id: a916c90486ec4f9664be79608a8a8f907e2634a7 --- .../com/facebook/react/fabric/jni/Android.mk | 3 +- .../java/com/facebook/react/fabric/jni/BUCK | 1 + .../fabric/jni/CoreComponentsRegistry.cpp | 4 +- .../components/progressbar/Android.mk | 38 +++++++++++++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 ReactCommon/react/renderer/components/progressbar/Android.mk diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk index 6ee21a2d022..593a8cf3081 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk @@ -11,7 +11,7 @@ LOCAL_MODULE := fabricjni LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) -LOCAL_SHARED_LIBRARIES := libreactconfig libreact_render_components_slider libreact_render_components_switch libreact_render_components_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core libreact_render_mapbuffer react_render_componentregistry libreact_render_components_view libreact_render_components_unimplementedview libreact_render_components_root libreact_render_components_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_viewmanagers react_render_components_text libreact_render_components_image react_render_components_textinput react_render_components_picker +LOCAL_SHARED_LIBRARIES := libreactconfig libreact_render_components_slider libreact_render_components_progressbar libreact_render_components_switch libreact_render_components_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core libreact_render_mapbuffer react_render_componentregistry libreact_render_components_view libreact_render_components_unimplementedview libreact_render_components_root libreact_render_components_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_viewmanagers react_render_components_text libreact_render_components_image react_render_components_textinput react_render_components_picker LOCAL_STATIC_LIBRARIES := @@ -43,6 +43,7 @@ $(call import-module,react/renderer/components/image) $(call import-module,react/renderer/components/modal) $(call import-module,react/renderer/components/root) $(call import-module,react/renderer/components/picker) +$(call import-module,react/renderer/components/progressbar) $(call import-module,react/renderer/components/scrollview) $(call import-module,react/renderer/components/slider) $(call import-module,react/renderer/components/switch) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK index 92380fa7168..0d6dd21aaaa 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK @@ -50,6 +50,7 @@ rn_xplat_cxx_library( react_native_xplat_target("react/renderer/components/picker:androidpicker"), react_native_xplat_target("react/renderer/components/slider:slider"), react_native_xplat_target("react/renderer/components/switch:androidswitch"), + react_native_xplat_target("react/renderer/components/progressbar:androidprogressbar"), react_native_xplat_target("react/renderer/components/text:text"), react_native_xplat_target("react/renderer/components/textinput:androidtextinput"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp index fa4802913b8..560b8eaaa70 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -39,6 +40,8 @@ CoreComponentsRegistry::sharedProviderRegistry() { auto providerRegistry = std::make_shared(); + providerRegistry->add(concreteComponentDescriptorProvider< + AndroidProgressBarComponentDescriptor>()); providerRegistry->add(concreteComponentDescriptorProvider< AndroidSwipeRefreshLayoutComponentDescriptor>()); providerRegistry->add(concreteComponentDescriptorProvider< @@ -90,7 +93,6 @@ CoreComponentsRegistry::initHybrid( auto registry = CoreComponentsRegistry::sharedProviderRegistry() ->createComponentDescriptorRegistry( {eventDispatcher, contextContainer}); - auto mutableRegistry = std::const_pointer_cast(registry); mutableRegistry->setFallbackComponentDescriptor( diff --git a/ReactCommon/react/renderer/components/progressbar/Android.mk b/ReactCommon/react/renderer/components/progressbar/Android.mk new file mode 100644 index 00000000000..f17cb34c809 --- /dev/null +++ b/ReactCommon/react/renderer/components/progressbar/Android.mk @@ -0,0 +1,38 @@ +# 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. + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := react_render_components_progressbar + +LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/android/react/renderer/components/progressbar/*.cpp) + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/android/ +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/android/ + +LOCAL_CFLAGS := \ + -DLOG_TAG=\"Fabric\" + +LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall + +LOCAL_STATIC_LIBRARIES := + +LOCAL_SHARED_LIBRARIES := libfbjni libreact_render_viewmanagers libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view + +include $(BUILD_SHARED_LIBRARY) + +$(call import-module,fbjni) +$(call import-module,folly) +$(call import-module,fbgloginit) +$(call import-module,glog) +$(call import-module,react/renderer/componentregistry) +$(call import-module,react/renderer/core) +$(call import-module,react/renderer/debug) +$(call import-module,react/renderer/graphics) +$(call import-module,react/renderer/components/view) +$(call import-module,react/renderer/uimanager) +$(call import-module,yogajni)