From e2a6ca5030c954dacfcbef64f76ef7a9dd07981c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 7 Oct 2025 21:56:25 +0200 Subject: [PATCH] Reduce number of changes in preview. --- .../home/impl/spaces/SpaceRoomProvider.kt | 10 ---------- .../impl/leave/LeaveSpaceStateProvider.kt | 2 +- .../space/impl/root/SpaceStateProvider.kt | 1 - .../impl/leave/LeaveSpacePresenterTest.kt | 4 ++-- .../features/space/impl/root/SpaceViewTest.kt | 2 +- .../matrix/ui/components/SpaceRoomProvider.kt | 19 ++++--------------- .../previewutils/room/SpaceRoomFixture.kt | 2 +- 7 files changed, 9 insertions(+), 31 deletions(-) diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt index 56d441a42e..b1b3ac1950 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt @@ -30,7 +30,6 @@ class SpaceRoomProvider : PreviewParameterProvider { roomId = RoomId("!spaceId1:example.com"), ), aSpaceRoom( - rawName = null, numJoinedMembers = 5, childrenCount = 10, worldReadable = true, @@ -38,14 +37,5 @@ class SpaceRoomProvider : PreviewParameterProvider { roomId = RoomId("!spaceId2:example.com"), state = CurrentUserMembership.INVITED, ), - aSpaceRoom( - rawName = null, - numJoinedMembers = 5, - childrenCount = 10, - worldReadable = true, - avatarUrl = "anUrl", - roomId = RoomId("!spaceId3:example.com"), - state = CurrentUserMembership.INVITED, - ), ) } diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt index 85518f8b18..3e54b01d35 100644 --- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt +++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt @@ -30,7 +30,7 @@ class LeaveSpaceStateProvider : PreviewParameterProvider { persistentListOf( aSelectableSpaceRoom( spaceRoom = aSpaceRoom( - rawName = "A long space name that should be truncated", + displayName = "A long space name that should be truncated", worldReadable = true, ), isLastAdmin = true, diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt index b165e9d9ca..e58e7e82f4 100644 --- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt +++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt @@ -37,7 +37,6 @@ open class SpaceStateProvider : PreviewParameterProvider { ), aSpaceState( parentSpace = aSpaceRoom( - rawName = null, numJoinedMembers = 5, childrenCount = 10, worldReadable = true, diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt index 7c3336e0fe..81920dd0f2 100644 --- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt +++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt @@ -29,7 +29,7 @@ import org.junit.Test class LeaveSpacePresenterTest { private val aSpace = aSpaceRoom( roomId = A_SPACE_ID, - rawName = A_SPACE_NAME, + displayName = A_SPACE_NAME, ) @Test @@ -198,7 +198,7 @@ class LeaveSpacePresenterTest { private fun aLeaveSpaceRoom( spaceRoom: SpaceRoom = aSpaceRoom( roomId = A_SPACE_ID, - rawName = A_SPACE_NAME, + displayName = A_SPACE_NAME, ), isLastAdmin: Boolean = false, ) = LeaveSpaceRoom( diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt index 9e0897cb8f..3c8d264731 100644 --- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt +++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt @@ -52,7 +52,7 @@ class SpaceViewTest { @Test 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(expectEvents = false) ensureCalledOnceWithParam(aSpaceRoom) { rule.setSpaceView( diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt index a355dd132c..eb2de583d1 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt @@ -18,17 +18,16 @@ class SpaceRoomProvider : PreviewParameterProvider { override val values: Sequence = sequenceOf( aSpaceRoom( roomType = RoomType.Room, - rawName = "Room name with topic", + displayName = "Room name with topic", topic = "Room topic that is quite long and might be truncated" ), aSpaceRoom( roomType = RoomType.Room, - rawName = "Room name no topic", + displayName = "Room name no topic", state = CurrentUserMembership.LEFT, ), aSpaceRoom( roomType = RoomType.Room, - rawName = null, isDirect = true, heroes = listOf(aMatrixUser(displayName = "Alice")), state = CurrentUserMembership.JOINED, @@ -36,13 +35,13 @@ class SpaceRoomProvider : PreviewParameterProvider { ), aSpaceRoom( roomType = RoomType.Room, - rawName = "Room name with topic", + displayName = "Room name with topic", topic = "Room topic that is quite long and might be truncated", state = CurrentUserMembership.INVITED, ), aSpaceRoom( roomType = RoomType.Room, - rawName = "Room name no topic", + displayName = "Room name no topic", state = CurrentUserMembership.INVITED, ), aSpaceRoom( @@ -60,7 +59,6 @@ class SpaceRoomProvider : PreviewParameterProvider { state = CurrentUserMembership.LEFT, ), aSpaceRoom( - rawName = null, numJoinedMembers = 5, childrenCount = 10, worldReadable = true, @@ -68,14 +66,5 @@ class SpaceRoomProvider : PreviewParameterProvider { roomId = RoomId("!spaceId2:example.com"), state = CurrentUserMembership.INVITED, ), - aSpaceRoom( - rawName = null, - numJoinedMembers = 5, - childrenCount = 10, - worldReadable = true, - avatarUrl = "anUrl", - roomId = RoomId("!spaceId3:example.com"), - state = CurrentUserMembership.INVITED, - ), ) } diff --git a/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt b/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt index 4f6c61a9e9..5f8fd2ee38 100644 --- a/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt +++ b/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt @@ -16,7 +16,7 @@ import io.element.android.libraries.matrix.api.spaces.SpaceRoom import io.element.android.libraries.matrix.api.user.MatrixUser fun aSpaceRoom( - rawName: String? = "Space name", + rawName: String? = null, displayName: String = "Space name", avatarUrl: String? = null, canonicalAlias: RoomAlias? = null,