Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 9 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 596b7f00fc
commit 5197154f54
76 changed files with 374 additions and 741 deletions
Download patch file Download diff file Expand all files Collapse all files

8
features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportFlowNode.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
@ -25,6 +24,7 @@ import io.element.android.features.rageshake.api.bugreport.BugReportEntryPoint
import io.element.android.features.viewfolder.api.ViewFolderEntryPoint
import io.element.android.libraries.architecture.BackstackView
import io.element.android.libraries.architecture.BaseFlowNode
import io.element.android.libraries.architecture.callback
import io.element.android.libraries.architecture.createNode
import kotlinx.parcelize.Parcelize
@ -42,9 +42,7 @@ class BugReportFlowNode(
buildContext = buildContext,
plugins = plugins
) {
private fun onDone() {
plugins<BugReportEntryPoint.Callback>().forEach { it.onDone() }
}
private val callback: BugReportEntryPoint.Callback = callback()
sealed interface NavTarget : Parcelable {
@Parcelize
@ -61,7 +59,7 @@ class BugReportFlowNode(
NavTarget.Root -> {
val callback = object : BugReportNode.Callback {
override fun onDone() {
this@BugReportFlowNode.onDone()
callback.onDone()
}
override fun navigateToViewLogs(basePath: String) {

14
features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportNode.kt
View file

@ -13,13 +13,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.rageshake.api.reporter.BugReporter
import io.element.android.libraries.androidutils.system.toast
import io.element.android.libraries.architecture.callback
import io.element.android.libraries.ui.strings.CommonStrings
@ContributesNode(AppScope::class)
@ -35,13 +35,7 @@ class BugReportNode(
fun navigateToViewLogs(basePath: String)
}
private fun onViewLogs(basePath: String) {
plugins<Callback>().forEach { it.navigateToViewLogs(basePath) }
}
private fun onDone() {
plugins<Callback>().forEach { it.onDone() }
}
private val callback: Callback = callback()
@Composable
override fun View(modifier: Modifier) {
@ -53,12 +47,12 @@ class BugReportNode(
onBackClick = { navigateUp() },
onSuccess = {
activity?.toast(CommonStrings.common_report_submitted)
onDone()
callback.onDone()
},
onViewLogs = {
// Force a logcat dump
bugReporter.saveLogCat()
onViewLogs(bugReporter.logDirectory().absolutePath)
callback.navigateToViewLogs(bugReporter.logDirectory().absolutePath)
}
)
}