mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-04 10:32:34 +00:00
Reverting the change to only show the green dot for all messages.
This commit is contained in:
+5
-10
@@ -152,7 +152,7 @@ private fun RowScope.NameAndTimestampRow(room: RoomListRoomSummary) {
|
|||||||
Text(
|
Text(
|
||||||
text = room.timestamp ?: "",
|
text = room.timestamp ?: "",
|
||||||
style = ElementTheme.typography.fontBodySmRegular,
|
style = ElementTheme.typography.fontBodySmRegular,
|
||||||
color = if (room.shouldDisplayNotificationAlertDecoration) {
|
color = if (room.hasUnread) {
|
||||||
ElementTheme.colors.unreadIndicator
|
ElementTheme.colors.unreadIndicator
|
||||||
} else {
|
} else {
|
||||||
MaterialTheme.roomListRoomMessageDate()
|
MaterialTheme.roomListRoomMessageDate()
|
||||||
@@ -182,7 +182,7 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
|
|||||||
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||||
) {
|
) {
|
||||||
NotificationIcon(room)
|
NotificationIcon(room)
|
||||||
if (room.shouldDisplayNotificationAlertDecoration) {
|
if (room.hasUnread) {
|
||||||
UnreadIndicatorAtom(
|
UnreadIndicatorAtom(
|
||||||
modifier = Modifier.padding(top = 3.dp),
|
modifier = Modifier.padding(top = 3.dp),
|
||||||
)
|
)
|
||||||
@@ -190,28 +190,23 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
// We should never show a green dot/icon for mute. Also mentions is not yet supported by the mobile app.
|
|
||||||
// In some cases a green @ was incorrectly shown when we switch from ALL_MESSAGES to MENTIONS_AND_KEYWORDS_ONLY
|
|
||||||
// and we don't know whether the room has mentions, just that it has unread.
|
|
||||||
private val RoomListRoomSummary.shouldDisplayNotificationAlertDecoration get() = hasUnread
|
|
||||||
&& notificationMode != RoomNotificationMode.MUTE
|
|
||||||
&& notificationMode != RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY
|
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun NotificationIcon(room: RoomListRoomSummary) {
|
private fun NotificationIcon(room: RoomListRoomSummary) {
|
||||||
|
val tint = if(room.hasUnread) ElementTheme.colors.unreadIndicator else ElementTheme.colors.iconQuaternary
|
||||||
when(room.notificationMode) {
|
when(room.notificationMode) {
|
||||||
null, RoomNotificationMode.ALL_MESSAGES -> return
|
null, RoomNotificationMode.ALL_MESSAGES -> return
|
||||||
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY ->
|
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY ->
|
||||||
Icon(
|
Icon(
|
||||||
contentDescription = stringResource(CommonStrings.screen_notification_settings_mode_mentions),
|
contentDescription = stringResource(CommonStrings.screen_notification_settings_mode_mentions),
|
||||||
imageVector = ImageVector.vectorResource(VectorIcons.Mention),
|
imageVector = ImageVector.vectorResource(VectorIcons.Mention),
|
||||||
tint = ElementTheme.colors.iconQuaternary,
|
tint = tint,
|
||||||
)
|
)
|
||||||
RoomNotificationMode.MUTE ->
|
RoomNotificationMode.MUTE ->
|
||||||
Icon(
|
Icon(
|
||||||
contentDescription = stringResource(CommonStrings.common_mute),
|
contentDescription = stringResource(CommonStrings.common_mute),
|
||||||
imageVector = ImageVector.vectorResource(VectorIcons.Mute),
|
imageVector = ImageVector.vectorResource(VectorIcons.Mute),
|
||||||
tint = ElementTheme.colors.iconQuaternary,
|
tint = tint,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user