Skip to content

Commit 3c3cef0

Browse files
committed
Improve preview of SelectedRoom and SelectedUser.
1 parent 2a5c399 commit 3c3cef0

File tree

2 files changed

+23
-14
lines changed

2 files changed

+23
-14
lines changed

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

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,24 @@ open class MatrixUserProvider : PreviewParameterProvider<MatrixUser> {
1515
override val values: Sequence<MatrixUser>
1616
get() = sequenceOf(
1717
aMatrixUser(),
18-
aMatrixUser().copy(displayName = null),
18+
aMatrixUser(displayName = null),
19+
)
20+
}
21+
22+
open class MatrixUserWithNullProvider : PreviewParameterProvider<MatrixUser?> {
23+
override val values: Sequence<MatrixUser?>
24+
get() = sequenceOf(
25+
aMatrixUser(),
26+
aMatrixUser(displayName = null),
27+
null,
28+
)
29+
}
30+
31+
open class MatrixUserWithAvatarProvider : PreviewParameterProvider<MatrixUser?> {
32+
override val values: Sequence<MatrixUser?>
33+
get() = sequenceOf(
34+
aMatrixUser(displayName = "John Doe"),
35+
aMatrixUser(displayName = "John Doe", avatarUrl = "anUrl"),
1936
)
2037
}
2138

@@ -41,12 +58,3 @@ fun aMatrixUserList() = listOf(
4158
aMatrixUser("@victor:server.org", "Victor"),
4259
aMatrixUser("@walter:server.org", "Walter"),
4360
)
44-
45-
open class MatrixUserWithNullProvider : PreviewParameterProvider<MatrixUser?> {
46-
override val values: Sequence<MatrixUser?>
47-
get() = sequenceOf(
48-
aMatrixUser(),
49-
aMatrixUser().copy(displayName = null),
50-
null,
51-
)
52-
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import androidx.compose.ui.semantics.contentDescription
3737
import androidx.compose.ui.semantics.onClick
3838
import androidx.compose.ui.text.style.TextAlign
3939
import androidx.compose.ui.text.style.TextOverflow
40+
import androidx.compose.ui.tooling.preview.PreviewParameter
4041
import androidx.compose.ui.unit.LayoutDirection
4142
import androidx.compose.ui.unit.dp
4243
import io.element.android.compound.theme.ElementTheme
@@ -151,9 +152,9 @@ fun SelectedUser(
151152

152153
@PreviewsDayNight
153154
@Composable
154-
internal fun SelectedUserPreview() = ElementPreview {
155+
internal fun SelectedUserPreview(@PreviewParameter(MatrixUserWithAvatarProvider::class) user: MatrixUser) = ElementPreview {
155156
SelectedUser(
156-
aMatrixUser(displayName = "John Doe"),
157+
matrixUser = user,
157158
canRemove = true,
158159
onUserRemove = {},
159160
)
@@ -166,7 +167,7 @@ internal fun SelectedUserRtlPreview() = CompositionLocalProvider(
166167
) {
167168
ElementPreview {
168169
SelectedUser(
169-
aMatrixUser(displayName = "John Doe"),
170+
matrixUser = aMatrixUser(displayName = "John Doe"),
170171
canRemove = true,
171172
onUserRemove = {},
172173
)
@@ -177,7 +178,7 @@ internal fun SelectedUserRtlPreview() = CompositionLocalProvider(
177178
@Composable
178179
internal fun SelectedUserCannotRemovePreview() = ElementPreview {
179180
SelectedUser(
180-
aMatrixUser(),
181+
matrixUser = aMatrixUser(),
181182
canRemove = false,
182183
onUserRemove = {},
183184
)

0 commit comments

Comments
 (0)