ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 12:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Benoit Marty
2025-10-30 11:37:59 +01:00
committed by Benoit Marty
parent be03c50aaf
commit 02dc71c4c3
115 changed files with 954 additions and 1174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareEntryPoint.kt
+8 -19
View File
@@ -9,7 +9,6 @@ package io.element.android.features.share.impl
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.ContributesBinding
import io.element.android.features.share.api.ShareEntryPoint
import io.element.android.libraries.architecture.createNode
@@ -17,23 +16,13 @@ import io.element.android.libraries.di.SessionScope
@ContributesBinding(SessionScope::class)
class DefaultShareEntryPoint : ShareEntryPoint {
override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): ShareEntryPoint.NodeBuilder {
val plugins = ArrayList<Plugin>()
return object : ShareEntryPoint.NodeBuilder {
override fun params(params: ShareEntryPoint.Params): ShareEntryPoint.NodeBuilder {
plugins += ShareNode.Inputs(intent = params.intent)
return this
}
override fun callback(callback: ShareEntryPoint.Callback): ShareEntryPoint.NodeBuilder {
plugins += callback
return this
}
override fun build(): Node {
return parentNode.createNode<ShareNode>(buildContext, plugins)
}
}
override fun createNode(parentNode: Node, buildContext: BuildContext, params: ShareEntryPoint.Params, callback: ShareEntryPoint.Callback): Node {
return parentNode.createNode<ShareNode>(
buildContext = buildContext,
plugins = listOf(
ShareNode.Inputs(intent = params.intent),
callback,
)
)
}
}
features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareNode.kt
+6 -4
View File
@@ -66,10 +66,12 @@ class ShareNode(
}
}
return roomSelectEntryPoint.nodeBuilder(this, buildContext)
.callback(callback)
.params(RoomSelectEntryPoint.Params(mode = RoomSelectMode.Share))
.build()
return roomSelectEntryPoint.createNode(
parentNode = this,
buildContext = buildContext,
params = RoomSelectEntryPoint.Params(mode = RoomSelectMode.Share),
callback = callback,
)
}
@Composable
features/share/impl/src/test/kotlin/io/element/android/features/share/impl/DefaultShareEntryPointTest.kt
+12 -7
View File
@@ -38,9 +38,12 @@ class DefaultShareEntryPointTest {
plugins = plugins,
presenterFactory = { createSharePresenter() },
roomSelectEntryPoint = object : RoomSelectEntryPoint {
override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomSelectEntryPoint.NodeBuilder {
lambdaError()
}
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
params: RoomSelectEntryPoint.Params,
callback: RoomSelectEntryPoint.Callback,
) = lambdaError()
},
)
}
@@ -50,10 +53,12 @@ class DefaultShareEntryPointTest {
val params = ShareEntryPoint.Params(
intent = Intent(),
)
val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
.params(params)
.callback(callback)
.build()
val result = entryPoint.createNode(
parentNode = parentNode,
buildContext = BuildContext.root(null),
params = params,
callback = callback,
)
assertThat(result).isInstanceOf(ShareNode::class.java)
assertThat(result.plugins).contains(ShareNode.Inputs(params.intent))
assertThat(result.plugins).contains(callback)