Remove context(parentNode: Node) and provide the parent Node as a parameter.

libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt

@@ -14,8 +14,11 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.EventId
 
 interface MediaGalleryEntryPoint : FeatureEntryPoint {
-    context(parentNode: Node)
-    fun createNode(buildContext: BuildContext, callback: Callback): Node
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         fun onBackClick()

libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt

@@ -19,8 +19,12 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 import kotlinx.parcelize.Parcelize
 
 interface MediaViewerEntryPoint : FeatureEntryPoint {
-    context(parentNode: Node)
-    fun createNode(buildContext: BuildContext, params: Params, callback: Callback): Node
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 
     fun createParamsForAvatar(filename: String, avatarUrl: String): Params
 

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPoint.kt

@@ -17,8 +17,11 @@ import io.element.android.libraries.mediaviewer.impl.gallery.root.MediaGalleryFl
 
 @ContributesBinding(AppScope::class)
 class DefaultMediaGalleryEntryPoint : MediaGalleryEntryPoint {
-    context(parentNode: Node)
-    override fun createNode(buildContext: BuildContext, callback: MediaGalleryEntryPoint.Callback): Node {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: MediaGalleryEntryPoint.Callback,
+    ): Node {
         return parentNode.createNode<MediaGalleryFlowNode>(
             buildContext = buildContext,
             plugins = listOf(callback),

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt

@@ -48,8 +48,8 @@ class DefaultMediaViewerEntryPoint : MediaViewerEntryPoint {
         )
     }
 
-    context(parentNode: Node)
     override fun createNode(
+        parentNode: Node,
         buildContext: BuildContext,
         params: MediaViewerEntryPoint.Params,
         callback: MediaViewerEntryPoint.Callback,

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryFlowNode.kt

@@ -125,6 +125,7 @@ class MediaGalleryFlowNode(
                     }
                 }
                 mediaViewerEntryPoint.createNode(
+                    parentNode = this,
                     buildContext = buildContext,
                     params = MediaViewerEntryPoint.Params(
                         mode = navTarget.mode,

libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPointTest.kt

@@ -42,12 +42,11 @@ class DefaultMediaGalleryEntryPointTest {
             override fun viewInTimeline(eventId: EventId) = lambdaError()
             override fun forward(eventId: EventId) = lambdaError()
         }
-        val result = with(parentNode) {
-            entryPoint.createNode(
-                buildContext = BuildContext.root(null),
-                callback = callback,
-            )
-        }
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(MediaGalleryFlowNode::class.java)
         assertThat(result.plugins).contains(callback)
     }

libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPointTest.kt

@@ -75,13 +75,12 @@ class DefaultMediaViewerEntryPointTest {
             override fun forwardEvent(eventId: EventId) = lambdaError()
         }
         val params = createMediaViewerEntryPointParams()
-        val result = with(parentNode) {
-            entryPoint.createNode(
-                buildContext = BuildContext.root(null),
-                params = params,
-                callback = callback,
-            )
-        }
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(MediaViewerNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)
@@ -125,13 +124,12 @@ class DefaultMediaViewerEntryPointTest {
             filename = "fn",
             avatarUrl = "avatarUrl",
         )
-        val result = with(parentNode) {
-            entryPoint.createNode(
-                buildContext = BuildContext.root(null),
-                params = params,
-                callback = callback,
-            )
-        }
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(MediaViewerNode::class.java)
         assertThat(result.plugins).contains(
             MediaViewerEntryPoint.Params(

libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeMediaGalleryEntryPoint.kt

@@ -13,8 +13,8 @@ import io.element.android.libraries.mediaviewer.api.MediaGalleryEntryPoint
 import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeMediaGalleryEntryPoint : MediaGalleryEntryPoint {
-    context(parentNode: Node)
     override fun createNode(
+        parentNode: Node,
         buildContext: BuildContext,
         callback: MediaGalleryEntryPoint.Callback,
     ): Node = lambdaError()

libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeMediaViewerEntryPoint.kt

@@ -15,8 +15,8 @@ import io.element.android.tests.testutils.lambda.lambdaError
 class FakeMediaViewerEntryPoint : MediaViewerEntryPoint {
     override fun createParamsForAvatar(filename: String, avatarUrl: String) = lambdaError()
 
-    context(parentNode: Node)
     override fun createNode(
+        parentNode: Node,
         buildContext: BuildContext,
         params: MediaViewerEntryPoint.Params,
         callback: MediaViewerEntryPoint.Callback,