From 03c19f54c2831e837225370f95777657215537f5 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 26 May 2021 10:56:09 -0300
Subject: [PATCH] Set background of typing indicator to match conversation.

---
 .../securesms/components/ConversationTypingView.java      | 8 +++++++-
 .../securesms/conversation/ConversationFragment.java      | 3 ++-
 app/src/main/res/layout/conversation_typing_view.xml      | 3 +--
 app/src/main/res/values-night/dark_colors.xml             | 1 -
 app/src/main/res/values/light_colors.xml                  | 1 -
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
index a143381088..5b3620f07f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
@@ -36,7 +36,7 @@ public class ConversationTypingView extends LinearLayout {
     indicator = findViewById(R.id.typing_indicator);
   }
 
-  public void setTypists(@NonNull GlideRequests glideRequests, @NonNull List<Recipient> typists, boolean isGroupThread) {
+  public void setTypists(@NonNull GlideRequests glideRequests, @NonNull List<Recipient> typists, boolean isGroupThread, boolean hasWallpaper) {
     if (typists.isEmpty()) {
       indicator.stopAnimation();
       return;
@@ -51,6 +51,12 @@ public class ConversationTypingView extends LinearLayout {
       avatar.setVisibility(GONE);
     }
 
+    if (hasWallpaper) {
+      bubble.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.conversation_item_wallpaper_bubble_color));
+    } else {
+      bubble.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.signal_background_secondary));
+    }
+
     indicator.startAnimation();
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 995bff50a7..2b2d09c0ef 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -701,7 +701,8 @@ public class ConversationFragment extends LoggingFragment {
         replacedByIncomingMessage = false;
       }
 
-      typingView.setTypists(GlideApp.with(ConversationFragment.this), recipients, recipient.get().isGroup());
+      Recipient resolved = recipient.get();
+      typingView.setTypists(GlideApp.with(ConversationFragment.this), recipients, resolved.isGroup(), resolved.hasWallpaper());
 
       ConversationAdapter adapter = getListAdapter();
 
diff --git a/app/src/main/res/layout/conversation_typing_view.xml b/app/src/main/res/layout/conversation_typing_view.xml
index 954eece416..7336b52b0f 100644
--- a/app/src/main/res/layout/conversation_typing_view.xml
+++ b/app/src/main/res/layout/conversation_typing_view.xml
@@ -33,8 +33,7 @@
         <FrameLayout
             android:id="@+id/typing_bubble"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/conversation_typing_indicator_bg">
+            android:layout_height="match_parent">
 
             <org.thoughtcrime.securesms.components.TypingIndicatorView
                 android:id="@+id/typing_indicator"
diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml
index f0d12d7b4b..e38409ced7 100644
--- a/app/src/main/res/values-night/dark_colors.xml
+++ b/app/src/main/res/values-night/dark_colors.xml
@@ -134,7 +134,6 @@
     <color name="settings_ripple_color">@color/transparent_white_10</color>
 
     <color name="quote_view_background">@color/transparent_black_40</color>
-    <color name="conversation_typing_indicator_bg">@color/core_grey_25</color>
     <color name="conversation_item_outgoing_footer_fg">@color/transparent_white_60</color>
     <color name="quote_preview_background">@color/core_grey_80</color>
 </resources>
diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml
index 66a0f8b509..8b79138a58 100644
--- a/app/src/main/res/values/light_colors.xml
+++ b/app/src/main/res/values/light_colors.xml
@@ -134,7 +134,6 @@
     <color name="settings_ripple_color">@color/transparent_black_10</color>
 
     <color name="quote_view_background">@color/transparent_white_60</color>
-    <color name="conversation_typing_indicator_bg">@color/core_grey_60</color>
     <color name="conversation_item_outgoing_footer_fg">@color/transparent_white_80</color>
     <color name="quote_preview_background">@color/core_grey_15</color>
 </resources>