Conversation menu resources adjusted for light theme support.

res/drawable/ic_baseline_call_split_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M14,4l2.29,2.29 -2.88,2.88 1.42,1.42 2.88,-2.88L20,10L20,4zM10,4L4,4v6l2.29,-2.29 4.71,4.7L11,20h2v-8.41l-5.29,-5.3z"/>
+</vector>

res/drawable/ic_baseline_file_copy_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5l6,6v10c0,1.1 -0.9,2 -2,2L7.99,23C6.89,23 6,22.1 6,21l0.01,-14c0,-1.1 0.89,-2 1.99,-2h7zM14,12h5.5L14,6.5L14,12z"/>
+</vector>

res/drawable/ic_baseline_key_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>

res/drawable/ic_baseline_launch_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
+</vector>

res/drawable/ic_baseline_reply_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
+</vector>

res/drawable/ic_baseline_select_all_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
+</vector>

res/drawable/ic_baseline_timer_off_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19.04,4.55l-1.42,1.42C16.07,4.74 14.12,4 12,4c-1.83,0 -3.53,0.55 -4.95,1.48l1.46,1.46C9.53,6.35 10.73,6 12,6c3.87,0 7,3.13 7,7 0,1.27 -0.35,2.47 -0.94,3.49l1.45,1.45C20.45,16.53 21,14.83 21,13c0,-2.12 -0.74,-4.07 -1.97,-5.61l1.42,-1.42 -1.41,-1.42zM15,1L9,1v2h6L15,1zM11,9.44l2,2L13,8h-2v1.44zM3.02,4L1.75,5.27 4.5,8.03C3.55,9.45 3,11.16 3,13c0,4.97 4.02,9 9,9 1.84,0 3.55,-0.55 4.98,-1.5l2.5,2.5 1.27,-1.27 -7.71,-7.71L3.02,4zM12,20c-3.87,0 -7,-3.13 -7,-7 0,-1.28 0.35,-2.48 0.95,-3.52l9.56,9.56c-1.03,0.61 -2.23,0.96 -3.51,0.96z"/>
+</vector>

res/menu/conversation_add_to_contacts.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:id="@+id/menu_add_to_contacts"
-          android:title="@string/conversation_add_to_contacts__menu_add_to_contacts"
-          app:showAsAction="never" />
-
-</menu>

res/menu/conversation_callable_insecure.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:title="@string/conversation_callable_insecure__menu_call"
-          android:id="@+id/menu_call_insecure"
-          android:icon="?menu_call_icon"
-          app:showAsAction="always" />
-
-</menu>

res/menu/conversation_callable_secure.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:title="@string/conversation_callable_secure__menu_call"
-          android:id="@+id/menu_call_secure"
-          android:icon="@drawable/ic_call_secure_white_24dp"
-          app:showAsAction="always" />
-
-</menu>

res/menu/conversation_context.xml

@@ -18,7 +18,7 @@
 
     <item android:title="@string/activity_conversation_copy_public_key_button_title"
         android:id="@+id/menu_context_copy_public_key"
-        android:icon="@drawable/ic_key"
+        android:icon="@drawable/ic_baseline_key_24"
         app:showAsAction="always" />
 
     <!-- <item android:title="@string/conversation_context__menu_forward_message"

res/menu/conversation_expiring_off.xml

@@ -4,6 +4,6 @@
 
     <item android:title="@string/conversation_expiring_off__disappearing_messages"
           android:id="@+id/menu_expiring_messages_off"
-          android:icon="@drawable/ic_timer_off_white_24dp"/>
+          android:icon="@drawable/ic_baseline_timer_off_24"/>
 
 </menu>

res/menu/conversation_group_options.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:title="@string/convesation_group_options__recipients_list"
-          android:id="@+id/menu_group_recipients"
-          android:icon="?menu_group_icon"
-          app:showAsAction="ifRoom" />
-
-</menu>

res/menu/conversation_list_batch_archive.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <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:showAsAction="always"/>
-
-</menu>

res/menu/conversation_list_batch_unarchive.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <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:showAsAction="always"/>
-
-</menu>

res/menu/conversation_mms_group_options.xml

@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:title="@string/conversation_group_options__delivery"
+    <item
         android:id="@+id/menu_group_delivery"
         android:icon="?menu_split_icon"
-          app:showAsAction="ifRoom" >
+        android:title="@string/conversation_group_options__delivery"
+        app:showAsAction="ifRoom">
 
         <menu>
-            <group android:id="@+id/distribution_group"
+            <group
+                android:id="@+id/distribution_group"
                 android:checkableBehavior="single">
-                <item android:id="@+id/menu_distribution_conversation" android:title="@string/conversation_group_options__conversation" android:checked="true" />
+                <item
-                <item android:id="@+id/menu_distribution_broadcast" android:title="@string/conversation_group_options__broadcast" />
+                    android:id="@+id/menu_distribution_conversation"
+                    android:checked="true"
+                    android:title="@string/conversation_group_options__conversation" />
+                <item
+                    android:id="@+id/menu_distribution_broadcast"
+                    android:title="@string/conversation_group_options__broadcast" />
             </group>
         </menu>
     </item>

res/menu/conversation_unblock.xml

@@ -3,6 +3,6 @@
 
     <item android:title="@string/ConversationActivity_unblock"
         android:id="@+id/menu_unblock"
-        android:icon="@drawable/ic_check_white_24dp" />
+        android:icon="?menu_accept_icon" />
 
 </menu>

res/values-notnight/themes.xml

