diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.kt index 4eaad3421a0c5f..80bbf61cc34ba5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.kt @@ -10,4 +10,4 @@ package com.facebook.react @Deprecated( message = "Use BaseReactPackage instead", replaceWith = ReplaceWith(expression = "BaseReactPackage")) -public abstract class TurboReactPackage : BaseReactPackage() {} +public abstract class TurboReactPackage : BaseReactPackage() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/InteropLegacyArchitecture.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/InteropLegacyArchitecture.kt index 93ec88717b31b9..687a939e9ab1dc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/InteropLegacyArchitecture.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/InteropLegacyArchitecture.kt @@ -13,4 +13,4 @@ package com.facebook.react.common.annotations.internal */ @Retention(AnnotationRetention.SOURCE) @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) -public annotation class InteropLegacyArchitecture() +public annotation class InteropLegacyArchitecture diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.kt index c89d7690a363f9..c3daf7efd64fb8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.kt @@ -18,7 +18,7 @@ import com.facebook.react.uimanager.events.BatchEventDispatchedListener */ @DoNotStrip @SuppressLint("MissingNativeLoadLibrary") -internal final class EventBeatManager() : HybridClassBase(), BatchEventDispatchedListener { +internal class EventBeatManager : HybridClassBase(), BatchEventDispatchedListener { init { initHybrid() } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.kt index bfaa89f76a8171..984bc8aaa702de 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.kt @@ -8,8 +8,6 @@ package com.facebook.react.modules.dialog import android.content.DialogInterface -import android.content.DialogInterface.OnClickListener -import android.content.DialogInterface.OnDismissListener import android.os.Bundle import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentManager diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.kt index 6900e16e30c5b0..29d704712ddf70 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.kt @@ -31,19 +31,19 @@ internal class ToastModule(reactContext: ReactApplicationContext) : override fun show(message: String?, durationDouble: Double) { val duration = durationDouble.toInt() - UiThreadUtil.runOnUiThread( - Runnable { Toast.makeText(getReactApplicationContext(), message, duration).show() }) + UiThreadUtil.runOnUiThread { + Toast.makeText(getReactApplicationContext(), message, duration).show() + } } override fun showWithGravity(message: String?, durationDouble: Double, gravityDouble: Double) { val duration = durationDouble.toInt() val gravity = gravityDouble.toInt() - UiThreadUtil.runOnUiThread( - Runnable { - val toast = Toast.makeText(getReactApplicationContext(), message, duration) - toast.setGravity(gravity, 0, 0) - toast.show() - }) + UiThreadUtil.runOnUiThread { + val toast = Toast.makeText(getReactApplicationContext(), message, duration) + toast.setGravity(gravity, 0, 0) + toast.show() + } } override fun showWithGravityAndOffset( @@ -57,12 +57,11 @@ internal class ToastModule(reactContext: ReactApplicationContext) : val gravity = gravityDouble.toInt() val xOffset = xOffsetDouble.toInt() val yOffset = yOffsetDouble.toInt() - UiThreadUtil.runOnUiThread( - Runnable { - val toast = Toast.makeText(getReactApplicationContext(), message, duration) - toast.setGravity(gravity, xOffset, yOffset) - toast.show() - }) + UiThreadUtil.runOnUiThread { + val toast = Toast.makeText(getReactApplicationContext(), message, duration) + toast.setGravity(gravity, xOffset, yOffset) + toast.show() + } } companion object { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt index da8ec612e678b1..66bf62b38e8714 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt @@ -125,14 +125,14 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) public override val runtimeExecutor: RuntimeExecutor? get() = reactHost.getRuntimeExecutor() - public override val runtimeScheduler: RuntimeScheduler? + public override val runtimeScheduler: RuntimeScheduler get() = throw UnsupportedOperationException("Unimplemented method 'getRuntimeScheduler'") public override fun extendNativeModules(modules: NativeModuleRegistry) { throw UnsupportedOperationException("Unimplemented method 'extendNativeModules'") } - public override val sourceURL: String? + public override val sourceURL: String get() = throw UnsupportedOperationException("Unimplemented method 'getSourceURL'") override fun addBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt index 444a96cc4f2a2f..61de1a62cc1bfd 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt @@ -136,7 +136,7 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R override fun hasNativeModule(nativeModuleInterface: Class): Boolean = reactHost.hasNativeModule(nativeModuleInterface) - override fun getNativeModules(): MutableCollection? = reactHost.nativeModules + override fun getNativeModules(): MutableCollection = reactHost.nativeModules override fun getNativeModule(nativeModuleInterface: Class): T? = reactHost.getNativeModule(nativeModuleInterface) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt index cccc6076bd6d24..861a25cda01cf7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt @@ -211,27 +211,27 @@ internal class ReactInstance( // 2. genericBubblingEventTypes. // 3. genericDirectEventTypes. // We want to match this beahavior. - DefaultEventTypesProvider { - Arguments.makeNativeMap(UIManagerModuleConstantsHelper.getDefaultExportableEventTypes()) - }, + { + Arguments.makeNativeMap(UIManagerModuleConstantsHelper.getDefaultExportableEventTypes()) + }, ConstantsForViewManagerProvider { viewManagerName: String -> val viewManager = viewManagerResolver.getViewManager(viewManagerName) ?: return@ConstantsForViewManagerProvider null getConstantsForViewManager(viewManager, customDirectEvents) }, - ConstantsProvider { - val viewManagers: List> = - ArrayList(viewManagerResolver.eagerViewManagerMap.values) - val constants = createConstants(viewManagers, customDirectEvents) - - val lazyViewManagers = viewManagerResolver.lazyViewManagerNames - if (!lazyViewManagers.isEmpty()) { - constants["ViewManagerNames"] = ArrayList(lazyViewManagers) - constants["LazyViewManagersEnabled"] = true - } - Arguments.makeNativeMap(constants) - }) + { + val viewManagers: List> = + ArrayList(viewManagerResolver.eagerViewManagerMap.values) + val constants = createConstants(viewManagers, customDirectEvents) + + val lazyViewManagers = viewManagerResolver.lazyViewManagerNames + if (!lazyViewManagers.isEmpty()) { + constants["ViewManagerNames"] = ArrayList(lazyViewManagers) + constants["LazyViewManagersEnabled"] = true + } + Arguments.makeNativeMap(constants) + }) } val eventBeatManager = EventBeatManager() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/ExecutorException.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/ExecutorException.kt index 9748991897414e..8863d2a95bb9e8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/ExecutorException.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/ExecutorException.kt @@ -12,4 +12,4 @@ package com.facebook.react.runtime.internal.bolts * the continuation block it self. */ internal class ExecutorException(e: Exception?) : - RuntimeException("An exception was thrown by an Executor", e) {} + RuntimeException("An exception was thrown by an Executor", e) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/CallInvokerHolderImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/CallInvokerHolderImpl.kt index 26788ca2446997..5f468b190bea87 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/CallInvokerHolderImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/CallInvokerHolderImpl.kt @@ -17,4 +17,4 @@ import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder * pass it from CatalystInstance, through Java, to TurboModuleManager::initHybrid. */ @FrameworkAPI -public class CallInvokerHolderImpl private constructor() : HybridClassBase(), CallInvokerHolder {} +public class CallInvokerHolderImpl private constructor() : HybridClassBase(), CallInvokerHolder diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl.kt index c8c29e2fef9202..5d6115f2dbe367 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl.kt @@ -19,4 +19,4 @@ import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHol */ @FrameworkAPI public class NativeMethodCallInvokerHolderImpl private constructor() : - HybridClassBase(), NativeMethodCallInvokerHolder {} + HybridClassBase(), NativeMethodCallInvokerHolder diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.kt index 52a8a4c3cfd88d..1c9f6c8c531e34 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.kt @@ -57,7 +57,7 @@ public class ReactStylesDiffMap(props: ReadableMap) { public fun getMap(name: String): ReadableMap? = backingMap.getMap(name) - public fun getDynamic(name: String): Dynamic? = backingMap.getDynamic(name) + public fun getDynamic(name: String): Dynamic = backingMap.getDynamic(name) override fun toString(): String = "{ ${javaClass.simpleName}: $backingMap }" } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.kt index 1bbb081a506dbb..fcdedc864ad785 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.kt @@ -10,7 +10,6 @@ package com.facebook.react.uimanager import android.view.accessibility.AccessibilityEvent import android.widget.ImageView import com.facebook.react.uimanager.events.TouchEventType -import com.facebook.react.uimanager.events.TouchEventType.Companion.getJSEventName /** Constants exposed to JS from [UIManagerModule]. */ internal object UIManagerModuleConstants { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.kt index 9178091fad08c0..f8dd8339ee5437 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.kt @@ -76,12 +76,11 @@ public class ViewGroupDrawingOrderHelper(private val viewGroup: ViewGroup) { } // Sort the views by zIndex - viewsToSort.sortWith( - Comparator { view1, view2 -> - val view1ZIndex = ViewGroupManager.getViewZIndex(view1) ?: 0 - val view2ZIndex = ViewGroupManager.getViewZIndex(view2) ?: 0 - view1ZIndex - view2ZIndex - }) + viewsToSort.sortWith { view1, view2 -> + val view1ZIndex = ViewGroupManager.getViewZIndex(view1) ?: 0 + val view2ZIndex = ViewGroupManager.getViewZIndex(view2) ?: 0 + view1ZIndex - view2ZIndex + } currentDrawingOrderIndices = IntArray(childCount) for (i in 0 until childCount) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerWithGeneratedInterface.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerWithGeneratedInterface.kt index c6bd71173a7f6e..80b49fcf664c14 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerWithGeneratedInterface.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerWithGeneratedInterface.kt @@ -8,4 +8,4 @@ package com.facebook.react.uimanager /** Marker interface to be extended by all code-generated ViewManagerInterface. */ -public interface ViewManagerWithGeneratedInterface {} +public interface ViewManagerWithGeneratedInterface diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.kt index 60b2809ce59548..f5a95dc55c01c9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.kt @@ -221,7 +221,7 @@ internal class FabricEventDispatcher( if (reactContext.isOnUiQueueThread()) { maybeDispatchBatchedEvents() } else { - reactContext.runOnUiQueueThread(Runnable { maybeDispatchBatchedEvents() }) + reactContext.runOnUiQueueThread { maybeDispatchBatchedEvents() } } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.kt index 26d038d4f323c2..ec3cc33989796f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.kt @@ -29,7 +29,7 @@ internal class DrawerStateChangedEvent : Event { override fun getEventName(): String = EVENT_NAME - protected override fun getEventData(): WritableMap? { + protected override fun getEventData(): WritableMap { val eventData: WritableMap = Arguments.createMap() eventData.putInt("drawerState", getDrawerState()) return eventData diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt index 77ce8a03a16799..33aeb0ddc994a2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt @@ -10,4 +10,4 @@ package com.facebook.react.views.safeareaview import com.facebook.react.common.annotations.internal.LegacyArchitecture import com.facebook.react.uimanager.LayoutShadowNode -@LegacyArchitecture internal class ReactSafeAreaViewShadowNode : LayoutShadowNode() {} +@LegacyArchitecture internal class ReactSafeAreaViewShadowNode : LayoutShadowNode() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt index 9714d323aa2e12..9c88d2816b4b72 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt @@ -566,7 +566,7 @@ public object ReactScrollViewHelper { } } - public class ReactScrollViewScrollState() { + public class ReactScrollViewScrollState { /** Get the position after current animation is finished */ public val finalAnimatedPositionScroll: Point = Point() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.kt index 51d13af1e78205..81565978827eb0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.kt @@ -9,7 +9,6 @@ package com.facebook.react.views.text import android.content.Context import android.content.res.ColorStateList -import androidx.core.content.res.use /** Utility class that access default values from style */ public object DefaultStyleValuesUtil { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt index 6f21f8413e85f2..197e9d7e184633 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt @@ -86,7 +86,7 @@ internal class PreparedLayoutTextViewManager : stateWrapper: StateWrapper ): Any? = (stateWrapper as? ReferenceStateWrapper)?.stateDataReference - override fun getExportedCustomDirectEventTypeConstants(): MutableMap? { + override fun getExportedCustomDirectEventTypeConstants(): MutableMap { val baseEventTypeConstants = super.getExportedCustomDirectEventTypeConstants() val eventTypeConstants = baseEventTypeConstants ?: HashMap() eventTypeConstants.put("topTextLayout", mapOf("registrationName" to "onTextLayout")) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.kt index b605c78b624c67..63ea6bb14d87ea 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.kt @@ -26,7 +26,7 @@ internal class ReactRawTextManager : ViewManager() public override fun createViewInstance(context: ThemedReactContext): ReactTextView = throw IllegalStateException("Attempt to create a native view for RCTRawText") - override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? = + override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View = throw IllegalStateException("Attempt to recycle a native view for RCTRawText") override fun updateExtraData(view: View, extraData: Any): Unit = Unit