From 8732c6fe42fdb55922d5a57f25e58202465f6018 Mon Sep 17 00:00:00 2001
From: NIkita Fedrunov <fedrunov@element.io>
Date: Mon, 7 Mar 2022 08:32:31 +0100
Subject: [PATCH] Amend spaces menu to have consistent copy

---
 changelog.d/5270.misc                                |  1 +
 vector/src/main/res/drawable/ic_explore.xml          |  9 +++++----
 .../main/res/layout/bottom_sheet_space_settings.xml  | 12 ++++++------
 vector/src/main/res/values/strings.xml               |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 changelog.d/5270.misc

diff --git a/changelog.d/5270.misc b/changelog.d/5270.misc
new file mode 100644
index 0000000000..9bbe41af59
--- /dev/null
+++ b/changelog.d/5270.misc
@@ -0,0 +1 @@
+Amend spaces menu to be consistent with iOS version
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/ic_explore.xml b/vector/src/main/res/drawable/ic_explore.xml
index 09a496170f..30a330a5d2 100644
--- a/vector/src/main/res/drawable/ic_explore.xml
+++ b/vector/src/main/res/drawable/ic_explore.xml
@@ -4,10 +4,11 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M22.6667,12C22.6667,17.8911 17.8911,22.6667 12,22.6667C6.109,22.6667 1.3333,17.8911 1.3333,12C1.3333,6.109 6.109,1.3334 12,1.3334C17.8911,1.3334 22.6667,6.109 22.6667,12ZM17.8333,7.1022C18.0778,6.5711 17.4288,5.9221 16.8977,6.1666L10.2263,9.238C9.7853,9.4411 9.4402,9.7861 9.2372,10.2271L6.1657,16.8986C5.9212,17.4297 6.5702,18.0787 7.1013,17.8341L13.7727,14.7627C14.2137,14.5597 14.5588,14.2146 14.7618,13.7736L17.8333,7.1022Z"
-      android:fillColor="#737D8C"
+      android:pathData="M11.0087,7.7576C11.0498,8.4697 11.2279,9.145 11.517,9.7577H9.1999L8.699,14.8922H13.4297L13.6984,12.1385C14.2849,12.4812 14.9415,12.7173 15.6413,12.8201L15.4392,14.8922H18.6685C19.2207,14.8922 19.6685,15.3399 19.6685,15.8922C19.6685,16.4445 19.2207,16.8922 18.6685,16.8922H15.2441L14.9066,20.3514C14.853,20.9011 14.3639,21.3032 13.8142,21.2496C13.2645,21.196 12.8624,20.7069 12.916,20.1572L13.2346,16.8922H8.5039L8.1664,20.3514C8.1128,20.9011 7.6237,21.3032 7.074,21.2496C6.5243,21.196 6.1222,20.7069 6.1758,20.1572L6.4944,16.8922H4C3.4477,16.8922 3,16.4445 3,15.8922C3,15.3399 3.4477,14.8922 4,14.8922H6.6895L7.1904,9.7577H4.7928C4.2405,9.7577 3.7928,9.3099 3.7928,8.7577C3.7928,8.2054 4.2405,7.7576 4.7928,7.7576H7.3855L7.7616,3.903C7.8152,3.3533 8.3043,2.9512 8.854,3.0048C9.4037,3.0584 9.8058,3.5475 9.7522,4.0972L9.395,7.7576H11.0087Z"
+      android:fillColor="#000000"
       android:fillType="evenOdd"/>
   <path