@@ -137,17 +137,11 @@
         <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
         <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
         <item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
-        <item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item>
         <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
         <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
         <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
-        <item name="menu_selectall_icon">@drawable/ic_select_all_white_24dp</item>
-        <item name="menu_split_icon">@drawable/ic_call_split_white_24dp</item>
-        <item name="menu_accept_icon">@drawable/ic_check_white_24dp</item>
         <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
-        <item name="menu_copy_icon">@drawable/ic_content_copy_white_24dp</item>
         <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
-        <item name="menu_reply_icon">@drawable/ic_reply_white_24dp</item>
 
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item>
         <item name="conversation_icon_attach_video">@drawable/ic_video_light</item>

res/values/themes.xml

@@ -21,7 +21,6 @@
         <item name="alertDialogTheme">@style/Session.AlertDialog</item>
         <item name="bottomSheetDialogTheme">@style/SessionBottomSheetDialogTheme</item>
         <item name="preferenceTheme">@style/Session.SettingsTheme</item>
-        <item name="actionModeBackground">@color/compose_view_background</item>
         <item name="statusBarBackground">@color/accent</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="titleTextColor">?android:textColorPrimary</item>
@@ -30,6 +29,7 @@
 
         <item name="windowActionModeOverlay">true</item>
         <item name="actionModeCloseDrawable">@drawable/ic_baseline_clear_24</item>
+        <item name="actionModeBackground">@color/compose_view_background</item>
 
         <item name="dividerVertical">@color/separator</item>
         <item name="dividerHorizontal">?dividerVertical</item>
@@ -47,6 +47,11 @@
         <item name="menu_save_icon">@drawable/ic_baseline_save_24</item>
         <item name="menu_photo_library_icon">@drawable/ic_baseline_photo_library_24</item>
         <item name="menu_delete_icon">@drawable/ic_baseline_delete_24</item>
+        <item name="menu_copy_icon">@drawable/ic_baseline_file_copy_24</item>
+        <item name="menu_reply_icon">@drawable/ic_baseline_reply_24</item>
+        <item name="menu_selectall_icon">@drawable/ic_baseline_select_all_24</item>
+        <item name="menu_split_icon">@drawable/ic_baseline_call_split_24</item>
+        <item name="menu_popup_expand">@drawable/ic_baseline_launch_24</item>
     </style>
 
     <style name="Session.DarkTheme" parent="Session.BaseDarkTheme">
@@ -374,9 +379,9 @@
         <item name="actionBarTheme">@style/Session.DarkActionBar</item>
         <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
-        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>
+<!--        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>-->
-        <item name="actionModeBackground">@color/compose_view_background</item>
+<!--        <item name="actionModeBackground">@color/compose_view_background</item>-->
-        <item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>
+<!--        <item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>-->
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
         <item name="colorAccent">@color/accent</item>
@@ -499,17 +504,12 @@
         <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
         <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
         <item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
-        <item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item>
         <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
         <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
         <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
-        <item name="menu_selectall_icon">@drawable/ic_select_all_white_24dp</item>
-        <item name="menu_split_icon">@drawable/ic_call_split_white_24dp</item>
         <item name="menu_accept_icon">@drawable/ic_check_white_24dp</item>
         <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
-        <item name="menu_copy_icon">@drawable/ic_content_copy_white_24dp</item>
         <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
-        <item name="menu_reply_icon">@drawable/ic_reply_white_24dp</item>
 
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_dark</item>
         <item name="conversation_icon_attach_video">@drawable/ic_video_dark</item>

src/org/thoughtcrime/securesms/ConversationListFragment.java

@@ -455,7 +455,7 @@ public class ConversationListFragment extends Fragment
     switch (item.getItemId()) {
     case R.id.menu_select_all:       handleSelectAllThreads();   return true;
     case R.id.menu_delete_selected:  handleDeleteAllSelected();  return true;
-    case R.id.menu_archive_selected: handleArchiveAllSelected(); return true;
+//    case R.id.menu_archive_selected: handleArchiveAllSelected(); return true;
     }
 
     return false;

src/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -849,16 +849,16 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
     switch (item.getItemId()) {
-    case R.id.menu_call_secure:               handleDial(getRecipient(), true);         return true;
+//    case R.id.menu_call_secure:               handleDial(getRecipient(), true);         return true;
-    case R.id.menu_call_insecure:             handleDial(getRecipient(), false);        return true;
+//    case R.id.menu_call_insecure:             handleDial(getRecipient(), false);        return true;
     case R.id.menu_unblock:                   handleUnblock();                                   return true;
     case R.id.menu_block:                     handleBlock();                                     return true;
     case R.id.menu_view_media:                handleViewMedia();                                 return true;
     case R.id.menu_add_shortcut:              handleAddShortcut();                               return true;
     case R.id.menu_search:                    handleSearch();                                    return true;
-    case R.id.menu_add_to_contacts:           handleAddToContacts();                             return true;
+//    case R.id.menu_add_to_contacts:           handleAddToContacts();                             return true;
     case R.id.menu_reset_secure_session:      handleResetSecureSession();                        return true;
-    case R.id.menu_group_recipients:          handleDisplayGroupRecipients();                    return true;
+//    case R.id.menu_group_recipients:          handleDisplayGroupRecipients();                    return true;
     case R.id.menu_distribution_broadcast:    handleDistributionBroadcastEnabled(item);          return true;
     case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item);       return true;
     case R.id.menu_edit_group:                handleEditPushGroup();                             return true;