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

Rename callbacks for clarity and consistency

Browse source
This commit is contained in:
Florian Renaud 2023-04-14 16:46:45 +02:00
parent 3c9af936ab
commit 9fcbab851a
5 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
View file

@ -56,10 +56,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.libraries.matrix.ui.di.MatrixUIBindings
import io.element.android.services.appnavstate.api.AppNavigationStateService
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import kotlinx.parcelize.Parcelize
import kotlin.coroutines.coroutineContext
@ContributesNode(AppScope::class)
class LoggedInFlowNode @AssistedInject constructor(
@ -201,7 +198,7 @@ class LoggedInFlowNode @AssistedInject constructor(
}
NavTarget.CreateRoom -> {
val callback = object : CreateRoomEntryPoint.Callback {
override fun onOpenRoom(roomId: RoomId) {
override fun onSuccess(roomId: RoomId) {
backstack.replace(NavTarget.Room(roomId))
}
}

2
features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt
View file

@ -31,6 +31,6 @@ interface CreateRoomEntryPoint : FeatureEntryPoint {
}
interface Callback : Plugin {
fun onOpenRoom(roomId: RoomId)
fun onSuccess(roomId: RoomId)
}
}

8
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt
View file

@ -68,16 +68,16 @@ class CreateRoomFlowNode @AssistedInject constructor(
backstack.push(NavTarget.NewRoom)
}
override fun onOpenRoom(roomId: RoomId) {
plugins<CreateRoomEntryPoint.Callback>().forEach { it.onOpenRoom(roomId) }
override fun onStartChatSuccess(roomId: RoomId) {
plugins<CreateRoomEntryPoint.Callback>().forEach { it.onSuccess(roomId) }
}
}
createNode<CreateRoomRootNode>(context = buildContext, plugins = listOf(callback))
}
NavTarget.NewRoom -> {
val callback = object : ConfigureRoomNode.Callback {
override fun onRoomCreated(roomId: RoomId) {
plugins<CreateRoomEntryPoint.Callback>().forEach { it.onOpenRoom(roomId) }
override fun onCreateRoomSuccess(roomId: RoomId) {
plugins<CreateRoomEntryPoint.Callback>().forEach { it.onSuccess(roomId) }
}
}
createNode<ConfigureRoomFlowNode>(context = buildContext, plugins = listOf(callback))

8
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt
View file

@ -36,12 +36,12 @@ class ConfigureRoomNode @AssistedInject constructor(
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
fun onRoomCreated(roomId: RoomId)
fun onCreateRoomSuccess(roomId: RoomId)
}
private val callback = object : Callback {
override fun onRoomCreated(roomId: RoomId) {
plugins<Callback>().forEach { it.onRoomCreated(roomId) }
override fun onCreateRoomSuccess(roomId: RoomId) {
plugins<Callback>().forEach { it.onCreateRoomSuccess(roomId) }
}
}
@ -52,7 +52,7 @@ class ConfigureRoomNode @AssistedInject constructor(
state = state,
modifier = modifier,
onBackPressed = this::navigateUp,
onRoomCreated = callback::onRoomCreated
onRoomCreated = callback::onCreateRoomSuccess
)
}
}

8
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootNode.kt
View file

@ -37,7 +37,7 @@ class CreateRoomRootNode @AssistedInject constructor(
interface Callback : Plugin {
fun onCreateNewRoom()
fun onOpenRoom(roomId: RoomId)
fun onStartChatSuccess(roomId: RoomId)
}
private val callback = object : Callback {
@ -45,8 +45,8 @@ class CreateRoomRootNode @AssistedInject constructor(
plugins<Callback>().forEach { it.onCreateNewRoom() }
}
override fun onOpenRoom(roomId: RoomId) {
plugins<Callback>().forEach { it.onOpenRoom(roomId) }
override fun onStartChatSuccess(roomId: RoomId) {
plugins<Callback>().forEach { it.onStartChatSuccess(roomId) }
}
}
@ -58,7 +58,7 @@ class CreateRoomRootNode @AssistedInject constructor(
modifier = modifier,
onClosePressed = this::navigateUp,
onNewRoomClicked = callback::onCreateNewRoom,
onOpenDM = callback::onOpenRoom,
onOpenDM = callback::onStartChatSuccess,
)
}
}