Retheme action modes.

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;
     }
 

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) {
+      if (!ThemeUtil.isDarkTheme(getContext())) {
-        activity.getWindow().getDecorView().setSystemUiVisibility(activity.getWindow().getDecorView().getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        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;
     }
 

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;
   }
 

app/src/main/res/drawable/ic_x_reaction_overlay.xml

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/reactions_overlay_toolbar_icon_tint"
+      android:fillColor="@color/signal_icon_tint_primary"
       android:pathData="M20.5,4.5l-1,-1l-7.5,7.4l-7.5,-7.4l-1,1l7.4,7.5l-7.4,7.5l1,1l7.5,-7.4l7.5,7.4l1,-1l-7.4,-7.5z"/>
 </vector>

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"

app/src/main/res/menu/conversation_context.xml

@@ -3,22 +3,26 @@
     <item android:title="@string/conversation_context__menu_message_details"
           android:id="@+id/menu_context_details"
           android:icon="@drawable/ic_info_white_24"
+          app:iconTint="@color/signal_icon_tint_primary"
           app:showAsAction="always" />
 
     <item android:title="@string/conversation_context__menu_delete_message"
         android:id="@+id/menu_context_delete_message"
         android:icon="@drawable/ic_trash_24"
+        app:iconTint="@color/signal_icon_tint_primary"
         app:showAsAction="always" />
 
     <item android:title="@string/conversation_context__menu_copy_text"
           android:id="@+id/menu_context_copy"
           android:icon="@drawable/ic_copy_24"
+          app:iconTint="@color/signal_icon_tint_primary"
           app:showAsAction="always" />
 
     <item android:title="@string/conversation_context__menu_reply_to_message"
         android:id="@+id/menu_context_reply"
         android:visible="true"
         android:icon="@drawable/ic_reply_24"
+        app:iconTint="@color/signal_icon_tint_primary"
         app:showAsAction="always" />
 
     <item android:title="@string/conversation_context__menu_resend_message"
@@ -30,11 +34,13 @@
           android:id="@+id/menu_context_save_attachment"
           android:visible="false"
           android:icon="@drawable/ic_save_24"
+          app:iconTint="@color/signal_icon_tint_primary"
           app:showAsAction="always" />
 
     <item android:title="@string/conversation_context__menu_forward_message"
         android:id="@+id/menu_context_forward"
         android:icon="@drawable/ic_forward_24"
+        app:iconTint="@color/signal_icon_tint_primary"
         app:showAsAction="always" />
 
 </menu>

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" />
 
   <item

app/src/main/res/menu/conversation_list_batch_archive.xml

@@ -5,6 +5,7 @@
     <item android:title="@string/conversation_list_batch_archive__menu_archive_selected"
           android:id="@+id/menu_archive_selected"
           android:icon="@drawable/ic_archive_white_24dp"
+          app:iconTint="@color/signal_icon_tint_primary"
           app:showAsAction="always"/>
 
 </menu>

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" />
     <item
         android:id="@+id/menu_unpin_selected"
         android:icon="@drawable/ic_unpin_24"
         android:title="@string/conversation_list_batch__menu_unpin_selected"
+        app:iconTint="@color/signal_icon_tint_primary"
         app:showAsAction="always" />
 </menu>

app/src/main/res/menu/conversation_list_batch_unarchive.xml

@@ -5,6 +5,7 @@
     <item android:title="@string/conversation_list_batch_unarchive__menu_unarchive_selected"
           android:id="@+id/menu_archive_selected"
           android:icon="@drawable/ic_unarchive_white_24dp"
+          app:iconTint="@color/signal_icon_tint_primary"
           app:showAsAction="always"/>
 
 </menu>

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" />
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_trash_24"
         android:title="@string/conversation_context__menu_delete_message"
-        app:iconTint="@color/reactions_overlay_toolbar_icon_tint"
+        app:iconTint="@color/signal_icon_tint_primary"
         app:showAsAction="always" />
     <item
         android:id="@+id/action_copy"
         android:icon="@drawable/ic_copy_24"
         android:title="@string/conversation_context__menu_copy_text"
-        app:iconTint="@color/reactions_overlay_toolbar_icon_tint"
+        app:iconTint="@color/signal_icon_tint_primary"
         app:showAsAction="always" />
     <item
         android:id="@+id/action_reply"
         android:icon="@drawable/ic_reply_24"
         android:title="@string/conversation_context__menu_reply_to_message"
-        app:iconTint="@color/reactions_overlay_toolbar_icon_tint"
+        app:iconTint="@color/signal_icon_tint_primary"
         app:showAsAction="always" />
     <item
         android:visible="false"
         android:id="@+id/action_download"
         android:icon="@drawable/ic_save_24"
         android:title="@string/conversation_context_image__save_attachment"
-        app:iconTint="@color/reactions_overlay_toolbar_icon_tint"
+        app:iconTint="@color/signal_icon_tint_primary"
         app:showAsAction="always" />
     <item
         android:id="@+id/action_multiselect"
         android:icon="@drawable/ic_select_24"
         android:title="@string/conversation_context__reaction_multi_select"
-        app:iconTint="@color/reactions_overlay_toolbar_icon_tint"
+        app:iconTint="@color/signal_icon_tint_primary"
         app:showAsAction="always" />
     <item
         android:id="@+id/action_forward"
         android:icon="@drawable/ic_forward_24"
         android:title="@string/conversation_context__menu_forward_message"
-        app:iconTint="@color/reactions_overlay_toolbar_icon_tint"
+        app:iconTint="@color/signal_icon_tint_primary"
         app:showAsAction="ifRoom" />
 </menu>

app/src/main/res/values-night/dark_colors.xml

@@ -96,9 +96,6 @@
     <color name="quote_missing_icon_color">@color/core_grey_05</color>
     <color name="quote_dismiss_button_tint">@color/core_white</color>
 
-    <color name="reactions_overlay_toolbar_icon_tint">@color/core_white</color>
-
-    <color name="reactions_overlay_toolbar_background_color">@color/action_mode_status_bar</color>
     <color name="reactions_pill_text_color">@color/core_grey_35</color>
     <color name="reactions_pill_selected_text_color">@color/core_grey_15</color>
     <color name="reactions_screen_shade_color">@color/transparent_black_60</color>

app/src/main/res/values-night/signal_styles.xml

@@ -5,4 +5,8 @@
     </style>
 
     <style name="Signal.DayNight.Popup" parent="@style/ThemeOverlay.AppCompat.Dark" />
+
+    <style name="Signal.DayNight.Toolbar.Overflow" parent="@style/Signal.Toolbar.Overflow" />
+
+    <style name="Signal.DayNight.TitleTextStyle" parent="@style/TextSecure.TitleTextStyle.Dark" />
 </resources>

app/src/main/res/values-v23/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="action_mode_status_bar">@color/signal_background_secondary</color>
+</resources>

app/src/main/res/values/colors.xml

@@ -21,7 +21,7 @@
 
     <color name="conversation_compose_divider">#32000000</color>
 
-    <color name="action_mode_status_bar">@color/core_grey_50</color>
+    <color name="action_mode_status_bar">@color/grey_50</color>
     <color name="touch_highlight">#400099cc</color>
 
     <color name="device_link_item_background_light">#ffffffff</color>

app/src/main/res/values/light_colors.xml

@@ -96,9 +96,6 @@
     <color name="quote_missing_icon_color">@color/core_grey_60</color>
     <color name="quote_dismiss_button_tint">@color/core_grey_70</color>
 
-    <color name="reactions_overlay_toolbar_icon_tint">@color/core_grey_75</color>
-
-    <color name="reactions_overlay_toolbar_background_color">@color/core_white</color>
     <color name="reactions_pill_text_color">@color/core_grey_60</color>
     <color name="reactions_pill_selected_text_color">@color/core_grey_75</color>
     <color name="reactions_screen_shade_color">@color/transparent_black_40</color>

app/src/main/res/values/signal_styles.xml

@@ -65,4 +65,8 @@
     </style>
 
     <style name="Signal.DayNight.Popup" parent="@style/ThemeOverlay.AppCompat.Light" />
+
+    <style name="Signal.DayNight.Toolbar.Overflow" parent="@style/Signal.Toolbar.Overflow.Light" />
+
+    <style name="Signal.DayNight.TitleTextStyle" parent="@style/TextSecure.TitleTextStyle" />
 </resources>

app/src/main/res/values/styles.xml

@@ -375,15 +375,13 @@
     </style>
 
     <style name="TextSecure.ActionModeStyle" parent="@style/Widget.AppCompat.ActionMode">
-        <item name="titleTextStyle">@style/TextSecure.TitleTextStyle.Conversation</item>
+        <item name="titleTextStyle">@style/Signal.DayNight.TitleTextStyle</item>
         <item name="theme">@style/Signal.ActionModeTheme</item>
     </style>
 
     <style name="Signal.ActionModeTheme" parent="ThemeOverlay.AppCompat">
-        <!-- Use the brighter version of the three dot button because
+        <item name="actionOverflowButtonStyle">@style/Signal.DayNight.Toolbar.Overflow</item>
-             ActionMode background is darker regardless of the current theme (light or dark) -->
+        <item name="android:actionOverflowButtonStyle">@style/Signal.DayNight.Toolbar.Overflow</item>
-        <item name="actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow</item>
-        <item name="android:actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow</item>
     </style>
 
     <style name="Widget.Signal.ArcProgressBar" parent="">

app/src/main/res/values/themes.xml

@@ -106,8 +106,8 @@
 
         <item name="actionBarStyle">@style/TextSecure.LightActionBar</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
-        <item name="actionModeBackground">@color/core_grey_50</item>
+        <item name="actionModeBackground">@color/signal_background_secondary</item>
-        <item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_x_tinted</item>
         <item name="actionModeStyle">@style/TextSecure.ActionModeStyle</item>
         <item name="android:textColor">@color/text_color_light_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light_theme</item>
@@ -160,8 +160,8 @@
         <item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="actionModeBackground">@color/core_grey_50</item>
+        <item name="actionModeBackground">@color/signal_background_secondary</item>
-        <item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_x_tinted</item>
         <item name="actionModeStyle">@style/TextSecure.ActionModeStyle</item>
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>