-      android:pathData="M13.178,13.1789C12.5271,13.8298 11.4719,13.8298 10.821,13.1789C10.1701,12.528 10.1701,11.4727 10.821,10.8219C11.4719,10.171 12.5271,10.171 13.178,10.8219C13.8289,11.4727 13.8289,12.528 13.178,13.1789Z"
-      android:fillColor="#737D8C"/>
+      android:pathData="M18.4224,7.3784C18.4224,8.5075 17.5071,9.4229 16.3779,9.4229C15.2488,9.4229 14.3335,8.5075 14.3335,7.3784C14.3335,6.2493 15.2488,5.334 16.3779,5.334C17.5071,5.334 18.4224,6.2493 18.4224,7.3784ZM19.8496,9.4545C20.2133,8.8476 20.4224,8.1375 20.4224,7.3784C20.4224,5.1447 18.6116,3.334 16.3779,3.334C14.1443,3.334 12.3335,5.1447 12.3335,7.3784C12.3335,9.6121 14.1443,11.4229 16.3779,11.4229C17.1369,11.4229 17.8471,11.2138 18.454,10.8501C18.4853,10.8937 18.5205,10.9353 18.5597,10.9744L20.293,12.7078C20.6835,13.0983 21.3167,13.0983 21.7072,12.7078C22.0977,12.3172 22.0977,11.6841 21.7072,11.2936L19.9739,9.5602C19.9347,9.5211 19.8931,9.4858 19.8496,9.4545Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index 4ea71ca5e7..e764cdedc4 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -76,7 +76,7 @@
         android:layout_height="wrap_content"
         app:actionTitle="@string/invite_people_menu"
         app:leftIcon="@drawable/ic_invite_people"
-        app:tint="?vctr_content_primary"
+        app:tint="?vctr_content_secondary"
         app:titleTextColor="?vctr_content_primary" />
 
     <im.vector.app.core.ui.views.BottomSheetActionButton
@@ -85,7 +85,7 @@
         android:layout_height="wrap_content"
         app:actionTitle="@string/list_members"
         app:leftIcon="@drawable/ic_room_profile_member_list"
-        app:tint="?vctr_content_primary"
+        app:tint="?vctr_content_secondary"
         app:titleTextColor="?vctr_content_primary" />
 
     <!-- Only visible when in developer mode -->
@@ -95,7 +95,7 @@
         android:layout_height="wrap_content"
         app:actionTitle="@string/settings"
         app:leftIcon="@drawable/ic_settings_root_general"
-        app:tint="?vctr_content_primary"
+        app:tint="?vctr_content_secondary"
         app:titleTextColor="?vctr_content_primary" />
 
     <im.vector.app.core.ui.views.BottomSheetActionButton
@@ -104,7 +104,7 @@
         android:layout_height="wrap_content"
         app:actionTitle="@string/space_explore_activity_title"
         app:leftIcon="@drawable/ic_explore"
-        app:tint="?vctr_content_primary"
+        app:tint="?vctr_content_secondary"
         app:titleTextColor="?vctr_content_primary"
         tools:actionDescription="" />
 
@@ -114,7 +114,7 @@
         android:layout_height="wrap_content"
         app:actionTitle="@string/space_add_child_title"
         app:leftIcon="@drawable/ic_fab_add"
-        app:tint="?vctr_content_primary"
+        app:tint="?vctr_content_secondary"
         app:titleTextColor="?vctr_content_primary"
         tools:actionDescription="" />
 
@@ -124,7 +124,7 @@
         android:layout_height="wrap_content"
         app:actionTitle="@string/add_space"
         app:leftIcon="@drawable/ic_fab_add"
-        app:tint="?vctr_content_primary"
+        app:tint="?vctr_content_secondary"
         app:titleTextColor="?vctr_content_primary"
         app:betaAction="true"
         tools:actionDescription="" />
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index dc52d2cf5d..4ca1d1104f 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -597,7 +597,7 @@
     <string name="_continue">Continue</string>
 
     <!-- Room -->
-    <string name="list_members">List members</string>
+    <string name="list_members">Members</string>
     <string name="room_jump_to_first_unread">Jump to unread</string>
 
     <!-- Chat creation -->
@@ -2781,7 +2781,7 @@
 
     <string name="space_explore_activity_title">Explore rooms</string>
     <string name="space_add_child_title">Add rooms</string>
-    <string name="leave_space">Leave Space</string>
+    <string name="leave_space">Leave</string>
     <string name="space_leave_prompt_msg_with_name">Are you sure you want to leave %s?</string>
     <string name="space_leave_prompt_msg_only_you">You are the only person here. If you leave, no one will be able to join in the future, including you.</string>
     <string name="space_leave_prompt_msg_private">You won\'t be able to rejoin unless you are re-invited.</string>