From 9fcbab851a9101b38c5a0c608d961a982e091fd2 Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Fri, 14 Apr 2023 16:46:45 +0200 Subject: [PATCH] Rename callbacks for clarity and consistency --- .../kotlin/io/element/android/appnav/LoggedInFlowNode.kt | 5 +---- .../features/createroom/api/CreateRoomEntryPoint.kt | 2 +- .../features/createroom/impl/CreateRoomFlowNode.kt | 8 ++++---- .../createroom/impl/configureroom/ConfigureRoomNode.kt | 8 ++++---- .../features/createroom/impl/root/CreateRoomRootNode.kt | 8 ++++---- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt index 6f9319f923..5aee5cb22c 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt @@ -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)) } } diff --git a/features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt b/features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt index 73f5110daa..18e0e4e28f 100644 --- a/features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt +++ b/features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt @@ -31,6 +31,6 @@ interface CreateRoomEntryPoint : FeatureEntryPoint { } interface Callback : Plugin { - fun onOpenRoom(roomId: RoomId) + fun onSuccess(roomId: RoomId) } } diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt index 1376a7270f..6f447e6bc9 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt @@ -68,16 +68,16 @@ class CreateRoomFlowNode @AssistedInject constructor( backstack.push(NavTarget.NewRoom) } - override fun onOpenRoom(roomId: RoomId) { - plugins().forEach { it.onOpenRoom(roomId) } + override fun onStartChatSuccess(roomId: RoomId) { + plugins().forEach { it.onSuccess(roomId) } } } createNode(context = buildContext, plugins = listOf(callback)) } NavTarget.NewRoom -> { val callback = object : ConfigureRoomNode.Callback { - override fun onRoomCreated(roomId: RoomId) { - plugins().forEach { it.onOpenRoom(roomId) } + override fun onCreateRoomSuccess(roomId: RoomId) { + plugins().forEach { it.onSuccess(roomId) } } } createNode(context = buildContext, plugins = listOf(callback)) diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt index aaa6f9667a..060bb447e7 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt @@ -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().forEach { it.onRoomCreated(roomId) } + override fun onCreateRoomSuccess(roomId: RoomId) { + plugins().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 ) } } diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootNode.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootNode.kt index 3a714a0eb3..596255dc15 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootNode.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootNode.kt @@ -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().forEach { it.onCreateNewRoom() } } - override fun onOpenRoom(roomId: RoomId) { - plugins().forEach { it.onOpenRoom(roomId) } + override fun onStartChatSuccess(roomId: RoomId) { + plugins().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, ) } }