Skip to content

Commit a323189

Browse files
committed
Update text colors when the state is disabled.
1 parent 320a113 commit a323189

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,20 @@ fun CheckableUserRow(
5050
avatarData = data.avatarData,
5151
name = data.name,
5252
subtext = data.subtext,
53+
enabled = enabled,
5354
)
5455
}
5556
is CheckableUserRowData.Unresolved -> {
5657
UnresolvedUserRow(
5758
modifier = rowModifier,
5859
avatarData = data.avatarData,
5960
id = data.id,
61+
enabled = enabled,
6062
)
6163
}
6264
}
6365
SelectedIndicatorAtom(
64-
modifier = modifier.padding(end = 24.dp),
66+
modifier = Modifier.padding(end = 24.dp),
6567
checked = checked,
6668
enabled = enabled,
6769
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fun MatrixUserRow(
2828
name = matrixUser.getBestName(),
2929
subtext = if (matrixUser.displayName.isNullOrEmpty()) null else matrixUser.userId.value,
3030
modifier = modifier,
31-
trailingContent,
31+
trailingContent = trailingContent,
3232
)
3333

3434
@PreviewsDayNight

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ fun UnresolvedUserRow(
3939
avatarData: AvatarData,
4040
id: String,
4141
modifier: Modifier = Modifier,
42+
enabled: Boolean = true,
4243
) {
4344
Row(
4445
modifier = modifier
@@ -61,7 +62,7 @@ fun UnresolvedUserRow(
6162
text = id,
6263
maxLines = 1,
6364
overflow = TextOverflow.Ellipsis,
64-
color = ElementTheme.colors.textPrimary,
65+
color = if (enabled) ElementTheme.colors.textPrimary else ElementTheme.colors.textDisabled,
6566
style = ElementTheme.typography.fontBodyLgMedium,
6667
)
6768

@@ -78,11 +79,11 @@ fun UnresolvedUserRow(
7879
.size(18.dp)
7980
.align(Alignment.Top)
8081
.padding(2.dp),
81-
tint = ElementTheme.colors.iconCriticalPrimary,
82+
tint = if (enabled) ElementTheme.colors.iconCriticalPrimary else ElementTheme.colors.iconDisabled,
8283
)
8384
Text(
8485
text = stringResource(CommonStrings.common_invite_unknown_profile),
85-
color = ElementTheme.colors.textSecondary,
86+
color = if (enabled) ElementTheme.colors.textSecondary else ElementTheme.colors.textDisabled,
8687
style = ElementTheme.typography.fontBodySmRegular.copy(lineHeight = 16.sp),
8788
)
8889
}
@@ -94,5 +95,8 @@ fun UnresolvedUserRow(
9495
@Composable
9596
internal fun UnresolvedUserRowPreview() = ElementThemedPreview {
9697
val matrixUser = aMatrixUser()
97-
UnresolvedUserRow(matrixUser.getAvatarData(size = AvatarSize.UserListItem), matrixUser.userId.value)
98+
Column {
99+
UnresolvedUserRow(matrixUser.getAvatarData(size = AvatarSize.UserListItem), matrixUser.userId.value)
100+
UnresolvedUserRow(matrixUser.getAvatarData(size = AvatarSize.UserListItem), matrixUser.userId.value, enabled = false)
101+
}
98102
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ internal fun UserRow(
3030
name: String,
3131
subtext: String?,
3232
modifier: Modifier = Modifier,
33+
enabled: Boolean = true,
3334
trailingContent: @Composable (() -> Unit)? = null,
3435
) {
3536
Row(
@@ -54,14 +55,14 @@ internal fun UserRow(
5455
text = name,
5556
maxLines = 1,
5657
overflow = TextOverflow.Ellipsis,
57-
color = ElementTheme.colors.textPrimary,
58+
color = if (enabled) ElementTheme.colors.textPrimary else ElementTheme.colors.textDisabled,
5859
style = ElementTheme.typography.fontBodyLgRegular,
5960
)
6061
// Id
6162
subtext?.let {
6263
Text(
6364
text = subtext,
64-
color = ElementTheme.colors.textSecondary,
65+
color = if (enabled) ElementTheme.colors.textSecondary else ElementTheme.colors.textDisabled,
6566
maxLines = 1,
6667
overflow = TextOverflow.Ellipsis,
6768
style = ElementTheme.typography.fontBodySmRegular,

0 commit comments

Comments
 (0)