filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Differentiate wordings for the room profile screen.

Browse Source
This commit is contained in:
Onuray Sahin 2020-09-28 11:35:02 +03:00 committed by Benoit Marty
parent 3a9e6fa97f
commit 2a96b2c68e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
View File

@ -57,7 +57,7 @@ class RoomProfileController @Inject constructor(
// Security // Security
buildProfileSection(stringProvider.getString(R.string.room_profile_section_security)) buildProfileSection(stringProvider.getString(R.string.room_profile_section_security))
val learnMoreSubtitle = if (roomSummary.isEncrypted) { val learnMoreSubtitle = if (roomSummary.isEncrypted) {
R.string.room_profile_encrypted_subtitle if (roomSummary.isDirect) R.string.direct_room_profile_encrypted_subtitle else R.string.room_profile_encrypted_subtitle
} else { } else {
R.string.room_profile_not_encrypted_subtitle R.string.room_profile_not_encrypted_subtitle
} }
@ -71,7 +71,10 @@ class RoomProfileController @Inject constructor(
buildProfileSection(stringProvider.getString(R.string.room_profile_section_more)) buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
buildProfileAction( buildProfileAction(
id = "settings", id = "settings",
title = stringProvider.getString(R.string.room_profile_section_more_settings), title = if (roomSummary.isDirect)
stringProvider.getString(R.string.direct_room_profile_section_more_settings)
else
stringProvider.getString(R.string.room_profile_section_more_settings),
dividerColor = dividerColor, dividerColor = dividerColor,
icon = R.drawable.ic_room_profile_settings, icon = R.drawable.ic_room_profile_settings,
action = { callback?.onSettingsClicked() } action = { callback?.onSettingsClicked() }
@ -112,7 +115,10 @@ class RoomProfileController @Inject constructor(
) )
buildProfileAction( buildProfileAction(
id = "leave", id = "leave",
title = stringProvider.getString(R.string.room_profile_section_more_leave), title = if (roomSummary.isDirect)
stringProvider.getString(R.string.direct_room_profile_section_more_leave)
else
stringProvider.getString(R.string.room_profile_section_more_leave),
dividerColor = dividerColor, dividerColor = dividerColor,
divider = false, divider = false,
destructive = true, destructive = true,

3
vector/src/main/res/values/strings.xml
View File

@ -2118,11 +2118,13 @@
<string name="verification_request_alert_description">For extra security, verify %s by checking a one-time code on both your devices.\n\nFor maximum security, do this in person.</string> <string name="verification_request_alert_description">For extra security, verify %s by checking a one-time code on both your devices.\n\nFor maximum security, do this in person.</string>
<string name="room_profile_not_encrypted_subtitle">Messages in this room are not end-to-end encrypted.</string> <string name="room_profile_not_encrypted_subtitle">Messages in this room are not end-to-end encrypted.</string>
<string name="room_profile_encrypted_subtitle">Messages in this room are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string> <string name="room_profile_encrypted_subtitle">Messages in this room are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
<string name="direct_room_profile_encrypted_subtitle">Messages here are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
<string name="room_profile_section_security">Security</string> <string name="room_profile_section_security">Security</string>
<string name="room_profile_section_security_learn_more">Learn more</string> <string name="room_profile_section_security_learn_more">Learn more</string>
<string name="room_profile_section_more">More</string> <string name="room_profile_section_more">More</string>
<string name="room_profile_section_admin">Admin Actions</string> <string name="room_profile_section_admin">Admin Actions</string>
<string name="room_profile_section_more_settings">Room settings</string> <string name="room_profile_section_more_settings">Room settings</string>
<string name="direct_room_profile_section_more_settings">Settings</string>
<string name="room_profile_section_more_notifications">Notifications</string> <string name="room_profile_section_more_notifications">Notifications</string>
<plurals name="room_profile_section_more_member_list"> <plurals name="room_profile_section_more_member_list">
<item quantity="one">"One person"</item> <item quantity="one">"One person"</item>
@ -2130,6 +2132,7 @@
</plurals> </plurals>
<string name="room_profile_section_more_uploads">Uploads</string> <string name="room_profile_section_more_uploads">Uploads</string>
<string name="room_profile_section_more_leave">Leave Room</string> <string name="room_profile_section_more_leave">Leave Room</string>
<string name="direct_room_profile_section_more_leave">Leave</string>
<string name="room_profile_leaving_room">"Leaving the room…"</string> <string name="room_profile_leaving_room">"Leaving the room…"</string>
<string name="room_member_power_level_admins">Admins</string> <string name="room_member_power_level_admins">Admins</string>