expo-modules-core 0.8.0 → 0.9.2

package/android/src/main/java/expo/modules/kotlin/modules/ModuleDefinitionBuilder.kt

@@ -10,6 +10,7 @@
  * That's why we used typeOf. It solves all problems described above.
  */
 @file:OptIn(ExperimentalStdlibApi::class)
+@file:Suppress("FunctionName")
 
 package expo.modules.kotlin.modules
 
@@ -61,30 +62,48 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     )
   }
 
+  @Deprecated(
+    message = "The 'name' component was renamed to 'Name'.",
+    replaceWith = ReplaceWith("Name(name)")
+  )
+  fun name(name: String) = Name(name)
+
   /**
    * Sets the name of the module that is exported to the JavaScript world.
    */
-  fun name(name: String) {
+  fun Name(name: String) {
     this.name = name
   }
 
+  @Deprecated(
+    message = "The 'constants' component was renamed to 'Constants'.",
+    replaceWith = ReplaceWith("Constants(constantsProvider)")
+  )
+  fun constants(constantsProvider: () -> Map<String, Any?>) = Constants(constantsProvider)
+
   /**
    * Definition function setting the module's constants to export.
    */
-  fun constants(constantsProvider: () -> Map<String, Any?>) {
+  fun Constants(constantsProvider: () -> Map<String, Any?>) {
     this.constantsProvider = constantsProvider
   }
 
+  @Deprecated(
+    message = "The 'constants' component was renamed to 'Constants'.",
+    replaceWith = ReplaceWith("Constants(constants)")
+  )
+  fun constants(vararg constants: Pair<String, Any?>) = Constants(*constants)
+
   /**
    * Definition of the module's constants to export.
    */
-  fun constants(vararg constants: Pair<String, Any?>) {
+  fun Constants(vararg constants: Pair<String, Any?>) {
     constantsProvider = { constants.toMap() }
   }
 
   @Deprecated(
     message = "The 'function' component was deprecated and will change its behavior in the future.",
-    replaceWith = ReplaceWith("asyncFunction(name, body)")
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
   )
   @JvmName("functionWithoutArgs")
   inline fun function(
@@ -96,7 +115,7 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
 
   @Deprecated(
     message = "The 'function' component was deprecated and will change its behavior in the future.",
-    replaceWith = ReplaceWith("asyncFunction(name, body)")
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
   )
   inline fun <reified R> function(
     name: String,
@@ -107,7 +126,7 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
 
   @Deprecated(
     message = "The 'function' component was deprecated and will change its behavior in the future.",
-    replaceWith = ReplaceWith("asyncFunction(name, body)")
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
   )
   inline fun <reified R, reified P0> function(
     name: String,
@@ -122,7 +141,7 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
 
   @Deprecated(
     message = "The 'function' component was deprecated and will change its behavior in the future.",
-    replaceWith = ReplaceWith("asyncFunction(name, body)")
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
   )
   inline fun <reified R, reified P0, reified P1> function(
     name: String,
@@ -137,7 +156,7 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
 
   @Deprecated(
     message = "The 'function' component was deprecated and will change its behavior in the future.",
-    replaceWith = ReplaceWith("asyncFunction(name, body)")
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
   )
   inline fun <reified R, reified P0, reified P1, reified P2> function(
     name: String,
@@ -152,7 +171,7 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
 
   @Deprecated(
     message = "The 'function' component was deprecated and will change its behavior in the future.",
-    replaceWith = ReplaceWith("asyncFunction(name, body)")
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
   )
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3> function(
     name: String,
@@ -167,7 +186,7 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
 
   @Deprecated(
     message = "The 'function' component was deprecated and will change its behavior in the future.",
-    replaceWith = ReplaceWith("asyncFunction(name, body)")
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
   )
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> function(
     name: String,
@@ -182,7 +201,7 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
 
   @Deprecated(
     message = "The 'function' component was deprecated and will change its behavior in the future.",
-    replaceWith = ReplaceWith("asyncFunction(name, body)")
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
   )
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> function(
     name: String,
@@ -197,7 +216,7 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
 
   @Deprecated(
     message = "The 'function' component was deprecated and will change its behavior in the future.",
-    replaceWith = ReplaceWith("asyncFunction(name, body)")
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
   )
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> function(
     name: String,
@@ -212,7 +231,7 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
 
   @Deprecated(
     message = "The 'function' component was deprecated and will change its behavior in the future.",
-    replaceWith = ReplaceWith("asyncFunction(name, body)")
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
   )
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> function(
     name: String,
@@ -225,24 +244,52 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     }
   }
 
+  @Deprecated(
+    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
+  )
   @JvmName("asyncFunctionWithoutArgs")
   inline fun asyncFunction(
     name: String,
     crossinline body: () -> Any?
+  ) = AsyncFunction(name, body)
+
+  @JvmName("AsyncFunctionWithoutArgs")
+  inline fun AsyncFunction(
+    name: String,
+    crossinline body: () -> Any?
   ) {
     methods[name] = AsyncFunction(name, arrayOf()) { body() }
   }
 
+  @Deprecated(
+    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
+  )
   inline fun <reified R> asyncFunction(
     name: String,
     crossinline body: () -> R
+  ) = AsyncFunction(name, body)
+
+  inline fun <reified R> AsyncFunction(
+    name: String,
+    crossinline body: () -> R
   ) {
     methods[name] = AsyncFunction(name, arrayOf()) { body() }
   }
 
+  @Deprecated(
+    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
+  )
   inline fun <reified R, reified P0> asyncFunction(
     name: String,
     crossinline body: (p0: P0) -> R
+  ) = AsyncFunction(name, body)
+
+  inline fun <reified R, reified P0> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0) -> R
   ) {
     methods[name] = if (P0::class == Promise::class) {
       AsyncFunctionWithPromise(name, arrayOf()) { _, promise -> body(promise as P0) }
@@ -251,9 +298,18 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     }
   }
 
+  @Deprecated(
+    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
+  )
   inline fun <reified R, reified P0, reified P1> asyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1) -> R
+  ) = AsyncFunction(name, body)
+
+  inline fun <reified R, reified P0, reified P1> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1) -> R
   ) {
     methods[name] = if (P1::class == Promise::class) {
       AsyncFunctionWithPromise(name, arrayOf(typeOf<P0>().toAnyType())) { args, promise -> body(args[0] as P0, promise as P1) }
@@ -262,9 +318,18 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     }
   }
 
+  @Deprecated(
+    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
+  )
   inline fun <reified R, reified P0, reified P1, reified P2> asyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2) -> R
+  ) = AsyncFunction(name, body)
+
+  inline fun <reified R, reified P0, reified P1, reified P2> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2) -> R
   ) {
     methods[name] = if (P2::class == Promise::class) {
       AsyncFunctionWithPromise(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, promise as P2) }
@@ -273,9 +338,18 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     }
   }
 
