From 35235509ca529b5bb03e86d73621ba8bc7040014 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 10 Apr 2025 14:12:04 -0300
Subject: [PATCH] Prevent wallpaper mode from overwriting navbar color.

---
 .../org/thoughtcrime/securesms/components/InputPanel.java   | 6 +++++-
 .../securesms/conversation/v2/ConversationFragment.kt       | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
index 27f5006aa9..c896e72962 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
@@ -784,13 +784,17 @@ public class InputPanel extends ConstraintLayout
   }
 
   private void updateVisibility() {
-    if (hideForGroupState || hideForBlockedState || hideForSearch || hideForSelection || hideForMessageRequestState) {
+    if (isHidden()) {
       setVisibility(GONE);
     } else {
       setVisibility(VISIBLE);
     }
   }
 
+  public boolean isHidden() {
+    return hideForGroupState || hideForBlockedState || hideForSearch || hideForSelection || hideForMessageRequestState;
+  }
+
   public @Nullable MessageRecord getEditMessage() {
     return messageToEdit;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 299c85dd14..af8c1dea16 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -1482,7 +1482,9 @@ class ConversationFragment :
       )
     )
 
-    binding.navBar.setBackgroundColor(ContextCompat.getColor(requireContext(), navColor))
+    if (!inputPanel.isHidden) {
+      binding.navBar.setBackgroundColor(ContextCompat.getColor(requireContext(), navColor))
+    }
   }
 
   private fun presentChatColors(chatColors: ChatColors) {