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

More replacements

Browse source
This commit is contained in:
Benoit Marty 2026-05-07 09:50:00 +02:00
parent f148502b36
commit 50d3876836
3 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt
View file

@ -33,6 +33,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarType.Ro
import io.element.android.libraries.designsystem.components.avatar.anAvatarData import io.element.android.libraries.designsystem.components.avatar.anAvatarData
import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
import io.element.android.libraries.designsystem.theme.components.HorizontalDivider import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.matrix.api.core.RoomAlias import io.element.android.libraries.matrix.api.core.RoomAlias
@ -198,7 +199,7 @@ internal fun SuggestionsPickerViewPreview() {
suggestions = persistentListOf( suggestions = persistentListOf(
ResolvedSuggestion.AtRoom, ResolvedSuggestion.AtRoom,
ResolvedSuggestion.Member(roomMember), ResolvedSuggestion.Member(roomMember),
ResolvedSuggestion.Member(roomMember.copy(userId = UserId("@bob:server.org"), displayName = "Bob")), ResolvedSuggestion.Member(roomMember.copy(userId = UserId("@bob:server.org"), displayName = USER_NAME_BOB)),
ResolvedSuggestion.Alias( ResolvedSuggestion.Alias(
roomAlias = anAlias, roomAlias = anAlias,
roomId = RoomId("!room:matrix.org"), roomId = RoomId("!room:matrix.org"),

30
libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/RoomMemberFixture.kt
View file

@ -8,6 +8,16 @@
package io.element.android.libraries.previewutils.room package io.element.android.libraries.previewutils.room
import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
import io.element.android.libraries.designsystem.preview.USER_NAME_CAROL
import io.element.android.libraries.designsystem.preview.USER_NAME_DAVID
import io.element.android.libraries.designsystem.preview.USER_NAME_EVE
import io.element.android.libraries.designsystem.preview.USER_NAME_JUSTIN
import io.element.android.libraries.designsystem.preview.USER_NAME_MALLORY
import io.element.android.libraries.designsystem.preview.USER_NAME_SUSIE
import io.element.android.libraries.designsystem.preview.USER_NAME_VICTOR
import io.element.android.libraries.designsystem.preview.USER_NAME_WALTER
import io.element.android.libraries.matrix.api.core.UserId import io.element.android.libraries.matrix.api.core.UserId
import io.element.android.libraries.matrix.api.room.RoomMember import io.element.android.libraries.matrix.api.room.RoomMember
import io.element.android.libraries.matrix.api.room.RoomMembershipState import io.element.android.libraries.matrix.api.room.RoomMembershipState
@ -38,27 +48,27 @@ fun aRoomMember(
fun aRoomMemberList() = persistentListOf( fun aRoomMemberList() = persistentListOf(
anAlice(), anAlice(),
aBob(), aBob(),
aRoomMember(UserId("@carol:server.org"), "Carol"), aRoomMember(UserId("@carol:server.org"), USER_NAME_CAROL),
aRoomMember(UserId("@david:server.org"), "David"), aRoomMember(UserId("@david:server.org"), USER_NAME_DAVID),
aRoomMember(UserId("@eve:server.org"), "Eve"), aRoomMember(UserId("@eve:server.org"), USER_NAME_EVE),
aRoomMember(UserId("@justin:server.org"), "Justin"), aRoomMember(UserId("@justin:server.org"), USER_NAME_JUSTIN),
aRoomMember(UserId("@mallory:server.org"), "Mallory"), aRoomMember(UserId("@mallory:server.org"), USER_NAME_MALLORY),
aRoomMember(UserId("@susie:server.org"), "Susie"), aRoomMember(UserId("@susie:server.org"), USER_NAME_SUSIE),
aVictor(), aVictor(),
aWalter(), aWalter(),
) )
fun anAlice() = aRoomMember(UserId("@alice:server.org"), "Alice", role = RoomMember.Role.Admin) fun anAlice() = aRoomMember(UserId("@alice:server.org"), USER_NAME_ALICE, role = RoomMember.Role.Admin)
fun aBob() = aRoomMember(UserId("@bob:server.org"), "Bob", role = RoomMember.Role.Moderator) fun aBob() = aRoomMember(UserId("@bob:server.org"), USER_NAME_BOB, role = RoomMember.Role.Moderator)
fun aVictor() = aRoomMember( fun aVictor() = aRoomMember(
UserId("@victor:server.org"), UserId("@victor:server.org"),
"Victor", USER_NAME_VICTOR,
membership = RoomMembershipState.INVITE membership = RoomMembershipState.INVITE
) )
fun aWalter() = aRoomMember( fun aWalter() = aRoomMember(
UserId("@walter:server.org"), UserId("@walter:server.org"),
"Walter", USER_NAME_WALTER,
membership = RoomMembershipState.INVITE membership = RoomMembershipState.INVITE
) )

3
libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt
View file

@ -8,6 +8,7 @@
package io.element.android.libraries.previewutils.room package io.element.android.libraries.previewutils.room
import io.element.android.libraries.designsystem.preview.SPACE_NAME
import io.element.android.libraries.matrix.api.core.RoomAlias import io.element.android.libraries.matrix.api.core.RoomAlias
import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.libraries.matrix.api.room.CurrentUserMembership import io.element.android.libraries.matrix.api.room.CurrentUserMembership
@ -19,7 +20,7 @@ import kotlinx.collections.immutable.toImmutableList
fun aSpaceRoom( fun aSpaceRoom(
rawName: String? = null, rawName: String? = null,
displayName: String = "Space name", displayName: String = SPACE_NAME,
avatarUrl: String? = null, avatarUrl: String? = null,
canonicalAlias: RoomAlias? = null, canonicalAlias: RoomAlias? = null,
childrenCount: Int = 0, childrenCount: Int = 0,