mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-19 03:29:28 +01:00
Merge pull request #4710 from nextcloud/issue-4707-edit-btn-fix
No longer does edit button overlap the recordAudioButton
This commit is contained in:
commit
5e872564b7
@ -160,10 +160,6 @@ class MessageInputFragment : Fragment() {
|
|||||||
saveState()
|
saveState()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onResume() {
|
|
||||||
super.onResume()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onDestroyView() {
|
override fun onDestroyView() {
|
||||||
super.onDestroyView()
|
super.onDestroyView()
|
||||||
if (mentionAutocomplete != null && mentionAutocomplete!!.isPopupShowing) {
|
if (mentionAutocomplete != null && mentionAutocomplete!!.isPopupShowing) {
|
||||||
@ -470,7 +466,13 @@ class MessageInputFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
binding.fragmentMessageInputView.inputEditText.doAfterTextChanged {
|
binding.fragmentMessageInputView.inputEditText.doAfterTextChanged {
|
||||||
binding.fragmentMessageInputView.recordAudioButton.visibility =
|
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 =
|
binding.fragmentMessageInputView.messageSendButton.visibility =
|
||||||
if (binding.fragmentMessageInputView.inputEditText.text.isEmpty() ||
|
if (binding.fragmentMessageInputView.inputEditText.text.isEmpty() ||
|
||||||
|
Loading…
Reference in New Issue
Block a user