mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-24 18:36:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5831 from emotionalamoeba/develop

Browse source 
Updated copy and moved override in profile screen
This commit is contained in:
Benoit Marty 2022-05-10 14:40:40 +02:00 committed by GitHub
commit eafe65b417
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/5825.bugfix Normal file
View file

@ -0,0 +1 @@
Changed copy and list order in member profile screen.

16
vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
View file

@ -182,6 +182,15 @@ class RoomMemberProfileController @Inject constructor(
// More
buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
if (!state.isMine) {
buildProfileAction(
id = "direct",
editable = false,
title = stringProvider.getString(R.string.room_member_open_or_create_dm),
action = { callback?.onOpenDmClicked() }
)
}
buildProfileAction(
id = "overrideColor",
editable = false,
@ -194,13 +203,6 @@ class RoomMemberProfileController @Inject constructor(
if (!state.isMine) {
val membership = state.asyncMembership() ?: return
buildProfileAction(
id = "direct",
editable = false,
title = stringProvider.getString(R.string.room_member_open_or_create_dm),
action = { callback?.onOpenDmClicked() }
)
if (!state.isSpace && state.hasReadReceipt) {
buildProfileAction(
id = "read_receipt",

2
vector/src/main/res/values/strings.xml
View file

@ -2178,7 +2178,7 @@
<string name="direct_room_profile_section_more_leave">Leave</string>
<string name="room_profile_leaving_room">"Leaving the room…"</string>
<string name="room_member_override_nick_color">Override nick color</string>
<string name="room_member_override_nick_color">Override display name color</string>
<string name="room_member_power_level_admins">Admins</string>
<string name="room_member_power_level_moderators">Moderators</string>