From 08bb24891901b5f733763d897cb5822b8766264e Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 15 Aug 2025 23:23:02 +0200 Subject: [PATCH] revert status bar color hack --- .../securesms/ConversationFragment.java | 4 ++-- .../org/thoughtcrime/securesms/util/Util.java | 21 ------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java index 13930b17c..571457178 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java @@ -865,7 +865,7 @@ public class ConversationFragment extends MessageSelectorFragment Window window = getActivity().getWindow(); statusBarColor = window.getStatusBarColor(); - Util.setStatusBarColor(window, getResources().getColor(R.color.action_mode_status_bar)); + window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar)); Util.redMenuItem(menu, R.id.menu_context_delete_message); setCorrectMenuVisibility(menu); ConversationAdaptiveActionsToolbar.adjustMenuActions(menu, 10, requireActivity().getWindow().getDecorView().getMeasuredWidth()); @@ -882,7 +882,7 @@ public class ConversationFragment extends MessageSelectorFragment ((ConversationAdapter)list.getAdapter()).clearSelection(); list.getAdapter().notifyDataSetChanged(); - Util.setStatusBarColor(getActivity().getWindow(), statusBarColor); + getActivity().getWindow().setStatusBarColor(statusBarColor); actionMode = null; hideAddReactionView(); diff --git a/src/main/java/org/thoughtcrime/securesms/util/Util.java b/src/main/java/org/thoughtcrime/securesms/util/Util.java index 158fe7777..96757f110 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/Util.java +++ b/src/main/java/org/thoughtcrime/securesms/util/Util.java @@ -23,11 +23,9 @@ import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Color; -import android.graphics.Insets; import android.graphics.Typeface; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; import android.os.Handler; import android.os.Looper; import android.text.Spannable; @@ -38,8 +36,6 @@ import android.text.style.StyleSpan; import android.util.Log; import android.view.Menu; import android.view.MenuItem; -import android.view.Window; -import android.view.WindowInsets; import android.view.accessibility.AccessibilityManager; import androidx.annotation.NonNull; @@ -115,23 +111,6 @@ public class Util { } } - public static void setStatusBarColor(Window window, int color) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) { - // Android 15+ - window.getDecorView().setOnApplyWindowInsetsListener((view, insets) -> { - Insets statusBarInsets = insets.getInsets(WindowInsets.Type.statusBars()); - view.setBackgroundColor(color); - - // Adjust padding to avoid overlap - //view.setPadding(0, statusBarInsets.top, 0, 0); - return insets; - }); - } else { - // Android 14 and below - window.setStatusBarColor(color); - } - } - public static @NonNull int[] appendInt(@Nullable int[] cur, int val) { if (cur == null) { return new int[] { val };