Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Replace 'leave room' text with 'leave conversation' for DMs (#2231)

Browse source 
* Replace 'leave room' text with 'leave conversation' for DMs

* Add `isDm` property to both `RoomSummary` and `RoomListRoomSummary`

* Remove redundant `leave_conversation_alert_subtitle_*` texts

* Fix maestro flow

---------

Co-authored-by: ElementBot <benoitm+elementbot@element.io>
This commit is contained in:
Jorge Martin Espinosa 2024-01-16 15:49:44 +01:00 • committed by GitHub
parent a9776f9fcb
commit 64a18afc1b
77 changed files with 115 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
View file

@ -190,9 +190,10 @@ fun RoomDetailsView(
BlockUserDialogs(roomMemberState)
}
OtherActionsSection(onLeaveRoom = {
state.eventSink(RoomDetailsEvent.LeaveRoom)
})
OtherActionsSection(
isDm = state.roomType is RoomDetailsType.Dm,
onLeaveRoom = { state.eventSink(RoomDetailsEvent.LeaveRoom) }
)
}
}
}
@ -410,10 +411,17 @@ private fun SecuritySection(modifier: Modifier = Modifier) {
}
@Composable
private fun OtherActionsSection(onLeaveRoom: () -> Unit, modifier: Modifier = Modifier) {
private fun OtherActionsSection(isDm: Boolean, onLeaveRoom: () -> Unit, modifier: Modifier = Modifier) {
PreferenceCategory(showDivider = false, modifier = modifier) {
ListItem(
headlineContent = { Text(stringResource(R.string.screen_room_details_leave_room_title)) },
headlineContent = {
val leaveText = stringResource(id = if (isDm) {
R.string.screen_room_details_leave_conversation_title
} else {
R.string.screen_room_details_leave_room_title
})
Text(leaveText)
},
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Leave)),
style = ListItemStyle.Destructive,
onClick = onLeaveRoom,

1
features/roomdetails/impl/src/main/res/values/localazy.xml
View file

@ -47,6 +47,7 @@
<string name="screen_dm_details_unblock_alert_action">"Unblock"</string>
<string name="screen_dm_details_unblock_alert_description">"You\'ll be able to see all messages from them again."</string>
<string name="screen_dm_details_unblock_user">"Unblock user"</string>
<string name="screen_room_details_leave_conversation_title">"Leave conversation"</string>
<string name="screen_room_details_leave_room_title">"Leave room"</string>
<string name="screen_room_details_security_title">"Security"</string>
<string name="screen_room_details_topic_title">"Topic"</string>