+  @Deprecated(
+    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
+  )
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3> asyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3) -> R
+  ) = AsyncFunction(name, body)
+
+  inline fun <reified R, reified P0, reified P1, reified P2, reified P3> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3) -> R
   ) {
     methods[name] = if (P3::class == Promise::class) {
       AsyncFunctionWithPromise(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, promise as P3) }
@@ -284,9 +358,18 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     }
   }
 
+  @Deprecated(
+    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
+  )
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> asyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R
+  ) = AsyncFunction(name, body)
+
+  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R
   ) {
     methods[name] = if (P4::class == Promise::class) {
       AsyncFunctionWithPromise(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, args[3] as P3, promise as P4) }
@@ -295,9 +378,18 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     }
   }
 
+  @Deprecated(
+    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
+  )
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> asyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R
+  ) = AsyncFunction(name, body)
+
+  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R
   ) {
     methods[name] = if (P5::class == Promise::class) {
       AsyncFunctionWithPromise(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, args[3] as P3, args[4] as P4, promise as P5) }
@@ -306,9 +398,18 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     }
   }
 
+  @Deprecated(
+    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
+  )
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> asyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R
+  ) = AsyncFunction(name, body)
+
+  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R
   ) {
     methods[name] = if (P6::class == Promise::class) {
       AsyncFunctionWithPromise(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, args[3] as P3, args[4] as P4, args[5] as P5, promise as P6) }
@@ -317,9 +418,18 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     }
   }
 
