Change type of roomId from String to RoomId

This commit is contained in:
Benoit Marty
2024-05-15 09:23:30 +02:00
parent b971ac36d3
commit 39d702db5b
5 changed files with 7 additions and 5 deletions

View File

@@ -140,7 +140,7 @@ class RoomDetailsEditPresenter @Inject constructor(
}
return RoomDetailsEditState(
roomId = room.roomId.value,
roomId = room.roomId,
roomName = roomName,
canChangeName = canChangeName,
roomTopic = roomTopic.orEmpty(),

View File

@@ -18,12 +18,13 @@ package io.element.android.features.roomdetails.impl.edit
import android.net.Uri
import io.element.android.libraries.architecture.AsyncAction
import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.libraries.matrix.ui.media.AvatarAction
import io.element.android.libraries.permissions.api.PermissionsState
import kotlinx.collections.immutable.ImmutableList
data class RoomDetailsEditState(
val roomId: String,
val roomId: RoomId,
val roomName: String,
val canChangeName: Boolean,
val roomTopic: String,

View File

@@ -19,6 +19,7 @@ package io.element.android.features.roomdetails.impl.edit
import android.net.Uri
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import io.element.android.libraries.architecture.AsyncAction
import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.libraries.permissions.api.aPermissionsState
import kotlinx.collections.immutable.persistentListOf
@@ -36,7 +37,7 @@ open class RoomDetailsEditStateProvider : PreviewParameterProvider<RoomDetailsEd
}
fun aRoomDetailsEditState() = RoomDetailsEditState(
roomId = "a room id",
roomId = RoomId("!aRoomId:aDomain"),
roomName = "Marketing",
canChangeName = true,
roomTopic = "a room topic that is quite long so should wrap onto multiple lines",

View File

@@ -118,7 +118,7 @@ fun RoomDetailsEditView(
) {
Spacer(modifier = Modifier.height(24.dp))
EditableAvatarView(
userId = state.roomId,
userId = state.roomId.value,
displayName = state.roomName,
avatarUrl = state.roomAvatarUrl,
avatarSize = AvatarSize.EditRoomDetails,

View File

@@ -97,7 +97,7 @@ class RoomDetailsEditPresenterTest {
presenter.present()
}.test {
val initialState = awaitItem()
assertThat(initialState.roomId).isEqualTo(room.roomId.value)
assertThat(initialState.roomId).isEqualTo(room.roomId)
assertThat(initialState.roomName).isEqualTo(room.displayName)
assertThat(initialState.roomAvatarUrl).isEqualTo(roomAvatarUri)
assertThat(initialState.roomTopic).isEqualTo(room.topic.orEmpty())