From db4a0deccc9bb34ef26a33374478c4a4058fc763 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 19 Nov 2021 10:05:45 -0400
Subject: [PATCH] Slide badge on swipe to reply.

---
 .../thoughtcrime/securesms/conversation/ConversationItem.java | 2 +-
 .../securesms/conversation/ConversationItemSwipeCallback.java | 4 ----
 .../conversation/ConversationSwipeAnimationHelper.java        | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 3b5a7bbae0..f604d82d6a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -184,7 +184,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
             private   AvatarImageView            contactPhoto;
             private   AlertView                  alertView;
             protected ReactionsConversationView  reactionsView;
-            private   BadgeImageView             badgeImageView;
+            protected BadgeImageView             badgeImageView;
 
   private @NonNull  Set<MultiselectPart>                    batchSelected = new HashSet<>();
   private @NonNull  Outliner                                outliner      = new Outliner();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java
index 46b8ff42dc..55339a4a17 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java
@@ -202,8 +202,4 @@ public class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallbac
   interface OnSwipeListener {
     void onSwipe(ConversationMessage conversationMessage);
   }
-
-  public interface OnViewHolderTranslated {
-    void onViewHolderTranslated(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder);
-  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSwipeAnimationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSwipeAnimationHelper.java
index dac6af5e86..49fd8f5d18 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSwipeAnimationHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSwipeAnimationHelper.java
@@ -36,6 +36,7 @@ final class ConversationSwipeAnimationHelper {
     updateReactionsTransition(conversationItem.reactionsView, dx, sign);
     updateReplyIconTransition(conversationItem.reply, dx, progress, sign);
     updateContactPhotoHolderTransition(conversationItem.contactPhotoHolder, progress, sign);
+    updateContactPhotoHolderTransition(conversationItem.badgeImageView, progress, sign);
   }
 
   public static void trigger(@NonNull ConversationItem conversationItem) {