Skip to content

Commit cd1b56b

Browse files
committed
Reduce number of changes in preview.
1 parent 331583c commit cd1b56b

File tree

7 files changed

+9
-31
lines changed

7 files changed

+9
-31
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,12 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
3030
roomId = RoomId("!spaceId1:example.com"),
3131
),
3232
aSpaceRoom(
33-
rawName = null,
3433
numJoinedMembers = 5,
3534
childrenCount = 10,
3635
worldReadable = true,
3736
avatarUrl = "anUrl",
3837
roomId = RoomId("!spaceId2:example.com"),
3938
state = CurrentUserMembership.INVITED,
4039
),
41-
aSpaceRoom(
42-
rawName = null,
43-
numJoinedMembers = 5,
44-
childrenCount = 10,
45-
worldReadable = true,
46-
avatarUrl = "anUrl",
47-
roomId = RoomId("!spaceId3:example.com"),
48-
state = CurrentUserMembership.INVITED,
49-
),
5040
)
5141
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class LeaveSpaceStateProvider : PreviewParameterProvider<LeaveSpaceState> {
3030
persistentListOf(
3131
aSelectableSpaceRoom(
3232
spaceRoom = aSpaceRoom(
33-
rawName = "A long space name that should be truncated",
33+
displayName = "A long space name that should be truncated",
3434
worldReadable = true,
3535
),
3636
isLastAdmin = true,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ open class SpaceStateProvider : PreviewParameterProvider<SpaceState> {
3737
),
3838
aSpaceState(
3939
parentSpace = aSpaceRoom(
40-
rawName = null,
4140
numJoinedMembers = 5,
4241
childrenCount = 10,
4342
worldReadable = true,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import org.junit.Test
2929
class LeaveSpacePresenterTest {
3030
private val aSpace = aSpaceRoom(
3131
roomId = A_SPACE_ID,
32-
rawName = A_SPACE_NAME,
32+
displayName = A_SPACE_NAME,
3333
)
3434

3535
@Test
@@ -198,7 +198,7 @@ class LeaveSpacePresenterTest {
198198
private fun aLeaveSpaceRoom(
199199
spaceRoom: SpaceRoom = aSpaceRoom(
200200
roomId = A_SPACE_ID,
201-
rawName = A_SPACE_NAME,
201+
displayName = A_SPACE_NAME,
202202
),
203203
isLastAdmin: Boolean = false,
204204
) = LeaveSpaceRoom(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class SpaceViewTest {
5252

5353
@Test
5454
fun `clicking on a room name invokes the expected callback`() {
55-
val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, rawName = A_ROOM_NAME)
55+
val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, displayName = A_ROOM_NAME)
5656
val eventsRecorder = EventsRecorder<SpaceEvents>(expectEvents = false)
5757
ensureCalledOnceWithParam(aSpaceRoom) {
5858
rule.setSpaceView(

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,30 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
1818
override val values: Sequence<SpaceRoom> = sequenceOf(
1919
aSpaceRoom(
2020
roomType = RoomType.Room,
21-
rawName = "Room name with topic",
21+
displayName = "Room name with topic",
2222
topic = "Room topic that is quite long and might be truncated"
2323
),
2424
aSpaceRoom(
2525
roomType = RoomType.Room,
26-
rawName = "Room name no topic",
26+
displayName = "Room name no topic",
2727
state = CurrentUserMembership.LEFT,
2828
),
2929
aSpaceRoom(
3030
roomType = RoomType.Room,
31-
rawName = null,
3231
isDirect = true,
3332
heroes = listOf(aMatrixUser(displayName = "Alice")),
3433
state = CurrentUserMembership.JOINED,
3534
numJoinedMembers = 2,
3635
),
3736
aSpaceRoom(
3837
roomType = RoomType.Room,
39-
rawName = "Room name with topic",
38+
displayName = "Room name with topic",
4039
topic = "Room topic that is quite long and might be truncated",
4140
state = CurrentUserMembership.INVITED,
4241
),
4342
aSpaceRoom(
4443
roomType = RoomType.Room,
45-
rawName = "Room name no topic",
44+
displayName = "Room name no topic",
4645
state = CurrentUserMembership.INVITED,
4746
),
4847
aSpaceRoom(
@@ -60,22 +59,12 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
6059
state = CurrentUserMembership.LEFT,
6160
),
6261
aSpaceRoom(
63-
rawName = null,
6462
numJoinedMembers = 5,
6563
childrenCount = 10,
6664
worldReadable = true,
6765
avatarUrl = "anUrl",
6866
roomId = RoomId("!spaceId2:example.com"),
6967
state = CurrentUserMembership.INVITED,
7068
),
71-
aSpaceRoom(
72-
rawName = null,
73-
numJoinedMembers = 5,
74-
childrenCount = 10,
75-
worldReadable = true,
76-
avatarUrl = "anUrl",
77-
roomId = RoomId("!spaceId3:example.com"),
78-
state = CurrentUserMembership.INVITED,
79-
),
8069
)
8170
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import io.element.android.libraries.matrix.api.spaces.SpaceRoom
1616
import io.element.android.libraries.matrix.api.user.MatrixUser
1717

1818
fun aSpaceRoom(
19-
rawName: String? = "Space name",
19+
rawName: String? = null,
2020
displayName: String = "Space name",
2121
avatarUrl: String? = null,
2222
canonicalAlias: RoomAlias? = null,

0 commit comments

Comments
 (0)