Remove NodeBuilder to ensure that Params and Callback are always provided.

This commit is contained in:
Benoit Marty
2025-10-30 11:37:59 +01:00
committed by Benoit Marty
parent 5197154f54
commit 566515ca88
115 changed files with 954 additions and 1174 deletions

View File

@@ -18,10 +18,5 @@ interface CreatePollEntryPoint : FeatureEntryPoint {
val mode: CreatePollMode,
)
fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
interface NodeBuilder {
fun params(params: Params): NodeBuilder
fun build(): Node
}
fun createNode(parentNode: Node, buildContext: BuildContext, params: Params): Node
}

View File

@@ -9,7 +9,6 @@ package io.element.android.features.poll.impl.create
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesBinding
import io.element.android.features.poll.api.create.CreatePollEntryPoint
@@ -17,18 +16,10 @@ import io.element.android.libraries.architecture.createNode
@ContributesBinding(AppScope::class)
class DefaultCreatePollEntryPoint : CreatePollEntryPoint {
override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): CreatePollEntryPoint.NodeBuilder {
val plugins = ArrayList<Plugin>()
return object : CreatePollEntryPoint.NodeBuilder {
override fun params(params: CreatePollEntryPoint.Params): CreatePollEntryPoint.NodeBuilder {
plugins += CreatePollNode.Inputs(timelineMode = params.timelineMode, mode = params.mode)
return this
}
override fun build(): Node {
return parentNode.createNode<CreatePollNode>(buildContext, plugins)
}
}
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

@@ -53,14 +53,14 @@ class PollHistoryFlowNode(
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
return when (navTarget) {
is NavTarget.EditPoll -> {
createPollEntryPoint.nodeBuilder(this, buildContext)
.params(
CreatePollEntryPoint.Params(
createPollEntryPoint.createNode(
parentNode = this,
buildContext = buildContext,
params = CreatePollEntryPoint.Params(
timelineMode = Timeline.Mode.Live,
mode = CreatePollMode.EditPoll(eventId = navTarget.pollStartEventId)
)
)
.build()
)
}
NavTarget.Root -> {
val callback = object : PollHistoryNode.Callback {

View File

@@ -53,9 +53,11 @@ class DefaultCreatePollEntryPointTest {
timelineMode = Timeline.Mode.Live,
mode = CreatePollMode.NewPoll,
)
val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
.params(params)
.build()
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,7 +34,11 @@ class DefaultPollHistoryEntryPointTest {
buildContext = buildContext,
plugins = plugins,
createPollEntryPoint = object : CreatePollEntryPoint {
override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
params: CreatePollEntryPoint.Params,
) = lambdaError()
}
)
}