From f64366e3ff0ccee59c7dd6d82a633d76c4afa184 Mon Sep 17 00:00:00 2001 From: p_0g_8mm3_ <37022952+pr0gr8mm3r@users.noreply.github.com> Date: Thu, 5 Aug 2021 00:00:12 +0200 Subject: [PATCH 1/4] Fix attachment menu animation order --- .../features/attachments/AttachmentTypeSelectorView.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt index c0d46691081..af544593f58 100644 --- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt @@ -102,12 +102,12 @@ class AttachmentTypeSelectorView(context: Context, contentView.doOnNextLayout { animateWindowInCircular(anchor, contentView) } - animateButtonIn(views.attachmentGalleryButton, ANIMATION_DURATION / 2) + animateButtonIn(views.attachmentGalleryButton, ANIMATION_DURATION / 4) animateButtonIn(views.attachmentCameraButton, ANIMATION_DURATION / 2) - animateButtonIn(views.attachmentFileButton, ANIMATION_DURATION / 4) - animateButtonIn(views.attachmentAudioButton, ANIMATION_DURATION / 2) + animateButtonIn(views.attachmentFileButton, ANIMATION_DURATION / 2) + animateButtonIn(views.attachmentAudioButton, 0) animateButtonIn(views.attachmentContactButton, ANIMATION_DURATION / 4) - animateButtonIn(views.attachmentStickersButton, 0) + animateButtonIn(views.attachmentStickersButton, ANIMATION_DURATION / 2) } override fun dismiss() { From 9749b4fd2949925325992f8d823e4db3da2c2392 Mon Sep 17 00:00:00 2001 From: p_0g_8mm3_ <37022952+pr0gr8mm3r@users.noreply.github.com> Date: Thu, 5 Aug 2021 20:16:29 +0200 Subject: [PATCH 2/4] Add changelog file --- changelog.d/3793.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/3793.bugfix diff --git a/changelog.d/3793.bugfix b/changelog.d/3793.bugfix new file mode 100644 index 00000000000..8f812292624 --- /dev/null +++ b/changelog.d/3793.bugfix @@ -0,0 +1 @@ +Fix order in which the items of the attachement menu appear From bdcdff021f7725cdad03c82a0bd2467d952eb250 Mon Sep 17 00:00:00 2001 From: Simon Wazynski <37022952+pr0gr8mm3r@users.noreply.github.com> Date: Wed, 18 Aug 2021 20:18:03 +0200 Subject: [PATCH 3/4] Sign off Signed-off-by: Simon Wazynski <37022952+pr0gr8mm3r@users.noreply.github.com> From dfa0fb70d68c3074a73bae725f7a3b02bb5ce2f4 Mon Sep 17 00:00:00 2001 From: Simon Wazynski <37022952+pr0gr8mm3r@users.noreply.github.com> Date: Wed, 18 Aug 2021 21:03:40 +0200 Subject: [PATCH 4/4] Fix swapped order --- .../app/features/attachments/AttachmentTypeSelectorView.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt index af544593f58..eba5dadedac 100644 --- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt @@ -102,8 +102,8 @@ class AttachmentTypeSelectorView(context: Context, contentView.doOnNextLayout { animateWindowInCircular(anchor, contentView) } - animateButtonIn(views.attachmentGalleryButton, ANIMATION_DURATION / 4) - animateButtonIn(views.attachmentCameraButton, ANIMATION_DURATION / 2) + animateButtonIn(views.attachmentGalleryButton, ANIMATION_DURATION / 2) + animateButtonIn(views.attachmentCameraButton, ANIMATION_DURATION / 4) animateButtonIn(views.attachmentFileButton, ANIMATION_DURATION / 2) animateButtonIn(views.attachmentAudioButton, 0) animateButtonIn(views.attachmentContactButton, ANIMATION_DURATION / 4)