From 1aabaecde0495fb089f2b54a572fd37465609d5b Mon Sep 17 00:00:00 2001 From: Fabrizio Cucci Date: Thu, 4 Apr 2024 00:23:49 -0700 Subject: [PATCH] Kotlinify ReactHorizontalScrollContainerViewManager (#43795) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/43795 Changelog: [Internal] As part of the Sustainability Week (see [post](https://fb.workplace.com/groups/251759413609061/permalink/742797531171911/)). Reviewed By: alanleedev Differential Revision: D55654460 fbshipit-source-id: 9a498619d6a7e6c3691dcddf1ec455974b8d8e1f --- .../ReactAndroid/api/ReactAndroid.api | 6 +++- ...tHorizontalScrollContainerViewManager.java | 34 ------------------- ...actHorizontalScrollContainerViewManager.kt | 28 +++++++++++++++ 3 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java create mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 29ee2a65aa0..a4187ac3c3c 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -6334,7 +6334,8 @@ public class com/facebook/react/views/scroll/ReactHorizontalScrollContainerView public fun setRemoveClippedSubviews (Z)V } -public class com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager : com/facebook/react/views/view/ReactClippingViewManager { +public final class com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager : com/facebook/react/views/view/ReactClippingViewManager { + public static final field Companion Lcom/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager$Companion; public static final field REACT_CLASS Ljava/lang/String; public fun ()V public synthetic fun createViewInstance (Lcom/facebook/react/uimanager/ThemedReactContext;)Landroid/view/View; @@ -6349,6 +6350,9 @@ public class com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewM public fun setProperty (Lcom/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager;Lcom/facebook/react/views/scroll/ReactHorizontalScrollContainerView;Ljava/lang/String;Ljava/lang/Object;)V } +public final class com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager$Companion { +} + public class com/facebook/react/views/scroll/ReactHorizontalScrollView : android/widget/HorizontalScrollView, android/view/View$OnLayoutChangeListener, android/view/ViewGroup$OnHierarchyChangeListener, com/facebook/react/uimanager/ReactClippingViewGroup, com/facebook/react/uimanager/ReactOverflowViewWithInset, com/facebook/react/views/scroll/ReactScrollViewHelper$HasFlingAnimator, com/facebook/react/views/scroll/ReactScrollViewHelper$HasScrollEventThrottle, com/facebook/react/views/scroll/ReactScrollViewHelper$HasScrollState, com/facebook/react/views/scroll/ReactScrollViewHelper$HasSmoothScroll, com/facebook/react/views/scroll/ReactScrollViewHelper$HasStateWrapper { public fun (Landroid/content/Context;)V public fun (Landroid/content/Context;Lcom/facebook/react/views/scroll/FpsListener;)V diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java deleted file mode 100644 index c8c1d73c439..00000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * 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.views.scroll; - -import com.facebook.infer.annotation.Nullsafe; -import com.facebook.react.module.annotations.ReactModule; -import com.facebook.react.uimanager.ThemedReactContext; -import com.facebook.react.views.view.ReactClippingViewManager; - -/** View manager for {@link ReactHorizontalScrollContainerView} components. */ -@Nullsafe(Nullsafe.Mode.LOCAL) -@ReactModule(name = ReactHorizontalScrollContainerViewManager.REACT_CLASS) -public class ReactHorizontalScrollContainerViewManager - extends ReactClippingViewManager { - - public static final String REACT_CLASS = "AndroidHorizontalScrollContentView"; - - public ReactHorizontalScrollContainerViewManager() {} - - @Override - public String getName() { - return REACT_CLASS; - } - - @Override - public ReactHorizontalScrollContainerView createViewInstance(ThemedReactContext context) { - return new ReactHorizontalScrollContainerView(context); - } -} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt new file mode 100644 index 00000000000..bbe48afd4b5 --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt @@ -0,0 +1,28 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * 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.views.scroll + +import com.facebook.react.module.annotations.ReactModule +import com.facebook.react.uimanager.ThemedReactContext +import com.facebook.react.views.view.ReactClippingViewManager + +/** View manager for {@link ReactHorizontalScrollContainerView} components. */ +@ReactModule(name = ReactHorizontalScrollContainerViewManager.REACT_CLASS) +public class ReactHorizontalScrollContainerViewManager : + ReactClippingViewManager() { + + override public fun getName(): String = REACT_CLASS + + override public fun createViewInstance( + context: ThemedReactContext + ): ReactHorizontalScrollContainerView = ReactHorizontalScrollContainerView(context) + + public companion object { + public const val REACT_CLASS: String = "AndroidHorizontalScrollContentView" + } +}