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

This commit is contained in:
Benoit Marty
2025-10-31 12:04:57 +01:00
parent 45400d70d2
commit e70d767183
161 changed files with 668 additions and 436 deletions

View File

@@ -18,6 +18,9 @@ interface CreatePollEntryPoint : FeatureEntryPoint {
val mode: CreatePollMode,
)
context(parentNode: Node)
fun createNode(buildContext: BuildContext, params: Params): Node
fun createNode(
parentNode: Node,
buildContext: BuildContext,
params: Params,
): Node
}

View File

@@ -16,8 +16,11 @@ import io.element.android.libraries.architecture.createNode
@ContributesBinding(AppScope::class)
class DefaultCreatePollEntryPoint : CreatePollEntryPoint {
context(parentNode: Node)
override fun createNode(buildContext: BuildContext, params: CreatePollEntryPoint.Params): Node {
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
params: CreatePollEntryPoint.Params,
): Node {
return parentNode.createNode<CreatePollNode>(
buildContext = buildContext,
plugins = listOf(CreatePollNode.Inputs(timelineMode = params.timelineMode, mode = params.mode))

View File

@@ -16,8 +16,7 @@ import io.element.android.libraries.architecture.createNode
@ContributesBinding(AppScope::class)
class DefaultPollHistoryEntryPoint : PollHistoryEntryPoint {
context(parentNode: Node)
override fun createNode(buildContext: BuildContext): Node {
override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
return parentNode.createNode<PollHistoryFlowNode>(buildContext)
}
}

View File

@@ -54,6 +54,7 @@ class PollHistoryFlowNode(
return when (navTarget) {
is NavTarget.EditPoll -> {
createPollEntryPoint.createNode(
parentNode = this,
buildContext = buildContext,
params = CreatePollEntryPoint.Params(
timelineMode = Timeline.Mode.Live,

View File

@@ -53,12 +53,11 @@ class DefaultCreatePollEntryPointTest {
timelineMode = Timeline.Mode.Live,
mode = CreatePollMode.NewPoll,
)
val result = with(parentNode) {
entryPoint.createNode(
buildContext = BuildContext.root(null),
params = params,
)
}
val result = entryPoint.createNode(
parentNode = parentNode,
buildContext = BuildContext.root(null),
params = params,
)
assertThat(result).isInstanceOf(CreatePollNode::class.java)
assertThat(result.plugins).contains(CreatePollNode.Inputs(timelineMode = params.timelineMode, mode = params.mode))
}

View File

@@ -34,9 +34,7 @@ class DefaultPollHistoryEntryPointTest {
createPollEntryPoint = FakeCreatePollEntryPoint(),
)
}
val result = with(parentNode) {
entryPoint.createNode(BuildContext.root(null))
}
val result = entryPoint.createNode(parentNode, BuildContext.root(null))
assertThat(result).isInstanceOf(PollHistoryFlowNode::class.java)
}
}

View File

@@ -14,8 +14,8 @@ import io.element.android.features.poll.api.create.CreatePollEntryPoint.Params
import io.element.android.tests.testutils.lambda.lambdaError
class FakeCreatePollEntryPoint : CreatePollEntryPoint {
context(parentNode: Node)
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
params: Params,
): Node = lambdaError()

View File

@@ -13,8 +13,8 @@ import io.element.android.features.poll.api.history.PollHistoryEntryPoint
import io.element.android.tests.testutils.lambda.lambdaError
class FakePollHistoryEntryPoint : PollHistoryEntryPoint {
context(parentNode: Node)
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
): Node = lambdaError()
}