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

Remove text from parent interface.

Browse source
This commit is contained in:
Benoit Marty 2024-02-12 23:43:58 +01:00
parent af497e1282
commit 07c23cbcdd
2 changed files with 8 additions and 10 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/TimelineItemEventRow.kt
View file

@ -660,7 +660,9 @@ private fun ReplyToContentText(metadata: InReplyToMetadata?) {
val text = when (metadata) { val text = when (metadata) {
InReplyToMetadata.Redacted -> stringResource(id = CommonStrings.common_message_removed) InReplyToMetadata.Redacted -> stringResource(id = CommonStrings.common_message_removed)
InReplyToMetadata.UnableToDecrypt -> stringResource(id = CommonStrings.common_waiting_for_decryption_key) InReplyToMetadata.UnableToDecrypt -> stringResource(id = CommonStrings.common_waiting_for_decryption_key)
else -> metadata?.text.orEmpty() is InReplyToMetadata.Text -> metadata.text
is InReplyToMetadata.Thumbnail -> metadata.text
null -> ""
} }
val iconResourceId = when (metadata) { val iconResourceId = when (metadata) {
InReplyToMetadata.Redacted -> CompoundDrawables.ic_compound_delete InReplyToMetadata.Redacted -> CompoundDrawables.ic_compound_delete

14
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadata.kt
View file

@ -43,24 +43,20 @@ import io.element.android.libraries.ui.strings.CommonStrings
@Immutable @Immutable
internal sealed interface InReplyToMetadata { internal sealed interface InReplyToMetadata {
val text: String?
data class Thumbnail( data class Thumbnail(
val attachmentThumbnailInfo: AttachmentThumbnailInfo val attachmentThumbnailInfo: AttachmentThumbnailInfo
) : InReplyToMetadata { ) : InReplyToMetadata {
override val text: String? = attachmentThumbnailInfo.textContent val text: String = attachmentThumbnailInfo.textContent.orEmpty()
} }
data class Text( data class Text(
override val text: String val text: String
) : InReplyToMetadata ) : InReplyToMetadata
abstract class Informative : InReplyToMetadata { sealed interface Informative : InReplyToMetadata
override val text: String? = null
}
data object Redacted : Informative() data object Redacted : Informative
data object UnableToDecrypt : Informative() data object UnableToDecrypt : Informative
} }
/** /**