diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
index 80f7beda56..d77cd9e6ea 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@@ -241,7 +241,7 @@ fun RoomDetailsView(
@Composable
private fun KnockRequestsItem(knockRequestsCount: Int?, onKnockRequestsClick: () -> Unit) {
ListItem(
- headlineContent = { Text(stringResource(CommonStrings.screen_room_details_requests_to_join_title)) },
+ headlineContent = { Text(stringResource(R.string.screen_room_details_requests_to_join_title)) },
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Notifications())),
trailingContent = if (knockRequestsCount == null || knockRequestsCount == 0) {
null
@@ -546,7 +546,7 @@ private fun PinnedMessagesItem(
) {
val analyticsService = LocalAnalyticsService.current
ListItem(
- headlineContent = { Text(stringResource(CommonStrings.screen_room_details_pinned_events_row_title)) },
+ headlineContent = { Text(stringResource(R.string.screen_room_details_pinned_events_row_title)) },
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Pin())),
trailingContent =
if (pinnedMessagesCount == null) {
diff --git a/features/roomdetails/impl/src/main/res/values/localazy.xml b/features/roomdetails/impl/src/main/res/values/localazy.xml
index 19400c85b3..50c2d639be 100644
--- a/features/roomdetails/impl/src/main/res/values/localazy.xml
+++ b/features/roomdetails/impl/src/main/res/values/localazy.xml
@@ -49,9 +49,12 @@
"Invite people"
"Leave conversation"
"Leave room"
+ "Media and files"
"Custom"
"Default"
"Notifications"
+ "Pinned messages"
+ "Requests to join"
"Roles and permissions"
"Room name"
"Security"
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt
index e4eb8d5f69..abbca71b53 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt
@@ -129,7 +129,7 @@ class RoomDetailsViewTest {
),
onPinnedMessagesClick = callback,
)
- rule.clickOn(CommonStrings.screen_room_details_pinned_events_row_title)
+ rule.clickOn(R.string.screen_room_details_pinned_events_row_title)
}
}
@@ -253,6 +253,21 @@ class RoomDetailsViewTest {
rule.clickOn(R.string.screen_room_details_leave_room_title)
eventsRecorder.assertSingle(RoomDetailsEvent.LeaveRoom)
}
+
+ @Config(qualifiers = "h1024dp")
+ @Test
+ fun `click on knock requests invokes expected callback`() {
+ ensureCalledOnce { callback ->
+ rule.setRoomDetailView(
+ state = aRoomDetailsState(
+ eventSink = EventsRecorder(expectEvents = false),
+ canShowKnockRequests = true,
+ ),
+ onKnockRequestsClick = callback,
+ )
+ rule.clickOn(R.string.screen_room_details_requests_to_join_title)
+ }
+ }
}
private fun AndroidComposeTestRule.setRoomDetailView(
@@ -270,6 +285,7 @@ private fun AndroidComposeTestRule.setRoomD
openAdminSettings: () -> Unit = EnsureNeverCalled(),
onJoinCallClick: () -> Unit = EnsureNeverCalled(),
onPinnedMessagesClick: () -> Unit = EnsureNeverCalled(),
+ onKnockRequestsClick: () -> Unit = EnsureNeverCalled(),
) {
setContent {
RoomDetailsView(
@@ -285,6 +301,7 @@ private fun AndroidComposeTestRule.setRoomD
openAdminSettings = openAdminSettings,
onJoinCallClick = onJoinCallClick,
onPinnedMessagesClick = onPinnedMessagesClick,
+ onKnockRequestsClick = onKnockRequestsClick,
)
}
}
diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
index 8ab9695844..75b0f6853a 100644
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -320,8 +320,6 @@ Reason: %1$s."
"Your message was not sent because %1$s has not verified all devices"
"One or more of your devices are unverified. You can send the message anyway, or you can cancel for now and try again later after you have verified all of your devices."
"Your message was not sent because you have not verified one or more of your devices"
- "Pinned messages"
- "Requests to join"
"Failed processing media to upload, please try again."
"Could not retrieve user details"
diff --git a/tools/localazy/config.json b/tools/localazy/config.json
index 9bf178ac85..fe95d1930e 100644
--- a/tools/localazy/config.json
+++ b/tools/localazy/config.json
@@ -165,6 +165,7 @@
"name" : ":features:roomdetails:impl",
"includeRegex" : [
"screen_room_details_.*",
+ "screen\\.room_details\\..*",
"screen_room_member_list_.*",
"screen_room_notification_settings_.*",
"screen_notification_settings_edit_failed_updating_default_mode",