From 5e84772a8ddd5e57a07154a56712cbe3db9b6c77 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Fri, 8 Mar 2024 17:17:03 +0100
Subject: [PATCH] Give action bar icons the right color during action mode

---
 .../res/drawable/ic_content_copy_white_24dp.xml     |  5 +++--
 app/src/main/res/values/themes.xml                  | 13 +++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml b/app/src/main/res/drawable/ic_content_copy_white_24dp.xml
index ac30b89742..8dfe885914 100644
--- a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_content_copy_white_24dp.xml
@@ -3,6 +3,7 @@
     android:height="24dp"
     android:width="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" />
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="#fff" android:pathData="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" />
 </vector>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index eb06e0e3da..e8fdde3ed6 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -58,8 +58,7 @@
         <!-- Styles -->
         <item name="dropdownStyle">@style/Widget.Aegis.Dropdown</item>
         <item name="preferenceTheme">@style/ThemeOverlay.Aegis.Preference</item>
-        <!-- The hack below is necessary to force the action mode overflow menu to the right color -->
-        <item name="actionBarPopupTheme">@style/Widget.Material3.PopupMenu.ContextMenu</item>
+        <item name="actionModeTheme">@style/ThemeOverlay.Aegis.ActionMode</item>
         <!-- Settings -->
         <item name="windowActionModeOverlay">true</item>
         <item name="windowActionBar">false</item>
@@ -125,8 +124,7 @@
         <!-- Styles -->
         <item name="dropdownStyle">@style/Widget.Aegis.Dropdown</item>
         <item name="preferenceTheme">@style/ThemeOverlay.Aegis.Preference</item>
-        <!-- The hack below is necessary to force the action mode overflow menu to the right color -->
-        <item name="actionBarPopupTheme">@style/Widget.Material3.PopupMenu.ContextMenu</item>
+        <item name="actionModeTheme">@style/ThemeOverlay.Aegis.ActionMode</item>
         <!-- Settings -->
         <item name="windowActionModeOverlay">true</item>
         <item name="windowActionBar">false</item>
@@ -193,4 +191,11 @@
     <style name="ThemeOverlay.Aegis.ErrorCardView" parent="">
         <item name="colorSurfaceContainerHighest">?attr/colorErrorContainer</item>
     </style>
+
+    <style name="ThemeOverlay.Aegis.ActionMode" parent="">
+        <!-- Magically give the action mode icons the right color -->
+        <item name="actionButtonStyle">@style/Widget.AppCompat.ActionButton</item>
+        <!-- The hack below is necessary to force the action mode overflow menu to the right color -->
+        <item name="actionBarPopupTheme">@style/Widget.Material3.PopupMenu.ContextMenu</item>
+    </style>
 </resources>