From 596b7f00fc95d7cd4f3b71b668f90527259fc209 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 30 Oct 2025 08:36:14 +0100 Subject: [PATCH] More renaming --- .../roomdetails/impl/RoomDetailsNode.kt | 100 ++++-------------- .../features/space/impl/SpaceFlowNode.kt | 2 +- .../features/space/impl/root/SpaceNode.kt | 4 +- 3 files changed, 25 insertions(+), 81 deletions(-) diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt index ea37c0f774..c439c2ce49 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt @@ -63,7 +63,7 @@ class RoomDetailsNode( fun navigateToSelectNewOwnersWhenLeaving() } - private val callback = plugins().first() + private val callback = plugins().single() init { lifecycle.subscribe( @@ -73,30 +73,6 @@ class RoomDetailsNode( ) } - private fun openRoomMemberList() { - callback.navigateToRoomMemberList() - } - - private fun openRoomNotificationSettings() { - callback.navigateToRoomNotificationSettings() - } - - private fun invitePeople() { - callback.navigateToInviteMembers() - } - - private fun openPollHistory() { - callback.navigateToPollHistory() - } - - private fun openMediaGallery() { - callback.navigateToMediaGallery() - } - - private fun onJoinCall() { - callback.navigateToRoomCall() - } - private fun CoroutineScope.onShareRoom(context: Context) = launch { room.getPermalink() .onSuccess { permalink -> @@ -112,42 +88,6 @@ class RoomDetailsNode( } } - private fun onEditRoomDetails() { - callback.navigateToRoomDetailsEdit() - } - - private fun openAvatarPreview(name: String, url: String) { - callback.navigateToAvatarPreview(name, url) - } - - private fun openAdminSettings() { - callback.navigateToAdminSettings() - } - - private fun openPinnedMessages() { - callback.navigateToPinnedMessagesList() - } - - private fun openKnockRequestsLists() { - callback.navigateToKnockRequestsList() - } - - private fun openSecurityAndPrivacy() { - callback.navigateToSecurityAndPrivacy() - } - - private fun onProfileClick(userId: UserId) { - callback.navigateToRoomMemberDetails(userId) - } - - private fun onReportRoomClick() { - callback.navigateToReportRoom() - } - - private fun onSelectNewOwnersWhenLeaving() { - return callback.navigateToSelectNewOwnersWhenLeaving() - } - private val stateFlow = launchMolecule { presenter.present() } fun onNewOwnersSelected() { @@ -165,34 +105,38 @@ class RoomDetailsNode( fun onActionClick(action: RoomDetailsAction) { when (action) { - RoomDetailsAction.Edit -> onEditRoomDetails() - RoomDetailsAction.AddTopic -> onEditRoomDetails() + RoomDetailsAction.Edit -> { + callback.navigateToRoomDetailsEdit() + } + RoomDetailsAction.AddTopic -> { + callback.navigateToRoomDetailsEdit() + } } } RoomDetailsView( state = state, modifier = modifier, - goBack = this::navigateUp, + goBack = ::navigateUp, onActionClick = ::onActionClick, onShareRoom = ::onShareRoom, - openRoomMemberList = ::openRoomMemberList, - openRoomNotificationSettings = ::openRoomNotificationSettings, - invitePeople = ::invitePeople, - openAvatarPreview = ::openAvatarPreview, - openPollHistory = ::openPollHistory, - openMediaGallery = ::openMediaGallery, - openAdminSettings = this::openAdminSettings, - onJoinCallClick = ::onJoinCall, - onPinnedMessagesClick = ::openPinnedMessages, - onKnockRequestsClick = ::openKnockRequestsLists, - onSecurityAndPrivacyClick = ::openSecurityAndPrivacy, - onProfileClick = ::onProfileClick, - onReportRoomClick = ::onReportRoomClick, + openRoomMemberList = callback::navigateToRoomMemberList, + openRoomNotificationSettings = callback::navigateToRoomNotificationSettings, + invitePeople = callback::navigateToInviteMembers, + openAvatarPreview = callback::navigateToAvatarPreview, + openPollHistory = callback::navigateToPollHistory, + openMediaGallery = callback::navigateToMediaGallery, + openAdminSettings = callback::navigateToAdminSettings, + onJoinCallClick = callback::navigateToRoomCall, + onPinnedMessagesClick = callback::navigateToPinnedMessagesList, + onKnockRequestsClick = callback::navigateToKnockRequestsList, + onSecurityAndPrivacyClick = callback::navigateToSecurityAndPrivacy, + onProfileClick = callback::navigateToRoomMemberDetails, + onReportRoomClick = callback::navigateToReportRoom, leaveRoomView = { leaveRoomRenderer.Render( state = state.leaveRoomState, - onSelectNewOwners = { onSelectNewOwnersWhenLeaving() }, + onSelectNewOwners = { callback.navigateToSelectNewOwnersWhenLeaving() }, modifier = Modifier ) } diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt index a9f8a79ed6..fb3de4a9be 100644 --- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt +++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt @@ -88,7 +88,7 @@ class SpaceFlowNode( callback.navigateToRoomDetails() } - override fun onOpenMemberList() { + override fun navigateToRoomMemberList() { callback.navigateToRoomMemberList() } diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceNode.kt index 978dc8dcbf..28481651eb 100644 --- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceNode.kt +++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceNode.kt @@ -42,7 +42,7 @@ class SpaceNode( interface Callback : Plugin { fun navigateToRoom(roomId: RoomId, viaParameters: List) fun navigateToRoomDetails() - fun onOpenMemberList() + fun navigateToRoomMemberList() fun startLeaveSpaceFlow() } @@ -85,7 +85,7 @@ class SpaceNode( onShareRoom(context) }, onViewMembersClick = { - callback.onOpenMemberList() + callback.navigateToRoomMemberList() }, acceptDeclineInviteView = { acceptDeclineInviteView.Render(