Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unread indicator color changed to iconAccentTertiary

Browse source
This commit is contained in:
Benoit Marty 2023-06-29 11:19:13 +02:00 • committed by Benoit Marty
parent d8fdbabd27
commit 85d3fef5e7
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt
View file

@ -50,7 +50,6 @@ import io.element.android.features.invitelist.impl.model.InviteSender
import io.element.android.libraries.designsystem.ElementTextStyles
import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom
import io.element.android.libraries.designsystem.components.avatar.Avatar
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.designsystem.theme.components.Button
@ -58,6 +57,7 @@ import io.element.android.libraries.designsystem.theme.components.OutlinedButton
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.theme.noFontPadding
import io.element.android.libraries.designsystem.theme.roomListUnreadIndicator
import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.ui.strings.CommonStrings
private val minHeight = 72.dp
@ -161,7 +161,7 @@ internal fun DefaultInviteSummaryRow(
}
}
val unreadIndicatorColor = if (invite.isNew) MaterialTheme.roomListUnreadIndicator() else Color.Transparent
val unreadIndicatorColor = if (invite.isNew) ElementTheme.colors.roomListUnreadIndicator else Color.Transparent
UnreadIndicatorAtom(color = unreadIndicatorColor)
}
}

8
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
View file

@ -145,7 +145,11 @@ private fun RowScope.NameAndTimestampRow(room: RoomListRoomSummary) {
Text(
text = room.timestamp ?: "",
style = ElementTheme.typography.fontBodySmRegular,
color = MaterialTheme.roomListRoomMessageDate(),
color = if (room.hasUnread) {
ElementTheme.colors.roomListUnreadIndicator
} else {
MaterialTheme.roomListRoomMessageDate()
},
)
}
@ -167,7 +171,7 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
)
// Unread
val unreadIndicatorColor =
if (room.hasUnread) MaterialTheme.roomListUnreadIndicator() else Color.Transparent
if (room.hasUnread) ElementTheme.colors.roomListUnreadIndicator else Color.Transparent
UnreadIndicatorAtom(
modifier = Modifier.padding(top = 3.dp),
color = unreadIndicatorColor,