From 1d356cd49db9a814c2173857cbbbef7e5694f0cd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 11:34:27 +0200
Subject: [PATCH] Fix some issue on menu icon colors

---
 vector/src/main/res/drawable/ic_delete_unsent_messages.xml | 2 +-
 vector/src/main/res/menu/bug_report.xml                    | 1 +
 vector/src/main/res/menu/menu_manage_space.xml             | 6 +++---
 vector/src/main/res/menu/menu_push_gateways.xml            | 1 +
 vector/src/main/res/menu/menu_space_add_room.xml           | 1 -
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/res/drawable/ic_delete_unsent_messages.xml b/vector/src/main/res/drawable/ic_delete_unsent_messages.xml
index 24fdbc94c2..8f7beaeb20 100644
--- a/vector/src/main/res/drawable/ic_delete_unsent_messages.xml
+++ b/vector/src/main/res/drawable/ic_delete_unsent_messages.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="30">
   <path
       android:pathData="M8.5714,22.5C8.5714,23.6864 9.5357,25 10.7143,25H19.2857C20.4643,25 21.4286,23.4428 21.4286,22.2564V11.4711C21.4286,10.2848 20.4643,9.3141 19.2857,9.3141H10.7143C9.5357,9.3141 8.5714,10.2848 8.5714,11.4711V22.5ZM21.4286,6.0785H18.75L17.9893,5.3128C17.7964,5.1186 17.5179,5 17.2393,5H12.7607C12.4821,5 12.2036,5.1186 12.0107,5.3128L11.25,6.0785H8.5714C7.9821,6.0785 7.5,6.5639 7.5,7.1571C7.5,7.7502 7.9821,8.2356 8.5714,8.2356H21.4286C22.0179,8.2356 22.5,7.7502 22.5,7.1571C22.5,6.5639 22.0179,6.0785 21.4286,6.0785Z"
-      android:fillColor="#FE2928"/>
+      android:fillColor="?colorError"/>
 </vector>
diff --git a/vector/src/main/res/menu/bug_report.xml b/vector/src/main/res/menu/bug_report.xml
index e35028be35..a6420432cf 100755
--- a/vector/src/main/res/menu/bug_report.xml
+++ b/vector/src/main/res/menu/bug_report.xml
@@ -8,5 +8,6 @@
         android:id="@+id/ic_action_send_bug_report"
         android:icon="@drawable/ic_send"
         android:title="@string/send_bug_report"
+        app:iconTint="?colorPrimary"
         app:showAsAction="always" />
 </menu>
diff --git a/vector/src/main/res/menu/menu_manage_space.xml b/vector/src/main/res/menu/menu_manage_space.xml
index 858c3bc9c3..ac657e0df2 100644
--- a/vector/src/main/res/menu/menu_manage_space.xml
+++ b/vector/src/main/res/menu/menu_manage_space.xml
@@ -4,18 +4,18 @@
 
     <item
         android:id="@+id/action_delete"
-        android:title="@string/delete"
         android:icon="@drawable/ic_delete_unsent_messages"
+        android:title="@string/delete"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_mark_as_suggested"
         android:title="@string/space_mark_as_suggested"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_mark_as_not_suggested"
         android:title="@string/space_mark_as_not_suggested"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
 
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_push_gateways.xml b/vector/src/main/res/menu/menu_push_gateways.xml
index 15709a1f1e..99b2bca963 100644
--- a/vector/src/main/res/menu/menu_push_gateways.xml
+++ b/vector/src/main/res/menu/menu_push_gateways.xml
@@ -6,6 +6,7 @@
         android:id="@+id/refresh"
         android:icon="@drawable/ic_refresh_cw"
         android:title="@string/refresh"
+        app:iconTint="?colorPrimary"
         app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_space_add_room.xml b/vector/src/main/res/menu/menu_space_add_room.xml
index b11844673e..048b89892c 100644
--- a/vector/src/main/res/menu/menu_space_add_room.xml
+++ b/vector/src/main/res/menu/menu_space_add_room.xml
@@ -4,6 +4,5 @@
     <item
         android:id="@+id/spaceAddRoomSaveItem"
         android:title="@string/save"
-        app:iconTint="?colorSecondary"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file