Skip to content

fix(dialog): label reply media instead of falling back #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gdlbo merged 1 commit into from
Oct 13, 2026
Merged

fix(dialog): label reply media instead of falling back #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion feature/dialog/src/main/java/org/monogram/feature/dialog/ui/DialogScreenDialogs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ internal fun DialogScreenDialogs(
editing = state.editing != null,
editingBody = state.editing?.text.orEmpty(),
replyBody = state.replyTo?.let {
it.text ?: stringResource(R.string.dialog_media_photo)
it.text ?: replyMediaFallbackLabel(it.mediaKind)
},
pendingAttach = state.pendingAttach,
hasFailed = state.messages.any { it.failed },
Expand Down
24 changes: 14 additions & 10 deletions feature/dialog/src/main/java/org/monogram/feature/dialog/ui/MessageReplyQuote.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,18 @@ internal fun replyQuoteAuthor(
else -> null
}

internal fun replyMediaLabelRes(kind: String?): Int = when (kind) {
"photo" -> R.string.dialog_reply_photo
"video" -> R.string.dialog_reply_video
"sticker", "sticker_animated" -> R.string.dialog_reply_sticker
"gif" -> R.string.dialog_reply_gif
"document" -> R.string.dialog_reply_document
"audio" -> R.string.dialog_media_audio
"voice" -> R.string.dialog_media_voice
"video_note" -> R.string.dialog_media_video_note
else -> R.string.dialog_replying
}

@Composable
private fun replyMediaFallbackLabel(kind: String?): String = stringResource(
when (kind) {
"photo" -> R.string.dialog_reply_photo
"video" -> R.string.dialog_reply_video
"sticker", "sticker_animated" -> R.string.dialog_reply_sticker
"gif" -> R.string.dialog_reply_gif
"document" -> R.string.dialog_reply_document
else -> R.string.dialog_replying
},
)
internal fun replyMediaFallbackLabel(kind: String?): String =
stringResource(replyMediaLabelRes(kind))
31 changes: 31 additions & 0 deletions feature/dialog/src/test/java/org/monogram/feature/dialog/ui/MessageReplyQuoteTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package org.monogram.feature.dialog.ui

import org.junit.Assert.assertEquals
import org.junit.Test
import org.monogram.feature.dialog.R

class MessageReplyQuoteTest {
@Test
fun mediaKindsThatHadNoLabelMapToTheirOwnLabel() {
assertEquals(R.string.dialog_media_audio, replyMediaLabelRes("audio"))
assertEquals(R.string.dialog_media_voice, replyMediaLabelRes("voice"))
assertEquals(R.string.dialog_media_video_note, replyMediaLabelRes("video_note"))
}

@Test
fun kindsThatAlreadyHadALabelKeepIt() {
assertEquals(R.string.dialog_reply_photo, replyMediaLabelRes("photo"))
assertEquals(R.string.dialog_reply_video, replyMediaLabelRes("video"))
assertEquals(R.string.dialog_reply_sticker, replyMediaLabelRes("sticker"))
assertEquals(R.string.dialog_reply_sticker, replyMediaLabelRes("sticker_animated"))
assertEquals(R.string.dialog_reply_gif, replyMediaLabelRes("gif"))
assertEquals(R.string.dialog_reply_document, replyMediaLabelRes("document"))
}

@Test
fun unknownAndMissingKindsFallBackToTheGenericLabel() {
assertEquals(R.string.dialog_replying, replyMediaLabelRes(null))
assertEquals(R.string.dialog_replying, replyMediaLabelRes(""))
assertEquals(R.string.dialog_replying, replyMediaLabelRes("contact"))
}
}