mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-24 18:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixes wrong spellings in Message file and voice items

Browse source
This commit is contained in:
ericdecanini 2022-03-17 17:58:11 +01:00
parent 00bced9500
commit cde10ca032
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
View file

@ -51,10 +51,10 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
// var clickListener: ClickListener? = null // var clickListener: ClickListener? = null
@EpoxyAttribute @EpoxyAttribute
var izLocalFile = false var isLocalFile = false
@EpoxyAttribute @EpoxyAttribute
var izDownloaded = false var isDownloaded = false
@EpoxyAttribute @EpoxyAttribute
lateinit var contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder lateinit var contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder
@ -66,7 +66,7 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
super.bind(holder) super.bind(holder)
renderSendState(holder.fileLayout, holder.filenameView) renderSendState(holder.fileLayout, holder.filenameView)
if (!attributes.informationData.sendState.hasFailed()) { if (!attributes.informationData.sendState.hasFailed()) {
contentUploadStateTrackerBinder.bind(attributes.informationData.eventId, izLocalFile, holder.progressLayout) contentUploadStateTrackerBinder.bind(attributes.informationData.eventId, isLocalFile, holder.progressLayout)
} else { } else {
holder.fileImageView.setImageResource(R.drawable.ic_cross) holder.fileImageView.setImageResource(R.drawable.ic_cross)
holder.progressLayout.isVisible = false holder.progressLayout.isVisible = false
@ -75,7 +75,7 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
if (attributes.informationData.sendState.isSending()) { if (attributes.informationData.sendState.isSending()) {
holder.fileImageView.setImageResource(iconRes) holder.fileImageView.setImageResource(iconRes)
} else { } else {
if (izDownloaded) { if (isDownloaded) {
holder.fileImageView.setImageResource(iconRes) holder.fileImageView.setImageResource(iconRes)
holder.fileDownloadProgress.progress = 0 holder.fileDownloadProgress.progress = 0
} else { } else {

13
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
View file

@ -48,10 +48,10 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
var waveform: List<Int> = emptyList() var waveform: List<Int> = emptyList()
@EpoxyAttribute @EpoxyAttribute
var izLocalFile = false var isLocalFile = false
@EpoxyAttribute @EpoxyAttribute
var izDownloaded = false var isDownloaded = false
@EpoxyAttribute @EpoxyAttribute
lateinit var contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder lateinit var contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder
@ -69,7 +69,7 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
super.bind(holder) super.bind(holder)
renderSendState(holder.voiceLayout, null) renderSendState(holder.voiceLayout, null)
if (!attributes.informationData.sendState.hasFailed()) { if (!attributes.informationData.sendState.hasFailed()) {
contentUploadStateTrackerBinder.bind(attributes.informationData.eventId, izLocalFile, holder.progressLayout) contentUploadStateTrackerBinder.bind(attributes.informationData.eventId, isLocalFile, holder.progressLayout)
} else { } else {
holder.voicePlaybackControlButton.setImageResource(R.drawable.ic_cross) holder.voicePlaybackControlButton.setImageResource(R.drawable.ic_cross)
holder.voicePlaybackControlButton.contentDescription = holder.view.context.getString(R.string.error_voice_message_unable_to_play) holder.voicePlaybackControlButton.contentDescription = holder.view.context.getString(R.string.error_voice_message_unable_to_play)
@ -85,11 +85,11 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
} }
} }
val backgroundTint = if (attributes.informationData.messageLayout is TimelineMessageLayout.Bubble) { val backgroundTint = if (attributes.informationData.messageLayout is TimelineMessageLayout.Bubble)
Color.TRANSPARENT Color.TRANSPARENT
} else { else
ThemeUtils.getColor(holder.view.context, R.attr.vctr_content_quinary) ThemeUtils.getColor(holder.view.context, R.attr.vctr_content_quinary)
}
holder.voicePlaybackLayout.backgroundTintList = ColorStateList.valueOf(backgroundTint) holder.voicePlaybackLayout.backgroundTintList = ColorStateList.valueOf(backgroundTint)
holder.voicePlaybackControlButton.setOnClickListener { playbackControlButtonClickListener?.invoke(it) } holder.voicePlaybackControlButton.setOnClickListener { playbackControlButtonClickListener?.invoke(it) }
@ -99,6 +99,7 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
is VoiceMessagePlaybackTracker.Listener.State.Idle -> renderIdleState(holder) is VoiceMessagePlaybackTracker.Listener.State.Idle -> renderIdleState(holder)
is VoiceMessagePlaybackTracker.Listener.State.Playing -> renderPlayingState(holder, state) is VoiceMessagePlaybackTracker.Listener.State.Playing -> renderPlayingState(holder, state)
is VoiceMessagePlaybackTracker.Listener.State.Paused -> renderPausedState(holder, state) is VoiceMessagePlaybackTracker.Listener.State.Paused -> renderPausedState(holder, state)
is VoiceMessagePlaybackTracker.Listener.State.Recording -> Unit
} }
} }
}) })