From 0664afdf9ab355e7c26a98f66e3505ced0d9e848 Mon Sep 17 00:00:00 2001
From: fedrunov <66663241+fedrunov@users.noreply.github.com>
Date: Tue, 5 Apr 2022 09:27:39 +0200
Subject: [PATCH] Update Spaces menu ordering and capitalisation (#5539)

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

diff --git a/changelog.d/5524.misc b/changelog.d/5524.misc
new file mode 100644
index 0000000000..d873c4d63a
--- /dev/null
+++ b/changelog.d/5524.misc
@@ -0,0 +1 @@
+Changed items order in space menu. Changed capitalization for "space" in those items
\ No newline at end of file
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 e764cdedc4..fc5d5ca57d 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -79,6 +79,17 @@
         app:tint="?vctr_content_secondary"
         app:titleTextColor="?vctr_content_primary" />
 
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/exploreRooms"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="@string/space_explore_activity_title"
+        app:leftIcon="@drawable/ic_explore"
+        app:tint="?vctr_content_secondary"
+        app:titleTextColor="?vctr_content_primary"
+        tools:actionDescription="" />
+
+
     <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/showMemberList"
         android:layout_width="match_parent"
@@ -98,16 +109,6 @@
         app:tint="?vctr_content_secondary"
         app:titleTextColor="?vctr_content_primary" />
 
-    <im.vector.app.core.ui.views.BottomSheetActionButton
-        android:id="@+id/exploreRooms"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:actionTitle="@string/space_explore_activity_title"
-        app:leftIcon="@drawable/ic_explore"
-        app:tint="?vctr_content_secondary"
-        app:titleTextColor="?vctr_content_primary"
-        tools:actionDescription="" />
-
     <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/addRooms"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 9bdbb291a5..fc168ee33d 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2739,7 +2739,7 @@
 
     <string name="public_space">Public space</string>
     <string name="private_space">Private space</string>
-    <string name="add_space">Add Space</string>
+    <string name="add_space">Add space</string>
     <string name="your_public_space">Your public space</string>
     <string name="your_private_space">Your private space</string>
     <string name="create_spaces_choose_type_label">What type of space do you want to create?</string>
@@ -2783,7 +2783,7 @@
     <!-- First one is the space name, and the second one is the matrix.to link -->
     <string name="share_space_link_message">Join my space %1$s %2$s</string>
     <string name="skip_for_now">Skip for now</string>
-    <string name="create_space">Create Space</string>
+    <string name="create_space">Create space</string>
     <string name="join_space">Join Space</string>
     <string name="join_anyway">Join Anyway</string>
     <string name="room_alias_preview_not_found">This alias is not accessible at this time.\nTry again later, or ask a room admin to check if you have access.</string>