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 8fdcee3485..135ec2a1da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -129,8 +129,10 @@ import org.thoughtcrime.securesms.util.SnapToTopDataObserver; import org.thoughtcrime.securesms.util.StickyHeaderDecoration; import org.thoughtcrime.securesms.util.StorageUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; +import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; +import org.thoughtcrime.securesms.util.WindowUtil; import org.thoughtcrime.securesms.util.concurrent.SignalExecutors; import org.thoughtcrime.securesms.util.concurrent.SimpleTask; import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask; @@ -1524,6 +1526,10 @@ public class ConversationFragment extends LoggingFragment { window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar)); } + if (!ThemeUtil.isDarkTheme(getContext())) { + WindowUtil.setLightStatusBar(getActivity().getWindow()); + } + setCorrectMenuVisibility(menu); AdaptiveActionsToolbar.adjustMenuActions(menu, 10, requireActivity().getWindow().getDecorView().getMeasuredWidth()); listener.onMessageActionToolbarOpened(); @@ -1544,6 +1550,7 @@ public class ConversationFragment extends LoggingFragment { getActivity().getWindow().setStatusBarColor(statusBarColor); } + WindowUtil.clearLightStatusBar(getActivity().getWindow()); actionMode = null; } 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 7622b50708..4152fc3d30 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java @@ -39,6 +39,7 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; +import org.thoughtcrime.securesms.util.WindowUtil; import java.util.Collections; import java.util.LinkedList; @@ -200,10 +201,10 @@ public final class ConversationReactionOverlay extends RelativeLayout { if (Build.VERSION.SDK_INT >= 21) { this.activity = activity; originalStatusBarColor = activity.getWindow().getStatusBarColor(); - activity.getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), R.color.reactions_overlay_toolbar_background_color)); + activity.getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), R.color.signal_background_secondary)); - if (!ThemeUtil.isDarkTheme(getContext()) && Build.VERSION.SDK_INT >= 23) { - activity.getWindow().getDecorView().setSystemUiVisibility(activity.getWindow().getDecorView().getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + if (!ThemeUtil.isDarkTheme(getContext())) { + WindowUtil.setLightStatusBar(activity.getWindow()); } } } @@ -241,9 +242,9 @@ public final class ConversationReactionOverlay extends RelativeLayout { revealAnimatorSet.end(); hideAnimatorSet.start(); - if (Build.VERSION.SDK_INT >= 23 && activity != null) { + if (Build.VERSION.SDK_INT >= 21 && activity != null) { activity.getWindow().setStatusBarColor(originalStatusBarColor); - activity.getWindow().getDecorView().setSystemUiVisibility(activity.getWindow().getDecorView().getSystemUiVisibility() & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + WindowUtil.clearLightStatusBar(activity.getWindow()); activity = null; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java index 5173dcb7f0..f83267880a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java @@ -892,11 +892,6 @@ public class ConversationListFragment extends MainFragment implements ActionMode getActivity().getWindow().setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar)); } - if (Build.VERSION.SDK_INT >= 23) { - int current = getActivity().getWindow().getDecorView().getSystemUiVisibility(); - getActivity().getWindow().getDecorView().setSystemUiVisibility(current & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - } - return true; } diff --git a/app/src/main/res/drawable/ic_x_reaction_overlay.xml b/app/src/main/res/drawable/ic_x_reaction_overlay.xml index 67bf1c342c..0187c8659b 100644 --- a/app/src/main/res/drawable/ic_x_reaction_overlay.xml +++ b/app/src/main/res/drawable/ic_x_reaction_overlay.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml b/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml index 1aad43b994..8c2f1a3dd3 100644 --- a/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml +++ b/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="@color/reactions_overlay_toolbar_background_color" + android:background="@color/signal_background_secondary" app:contentInsetStart="0dp" app:contentInsetStartWithNavigation="48sp" app:menu="@menu/conversation_reactions_long_press_menu" diff --git a/app/src/main/res/menu/conversation_context.xml b/app/src/main/res/menu/conversation_context.xml index cea0370327..584cf78b42 100644 --- a/app/src/main/res/menu/conversation_context.xml +++ b/app/src/main/res/menu/conversation_context.xml @@ -3,22 +3,26 @@ diff --git a/app/src/main/res/menu/conversation_list_batch.xml b/app/src/main/res/menu/conversation_list_batch.xml index bf72f991ed..91a7061e5b 100644 --- a/app/src/main/res/menu/conversation_list_batch.xml +++ b/app/src/main/res/menu/conversation_list_batch.xml @@ -7,6 +7,7 @@ android:id="@+id/menu_delete_selected" android:icon="@drawable/ic_trash_24" android:title="@string/conversation_list_batch__menu_delete_selected" + app:iconTint="@color/signal_icon_tint_primary" app:showAsAction="always" /> \ No newline at end of file diff --git a/app/src/main/res/menu/conversation_list_batch_pin.xml b/app/src/main/res/menu/conversation_list_batch_pin.xml index 6f674ea6c9..9f3310d7fc 100644 --- a/app/src/main/res/menu/conversation_list_batch_pin.xml +++ b/app/src/main/res/menu/conversation_list_batch_pin.xml @@ -5,10 +5,12 @@ android:id="@+id/menu_pin_selected" android:icon="@drawable/ic_pin_24" android:title="@string/conversation_list_batch__menu_pin_selected" + app:iconTint="@color/signal_icon_tint_primary" app:showAsAction="always" /> \ No newline at end of file diff --git a/app/src/main/res/menu/conversation_list_batch_unarchive.xml b/app/src/main/res/menu/conversation_list_batch_unarchive.xml index 3d42468333..9c5fe12558 100644 --- a/app/src/main/res/menu/conversation_list_batch_unarchive.xml +++ b/app/src/main/res/menu/conversation_list_batch_unarchive.xml @@ -5,6 +5,7 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/conversation_reactions_long_press_menu.xml b/app/src/main/res/menu/conversation_reactions_long_press_menu.xml index 5bef015c4b..9bc1e9ecda 100644 --- a/app/src/main/res/menu/conversation_reactions_long_press_menu.xml +++ b/app/src/main/res/menu/conversation_reactions_long_press_menu.xml @@ -5,43 +5,43 @@ android:id="@+id/action_info" android:icon="@drawable/ic_info_white_24" android:title="@string/conversation_context__menu_message_details" - app:iconTint="@color/reactions_overlay_toolbar_icon_tint" + app:iconTint="@color/signal_icon_tint_primary" app:showAsAction="always" /> \ No newline at end of file diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml index cec9cfc8f5..63d99ad0ae 100644 --- a/app/src/main/res/values-night/dark_colors.xml +++ b/app/src/main/res/values-night/dark_colors.xml @@ -96,9 +96,6 @@ @color/core_grey_05 @color/core_white - @color/core_white - - @color/action_mode_status_bar @color/core_grey_35 @color/core_grey_15 @color/transparent_black_60 diff --git a/app/src/main/res/values-night/signal_styles.xml b/app/src/main/res/values-night/signal_styles.xml index 1ac0eb08e4..112d400309 100644 --- a/app/src/main/res/values-night/signal_styles.xml +++ b/app/src/main/res/values-night/signal_styles.xml @@ -5,4 +5,8 @@