From 3088d7f1823c18969f373221574ca8b2449e1bec Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Wed, 6 Apr 2022 14:54:53 -0400
Subject: [PATCH] Adjust quote view colors.

---
 .../thoughtcrime/securesms/components/QuoteView.java | 12 +++++++++++-
 app/src/main/res/values-night/dark_colors.xml        |  3 ++-
 app/src/main/res/values/light_colors.xml             |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
index 82cc89361..7884fc53c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
@@ -261,7 +261,17 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     }
 
     quoteBarView.setBackgroundColor(ContextCompat.getColor(getContext(), outgoing || isStoryReply() ? R.color.core_white : android.R.color.transparent));
-    mainView.setBackgroundColor(ContextCompat.getColor(getContext(), preview || (!outgoing && isStoryReply()) ? R.color.quote_preview_background : R.color.quote_view_background));
+
+    int mainViewColor;
+    if (preview) {
+      mainViewColor = R.color.quote_preview_background;
+    } else if (!outgoing && isStoryReply()) {
+      mainViewColor = R.color.quote_incoming_story_background;
+    } else {
+      mainViewColor = R.color.quote_view_background;
+    }
+
+    mainView.setBackgroundColor(ContextCompat.getColor(getContext(), mainViewColor));
   }
 
   private boolean isStoryReply() {
diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml
index 17c56bf25..f18432d95 100644
--- a/app/src/main/res/values-night/dark_colors.xml
+++ b/app/src/main/res/values-night/dark_colors.xml
@@ -166,7 +166,8 @@
 
     <color name="quote_view_background">@color/transparent_black_40</color>
     <color name="conversation_item_outgoing_footer_fg">@color/transparent_white_60</color>
-    <color name="quote_preview_background">@color/core_grey_80</color>
+    <color name="quote_preview_background">@color/core_grey_60</color>
+    <color name="quote_incoming_story_background">@color/core_grey_80</color>
 
     <color name="react_with_any_background">@color/core_grey_75</color>
     <color name="react_with_any_search_background">@color/core_grey_65</color>
diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml
index 566a03cd4..d66029931 100644
--- a/app/src/main/res/values/light_colors.xml
+++ b/app/src/main/res/values/light_colors.xml
@@ -166,7 +166,8 @@
 
     <color name="quote_view_background">@color/transparent_white_60</color>
     <color name="conversation_item_outgoing_footer_fg">@color/transparent_white_80</color>
-    <color name="quote_preview_background">#f2f2f2</color>
+    <color name="quote_preview_background">@color/core_grey_15</color>
+    <color name="quote_incoming_story_background">#f2f2f2</color>
 
     <color name="react_with_any_background">@color/core_white</color>
     <color name="react_with_any_search_background">@color/core_grey_05</color>