ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 20:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some string keys have been renamed, so rename them in the code.

Browse Source
This commit is contained in:
Benoit Marty
2024-03-13 10:02:06 +01:00
parent 08f3faed02
commit 59f66a9df0
7 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
+1 -1
View File
@@ -445,7 +445,7 @@ class MessagesPresenter @AssistedInject constructor(
clipboardHelper.copyPlainText(content) clipboardHelper.copyPlainText(content)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
snackbarDispatcher.post(SnackbarMessage(R.string.screen_room_message_copied)) snackbarDispatcher.post(SnackbarMessage(R.string.screen_room_timeline_message_copied))
} }
} }
} }
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
+1 -1
View File
@@ -551,7 +551,7 @@ private fun CantSendMessageBanner() {
horizontalArrangement = Arrangement.Center horizontalArrangement = Arrangement.Center
) { ) {
Text( Text(
text = stringResource(id = R.string.screen_room_no_permission_to_post), text = stringResource(id = R.string.screen_room_timeline_no_permission_to_post),
color = MaterialTheme.colorScheme.onSecondary, color = MaterialTheme.colorScheme.onSecondary,
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt
+2 -2
View File
@@ -101,14 +101,14 @@ fun ReportMessageView(
OutlinedTextField( OutlinedTextField(
value = state.reason, value = state.reason,
onValueChange = { state.eventSink(ReportMessageEvents.UpdateReason(it)) }, onValueChange = { state.eventSink(ReportMessageEvents.UpdateReason(it)) },
placeholder = { Text(stringResource(R.string.report_content_hint)) }, placeholder = { Text(stringResource(R.string.screen_report_content_hint)) },
enabled = !isSending, enabled = !isSending,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.heightIn(min = 90.dp) .heightIn(min = 90.dp)
) )
Text( Text(
text = stringResource(R.string.report_content_explanation), text = stringResource(R.string.screen_report_content_explanation),
style = ElementTheme.typography.fontBodySmRegular, style = ElementTheme.typography.fontBodySmRegular,
color = MaterialTheme.colorScheme.secondary, color = MaterialTheme.colorScheme.secondary,
textAlign = TextAlign.Start, textAlign = TextAlign.Start,
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt
+1 -1
View File
@@ -113,7 +113,7 @@ private fun TimelineItemGroupedEventsRowContent(
Column(modifier = modifier.animateContentSize()) { Column(modifier = modifier.animateContentSize()) {
GroupHeaderView( GroupHeaderView(
text = pluralStringResource( text = pluralStringResource(
id = R.plurals.room_timeline_state_changes, id = R.plurals.screen_room_timeline_state_changes,
count = timelineItem.events.size, count = timelineItem.events.size,
timelineItem.events.size timelineItem.events.size
), ),
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt
+7 -1
View File
@@ -90,7 +90,13 @@ private fun TimelineItemReactionsView(
expandButton = { expandButton = {
MessagesReactionButton( MessagesReactionButton(
content = MessagesReactionsButtonContent.Text( content = MessagesReactionsButtonContent.Text(
text = stringResource(id = if (expanded) R.string.screen_room_reactions_show_less else R.string.screen_room_reactions_show_more) text = stringResource(
id = if (expanded) {
R.string.screen_room_timeline_reactions_show_less
} else {
R.string.screen_room_timeline_reactions_show_more
}
)
), ),
onClick = onToggleExpandClick, onClick = onToggleExpandClick,
onLongClick = {} onLongClick = {}
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemReadMarkerView.kt
+1 -1
View File
@@ -44,7 +44,7 @@ internal fun TimelineItemReadMarkerView(
verticalArrangement = spacedBy(4.dp), verticalArrangement = spacedBy(4.dp),
) { ) {
Text( Text(
text = stringResource(id = R.string.room_timeline_read_marker_title).uppercase(), text = stringResource(id = R.string.screen_room_timeline_read_marker_title).uppercase(),
style = ElementTheme.typography.fontBodySmMedium, style = ElementTheme.typography.fontBodySmMedium,
color = ElementTheme.colors.textSecondary, color = ElementTheme.colors.textSecondary,
) )
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemRoomBeginningView.kt
+2 -2
View File
@@ -45,9 +45,9 @@ fun TimelineItemRoomBeginningView(
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
) { ) {
val text = if (roomName == null) { val text = if (roomName == null) {
stringResource(id = R.string.room_timeline_beginning_of_room_no_name) stringResource(id = R.string.screen_room_timeline_beginning_of_room_no_name)
} else { } else {
stringResource(id = R.string.room_timeline_beginning_of_room, roomName) stringResource(id = R.string.screen_room_timeline_beginning_of_room, roomName)
} }
Text( Text(
color = MaterialTheme.colorScheme.secondary, color = MaterialTheme.colorScheme.secondary,