Merge pull request #1834 from Infomaniak/attachments-animations

Put back missing animations when removing Attachments
Infomaniak · May 1, 2024 · 627db89 · 627db89
2 parents b6a6d35 + 47a717b
commit 627db89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -479,9 +479,11 @@ class NewMessageFragment : Fragment() {
                 saveDraft()
             }
 
-            val shouldTransition = attachmentAdapter.itemCount != 0 && attachments.isEmpty()
-            attachmentAdapter.submitList(attachments)
-            if (shouldTransition) TransitionManager.beginDelayedTransition(binding.root)
+            // When removing an Attachment, both counts will be the same, because the Adapter is already notified.
+            // We don't want to notify it again, because it will cancel the nice animation.
+            if (attachments.count() != attachmentAdapter.itemCount) attachmentAdapter.submitList(attachments)
+
+            if (attachments.isEmpty()) TransitionManager.beginDelayedTransition(binding.root)
             binding.attachmentsRecyclerView.isVisible = attachments.isNotEmpty()
 
             updateIsSendingAllowed(attachments)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -636,7 +636,7 @@ class NewMessageViewModel @Inject constructor(
             val attachments = attachmentsLiveData.valueOrEmpty().toMutableList()
             val attachment = attachments[position]
             attachment.getUploadLocalFile()?.delete()
-            LocalStorageUtils.deleteAttachmentUploadDir(appContext, draftLocalUuid()!!, attachment.localUuid)
+            LocalStorageUtils.deleteAttachmentUploadDir(appContext, draftLocalUuid!!, attachment.localUuid)
             attachments.removeAt(position)
             attachmentsLiveData.value = attachments
         }.onFailure { exception ->