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

Reduce number of changes in preview.

Browse source
This commit is contained in:
Benoit Marty 2025-10-07 21:56:25 +02:00
parent 73d57e102e
commit e2a6ca5030
7 changed files with 9 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt
View file

@ -30,7 +30,6 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
roomId = RoomId("!spaceId1:example.com"), roomId = RoomId("!spaceId1:example.com"),
), ),
aSpaceRoom( aSpaceRoom(
rawName = null,
numJoinedMembers = 5, numJoinedMembers = 5,
childrenCount = 10, childrenCount = 10,
worldReadable = true, worldReadable = true,
@ -38,14 +37,5 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
roomId = RoomId("!spaceId2:example.com"), roomId = RoomId("!spaceId2:example.com"),
state = CurrentUserMembership.INVITED, state = CurrentUserMembership.INVITED,
), ),
aSpaceRoom(
rawName = null,
numJoinedMembers = 5,
childrenCount = 10,
worldReadable = true,
avatarUrl = "anUrl",
roomId = RoomId("!spaceId3:example.com"),
state = CurrentUserMembership.INVITED,
),
) )
} }

2
features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt
View file

@ -30,7 +30,7 @@ class LeaveSpaceStateProvider : PreviewParameterProvider<LeaveSpaceState> {
persistentListOf( persistentListOf(
aSelectableSpaceRoom( aSelectableSpaceRoom(
spaceRoom = aSpaceRoom( spaceRoom = aSpaceRoom(
rawName = "A long space name that should be truncated", displayName = "A long space name that should be truncated",
worldReadable = true, worldReadable = true,
), ),
isLastAdmin = true, isLastAdmin = true,

1
features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt
View file

@ -37,7 +37,6 @@ open class SpaceStateProvider : PreviewParameterProvider<SpaceState> {
), ),
aSpaceState( aSpaceState(
parentSpace = aSpaceRoom( parentSpace = aSpaceRoom(
rawName = null,
numJoinedMembers = 5, numJoinedMembers = 5,
childrenCount = 10, childrenCount = 10,
worldReadable = true, worldReadable = true,

4
features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt
View file

@ -29,7 +29,7 @@ import org.junit.Test
class LeaveSpacePresenterTest { class LeaveSpacePresenterTest {
private val aSpace = aSpaceRoom( private val aSpace = aSpaceRoom(
roomId = A_SPACE_ID, roomId = A_SPACE_ID,
rawName = A_SPACE_NAME, displayName = A_SPACE_NAME,
) )
@Test @Test
@ -198,7 +198,7 @@ class LeaveSpacePresenterTest {
private fun aLeaveSpaceRoom( private fun aLeaveSpaceRoom(
spaceRoom: SpaceRoom = aSpaceRoom( spaceRoom: SpaceRoom = aSpaceRoom(
roomId = A_SPACE_ID, roomId = A_SPACE_ID,
rawName = A_SPACE_NAME, displayName = A_SPACE_NAME,
), ),
isLastAdmin: Boolean = false, isLastAdmin: Boolean = false,
) = LeaveSpaceRoom( ) = LeaveSpaceRoom(

2
features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt
View file

@ -52,7 +52,7 @@ class SpaceViewTest {
@Test @Test
fun `clicking on a room name invokes the expected callback`() { fun `clicking on a room name invokes the expected callback`() {
val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, rawName = A_ROOM_NAME) val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, displayName = A_ROOM_NAME)
val eventsRecorder = EventsRecorder<SpaceEvents>(expectEvents = false) val eventsRecorder = EventsRecorder<SpaceEvents>(expectEvents = false)
ensureCalledOnceWithParam(aSpaceRoom) { ensureCalledOnceWithParam(aSpaceRoom) {
rule.setSpaceView( rule.setSpaceView(

19
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt
View file

@ -18,17 +18,16 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
override val values: Sequence<SpaceRoom> = sequenceOf( override val values: Sequence<SpaceRoom> = sequenceOf(
aSpaceRoom( aSpaceRoom(
roomType = RoomType.Room, roomType = RoomType.Room,
rawName = "Room name with topic", displayName = "Room name with topic",
topic = "Room topic that is quite long and might be truncated" topic = "Room topic that is quite long and might be truncated"
), ),
aSpaceRoom( aSpaceRoom(
roomType = RoomType.Room, roomType = RoomType.Room,
rawName = "Room name no topic", displayName = "Room name no topic",
state = CurrentUserMembership.LEFT, state = CurrentUserMembership.LEFT,
), ),
aSpaceRoom( aSpaceRoom(
roomType = RoomType.Room, roomType = RoomType.Room,
rawName = null,
isDirect = true, isDirect = true,
heroes = listOf(aMatrixUser(displayName = "Alice")), heroes = listOf(aMatrixUser(displayName = "Alice")),
state = CurrentUserMembership.JOINED, state = CurrentUserMembership.JOINED,
@ -36,13 +35,13 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
), ),
aSpaceRoom( aSpaceRoom(
roomType = RoomType.Room, roomType = RoomType.Room,
rawName = "Room name with topic", displayName = "Room name with topic",
topic = "Room topic that is quite long and might be truncated", topic = "Room topic that is quite long and might be truncated",
state = CurrentUserMembership.INVITED, state = CurrentUserMembership.INVITED,
), ),
aSpaceRoom( aSpaceRoom(
roomType = RoomType.Room, roomType = RoomType.Room,
rawName = "Room name no topic", displayName = "Room name no topic",
state = CurrentUserMembership.INVITED, state = CurrentUserMembership.INVITED,
), ),
aSpaceRoom( aSpaceRoom(
@ -60,7 +59,6 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
state = CurrentUserMembership.LEFT, state = CurrentUserMembership.LEFT,
), ),
aSpaceRoom( aSpaceRoom(
rawName = null,
numJoinedMembers = 5, numJoinedMembers = 5,
childrenCount = 10, childrenCount = 10,
worldReadable = true, worldReadable = true,
@ -68,14 +66,5 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
roomId = RoomId("!spaceId2:example.com"), roomId = RoomId("!spaceId2:example.com"),
state = CurrentUserMembership.INVITED, state = CurrentUserMembership.INVITED,
), ),
aSpaceRoom(
rawName = null,
numJoinedMembers = 5,
childrenCount = 10,
worldReadable = true,
avatarUrl = "anUrl",
roomId = RoomId("!spaceId3:example.com"),
state = CurrentUserMembership.INVITED,
),
) )
} }

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

@ -16,7 +16,7 @@ import io.element.android.libraries.matrix.api.spaces.SpaceRoom
import io.element.android.libraries.matrix.api.user.MatrixUser import io.element.android.libraries.matrix.api.user.MatrixUser
fun aSpaceRoom( fun aSpaceRoom(
rawName: String? = "Space name", rawName: String? = null,
displayName: String = "Space name", displayName: String = "Space name",
avatarUrl: String? = null, avatarUrl: String? = null,
canonicalAlias: RoomAlias? = null, canonicalAlias: RoomAlias? = null,