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

Make extension isCritical a val instead of a fun.

Browse source
This commit is contained in:
Benoit Marty 2024-08-16 09:18:13 +02:00 • committed by Benoit Marty
parent 0661cd2046
commit 3676bca042
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageShieldView.kt
View file

@ -65,7 +65,7 @@ internal fun MessageShieldView(
@Composable
internal fun MessageShield.toIconColor(): Color {
return when (isCritical()) {
return when (isCritical) {
true -> ElementTheme.colors.iconCriticalPrimary
false -> ElementTheme.colors.iconSecondary
}
@ -73,7 +73,7 @@ internal fun MessageShield.toIconColor(): Color {
@Composable
private fun MessageShield.toTextColor(): Color {
return when (isCritical()) {
return when (isCritical) {
true -> ElementTheme.colors.textCriticalPrimary
false -> ElementTheme.colors.textSecondary
}

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineEventTimestampView.kt
View file

@ -52,7 +52,7 @@ fun TimelineEventTimestampView(
) {
val formattedTime = event.sentTime
val hasUnrecoverableError = event.localSendState is LocalEventSendState.SendingFailed.Unrecoverable
val hasEncryptionCritical = event.messageShield?.isCritical().orFalse()
val hasEncryptionCritical = event.messageShield?.isCritical.orFalse()
val isMessageEdited = event.content.isEdited()
val tint = if (hasUnrecoverableError || hasEncryptionCritical) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.secondary
Row(