From bde7ae944ad0185dc012ff08446ab9f240cc4607 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 31 May 2023 15:22:07 -0300 Subject: [PATCH] Add draft handling in toggle button update method. --- .../conversation/v2/ConversationFragment.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt index de4102f7af..c8f8ea12be 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt @@ -585,10 +585,12 @@ class ConversationFragment : LoggingFragment(R.layout.v2_conversation_fragment) composeText.setDraftText(it.text) setMedia(it.media, it.mediaType) } + is ShareOrDraftData.SetQuote -> { composeText.setDraftText(it.draftText) handleReplyToMessage(it.quote) } + is ShareOrDraftData.SetText -> composeText.setDraftText(it.text) is ShareOrDraftData.StartSendMedia -> { val recipientId = viewModel.recipientSnapshot?.id ?: return@subscribeBy @@ -931,11 +933,13 @@ class ConversationFragment : LoggingFragment(R.layout.v2_conversation_fragment) quickAttachment.hide() inlineAttachment.hide() } - // todo [cfv2] draftViewModel.voiceNoteDraft != null) { { - // buttonToggle.display(sendButton) - // quickAttachment.hide() - // inlineAttachment.hide() - // } + + draftViewModel.voiceNoteDraft != null -> { + buttonToggle.display(sendButton) + quickAttachment.hide() + inlineAttachment.hide() + } + composeText.text?.isEmpty() == true && !attachmentManager.isAttachmentPresent -> { buttonToggle.display(binding.conversationInputPanel.attachButton) quickAttachment.show()