From 5ccaeea28618d584314827d0fb4c6e21fd9ac77b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 24 Jun 2024 10:53:24 +0200 Subject: [PATCH] Rename field of `RoomDetailsType.Dm` for clarity --- .../android/features/roomdetails/impl/RoomDetailsPresenter.kt | 2 +- .../android/features/roomdetails/impl/RoomDetailsState.kt | 2 +- .../android/features/roomdetails/impl/RoomDetailsView.kt | 2 +- .../android/features/roomdetails/RoomDetailsPresenterTest.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt index fdca72fa1d..50fad866d9 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt @@ -175,7 +175,7 @@ class RoomDetailsPresenter @Inject constructor( if (dmMember != null && currentMember != null) { RoomDetailsType.Dm( me = currentMember, - roomMember = dmMember, + otherMember = dmMember, ) } else { RoomDetailsType.Room diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt index b991130111..f6a63d70f5 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt @@ -54,7 +54,7 @@ sealed interface RoomDetailsType { data object Room : RoomDetailsType data class Dm( val me: RoomMember, - val roomMember: RoomMember, + val otherMember: RoomMember, ) : RoomDetailsType } diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt index 10f1d473b8..fc2a051dc6 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt @@ -139,7 +139,7 @@ fun RoomDetailsView( is RoomDetailsType.Dm -> { DmHeaderSection( me = state.roomType.me, - otherMember = state.roomType.roomMember, + otherMember = state.roomType.otherMember, roomName = state.roomName, openAvatarPreview = { name, avatarUrl -> openAvatarPreview(name, avatarUrl) diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTest.kt index 351f2ca5e3..92ac27454a 100644 --- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTest.kt +++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTest.kt @@ -172,7 +172,7 @@ class RoomDetailsPresenterTest { assertThat(initialState.roomType).isEqualTo( RoomDetailsType.Dm( me = myRoomMember, - roomMember = otherRoomMember, + otherMember = otherRoomMember, ) ) cancelAndIgnoreRemainingEvents()