From d46f2488a78bf1ecbce6271ac5899ef9b62dff2f Mon Sep 17 00:00:00 2001
From: rapterjet2004 <juliuslinus1@gmail.com>
Date: Wed, 12 Feb 2025 12:17:13 -0600
Subject: [PATCH 1/2] No longer does edit button overlap the recordAudioButton
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
---
.../java/com/nextcloud/talk/chat/MessageInputFragment.kt | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
index 69ba41561..05f990642 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
@@ -160,10 +160,6 @@ class MessageInputFragment : Fragment() {
saveState()
}
- override fun onResume() {
- super.onResume()
- }
-
override fun onDestroyView() {
super.onDestroyView()
if (mentionAutocomplete != null && mentionAutocomplete!!.isPopupShowing) {
@@ -470,7 +466,9 @@ class MessageInputFragment : Fragment() {
}
binding.fragmentMessageInputView.inputEditText.doAfterTextChanged {
binding.fragmentMessageInputView.recordAudioButton.visibility =
- if (binding.fragmentMessageInputView.inputEditText.text.isEmpty()) View.VISIBLE else View.GONE
+ if (binding.fragmentMessageInputView.inputEditText.text.isEmpty() &&
+ chatActivity.messageInputViewModel.getEditChatMessage.value == null
+ ) View.VISIBLE else View.GONE
binding.fragmentMessageInputView.messageSendButton.visibility =
if (binding.fragmentMessageInputView.inputEditText.text.isEmpty() ||
From 00b1b1fe515389d481aa5bd4652efd577b5a36eb Mon Sep 17 00:00:00 2001
From: sowjanyakch <sowjanya.kch@gmail.com>
Date: Fri, 14 Feb 2025 09:40:43 +0100
Subject: [PATCH 2/2] ktlintFormat
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
---
.../java/com/nextcloud/talk/chat/MessageInputFragment.kt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
index 05f990642..5c9e8534a 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
@@ -468,7 +468,11 @@ class MessageInputFragment : Fragment() {
binding.fragmentMessageInputView.recordAudioButton.visibility =
if (binding.fragmentMessageInputView.inputEditText.text.isEmpty() &&
chatActivity.messageInputViewModel.getEditChatMessage.value == null
- ) View.VISIBLE else View.GONE
+ ) {
+ View.VISIBLE
+ } else {
+ View.GONE
+ }
binding.fragmentMessageInputView.messageSendButton.visibility =
if (binding.fragmentMessageInputView.inputEditText.text.isEmpty() ||