From d797b7aa4db2b7145bad98b1d0eb1d48bc00fdc5 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Tue, 28 Jan 2025 11:37:53 -0800 Subject: [PATCH] Minor Kotlin cleanup (#49000) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/49000 Just found those nits around while looking at the codebase. This clears things out and should have no runtime impact. Changelog: [Internal] [Changed] - Reviewed By: mdvacca Differential Revision: D68768384 fbshipit-source-id: bd3a30f1792a6f662d1f5b25855c89b6d43e72bb --- .../com/facebook/react/animated/TransformAnimatedNode.kt | 4 ++-- .../facebook/react/bridge/ObjectAlreadyConsumedException.kt | 2 +- .../mounting/mountitems/DestroyUnmountedViewMountItem.kt | 5 +---- .../facebook/react/modules/devloading/DevLoadingModule.kt | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.kt index 5aa66d392a1..8b79c609c13 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.kt @@ -26,7 +26,7 @@ internal class TransformAnimatedNode( transformConfigs = if (transforms == null) emptyList() else - List(transforms.size()) { i -> + List(transforms.size()) { i -> val transformConfigMap = checkNotNull(transforms.getMap(i)) val property = transformConfigMap.getString("property") val type = transformConfigMap.getString("type") @@ -46,7 +46,7 @@ internal class TransformAnimatedNode( fun collectViewUpdates(propsMap: JavaOnlyMap) { val transforms = - List(transformConfigs.size) { i -> + List(transformConfigs.size) { i -> val transformConfig = transformConfigs[i] val transform = if (transformConfig is AnimatedTransformConfig) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.kt index b3bafd533d7..6a70140191a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.kt @@ -16,4 +16,4 @@ import com.facebook.proguard.annotations.DoNotStrip */ @DoNotStrip internal class ObjectAlreadyConsumedException @DoNotStrip constructor(detailMessage: String) : - RuntimeException(detailMessage) {} + RuntimeException(detailMessage) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DestroyUnmountedViewMountItem.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DestroyUnmountedViewMountItem.kt index ce210fe046f..8bf5c5109cc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DestroyUnmountedViewMountItem.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DestroyUnmountedViewMountItem.kt @@ -19,10 +19,7 @@ internal class DestroyUnmountedViewMountItem( ) : MountItem { override fun execute(mountingManager: MountingManager) { - val surfaceMountingManager = mountingManager.getSurfaceManager(_surfaceId) - if (surfaceMountingManager == null) { - return - } + val surfaceMountingManager = mountingManager.getSurfaceManager(_surfaceId) ?: return surfaceMountingManager.deleteView(reactTag) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/devloading/DevLoadingModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/devloading/DevLoadingModule.kt index c4a927767fb..7344fcdad8d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/devloading/DevLoadingModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/devloading/DevLoadingModule.kt @@ -31,11 +31,11 @@ internal class DevLoadingModule(reactContext: ReactApplicationContext) : } override fun showMessage(message: String, color: Double?, backgroundColor: Double?) { - UiThreadUtil.runOnUiThread(Runnable { devLoadingViewManager?.showMessage(message) }) + UiThreadUtil.runOnUiThread { devLoadingViewManager?.showMessage(message) } } override fun hide() { - UiThreadUtil.runOnUiThread(Runnable { devLoadingViewManager?.hide() }) + UiThreadUtil.runOnUiThread { devLoadingViewManager?.hide() } } companion object {