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

Rename fun in Callback for clarity.

Browse source
This commit is contained in:
Benoit Marty 2025-10-29 10:30:30 +01:00 • committed by Benoit Marty
parent 353c00e032
commit 43972dba68
104 changed files with 658 additions and 664 deletions
Download patch file Download diff file Expand all files Collapse all files

12
features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt
View file

@ -80,19 +80,19 @@ class SpaceFlowNode(
}
NavTarget.Root -> {
val callback = object : SpaceNode.Callback {
override fun onOpenRoom(roomId: RoomId, viaParameters: List<String>) {
callback.onOpenRoom(roomId, viaParameters)
override fun navigateToRoom(roomId: RoomId, viaParameters: List<String>) {
callback.navigateToRoom(roomId, viaParameters)
}
override fun onOpenDetails() {
callback.onOpenDetails()
override fun navigateToRoomDetails() {
callback.navigateToRoomDetails()
}
override fun onOpenMemberList() {
callback.onOpenMemberList()
callback.navigateToRoomMemberList()
}
override fun onLeaveSpace() {
override fun startLeaveSpaceFlow() {
backstack.push(NavTarget.Leave)
}
}

15
features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceNode.kt
View file

@ -40,11 +40,10 @@ class SpaceNode(
private val acceptDeclineInviteView: AcceptDeclineInviteView,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
fun onOpenRoom(roomId: RoomId, viaParameters: List<String>)
fun onOpenDetails()
fun navigateToRoom(roomId: RoomId, viaParameters: List<String>)
fun navigateToRoomDetails()
fun onOpenMemberList()
fun onLeaveSpace()
fun startLeaveSpaceFlow()
}
private val callback = plugins.filterIsInstance<Callback>().single()
@ -74,13 +73,13 @@ class SpaceNode(
state = state,
onBackClick = ::navigateUp,
onLeaveSpaceClick = {
callback.onLeaveSpace()
callback.startLeaveSpaceFlow()
},
onRoomClick = { spaceRoom ->
callback.onOpenRoom(spaceRoom.roomId, spaceRoom.via)
callback.navigateToRoom(spaceRoom.roomId, spaceRoom.via)
},
onDetailsClick = {
callback.onOpenDetails()
callback.navigateToRoomDetails()
},
onShareSpace = {
onShareRoom(context)
@ -92,7 +91,7 @@ class SpaceNode(
acceptDeclineInviteView.Render(
state = state.acceptDeclineInviteState,
onAcceptInviteSuccess = { roomId ->
callback.onOpenRoom(roomId, emptyList())
callback.navigateToRoom(roomId, emptyList())
},
onDeclineInviteSuccess = { roomId ->
// No action needed

6
features/space/impl/src/test/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPointTest.kt
View file

@ -44,9 +44,9 @@ class DefaultSpaceEntryPointTest {
)
}
val callback = object : SpaceEntryPoint.Callback {
override fun onOpenRoom(roomId: RoomId, viaParameters: List<String>) = lambdaError()
override fun onOpenDetails() = lambdaError()
override fun onOpenMemberList() = lambdaError()
override fun navigateToRoom(roomId: RoomId, viaParameters: List<String>) = lambdaError()
override fun navigateToRoomDetails() = lambdaError()
override fun navigateToRoomMemberList() = lambdaError()
}
val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
.inputs(nodeInputs)