hacker/fast-messenger
1
0
Fork 0
forked from melod1n/fast-messenger
Code Pull Requests Activity

reply panel shows attachments text

Browse Source
This commit is contained in:
Danil Nikolaev
2021-10-11 13:06:56 +03:00
parent bcf4618c76
commit 35cd23318f
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/meloda/fast/api/VkUtils.kt
+2 -2
View File
@@ -512,7 +512,7 @@ object VkUtils {
)?.toString() )?.toString()
} }
fun getForwardsConversationText(context: Context, message: VkMessage): String? { fun getForwardsText(context: Context, message: VkMessage): String? {
if (message.forwards.isNullOrEmpty()) return null if (message.forwards.isNullOrEmpty()) return null
return message.forwards?.let { forwards -> return message.forwards?.let { forwards ->
@@ -523,7 +523,7 @@ object VkUtils {
} }
} }
fun getAttachmentConversationText(context: Context, message: VkMessage): String? { fun getAttachmentText(context: Context, message: VkMessage): String? {
message.geoType?.let { message.geoType?.let {
return when (it) { return when (it) {
"point" -> context.getString(R.string.message_geo_point) "point" -> context.getString(R.string.message_geo_point)
app/src/main/kotlin/com/meloda/fast/screens/conversations/ConversationsAdapter.kt
+3 -3
View File
@@ -153,12 +153,12 @@ class ConversationsAdapter constructor(
binding.textAttachment.isVisible = attachmentIcon != null binding.textAttachment.isVisible = attachmentIcon != null
binding.textAttachment.setImageDrawable(attachmentIcon) binding.textAttachment.setImageDrawable(attachmentIcon)
val attachmentText = if (attachmentIcon == null) VkUtils.getAttachmentConversationText( val attachmentText = if (attachmentIcon == null) VkUtils.getAttachmentText(
context = context, context = context,
message = message message = message
) else null ) else null
val forwardsMessage = if (message.text == null) VkUtils.getForwardsConversationText( val forwardsMessage = if (message.text == null) VkUtils.getForwardsText(
context = context, context = context,
message = message message = message
) else null ) else null
@@ -168,7 +168,7 @@ class ConversationsAdapter constructor(
forwardsMessage != null || forwardsMessage != null ||
attachmentText != null attachmentText != null
) "" ) ""
else message.text ?: "[no_message]").run { VkUtils.prepareMessageText(this) } else message.text ?: "").run { VkUtils.prepareMessageText(this) }
val coloredMessage = actionMessage ?: attachmentText ?: forwardsMessage ?: "" val coloredMessage = actionMessage ?: attachmentText ?: forwardsMessage ?: ""
app/src/main/kotlin/com/meloda/fast/screens/messages/MessagesHistoryFragment.kt
+14 -1
View File
@@ -618,8 +618,21 @@ class MessagesHistoryFragment :
else -> null else -> null
} }
val attachmentText = if (message.text == null) VkUtils.getAttachmentText(
context = requireContext(),
message = message
) else null
val forwardsMessage = if (message.text == null) VkUtils.getForwardsText(
context = requireContext(),
message = message
) else null
val messageText = forwardsMessage ?: attachmentText
?: (message.text ?: "").run { VkUtils.prepareMessageText(this) }
binding.replyMessageTitle.text = title binding.replyMessageTitle.text = title
binding.replyMessageText.text = message.text binding.replyMessageText.text = messageText
if (isEditing) { if (isEditing) {
binding.message.setText(message.text) binding.message.setText(message.text)