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

Ensure a Callback and only one is provided in the Plugin. Also reduce boilerplate code in Nodes.

Browse source
This commit is contained in:
Benoit Marty 2025-10-30 09:14:41 +01:00 • committed by Benoit Marty
parent 2e8785b36b
commit be03c50aaf
76 changed files with 374 additions and 741 deletions
Download patch file Download diff file Expand all files Collapse all files

9
features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileNode.kt
View file

@ -12,12 +12,12 @@ import androidx.compose.ui.Modifier
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
import com.bumble.appyx.core.plugin.plugins
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.Assisted
import dev.zacsweers.metro.AssistedInject
import io.element.android.annotations.ContributesNode
import io.element.android.libraries.architecture.NodeInputs
import io.element.android.libraries.architecture.callback
import io.element.android.libraries.architecture.inputs
@ContributesNode(AppScope::class)
@ -36,6 +36,7 @@ class ViewFileNode(
fun onBackClick()
}
private val callback: Callback = callback()
private val inputs: Inputs = inputs()
private val presenter = presenterFactory.create(
@ -43,17 +44,13 @@ class ViewFileNode(
name = inputs.name,
)
private fun onBackClick() {
plugins<Callback>().forEach { it.onBackClick() }
}
@Composable
override fun View(modifier: Modifier) {
val state = presenter.present()
ViewFileView(
state = state,
modifier = modifier,
onBackClick = ::onBackClick,
onBackClick = callback::onBackClick,
)
}
}

15
features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderNode.kt
View file

@ -12,13 +12,13 @@ import androidx.compose.ui.Modifier
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
import com.bumble.appyx.core.plugin.plugins
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.Assisted
import dev.zacsweers.metro.AssistedInject
import io.element.android.annotations.ContributesNode
import io.element.android.features.viewfolder.impl.model.Item
import io.element.android.libraries.architecture.NodeInputs
import io.element.android.libraries.architecture.callback
import io.element.android.libraries.architecture.inputs
@ContributesNode(AppScope::class)
@ -38,6 +38,7 @@ class ViewFolderNode(
fun navigateToItem(item: Item)
}
private val callback: Callback = callback()
private val inputs: Inputs = inputs()
private val presenter = presenterFactory.create(
@ -45,22 +46,14 @@ class ViewFolderNode(
path = inputs.path,
)
private fun onBackClick() {
plugins<Callback>().forEach { it.onBackClick() }
}
private fun onNavigateTo(item: Item) {
plugins<Callback>().forEach { it.navigateToItem(item) }
}
@Composable
override fun View(modifier: Modifier) {
val state = presenter.present()
ViewFolderView(
state = state,
modifier = modifier,
onNavigateTo = ::onNavigateTo,
onBackClick = ::onBackClick,
onNavigateTo = callback::navigateToItem,
onBackClick = callback::onBackClick,
)
}
}

9
features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/root/ViewFolderFlowNode.kt
View file

@ -13,7 +13,6 @@ import androidx.compose.ui.Modifier
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
import com.bumble.appyx.core.plugin.plugins
import com.bumble.appyx.navmodel.backstack.BackStack
import com.bumble.appyx.navmodel.backstack.operation.pop
import com.bumble.appyx.navmodel.backstack.operation.push
@ -28,6 +27,7 @@ import io.element.android.features.viewfolder.impl.model.Item
import io.element.android.libraries.architecture.BackstackView
import io.element.android.libraries.architecture.BaseFlowNode
import io.element.android.libraries.architecture.NodeInputs
import io.element.android.libraries.architecture.callback
import io.element.android.libraries.architecture.createNode
import io.element.android.libraries.architecture.inputs
import kotlinx.parcelize.Parcelize
@ -65,6 +65,7 @@ class ViewFolderFlowNode(
val rootPath: String,
) : NodeInputs
private val callback: ViewFolderEntryPoint.Callback = callback()
private val inputs: Inputs = inputs()
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
@ -108,7 +109,7 @@ class ViewFolderFlowNode(
): Node {
val callback: ViewFolderNode.Callback = object : ViewFolderNode.Callback {
override fun onBackClick() {
onDone()
callback.onDone()
}
override fun navigateToItem(item: Item) {
@ -133,8 +134,4 @@ class ViewFolderFlowNode(
override fun View(modifier: Modifier) {
BackstackView()
}
private fun onDone() {
plugins<ViewFolderEntryPoint.Callback>().forEach { it.onDone() }
}
}