react-native-tvos 0.80.1-0 → 0.81.0-0

package/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.kt

@@ -10,10 +10,10 @@ package com.facebook.react.modules.core
 import android.net.Uri
 import com.facebook.fbreact.specs.NativeDeviceEventManagerSpec
 import com.facebook.proguard.annotations.DoNotStripAny
-import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.JavaScriptModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.UiThreadUtil
+import com.facebook.react.bridge.buildReadableMap
 import com.facebook.react.module.annotations.ReactModule
 
 /** Native module that handles device hardware events like hardware back presses. */
@@ -43,8 +43,7 @@ public open class DeviceEventManagerModule(
   public open fun emitNewIntentReceived(uri: Uri) {
     val reactApplicationContext: ReactApplicationContext? =
         getReactApplicationContextIfActiveOrWarn()
-    val map = Arguments.createMap()
-    map.putString("url", uri.toString())
+    val map = buildReadableMap { put("url", uri.toString()) }
     reactApplicationContext?.emitDeviceEvent("url", map)
   }
 
@@ -56,7 +55,7 @@ public open class DeviceEventManagerModule(
     // There should be no need to check if the catalyst instance is alive. After initialization
     // the thread instances cannot be null, and scheduling on a thread after ReactApplicationContext
     // teardown is a noop.
-    getReactApplicationContext().runOnUiQueueThread(invokeDefaultBackPressRunnable)
+    reactApplicationContext.runOnUiQueueThread(invokeDefaultBackPressRunnable)
   }
 
   public companion object {

package/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.kt

@@ -23,7 +23,7 @@ internal open class HeadlessJsTaskSupportModule(reactContext: ReactApplicationCo
     NativeHeadlessJsTaskSupportSpec(reactContext) {
   override fun notifyTaskRetry(taskIdDouble: Double, promise: Promise) {
     val taskId = taskIdDouble.toInt()
-    val headlessJsTaskContext = HeadlessJsTaskContext.getInstance(getReactApplicationContext())
+    val headlessJsTaskContext = HeadlessJsTaskContext.getInstance(reactApplicationContext)
     if (headlessJsTaskContext.isTaskRunning(taskId)) {
       val retryPosted = headlessJsTaskContext.retryTask(taskId)
       promise.resolve(retryPosted)
@@ -38,7 +38,7 @@ internal open class HeadlessJsTaskSupportModule(reactContext: ReactApplicationCo
 
   override fun notifyTaskFinished(taskIdDouble: Double) {
     val taskId = taskIdDouble.toInt()
-    val headlessJsTaskContext = HeadlessJsTaskContext.getInstance(getReactApplicationContext())
+    val headlessJsTaskContext = HeadlessJsTaskContext.getInstance(reactApplicationContext)
     if (headlessJsTaskContext.isTaskRunning(taskId)) {
       headlessJsTaskContext.finishTask(taskId)
     } else {
@@ -48,4 +48,8 @@ internal open class HeadlessJsTaskSupportModule(reactContext: ReactApplicationCo
           taskId)
     }
   }
+
+  companion object {
+    const val NAME: String = NativeHeadlessJsTaskSupportSpec.NAME
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevMenuModule.kt

@@ -40,7 +40,7 @@ internal class DevMenuModule(
     devSupportManager.setHotModuleReplacementEnabled(enabled)
   }
 
-  public companion object {
-    public const val NAME: String = NativeDevMenuSpec.NAME
+  companion object {
+    const val NAME: String = NativeDevMenuSpec.NAME
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.kt

@@ -8,9 +8,9 @@
 package com.facebook.react.modules.debug
 
 import com.facebook.fbreact.specs.NativeDevSettingsSpec
-import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.UiThreadUtil
+import com.facebook.react.bridge.buildReadableMap
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.facebook.react.module.annotations.ReactModule
 
@@ -50,8 +50,7 @@ public class DevSettingsModule(
 
   override fun addMenuItem(title: String) {
     devSupportManager.addCustomDevOption(title) {
-      val data = Arguments.createMap()
-      data.putString("title", title)
+      val data = buildReadableMap { put("title", title) }
       val reactApplicationContext = reactApplicationContextIfActiveOrWarn
       reactApplicationContext?.emitDeviceEvent("didPressMenuItem", data)
     }

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.kt

@@ -16,8 +16,9 @@ import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugL
 /**
  * Debug object that listens to bridge busy/idle events and UiManagerModule dispatches and uses it
  * to calculate whether JS was able to update the UI during a given frame. After being installed on
- * a [ReactBridge] and a [UIManagerModule], [.getDidJSHitFrameAndCleanup] should be called once per
- * frame via a [Choreographer.FrameCallback].
+ * a [ReactBridge] and a [com.facebook.react.uimanager.UIManagerModule],
+ * [getDidJSHitFrameAndCleanup] should be called once per frame via a
+ * [android.view.Choreographer.FrameCallback].
  */
 internal class DidJSUpdateUiDuringFrameDetector :
     NotThreadSafeBridgeIdleDebugListener, NotThreadSafeViewHierarchyUpdateDebugListener {
@@ -53,10 +54,10 @@ internal class DidJSUpdateUiDuringFrameDetector :
   }
 
   /**
-   * Designed to be called from a [Choreographer.FrameCallback.doFrame] call.
+   * Designed to be called from a [android.view.Choreographer.FrameCallback.doFrame] call.
    *
-   * There are two 'success' cases that will cause [.getDidJSHitFrameAndCleanup] to return true for
-   * a given frame:
+   * There are two 'success' cases that will cause [getDidJSHitFrameAndCleanup] to return true for a
+   * given frame:
    * 1. UIManagerModule finished dispatching a batched UI update on the UI thread during the frame.
    *    This means that during the next hierarchy traversal, new UI will be drawn if needed (good).
    * 1. The bridge ended the frame idle (meaning there were no JS nor native module calls still in
@@ -67,10 +68,10 @@ internal class DidJSUpdateUiDuringFrameDetector :
    * NB: This call can only be called once for a given frame time range because it cleans up events
    * it recorded for that frame.
    *
-   * NB2: This makes the assumption that onViewHierarchyUpdateEnqueued is called from the
-   * [ ][UIManagerModule.onBatchComplete], e.g. while the bridge is still considered busy, which
-   * means there is no race condition where the bridge has gone idle but a hierarchy update is
-   * waiting to be enqueued.
+   * NB2: This makes the assumption that [onViewHierarchyUpdateEnqueued] is called from the
+   * [com.facebook.react.uimanager.UIManagerModule.onBatchComplete], e.g. while the bridge is still
+   * considered busy, which means there is no race condition where the bridge has gone idle but a
+   * hierarchy update is waiting to be enqueued.
    *
    * @param frameStartTimeNanos the time in nanos that the last frame started
    * @param frameEndTimeNanos the time in nanos that the last frame ended

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.kt

@@ -8,12 +8,10 @@
 package com.facebook.react.modules.debug
 
 import android.view.Choreographer
-import com.facebook.infer.annotation.Assertions
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.common.build.ReactBuildConfig
 import com.facebook.react.uimanager.UIManagerModule
-import java.util.TreeMap
 
 /**
  * Each time a frame is drawn, records whether it should have expected any more callbacks since the
@@ -25,17 +23,8 @@ import java.util.TreeMap
  * idle and not trying to update the UI. This is different from the FPS above since JS rendering is
  * async.
  */
-public class FpsDebugFrameCallback(private val reactContext: ReactContext) :
+internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     Choreographer.FrameCallback {
-  public class FpsInfo(
-      public val totalFrames: Int,
-      public val totalJsFrames: Int,
-      public val totalExpectedFrames: Int,
-      public val total4PlusFrameStutters: Int,
-      public val fps: Double,
-      public val jsFps: Double,
-      public val totalTimeMs: Int
-  )
 
   private var choreographer: Choreographer? = null
   private val didJSUpdateUiDuringFrameDetector: DidJSUpdateUiDuringFrameDetector =
@@ -46,9 +35,7 @@ public class FpsDebugFrameCallback(private val reactContext: ReactContext) :
   private var expectedNumFramesPrev = 0
   private var fourPlusFrameStutters = 0
   private var numFrameCallbacksWithBatchDispatches = 0
-  private var isRecordingFpsInfoAtEachFrame = false
   private var targetFps = DEFAULT_FPS
-  private var timeToFps: TreeMap<Long, FpsInfo>? = null
 
   override fun doFrame(l: Long) {
     if (firstFrameTime == -1L) {
@@ -65,25 +52,12 @@ public class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     if (framesDropped >= 4) {
       fourPlusFrameStutters++
     }
-    if (isRecordingFpsInfoAtEachFrame) {
-      Assertions.assertNotNull(timeToFps)
-      val info =
-          FpsInfo(
-              numFrames,
-              numJSFrames,
-              expectedNumFrames,
-              fourPlusFrameStutters,
-              fps,
-              jsFPS,
-              totalTimeMS)
-      timeToFps?.put(System.currentTimeMillis(), info)
-    }
     expectedNumFramesPrev = expectedNumFrames
     choreographer?.postFrameCallback(this)
   }
 
   @JvmOverloads
-  public fun start(targetFps: Double = this.targetFps) {
+  fun start(targetFps: Double = this.targetFps) {
     // T172641976: re-think if we need to implement addBridgeIdleDebugListener and
     // removeBridgeIdleDebugListener for Bridgeless
     @Suppress("DEPRECATION")
@@ -91,6 +65,11 @@ public class FpsDebugFrameCallback(private val reactContext: ReactContext) :
       val uiManagerModule = reactContext.getNativeModule(UIManagerModule::class.java)
       if (!reactContext.isBridgeless) {
         reactContext.catalystInstance.addBridgeIdleDebugListener(didJSUpdateUiDuringFrameDetector)
+        isRunningOnFabric = false
+      } else {
+        // T172641976 Consider either implementing a mechanism similar to addBridgeIdleDebugListener
+        // for Fabric or point users to use RNDT.
+        isRunningOnFabric = true
       }
       uiManagerModule?.setViewHierarchyUpdateDebugListener(didJSUpdateUiDuringFrameDetector)
     }
@@ -101,13 +80,7 @@ public class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     }
   }
 
-  public fun startAndRecordFpsAtEachFrame() {
-    timeToFps = TreeMap()
-    isRecordingFpsInfoAtEachFrame = true
-    start()
-  }
-
-  public fun stop() {
+  fun stop() {
     @Suppress("DEPRECATION")
     if (!ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
       val uiManagerModule = reactContext.getNativeModule(UIManagerModule::class.java)
@@ -123,53 +96,48 @@ public class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     }
   }
 
-  public val fps: Double
+  val fps: Double
     get() =
         if (lastFrameTime == firstFrameTime) {
           0.0
         } else numFrames.toDouble() * 1e9 / (lastFrameTime - firstFrameTime)
 
-  public val jsFPS: Double
+  /**
+   * Please note that this value is not relevant if running on Fabric. That's because we don't
+   * implement addBridgeIdleDebugListener on Fabric.
+   */
+  val jsFPS: Double
     get() =
         if (lastFrameTime == firstFrameTime) {
           0.0
         } else numJSFrames.toDouble() * 1e9 / (lastFrameTime - firstFrameTime)
 
-  public val numFrames: Int
+  val numFrames: Int
     get() = numFrameCallbacks - 1
 
-  public val numJSFrames: Int
+  private val numJSFrames: Int
     get() = numFrameCallbacksWithBatchDispatches - 1
 
-  public val expectedNumFrames: Int
+  val expectedNumFrames: Int
     get() {
       val totalTimeMS = totalTimeMS.toDouble()
       return (targetFps * totalTimeMS / 1000 + 1).toInt()
     }
 
-  public fun get4PlusFrameStutters(): Int = fourPlusFrameStutters
+  var isRunningOnFabric = true
+    private set
 
-  public val totalTimeMS: Int
-    get() = ((lastFrameTime.toDouble() - firstFrameTime) / 1000000.0).toInt()
+  fun get4PlusFrameStutters(): Int = fourPlusFrameStutters
 
-  /**
-   * Returns the FpsInfo as if stop had been called at the given upToTimeMs. Only valid if
-   * monitoring was started with [.startAndRecordFpsAtEachFrame].
-   */
-  public fun getFpsInfo(upToTimeMs: Long): FpsInfo? {
-    Assertions.assertNotNull(timeToFps, "FPS was not recorded at each frame!")
-    val (_, value) = timeToFps?.floorEntry(upToTimeMs) ?: return null
-    return value
-  }
+  private val totalTimeMS: Int
+    get() = ((lastFrameTime.toDouble() - firstFrameTime) / 1000000.0).toInt()
 
-  public fun reset() {
+  fun reset() {
     firstFrameTime = -1
     lastFrameTime = -1
     numFrameCallbacks = 0
     fourPlusFrameStutters = 0
     numFrameCallbacksWithBatchDispatches = 0
-    isRecordingFpsInfoAtEachFrame = false
-    timeToFps = null
   }
 
   private companion object {

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.kt

@@ -22,7 +22,7 @@ public class SourceCodeModule(reactContext: ReactApplicationContext) :
       mapOf(
           "scriptURL" to
               Assertions.assertNotNull<String>(
-                  getReactApplicationContext().getSourceURL(),
+                  reactApplicationContext.getSourceURL(),
                   "No source URL loaded, have you initialised the instance?"))
 
   public companion object {

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.kt

@@ -32,11 +32,6 @@ public interface DeveloperSettings {
   /** Whether Nuclide JS debugging is enabled. */
   public var isDeviceDebugEnabled: Boolean
 
-  /** Whether Start Sampling Profiler on App Start is enabled. */
-  @Deprecated(
-      "Legacy sampling profiler is no longer supported - This field will be removed in React Native 0.77")
-  public var isStartSamplingProfilerOnInit: Boolean
-
   /** Whether HMR is enabled. */
   public var isHotModuleReplacementEnabled: Boolean
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.kt

@@ -16,6 +16,7 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.DisplayMetricsHolder.getDisplayMetricsWritableMap
 import com.facebook.react.uimanager.DisplayMetricsHolder.initDisplayMetricsIfNotInitialized
+import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
 
 /** Module that exposes Android Constants to JS. */
 @ReactModule(name = NativeDeviceInfoSpec.NAME)
@@ -34,7 +35,11 @@ internal class DeviceInfoModule(reactContext: ReactApplicationContext) :
 
     // Cache the initial dimensions for later comparison in emitUpdateDimensionsEvent
     previousDisplayMetrics = displayMetrics.copy()
-    return mapOf("Dimensions" to displayMetrics.toHashMap())
+
+    return mapOf(
+        "Dimensions" to displayMetrics.toHashMap(),
+        "isEdgeToEdge" to isEdgeToEdgeFeatureFlagOn,
+    )
   }
 
   override fun onHostResume() {
@@ -74,7 +79,7 @@ internal class DeviceInfoModule(reactContext: ReactApplicationContext) :
     reactApplicationContext.removeLifecycleEventListener(this)
   }
 
-  public companion object {
-    public const val NAME: String = NativeDeviceInfoSpec.NAME
+  companion object {
+    const val NAME: String = NativeDeviceInfoSpec.NAME
   }
 }

package/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

package/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.kt

@@ -22,9 +22,9 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.common.ModuleDataCleaner
+import com.facebook.react.modules.network.CookieJarContainer
 import com.facebook.react.modules.network.ForwardingCookieHandler
 import com.facebook.react.modules.network.OkHttpClientProvider
-import com.facebook.react.modules.network.OkHttpCompat
 import com.facebook.react.turbomodule.core.interfaces.TurboModule
 import okhttp3.JavaNetCookieJar
 
@@ -50,7 +50,7 @@ constructor(
 
   /**
    * Create a new Fresco module with a default configuration (or the previously given configuration
-   * via [.FrescoModule].
+   * via [FrescoModule].
    *
    * @param reactContext the context to use
    * @param imagePipeline the Fresco image pipeline to use
@@ -132,7 +132,7 @@ constructor(
 
     /**
      * Check whether the FrescoModule has already been initialized. If this is the case, Calls to
-     * [.FrescoModule] will ignore the given configuration.
+     * [FrescoModule] will ignore the given configuration.
      *
      * @return true if this module has already been initialized
      */
@@ -145,7 +145,8 @@ constructor(
      * Get the default Fresco configuration builder. Allows adding of configuration options in
      * addition to the default values.
      *
-     * @return [ImagePipelineConfig.Builder] that has been initialized with default values
+     * @return [com.facebook.imagepipeline.core.ImagePipelineConfig.Builder] that has been
+     *   initialized with default values
      */
     @JvmStatic
     public fun getDefaultConfigBuilder(context: ReactContext): ImagePipelineConfig.Builder {
@@ -155,7 +156,10 @@ constructor(
 
       // make sure to forward cookies for any requests via the okHttpClient
       // so that image requests to endpoints that use cookies still work
-      val container = OkHttpCompat.getCookieJarContainer(client)
+
+      @Suppress("DEPRECATION_ERROR") // Conflicting okhttp versions
+      val container = client.cookieJar() as CookieJarContainer
+
       val handler = ForwardingCookieHandler()
       container.setCookieJar(JavaNetCookieJar(handler))
       val builder =

package/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.kt

@@ -11,9 +11,9 @@ import android.os.SystemClock
 import com.facebook.imagepipeline.backends.okhttp3.OkHttpNetworkFetcher
 import com.facebook.imagepipeline.producers.NetworkFetcher
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.modules.network.OkHttpCompat
 import java.util.concurrent.TimeUnit
 import okhttp3.CacheControl
+import okhttp3.Headers
 import okhttp3.OkHttpClient
 import okhttp3.Request
 
@@ -57,7 +57,10 @@ internal class ReactOkHttpNetworkFetcher(okHttpClient: OkHttpClient) :
     } else {
       cacheControlBuilder.noStore()
     }
-    val headers = OkHttpCompat.getHeadersFromMap(requestHeaders)
+
+    @Suppress("DEPRECATION_ERROR") // Conflicting okhttp versions
+    val headers = Headers.of(requestHeaders ?: emptyMap())
+
     val request =
         Request.Builder()
             .headers(headers)

package/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.kt

@@ -16,7 +16,7 @@ import com.facebook.react.module.annotations.ReactModule
 internal class I18nManagerModule(context: ReactApplicationContext?) :
     NativeI18nManagerSpec(context) {
   override fun getTypedExportedConstants(): Map<String, Any> {
-    val context = getReactApplicationContext()
+    val context = reactApplicationContext
     val locale = context.resources.configuration.locales[0]
 
     return mapOf(
@@ -26,15 +26,15 @@ internal class I18nManagerModule(context: ReactApplicationContext?) :
   }
 
   override fun allowRTL(value: Boolean) {
-    I18nUtil.instance.allowRTL(getReactApplicationContext(), value)
+    I18nUtil.instance.allowRTL(reactApplicationContext, value)
   }
 
   override fun forceRTL(value: Boolean) {
-    I18nUtil.instance.forceRTL(getReactApplicationContext(), value)
+    I18nUtil.instance.forceRTL(reactApplicationContext, value)
   }
 
   override fun swapLeftAndRightInRTL(value: Boolean) {
-    I18nUtil.instance.swapLeftAndRightInRTL(getReactApplicationContext(), value)
+    I18nUtil.instance.swapLeftAndRightInRTL(reactApplicationContext, value)
   }
 
   companion object {

package/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.kt

@@ -20,7 +20,6 @@ import com.facebook.imagepipeline.core.ImagePipeline
 import com.facebook.imagepipeline.image.CloseableImage
 import com.facebook.imagepipeline.request.ImageRequest
 import com.facebook.imagepipeline.request.ImageRequestBuilder
-import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.GuardedAsyncTask
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.Promise
@@ -28,7 +27,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableMap
+import com.facebook.react.bridge.buildReadableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.fresco.ReactNetworkImageRequest
 import com.facebook.react.views.image.ReactCallerContextFactory
@@ -82,7 +81,7 @@ internal class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventL
       promise.reject(ERROR_INVALID_URI, "Cannot get the size of an image for an empty URI")
       return
     }
-    val source = ImageSource(getReactApplicationContext(), uriString)
+    val source = ImageSource(reactApplicationContext, uriString)
     val request: ImageRequest = ImageRequestBuilder.newBuilderWithSource(source.uri).build()
     val dataSource: DataSource<CloseableReference<CloseableImage>> =
         this.imagePipeline.fetchDecodedImage(request, this.callerContext)
@@ -96,9 +95,10 @@ internal class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventL
             if (ref != null) {
               try {
                 val image: CloseableImage = ref.get()
-                val sizes: WritableMap = Arguments.createMap()
-                sizes.putInt("width", image.width)
-                sizes.putInt("height", image.height)
+                val sizes = buildReadableMap {
+                  put("width", image.width)
+                  put("height", image.height)
+                }
                 promise.resolve(sizes)
               } catch (e: Exception) {
                 promise.reject(ERROR_GET_SIZE_FAILURE, e)
@@ -131,7 +131,7 @@ internal class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventL
       promise.reject(ERROR_INVALID_URI, "Cannot get the size of an image for an empty URI")
       return
     }
-    val source = ImageSource(getReactApplicationContext(), uriString)
+    val source = ImageSource(reactApplicationContext, uriString)
     val imageRequestBuilder: ImageRequestBuilder =
         ImageRequestBuilder.newBuilderWithSource(source.uri)
     val request: ImageRequest =
@@ -148,9 +148,10 @@ internal class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventL
             if (ref != null) {
               try {
                 val image: CloseableImage = ref.get()
-                val sizes: WritableMap = Arguments.createMap()
-                sizes.putInt("width", image.width)
-                sizes.putInt("height", image.height)
+                val sizes = buildReadableMap {
+                  put("width", image.width)
+                  put("height", image.height)
+                }
                 promise.resolve(sizes)
               } catch (e: Exception) {
                 promise.reject(ERROR_GET_SIZE_FAILURE, e)
@@ -225,18 +226,19 @@ internal class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventL
   override fun queryCache(uris: ReadableArray, promise: Promise) {
     // perform cache interrogation in async task as disk cache checks are expensive
     @Suppress("DEPRECATION", "StaticFieldLeak")
-    object : GuardedAsyncTask<Void, Void>(getReactApplicationContext()) {
+    object : GuardedAsyncTask<Void, Void>(reactApplicationContext) {
           override fun doInBackgroundGuarded(vararg params: Void) {
-            val result: WritableMap = Arguments.createMap()
-            val imagePipeline: ImagePipeline = this@ImageLoaderModule.imagePipeline
-            for (i in 0 until uris.size()) {
-              val uriString = uris.getString(i)
-              if (!uriString.isNullOrEmpty()) {
-                val uri = Uri.parse(uriString)
-                if (imagePipeline.isInBitmapMemoryCache(uri)) {
-                  result.putString(uriString, "memory")
-                } else if (imagePipeline.isInDiskCacheSync(uri)) {
-                  result.putString(uriString, "disk")
+            val result = buildReadableMap {
+              val imagePipeline: ImagePipeline = this@ImageLoaderModule.imagePipeline
+              repeat(uris.size()) {
+                val uriString = uris.getString(it)
+                if (!uriString.isNullOrEmpty()) {
+                  val uri = Uri.parse(uriString)
+                  if (imagePipeline.isInBitmapMemoryCache(uri)) {
+                    put(uriString, "memory")
+                  } else if (imagePipeline.isInDiskCacheSync(uri)) {
+                    put(uriString, "disk")
+                  }
                 }
               }
             }

package/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.kt

@@ -34,7 +34,7 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
     synchronized(this) {
       pendingOpenURLPromises.clear()
       initialURLListener
-          ?.let { listener -> getReactApplicationContext().removeLifecycleEventListener(listener) }
+          ?.let { listener -> reactApplicationContext.removeLifecycleEventListener(listener) }
           .also { initialURLListener = null }
     }
     super.invalidate()
@@ -47,7 +47,7 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
    */
   override fun getInitialURL(promise: Promise) {
     try {
-      val currentActivity = getReactApplicationContext().getCurrentActivity()
+      val currentActivity = reactApplicationContext.getCurrentActivity()
       if (currentActivity == null) {
         waitForActivityAndGetInitialURL(promise)
         return
@@ -82,7 +82,7 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
     initialURLListener =
         object : LifecycleEventListener {
           override fun onHostResume() {
-            getReactApplicationContext().removeLifecycleEventListener(this)
+            reactApplicationContext.removeLifecycleEventListener(this)
             synchronized(this@IntentModule) {
               for (pendingPromise in pendingOpenURLPromises) {
                 getInitialURL(pendingPromise)
@@ -96,7 +96,7 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
 
           override fun onHostDestroy() = Unit
         }
-    getReactApplicationContext().addLifecycleEventListener(initialURLListener)
+    reactApplicationContext.addLifecycleEventListener(initialURLListener)
   }
 
   /**
@@ -108,7 +108,7 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
    * @param url the URL to open
    */
   override fun openURL(url: String?, promise: Promise) {
-    if (url == null || url.isEmpty()) {
+    if (url.isNullOrEmpty()) {
       promise.reject(JSApplicationIllegalArgumentException("Invalid URL: $url"))
       return
     }
@@ -131,7 +131,7 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
    * @param promise a promise that is always resolved with a boolean argument
    */
   override fun canOpenURL(url: String?, promise: Promise) {
-    if (url == null || url.isEmpty()) {
+    if (url.isNullOrEmpty()) {
       promise.reject(JSApplicationIllegalArgumentException("Invalid URL: $url"))
       return
     }
@@ -189,7 +189,7 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
    * @param extras An array of extras [{ String, String | Number | Boolean }]
    */
   override fun sendIntent(action: String?, extras: ReadableArray?, promise: Promise) {
-    if (action == null || action.isEmpty()) {
+    if (action.isNullOrEmpty()) {
       promise.reject(JSApplicationIllegalArgumentException("Invalid Action: $action."))
       return
     }
@@ -214,7 +214,6 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
             ReadableType.String -> {
               intent.putExtra(name, map.getString(EXTRA_MAP_KEY_FOR_VALUE))
             }
-
             ReadableType.Number -> {
               // We cannot know from JS if is an Integer or Double
               // See: https://github.com/facebook/react-native/issues/4141
@@ -222,11 +221,9 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
               val number = map.getDouble(EXTRA_MAP_KEY_FOR_VALUE)
               intent.putExtra(name, number)
             }
-
             ReadableType.Boolean -> {
               intent.putExtra(name, map.getBoolean(EXTRA_MAP_KEY_FOR_VALUE))
             }
-
             else -> {
               promise.reject(
                   JSApplicationIllegalArgumentException("Extra type for $name not supported."))