+  @Deprecated(
+    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
+  )
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> asyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R
+  ) = AsyncFunction(name, body)
+
+  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R
   ) {
     methods[name] = if (P7::class == Promise::class) {
       AsyncFunctionWithPromise(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType(), typeOf<P6>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, args[3] as P3, args[4] as P4, args[5] as P5, args[6] as P6, promise as P7) }
@@ -328,14 +438,28 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     }
   }
 
+  @Deprecated(
+    message = "The 'asyncFunction' component was renamed to 'AsyncFunction'.",
+    replaceWith = ReplaceWith("AsyncFunction(name, body)")
+  )
   fun asyncFunction(
     name: String
+  ) = AsyncFunction(name)
+
+  fun AsyncFunction(
+    name: String
   ) = AsyncFunctionBuilder(name).also { functionBuilders.add(it) }
 
+  @Deprecated(
+    message = "The 'viewManager' component was renamed to 'ViewManager'.",
+    replaceWith = ReplaceWith("ViewManager(body)")
+  )
+  inline fun viewManager(body: ViewManagerDefinitionBuilder.() -> Unit) = ViewManager(body)
+
   /**
    * Creates the view manager definition that scopes other view-related definitions.
    */
-  inline fun viewManager(body: ViewManagerDefinitionBuilder.() -> Unit) {
+  inline fun ViewManager(body: ViewManagerDefinitionBuilder.() -> Unit) {
     require(viewManagerDefinition == null) { "The module definition may have exported only one view manager." }
 
     val viewManagerDefinitionBuilder = ViewManagerDefinitionBuilder()
@@ -343,73 +467,133 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
     viewManagerDefinition = viewManagerDefinitionBuilder.build()
   }
 
+  @Deprecated(
+    message = "The 'onCreate' component was renamed to 'OnCreate'.",
+    replaceWith = ReplaceWith("OnCreate(body)")
+  )
+  inline fun onCreate(crossinline body: () -> Unit) = OnCreate(body)
+
   /**
    * Creates module's lifecycle listener that is called right after the module initialization.
    */
-  inline fun onCreate(crossinline body: () -> Unit) {
+  inline fun OnCreate(crossinline body: () -> Unit) {
     eventListeners[EventName.MODULE_CREATE] = BasicEventListener(EventName.MODULE_CREATE) { body() }
   }
 
+  @Deprecated(
+    message = "The 'onDestroy' component was renamed to 'OnDestroy'.",
+    replaceWith = ReplaceWith("OnDestroy(body)")
+  )
+  inline fun onDestroy(crossinline body: () -> Unit) = OnDestroy(body)
+
   /**
    * Creates module's lifecycle listener that is called when the module is about to be deallocated.
    */
-  inline fun onDestroy(crossinline body: () -> Unit) {
+  inline fun OnDestroy(crossinline body: () -> Unit) {
     eventListeners[EventName.MODULE_DESTROY] = BasicEventListener(EventName.MODULE_DESTROY) { body() }
   }
 
+  @Deprecated(
+    message = "The 'onActivityEntersForeground' component was renamed to 'OnActivityEntersForeground'.",
+    replaceWith = ReplaceWith("OnActivityEntersForeground(body)")
+  )
+  inline fun onActivityEntersForeground(crossinline body: () -> Unit) = OnActivityEntersForeground(body)
+
   /**
    * Creates module's lifecycle listener that is called right after the activity is resumed.
    */
-  inline fun onActivityEntersForeground(crossinline body: () -> Unit) {
+  inline fun OnActivityEntersForeground(crossinline body: () -> Unit) {
     eventListeners[EventName.ACTIVITY_ENTERS_FOREGROUND] = BasicEventListener(EventName.ACTIVITY_ENTERS_FOREGROUND) { body() }
   }
 
+  @Deprecated(
+    message = "The 'onActivityEntersBackground' component was renamed to 'OnActivityEntersBackground'.",
+    replaceWith = ReplaceWith("OnActivityEntersBackground(body)")
+  )
+  inline fun onActivityEntersBackground(crossinline body: () -> Unit) = OnActivityEntersBackground(body)
+
   /**
    * Creates module's lifecycle listener that is called right after the activity is paused.
    */
-  inline fun onActivityEntersBackground(crossinline body: () -> Unit) {
+  inline fun OnActivityEntersBackground(crossinline body: () -> Unit) {
     eventListeners[EventName.ACTIVITY_ENTERS_BACKGROUND] = BasicEventListener(EventName.ACTIVITY_ENTERS_BACKGROUND) { body() }
   }
 
+  @Deprecated(
+    message = "The 'onActivityDestroys' component was renamed to 'OnActivityDestroys'.",
+    replaceWith = ReplaceWith("OnActivityDestroys(body)")
+  )
+  inline fun onActivityDestroys(crossinline body: () -> Unit) = OnActivityDestroys(body)
+
   /**
    * Creates module's lifecycle listener that is called right after the activity is destroyed.
    */
-  inline fun onActivityDestroys(crossinline body: () -> Unit) {
+  inline fun OnActivityDestroys(crossinline body: () -> Unit) {
     eventListeners[EventName.ACTIVITY_DESTROYS] = BasicEventListener(EventName.ACTIVITY_DESTROYS) { body() }
   }
 
+  @Deprecated(
+    message = "The 'events' component was renamed to 'Events'.",
+    replaceWith = ReplaceWith("Events(events)")
+  )
+  fun events(vararg events: String) = Events(*events)
+
   /**
    * Defines event names that this module can send to JavaScript.
    */
-  fun events(vararg events: String) {
+  fun Events(vararg events: String) {
     eventsDefinition = EventsDefinition(events)
   }
 
+  @Deprecated(
+    message = "The 'onStartObserving' component was renamed to 'OnStartObserving'.",
+    replaceWith = ReplaceWith("OnStartObserving(body)")
+  )
+  inline fun onStartObserving(crossinline body: () -> Unit) = OnStartObserving(body)
+
   /**
    * Creates module's lifecycle listener that is called right after the first event listener is added.
    */
-  inline fun onStartObserving(crossinline body: () -> Unit) {
-    asyncFunction("startObserving", body)
+  inline fun OnStartObserving(crossinline body: () -> Unit) {
+    AsyncFunction("startObserving", body)
   }
 
+  @Deprecated(
+    message = "The 'onStopObserving' component was renamed to 'OnStopObserving'.",
+    replaceWith = ReplaceWith("OnStopObserving(body)")
+  )
+  inline fun onStopObserving(crossinline body: () -> Unit) = OnStopObserving(body)
+
   /**
    * Creates module's lifecycle listener that is called right after all event listeners are removed.
    */
-  inline fun onStopObserving(crossinline body: () -> Unit) {
-    asyncFunction("stopObserving", body)
+  inline fun OnStopObserving(crossinline body: () -> Unit) {
+    AsyncFunction("stopObserving", body)
   }
 
+  @Deprecated(
+    message = "The 'onNewIntent' component was renamed to 'OnNewIntent'.",
+    replaceWith = ReplaceWith("OnNewIntent(body)")
+  )
+  inline fun onNewIntent(crossinline body: (Intent) -> Unit) = OnNewIntent(body)
+
   /**
    * Creates module's lifecycle listener that is called right after the new intent was received.
    */
-  inline fun onNewIntent(crossinline body: (Intent) -> Unit) {
+  inline fun OnNewIntent(crossinline body: (Intent) -> Unit) {
     eventListeners[EventName.ON_NEW_INTENT] = EventListenerWithPayload<Intent>(EventName.ON_NEW_INTENT) { body(it) }
   }
 
+  @Deprecated(
+    message = "The 'onActivityResult' component was renamed to 'OnActivityResult'.",
+    replaceWith = ReplaceWith("OnActivityResult(body)")
+  )
+  inline fun onActivityResult(crossinline body: (Activity, OnActivityResultPayload) -> Unit) = OnActivityResult(body)
+
   /**
    * Creates module's lifecycle listener that is called right after the activity has received a result.
    */
-  inline fun onActivityResult(crossinline body: (Activity, OnActivityResultPayload) -> Unit) {
+  inline fun OnActivityResult(crossinline body: (Activity, OnActivityResultPayload) -> Unit) {
     eventListeners[EventName.ON_ACTIVITY_RESULT] =
       EventListenerWithSenderAndPayload<Activity, OnActivityResultPayload>(EventName.ON_ACTIVITY_RESULT) { sender, payload -> body(sender, payload) }
   }

package/android/src/main/java/expo/modules/kotlin/views/ViewGroupDefinitionBuilder.kt

@@ -1,4 +1,5 @@
 @file:OptIn(ExperimentalStdlibApi::class)
+@file:Suppress("FunctionName")
 
 package expo.modules.kotlin.views
 
@@ -8,11 +9,20 @@ import expo.modules.kotlin.modules.DefinitionMarker
 
 @DefinitionMarker
 class ViewGroupDefinitionBuilder {
-  @PublishedApi internal var addViewAction: AddViewAction? = null
-  @PublishedApi internal var getChildAtAction: GetChildAtAction? = null
-  @PublishedApi internal var getChildCountAction: GetChildCountAction? = null
-  @PublishedApi internal var removeViewAction: RemoveViewAction? = null
-  @PublishedApi internal var removeViewAtAction: RemoveViewAtAction? = null
+  @PublishedApi
+  internal var addViewAction: AddViewAction? = null
+
+  @PublishedApi
+  internal var getChildAtAction: GetChildAtAction? = null
+
+  @PublishedApi
+  internal var getChildCountAction: GetChildCountAction? = null
+
+  @PublishedApi
+  internal var removeViewAction: RemoveViewAction? = null
+
+  @PublishedApi
+  internal var removeViewAtAction: RemoveViewAtAction? = null
 
   fun build() = ViewGroupDefinition(
     addViewAction,
@@ -22,40 +32,80 @@ class ViewGroupDefinitionBuilder {
     removeViewAtAction
   )
 
+  @Deprecated(
+    message = "The 'addChildView' component was renamed to 'AddChildView'.",
+    replaceWith = ReplaceWith("AddChildView(body)")
+  )
   inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> addChildView(
     noinline body: (parent: ParentViewType, child: ChildViewType, index: Int) -> Unit
+  ) = AddChildView(body)
+
+  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> AddChildView(
+    noinline body: (parent: ParentViewType, child: ChildViewType, index: Int) -> Unit
   ) {
     addViewAction = { parent, child, index ->
       body(parent as ParentViewType, child as ChildViewType, index)
     }
   }
 
+  @Deprecated(
+    message = "The 'getChildCount' component was renamed to 'GetChildCount'.",
+    replaceWith = ReplaceWith("GetChildCount(body)")
+  )
   inline fun <reified ParentViewType : ViewGroup> getChildCount(
     noinline body: (view: ParentViewType) -> Int
+  ) = GetChildCount(body)
+
+  inline fun <reified ParentViewType : ViewGroup> GetChildCount(
+    noinline body: (view: ParentViewType) -> Int
   ) {
     getChildCountAction = { view ->
       body(view as ParentViewType)
     }
   }
 
+  @Deprecated(
+    message = "The 'getChildViewAt' component was renamed to 'GetChildViewAt'.",
+    replaceWith = ReplaceWith("GetChildViewAt(body)")
+  )
   inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> getChildViewAt(
     noinline body: (view: ParentViewType, index: Int) -> ChildViewType?
+  ) = GetChildViewAt(body)
+
+  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> GetChildViewAt(
+    noinline body: (view: ParentViewType, index: Int) -> ChildViewType?
   ) {
     getChildAtAction = { view, index ->
       body(view as ParentViewType, index)
     }
   }
 
+  @Deprecated(
+    message = "The 'removeChildViewAt' component was renamed to 'RemoveChildViewAt'.",
+    replaceWith = ReplaceWith("RemoveChildViewAt(body)")
+  )
   inline fun <reified ParentViewType : ViewGroup> removeChildViewAt(
     noinline body: (view: ParentViewType, index: Int) -> Unit
+  ) = RemoveChildViewAt(body)
+
+  inline fun <reified ParentViewType : ViewGroup> RemoveChildViewAt(
+    noinline body: (view: ParentViewType, index: Int) -> Unit
   ) {
     removeViewAtAction = { view, index ->
       body(view as ParentViewType, index)
     }
   }
 
+  @Deprecated(
+    message = "The 'removeChildView' component was renamed to 'RemoveChildView'.",
+    replaceWith = ReplaceWith("RemoveChildView(body)")
+  )
   inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> removeChildView(
     noinline body: (parent: ParentViewType, child: ChildViewType) -> Unit
+  ) = RemoveChildView(body)
+
+  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> RemoveChildView(
+    noinline body: (parent: ParentViewType, child: ChildViewType) -> Unit
   ) {
     removeViewAction = { view, child ->
       body(view as ParentViewType, child as ChildViewType)