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

Avoid using navigateUp.

Browse source
This commit is contained in:
Benoit Marty 2025-11-21 15:13:23 +01:00
parent 4a90186bd1
commit f05a00b9b3
4 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
View file

@ -40,6 +40,7 @@ import io.element.android.libraries.architecture.BaseFlowNode
import io.element.android.libraries.architecture.appyx.canPop
import io.element.android.libraries.architecture.callback
import io.element.android.libraries.architecture.createNode
import io.element.android.libraries.architecture.navigation.BaseCallback
import io.element.android.libraries.di.SessionScope
import io.element.android.libraries.matrix.api.core.EventId
import io.element.android.libraries.matrix.api.core.RoomId
@ -267,7 +268,8 @@ class PreferencesFlowNode(
}
is NavTarget.UserProfile -> {
val inputs = EditUserProfileNode.Inputs(navTarget.matrixUser)
createNode<EditUserProfileNode>(buildContext, listOf(inputs))
val callback = BaseCallback { backstack.pop() }
createNode<EditUserProfileNode>(buildContext, listOf(inputs, callback))
}
NavTarget.LockScreenSettings -> {
lockScreenEntryPoint.createNode(

8
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
View file

@ -17,7 +17,9 @@ 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
import io.element.android.libraries.architecture.navigation.BaseCallback
import io.element.android.libraries.architecture.navigation.BaseNavigator
import io.element.android.libraries.di.SessionScope
import io.element.android.libraries.matrix.api.user.MatrixUser
@ -35,6 +37,7 @@ class EditUserProfileNode(
) : NodeInputs
val matrixUser = inputs<Inputs>().matrixUser
val callback: BaseCallback = callback()
val presenter = presenterFactory.create(
matrixUser = matrixUser,
navigator = this,
@ -50,8 +53,5 @@ class EditUserProfileNode(
)
}
override fun close() {
// TODO Invoke callback
navigateUp()
}
override fun close() = callback.onDone()
}

17
libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseCallback.kt Normal file
View file

@ -0,0 +1,17 @@
/*
* Copyright (c) 2025 Element Creations Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.architecture.navigation
import com.bumble.appyx.core.plugin.Plugin
/**
* Base callback interface to be implemented by callers to handle results from nodes.
*/
fun interface BaseCallback : Plugin {
fun onDone()
}

3
libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/navigation/BaseNavigator.kt
View file

@ -7,6 +7,9 @@
package io.element.android.libraries.architecture.navigation
/**
* Base navigator interface to be implemented by nodes to handle navigation actions from presenters.
*/
fun interface BaseNavigator {
fun close()
}