From 6e0bfa2ceee5e72e3122f0b0dfb48fe8b9893999 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 20 Oct 2025 15:00:10 -0300
Subject: [PATCH] Fixes for reaction overlay.

---
 .../ConversationReactionOverlay.java            | 17 -----------------
 app/src/main/res/values-night/dark_colors.xml   |  1 -
 app/src/main/res/values-v23/colors.xml          |  4 ----
 app/src/main/res/values/colors.xml              |  1 -
 app/src/main/res/values/light_colors.xml        |  5 ++---
 5 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 app/src/main/res/values-v23/colors.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
index 03e7deb68d..83b05dc9d0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
@@ -203,7 +203,6 @@ public final class ConversationReactionOverlay extends FrameLayout {
     setVisibility(View.INVISIBLE);
 
     this.activity = activity;
-    updateSystemUiOnShow(activity);
 
     ViewKt.doOnLayout(this, v -> {
       showAfterLayout(activity, conversationMessage, lastSeenDownPoint, isMessageOnLeft);
@@ -424,22 +423,6 @@ public final class ConversationReactionOverlay extends FrameLayout {
     }
   }
 
-  private void updateSystemUiOnShow(@NonNull Activity activity) {
-    Window window   = activity.getWindow();
-    int    barColor = ContextCompat.getColor(getContext(), R.color.conversation_item_selected_system_ui);
-
-    originalStatusBarColor = window.getStatusBarColor();
-    WindowUtil.setStatusBarColor(window, barColor);
-
-    originalNavigationBarColor = window.getNavigationBarColor();
-    WindowUtil.setNavigationBarColor(activity, barColor);
-
-    if (!ThemeUtil.isDarkTheme(getContext())) {
-      WindowUtil.clearLightStatusBar(window);
-      WindowUtil.clearLightNavigationBar(window);
-    }
-  }
-
   public void hide() {
     hideInternal(onHideListener);
   }
diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml
index 9e8e2b725f..031b86d72f 100644
--- a/app/src/main/res/values-night/dark_colors.xml
+++ b/app/src/main/res/values-night/dark_colors.xml
@@ -137,7 +137,6 @@
     <color name="reactions_pill_selected_text_color">@color/core_grey_15</color>
     <color name="reactions_screen_dark_shade_color">@color/transparent_black_70</color>
     <color name="reactions_screen_light_shade_color">#df5e5e5e</color>
-    <color name="reactions_status_bar_shade">#191919</color>
 
     <color name="recipient_bottom_sheet_button_strip_background_color">@color/signal_colorSecondaryContainer</color>
 
diff --git a/app/src/main/res/values-v23/colors.xml b/app/src/main/res/values-v23/colors.xml
deleted file mode 100644
index 936fb1abbc..0000000000
--- a/app/src/main/res/values-v23/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="conversation_item_selected_system_ui">@color/reactions_status_bar_shade</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c594bc2f30..cb11d6a55c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -41,7 +41,6 @@
 
     <color name="conversation_compose_divider">#32000000</color>
 
-    <color name="conversation_item_selected_system_ui">#4d4d4d</color>
     <color name="touch_highlight">#400099cc</color>
     <color name="touch_highlight_material3">#14E2E1E5</color>
 
diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml
index 1d9c5e8614..56b1ad87b2 100644
--- a/app/src/main/res/values/light_colors.xml
+++ b/app/src/main/res/values/light_colors.xml
@@ -138,9 +138,8 @@
 
     <color name="reactions_pill_text_color">@color/signal_colorOnSurfaceVariant</color>
     <color name="reactions_pill_selected_text_color">@color/core_grey_75</color>
-    <color name="reactions_screen_dark_shade_color">@color/transparent_black_70</color>
-    <color name="reactions_screen_light_shade_color">@color/transparent_white_87</color>
-    <color name="reactions_status_bar_shade">#4d4d4d</color>
+    <color name="reactions_screen_dark_shade_color">#6670747D</color>
+    <color name="reactions_screen_light_shade_color">@color/transparent_white_20</color>
     <color name="reactions_overlay_any_emoji_background">@color/signal_colorSurfaceVariant_16_no_alpha</color>
     <color name="reactions_overlay_any_emoji_foreground">@color/signal_colorOnSurfaceVariant</color>