Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Benoit Marty 2025-10-31 12:04:57 +01:00
parent f1822c5afd
commit 07b6148035
161 changed files with 668 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/location/api/src/main/kotlin/io/element/android/features/location/api/SendLocationEntryPoint.kt
View file

@ -18,8 +18,8 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
* Allows a user to share a location message within a room.
*/
interface SendLocationEntryPoint : FeatureEntryPoint {
context(parentNode: Node)
fun createNode(
parentNode: Node,
buildContext: BuildContext,
timelineMode: Timeline.Mode,
): Node

12
features/location/api/src/main/kotlin/io/element/android/features/location/api/ShowLocationEntryPoint.kt
View file

@ -13,8 +13,14 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
import io.element.android.libraries.architecture.NodeInputs
interface ShowLocationEntryPoint : FeatureEntryPoint {
data class Inputs(val location: Location, val description: String?) : NodeInputs
data class Inputs(
val location: Location,
val description: String?,
) : NodeInputs
context(parentNode: Node)
fun createNode(buildContext: BuildContext, inputs: Inputs): Node
fun createNode(
parentNode: Node,
buildContext: BuildContext,
inputs: Inputs,
): Node
}

2
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPoint.kt
View file

@ -17,8 +17,8 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
@ContributesBinding(AppScope::class)
class DefaultSendLocationEntryPoint : SendLocationEntryPoint {
context(parentNode: Node)
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
timelineMode: Timeline.Mode,
): Node {

7
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPoint.kt
View file

@ -16,8 +16,11 @@ import io.element.android.libraries.architecture.createNode
@ContributesBinding(AppScope::class)
class DefaultShowLocationEntryPoint : ShowLocationEntryPoint {
context(parentNode: Node)
override fun createNode(buildContext: BuildContext, inputs: ShowLocationEntryPoint.Inputs): Node {
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
inputs: ShowLocationEntryPoint.Inputs,
): Node {
return parentNode.createNode<ShowLocationNode>(buildContext, listOf(inputs))
}
}

11
features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPointTest.kt
View file

@ -47,12 +47,11 @@ class DefaultSendLocationEntryPointTest {
)
}
val timelineMode = Timeline.Mode.Live
val result = with(parentNode) {
entryPoint.createNode(
buildContext = BuildContext.root(null),
timelineMode = timelineMode,
)
}
val result = entryPoint.createNode(
parentNode = parentNode,
buildContext = BuildContext.root(null),
timelineMode = timelineMode,
)
assertThat(result).isInstanceOf(SendLocationNode::class.java)
assertThat(result.plugins).contains(SendLocationNode.Inputs(timelineMode))
}

11
features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPointTest.kt
View file

@ -47,12 +47,11 @@ class DefaultShowLocationEntryPointTest {
location = Location(37.4219983, -122.084, 10f),
description = "My location",
)
val result = with(parentNode) {
entryPoint.createNode(
buildContext = BuildContext.root(null),
inputs = inputs,
)
}
val result = entryPoint.createNode(
parentNode = parentNode,
buildContext = BuildContext.root(null),
inputs = inputs,
)
assertThat(result).isInstanceOf(ShowLocationNode::class.java)
assertThat(result.plugins).contains(inputs)
}

2
features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeSendLocationEntryPoint.kt
View file

@ -14,8 +14,8 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
import io.element.android.tests.testutils.lambda.lambdaError
class FakeSendLocationEntryPoint : SendLocationEntryPoint {
context(parentNode: Node)
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
timelineMode: Timeline.Mode,
): Node = lambdaError()

2
features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeShowLocationEntryPoint.kt
View file

@ -13,8 +13,8 @@ import io.element.android.features.location.api.ShowLocationEntryPoint
import io.element.android.tests.testutils.lambda.lambdaError
class FakeShowLocationEntryPoint : ShowLocationEntryPoint {
context(parentNode: Node)
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
inputs: ShowLocationEntryPoint.Inputs,
): Node = lambdaError()