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

Improve anInviteSender() and use it in RoomListStateProvider.

Browse source
This commit is contained in:
Benoit Marty 2024-04-18 14:31:38 +02:00
parent 3526df77d1
commit 1baac47e78
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt
View file

@ -23,10 +23,10 @@ import io.element.android.features.leaveroom.api.LeaveRoomState
import io.element.android.features.leaveroom.api.aLeaveRoomState import io.element.android.features.leaveroom.api.aLeaveRoomState
import io.element.android.features.roomlist.impl.filters.RoomListFiltersState import io.element.android.features.roomlist.impl.filters.RoomListFiltersState
import io.element.android.features.roomlist.impl.filters.aRoomListFiltersState import io.element.android.features.roomlist.impl.filters.aRoomListFiltersState
import io.element.android.features.roomlist.impl.model.InviteSender
import io.element.android.features.roomlist.impl.model.RoomListRoomSummary import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType
import io.element.android.features.roomlist.impl.model.aRoomListRoomSummary import io.element.android.features.roomlist.impl.model.aRoomListRoomSummary
import io.element.android.features.roomlist.impl.model.anInviteSender
import io.element.android.features.roomlist.impl.search.RoomListSearchState import io.element.android.features.roomlist.impl.search.RoomListSearchState
import io.element.android.features.roomlist.impl.search.aRoomListSearchState import io.element.android.features.roomlist.impl.search.aRoomListSearchState
import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarData
@ -88,11 +88,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
name = "Room Invited", name = "Room Invited",
avatarData = AvatarData("!roomId", "Room with Alice and Bob", size = AvatarSize.RoomListItem), avatarData = AvatarData("!roomId", "Room with Alice and Bob", size = AvatarSize.RoomListItem),
id = "!roomId:domain", id = "!roomId:domain",
inviteSender = InviteSender( inviteSender = anInviteSender(),
userId = UserId("@bob:domain"),
displayName = "Bob",
avatarData = AvatarData("@bob:domain", "Bob", size = AvatarSize.InviteSender),
),
displayType = RoomSummaryDisplayType.INVITE, displayType = RoomSummaryDisplayType.INVITE,
), ),
aRoomListRoomSummary( aRoomListRoomSummary(

13
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt
View file

@ -86,7 +86,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
aRoomListRoomSummary( aRoomListRoomSummary(
displayType = RoomSummaryDisplayType.INVITE, displayType = RoomSummaryDisplayType.INVITE,
inviteSender = anInviteSender( inviteSender = anInviteSender(
userId = "@alice:matrix.org", userId = UserId("@alice:matrix.org"),
displayName = "Alice", displayName = "Alice",
), ),
canonicalAlias = RoomAlias("#alias:matrix.org"), canonicalAlias = RoomAlias("#alias:matrix.org"),
@ -95,7 +95,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
name = "Bob", name = "Bob",
displayType = RoomSummaryDisplayType.INVITE, displayType = RoomSummaryDisplayType.INVITE,
inviteSender = anInviteSender( inviteSender = anInviteSender(
userId = "@bob:matrix.org", userId = UserId("@bob:matrix.org"),
displayName = "Bob", displayName = "Bob",
), ),
isDirect = true, isDirect = true,
@ -105,12 +105,13 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
} }
internal fun anInviteSender( internal fun anInviteSender(
userId: String, userId: UserId = UserId("@bob:domain"),
displayName: String, displayName: String = "Bob",
avatarData: AvatarData = AvatarData(userId.value, displayName, size = AvatarSize.InviteSender),
) = InviteSender( ) = InviteSender(
userId = UserId(userId), userId = userId,
displayName = displayName, displayName = displayName,
avatarData = AvatarData(userId, displayName, size = AvatarSize.InviteSender), avatarData = avatarData,
) )
internal fun aRoomListRoomSummary( internal fun aRoomListRoomSummary(