Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Spaces menu ordering and capitalisation #5539

Merged
merged 1 commit into from
Apr 5, 2022
Merged

Update Spaces menu ordering and capitalisation #5539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5524.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Changed items order in space menu. Changed capitalization for "space" in those items
21 changes: 11 additions & 10 deletions vector/src/main/res/layout/bottom_sheet_space_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="" />

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like an extra bonus line was added


<im.vector.app.core.ui.views.BottomSheetActionButton
android:id="@+id/showMemberList"
android:layout_width="match_parent"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions vector/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2715,7 +2715,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>
Expand Down Expand Up @@ -2759,7 +2759,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>
Expand Down