Merge branch 'develop' into feature/fga/mark_room_as_favorite

2024-02-12 17:08:36 +01:00 · 2024-02-12 17:08:36 +01:00 · a8bc0cb4ca
commit a8bc0cb4ca
parent f3c1eb6738 9319ffa4cd
538 changed files with 4465 additions and 1639 deletions
--- 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
@ -212,12 +212,10 @@ private fun RoomDetailsTopBar(
    goBack: () -> Unit,
    onActionClicked: (RoomDetailsAction) -> Unit,
    showEdit: Boolean,
-    modifier: Modifier = Modifier,
 ) {
    var showMenu by remember { mutableStateOf(false) }

    TopAppBar(
-        modifier = modifier,
        title = { },
        navigationIcon = { BackButton(onClick = goBack) },
        actions = {
@ -245,8 +243,14 @@ private fun RoomDetailsTopBar(
 }

@Composable
-private fun MainActionsSection(state: RoomDetailsState, onShareRoom: () -> Unit, modifier: Modifier = Modifier) {
-    Row(modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
+private fun MainActionsSection(
+    state: RoomDetailsState,
+    onShareRoom: () -> Unit,
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.Center,
+    ) {
        val roomNotificationSettings = state.roomNotificationSettings
        if (state.canShowNotificationSettings && roomNotificationSettings != null) {
            if (roomNotificationSettings.mode == RoomNotificationMode.MUTE) {
@ -283,10 +287,9 @@ private fun RoomHeaderSection(
    roomName: String,
    roomAlias: String?,
    openAvatarPreview: (url: String) -> Unit,
-    modifier: Modifier = Modifier
 ) {
    Column(
-        modifier = modifier
+        modifier = Modifier
            .fillMaxWidth()
            .padding(horizontal = 16.dp),
        horizontalAlignment = Alignment.CenterHorizontally,
@ -320,9 +323,8 @@ private fun RoomHeaderSection(
 private fun TopicSection(
    roomTopic: RoomTopicState,
    onActionClicked: (RoomDetailsAction) -> Unit,
-    modifier: Modifier = Modifier
 ) {
-    PreferenceCategory(title = stringResource(CommonStrings.common_topic), modifier = modifier) {
+    PreferenceCategory(title = stringResource(CommonStrings.common_topic)) {
        if (roomTopic is RoomTopicState.CanAddTopic) {
            PreferenceText(
                title = stringResource(R.string.screen_room_details_add_topic_title),
@ -346,14 +348,13 @@ private fun TopicSection(
 private fun NotificationSection(
    isDefaultMode: Boolean,
    openRoomNotificationSettings: () -> Unit,
-    modifier: Modifier = Modifier
 ) {
    val subtitle = if (isDefaultMode) {
        stringResource(R.string.screen_room_details_notification_mode_default)
    } else {
        stringResource(R.string.screen_room_details_notification_mode_custom)
    }
-    PreferenceCategory(modifier = modifier) {
+    PreferenceCategory {
        ListItem(
            headlineContent = { Text(text = stringResource(R.string.screen_room_details_notification_title)) },
            supportingContent = { Text(text = subtitle) },
@ -383,9 +384,8 @@ private fun FavoriteSection(
 private fun MembersSection(
    memberCount: Long,
    openRoomMemberList: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
-    PreferenceCategory(modifier = modifier) {
+    PreferenceCategory {
        ListItem(
            headlineContent = { Text(stringResource(CommonStrings.common_people)) },
            leadingContent = ListItemContent.Icon(IconSource.Resource(CommonDrawables.ic_user)),
@ -398,9 +398,8 @@ private fun MembersSection(
@Composable
 private fun InviteSection(
    invitePeople: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
-    PreferenceCategory(modifier = modifier) {
+    PreferenceCategory {
        ListItem(
            headlineContent = { Text(stringResource(R.string.screen_room_details_invite_people_title)) },
            leadingContent = ListItemContent.Icon(IconSource.Resource(CommonDrawables.ic_user_add)),
@ -412,9 +411,8 @@ private fun InviteSection(
@Composable
 private fun PollsSection(
    openPollHistory: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
-    PreferenceCategory(modifier = modifier) {
+    PreferenceCategory {
        ListItem(
            headlineContent = { Text(stringResource(R.string.screen_polls_history_title)) },
            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Polls)),
@ -424,8 +422,8 @@ private fun PollsSection(
 }

@Composable
-private fun SecuritySection(modifier: Modifier = Modifier) {
-    PreferenceCategory(title = stringResource(R.string.screen_room_details_security_title), modifier = modifier) {
+private fun SecuritySection() {
+    PreferenceCategory(title = stringResource(R.string.screen_room_details_security_title)) {
        ListItem(
            headlineContent = { Text(stringResource(R.string.screen_room_details_encryption_enabled_title)) },
            supportingContent = { Text(stringResource(R.string.screen_room_details_encryption_enabled_subtitle)) },
@ -435,15 +433,17 @@ private fun SecuritySection(modifier: Modifier = Modifier) {
 }

@Composable
-private fun OtherActionsSection(isDm: Boolean, onLeaveRoom: () -> Unit, modifier: Modifier = Modifier) {
-    PreferenceCategory(showDivider = false, modifier = modifier) {
+private fun OtherActionsSection(isDm: Boolean, onLeaveRoom: () -> Unit) {
+    PreferenceCategory(showDivider = false) {
        ListItem(
            headlineContent = {
-                val leaveText = stringResource(id = if (isDm) {
-                    R.string.screen_room_details_leave_conversation_title
-                } else {
-                    R.string.screen_room_details_leave_room_title
-                })
+                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)),
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/blockuser/BlockUserSection.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/blockuser/BlockUserSection.kt
@ -39,8 +39,8 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.ui.strings.CommonStrings

@Composable
-internal fun BlockUserSection(state: RoomMemberDetailsState, modifier: Modifier = Modifier) {
-    PreferenceCategory(showDivider = false, modifier = modifier) {
+internal fun BlockUserSection(state: RoomMemberDetailsState) {
+    PreferenceCategory(showDivider = false) {
        when (state.isBlocked) {
            is AsyncData.Failure -> PreferenceBlockUser(isBlocked = state.isBlocked.prevData, isLoading = false, eventSink = state.eventSink)
            is AsyncData.Loading -> PreferenceBlockUser(isBlocked = state.isBlocked.prevData, isLoading = true, eventSink = state.eventSink)
@ -70,7 +70,6 @@ private fun PreferenceBlockUser(
    isBlocked: Boolean?,
    isLoading: Boolean,
    eventSink: (RoomMemberDetailsEvents) -> Unit,
-    modifier: Modifier = Modifier,
 ) {
    val loadingCurrentValue = @Composable {
        CircularProgressIndicator(
@ -87,7 +86,6 @@ private fun PreferenceBlockUser(
            onClick = { if (!isLoading) eventSink(RoomMemberDetailsEvents.UnblockUser(needsConfirmation = true)) },
            trailingContent = if (isLoading) ListItemContent.Custom(loadingCurrentValue) else null,
            style = ListItemStyle.Primary,
-            modifier = modifier,
        )
    } else {
        ListItem(
@ -96,7 +94,6 @@ private fun PreferenceBlockUser(
            style = ListItemStyle.Destructive,
            onClick = { if (!isLoading) eventSink(RoomMemberDetailsEvents.BlockUser(needsConfirmation = true)) },
            trailingContent = if (isLoading) ListItemContent.Custom(loadingCurrentValue) else null,
-            modifier = modifier,
        )
    }
 }
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt
@ -18,7 +18,6 @@

 package io.element.android.features.roomdetails.impl.edit

-import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@ -38,8 +37,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusManager
-import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
@ -52,6 +49,7 @@ import io.element.android.libraries.designsystem.components.async.AsyncActionVie
 import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.modifiers.clearFocusOnTap
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.aliasScreenTitle
@ -193,10 +191,8 @@ fun RoomDetailsEditView(
 private fun LabelledReadOnlyField(
    title: String,
    value: String,
-    modifier: Modifier = Modifier
 ) {
    Column(
-        modifier = modifier,
        verticalArrangement = Arrangement.spacedBy(8.dp),
    ) {
        Text(
@ -215,13 +211,6 @@ private fun LabelledReadOnlyField(
    }
 }

-private fun Modifier.clearFocusOnTap(focusManager: FocusManager): Modifier =
-    pointerInput(Unit) {
-        detectTapGestures(onTap = {
-            focusManager.clearFocus()
-        })
-    }
-
@PreviewsDayNight
@Composable
 internal fun RoomDetailsEditViewPreview(@PreviewParameter(RoomDetailsEditStateProvider::class) state: RoomDetailsEditState) = ElementPreview {
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt
@ -115,10 +115,8 @@ private fun RoomInviteMembersTopBar(
    canSend: Boolean,
    onBackPressed: () -> Unit,
    onSubmitPressed: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
    TopAppBar(
-        modifier = modifier,
        title = {
            Text(
                text = stringResource(R.string.screen_room_details_invite_people_title),
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
@ -194,10 +194,8 @@ private fun RoomMemberListTopBar(
    canInvite: Boolean,
    onBackPressed: () -> Unit,
    onInvitePressed: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
    TopAppBar(
-        modifier = modifier,
        title = {
            Text(
                text = stringResource(CommonStrings.common_people),
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsView.kt
@ -108,14 +108,12 @@ fun RoomMemberDetailsView(
@Composable
 private fun StartDMSection(
    onStartDMClicked: () -> Unit,
-    modifier: Modifier = Modifier
 ) {
    ListItem(
        headlineContent = { Text(stringResource(CommonStrings.common_direct_chat)) },
        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Chat)),
        style = ListItemStyle.Primary,
        onClick = onStartDMClicked,
-        modifier = modifier,
    )
 }

--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt
@ -178,10 +178,8 @@ private fun RoomSpecificNotificationSettingsView(
@Composable
 private fun RoomNotificationSettingsTopBar(
    onBackPressed: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
    TopAppBar(
-        modifier = modifier,
        title = {
            Text(
                text = stringResource(R.string.screen_room_details_notification_title),
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsView.kt
@ -103,10 +103,8 @@ fun UserDefinedRoomNotificationSettingsView(
 private fun UserDefinedRoomNotificationSettingsTopBar(
    roomName: String,
    onBackPressed: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
    TopAppBar(
-        modifier = modifier,
        title = {
            Text(
                text = roomName,
--- a/features/roomdetails/impl/src/main/res/values-be/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-be/translations.xml
@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="one">"%1$d карыстальнік"</item>
+    <item quantity="few">"%1$d карыстальнікаў"</item>
+    <item quantity="many">"%1$d карыстальнікаў"</item>
+  </plurals>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"Пры абнаўленні налад апавяшчэнняў адбылася памылка."</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"Ваш хатні сервер не падтрымлівае гэтую опцыю ў зашыфраваных пакоях, вы можаце не атрымаць апавяшчэнне ў некаторых пакоях."</string>
+  <string name="screen_polls_history_title">"Апытанні"</string>
+  <string name="screen_room_details_add_topic_title">"Дадаць тэму"</string>
+  <string name="screen_room_details_already_a_member">"Ужо ўдзельнік"</string>
+  <string name="screen_room_details_already_invited">"Ужо запрасілі"</string>
+  <string name="screen_room_details_edit_room_title">"Рэдагаваць пакой"</string>
+  <string name="screen_room_details_edition_error">"Адбылася невядомая памылка, і інфармацыю нельга было змяніць."</string>
+  <string name="screen_room_details_edition_error_title">"Немагчыма абнавіць пакой"</string>
+  <string name="screen_room_details_encryption_enabled_subtitle">"Паведамленні абаронены замкамі. Толькі ў вас і атрымальнікаў ёсць унікальныя ключы, каб разблакіраваць іх."</string>
+  <string name="screen_room_details_encryption_enabled_title">"Шыфраванне паведамленняў уключана"</string>
+  <string name="screen_room_details_error_loading_notification_settings">"Пры загрузцы налад апавяшчэнняў адбылася памылка."</string>
+  <string name="screen_room_details_error_muting">"Не атрымалася адключыць гук у гэтым пакоі, паўтарыце спробу."</string>
+  <string name="screen_room_details_error_unmuting">"Не ўдалося ўключыць гук у гэтым пакоі. Паўтарыце спробу."</string>
+  <string name="screen_room_details_invite_people_title">"Запрасіць людзей"</string>
+  <string name="screen_room_details_notification_mode_custom">"Карыстальніцкі"</string>
+  <string name="screen_room_details_notification_mode_default">"Па змаўчанні"</string>
+  <string name="screen_room_details_notification_title">"Апавяшчэнні"</string>
+  <string name="screen_room_details_share_room_title">"Падзяліцца пакоем"</string>
+  <string name="screen_room_details_updating_room">"Ідзе абнаўленне пакоя…"</string>
+  <string name="screen_room_member_list_pending_header_title">"У чаканні"</string>
+  <string name="screen_room_member_list_room_members_header_title">"Карыстальнікі пакоя"</string>
+  <string name="screen_room_notification_settings_allow_custom">"Дазволіць карыстальніцкую наладу"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"Калі гэта ўключыць, ваша налада па змаўчанні будзе адменена"</string>
+  <string name="screen_room_notification_settings_custom_settings_title">"Апавяшчаць мяне ў гэтым чаце для"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"Вы можаце змяніць яго ў сваім %1$s."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"глабальныя налады"</string>
+  <string name="screen_room_notification_settings_default_setting_title">"Налада па змаўчанні"</string>
+  <string name="screen_room_notification_settings_edit_remove_setting">"Выдаліць карыстальніцкую наладу"</string>
+  <string name="screen_room_notification_settings_error_loading_settings">"Падчас загрузкі налад апавяшчэнняў адбылася памылка."</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"Не атрымалася аднавіць рэжым па змаўчанні, паспрабуйце яшчэ раз."</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"Не ўдалося наладзіць рэжым, паспрабуйце яшчэ раз."</string>
+  <string name="screen_room_notification_settings_mentions_only_disclaimer">"Ваш хатні сервер не падтрымлівае гэту опцыю ў зашыфраваных пакоях, вы не атрымаеце апавяшчэнне ў гэтым пакоі."</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"Усе паведамленні"</string>
+  <string name="screen_room_notification_settings_room_custom_settings_title">"У гэтым пакоі паведаміце мяне пра"</string>
+  <string name="screen_start_chat_error_starting_chat">"Пры спробе пачаць чат адбылася памылка"</string>
+  <string name="screen_dm_details_block_alert_action">"Заблакіраваць"</string>
+  <string name="screen_dm_details_block_alert_description">"Заблакіраваныя карыстальнікі не змогуць адпраўляць вам паведамленні, і ўсе іх паведамленні будуць схаваны. Вы можаце разблакіраваць іх у любы час."</string>
+  <string name="screen_dm_details_block_user">"Заблакіраваць карыстальніка"</string>
+  <string name="screen_dm_details_unblock_alert_action">"Разблакіраваць"</string>
+  <string name="screen_dm_details_unblock_alert_description">"Вы зноў зможаце ўбачыць усе паведамленні."</string>
+  <string name="screen_dm_details_unblock_user">"Разблакіраваць карыстальніка"</string>
+  <string name="screen_room_details_leave_conversation_title">"Пакінуць размову"</string>
+  <string name="screen_room_details_leave_room_title">"Пакінуць пакой"</string>
+  <string name="screen_room_details_room_name_label">"Назва пакоя"</string>
+  <string name="screen_room_details_security_title">"Бяспека"</string>
+  <string name="screen_room_details_topic_title">"Тэма"</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Толькі згадванні і ключавыя словы"</string>
+</resources>
--- a/features/roomdetails/impl/src/main/res/values-cs/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-cs/translations.xml
@ -23,7 +23,6 @@
  <string name="screen_room_details_notification_mode_custom">"Vlastní"</string>
  <string name="screen_room_details_notification_mode_default">"Výchozí"</string>
  <string name="screen_room_details_notification_title">"Oznámení"</string>
-  <string name="screen_room_details_room_name_label">"Název místnosti"</string>
  <string name="screen_room_details_share_room_title">"Sdílet místnost"</string>
  <string name="screen_room_details_updating_room">"Aktualizace místnosti…"</string>
  <string name="screen_room_member_list_pending_header_title">"Nevyřízeno"</string>
@ -50,6 +49,7 @@
  <string name="screen_dm_details_unblock_user">"Odblokovat uživatele"</string>
  <string name="screen_room_details_leave_conversation_title">"Opustit konverzaci"</string>
  <string name="screen_room_details_leave_room_title">"Opustit místnost"</string>
+  <string name="screen_room_details_room_name_label">"Název místnosti"</string>
  <string name="screen_room_details_security_title">"Zabezpečení"</string>
  <string name="screen_room_details_topic_title">"Téma"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Pouze zmínky a klíčová slova"</string>
--- a/features/roomdetails/impl/src/main/res/values-de/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-de/translations.xml
@ -22,7 +22,6 @@
  <string name="screen_room_details_notification_mode_custom">"Benutzerdefiniert"</string>
  <string name="screen_room_details_notification_mode_default">"Standard"</string>
  <string name="screen_room_details_notification_title">"Benachrichtigungen"</string>
-  <string name="screen_room_details_room_name_label">"Raumname"</string>
  <string name="screen_room_details_share_room_title">"Raum teilen"</string>
  <string name="screen_room_details_updating_room">"Raum wird aktualisiert…"</string>
  <string name="screen_room_member_list_pending_header_title">"Ausstehend"</string>
@ -47,7 +46,9 @@
  <string name="screen_dm_details_unblock_alert_action">"Blockierung aufheben"</string>
  <string name="screen_dm_details_unblock_alert_description">"Du kannst dann wieder alle Nachrichten von ihnen sehen."</string>
  <string name="screen_dm_details_unblock_user">"Blockierung aufheben"</string>
+  <string name="screen_room_details_leave_conversation_title">"Unterhaltung verlassen"</string>
  <string name="screen_room_details_leave_room_title">"Raum verlassen"</string>
+  <string name="screen_room_details_room_name_label">"Raumname"</string>
  <string name="screen_room_details_security_title">"Sicherheit"</string>
  <string name="screen_room_details_topic_title">"Thema"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Nur Erwähnungen und Schlüsselwörter"</string>
--- a/features/roomdetails/impl/src/main/res/values-es/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-es/translations.xml
@ -22,7 +22,6 @@
  <string name="screen_room_details_notification_mode_custom">"Personalizado"</string>
  <string name="screen_room_details_notification_mode_default">"Por defecto"</string>
  <string name="screen_room_details_notification_title">"Notificaciones"</string>
-  <string name="screen_room_details_room_name_label">"Nombre de la sala"</string>
  <string name="screen_room_details_share_room_title">"Compartir sala"</string>
  <string name="screen_room_details_updating_room">"Actualizando la sala…"</string>
  <string name="screen_room_member_list_pending_header_title">"Pendiente"</string>
@ -48,6 +47,7 @@
  <string name="screen_dm_details_unblock_alert_description">"Podrás ver todos sus mensajes de nuevo."</string>
  <string name="screen_dm_details_unblock_user">"Desbloquear usuario"</string>
  <string name="screen_room_details_leave_room_title">"Salir de la sala"</string>
+  <string name="screen_room_details_room_name_label">"Nombre de la sala"</string>
  <string name="screen_room_details_security_title">"Seguridad"</string>
  <string name="screen_room_details_topic_title">"Tema"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Únicamente Menciones y Palabras clave"</string>
--- a/features/roomdetails/impl/src/main/res/values-fr/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fr/translations.xml
@ -22,7 +22,6 @@
  <string name="screen_room_details_notification_mode_custom">"Personnalisé"</string>
  <string name="screen_room_details_notification_mode_default">"Défaut"</string>
  <string name="screen_room_details_notification_title">"Notifications"</string>
-  <string name="screen_room_details_room_name_label">"Nom du salon"</string>
  <string name="screen_room_details_share_room_title">"Partager le salon"</string>
  <string name="screen_room_details_updating_room">"Mise à jour du salon…"</string>
  <string name="screen_room_member_list_pending_header_title">"En attente"</string>
@ -49,6 +48,7 @@
  <string name="screen_dm_details_unblock_user">"Débloquer l’utilisateur"</string>
  <string name="screen_room_details_leave_conversation_title">"Quitter la discussion"</string>
  <string name="screen_room_details_leave_room_title">"Quitter le salon"</string>
+  <string name="screen_room_details_room_name_label">"Nom du salon"</string>
  <string name="screen_room_details_security_title">"Sécurité"</string>
  <string name="screen_room_details_topic_title">"Sujet"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Mentions et mots clés uniquement"</string>
--- a/features/roomdetails/impl/src/main/res/values-hu/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-hu/translations.xml
@ -22,7 +22,6 @@
  <string name="screen_room_details_notification_mode_custom">"Egyéni"</string>
  <string name="screen_room_details_notification_mode_default">"Alapértelmezett"</string>
  <string name="screen_room_details_notification_title">"Értesítések"</string>
-  <string name="screen_room_details_room_name_label">"Szoba neve"</string>
  <string name="screen_room_details_share_room_title">"Szoba megosztása"</string>
  <string name="screen_room_details_updating_room">"Szoba frissítése…"</string>
  <string name="screen_room_member_list_pending_header_title">"Függőben"</string>
@ -47,7 +46,9 @@
  <string name="screen_dm_details_unblock_alert_action">"Letiltás feloldása"</string>
  <string name="screen_dm_details_unblock_alert_description">"Újra láthatja az összes üzenetét."</string>
  <string name="screen_dm_details_unblock_user">"Felhasználó kitiltásának feloldása"</string>
+  <string name="screen_room_details_leave_conversation_title">"Beszélgetés elhagyása"</string>
  <string name="screen_room_details_leave_room_title">"Szoba elhagyása"</string>
+  <string name="screen_room_details_room_name_label">"Szoba neve"</string>
  <string name="screen_room_details_security_title">"Biztonság"</string>
  <string name="screen_room_details_topic_title">"Téma"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Csak említések és kulcsszavak"</string>
--- a/features/roomdetails/impl/src/main/res/values-in/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-in/translations.xml
@ -21,7 +21,6 @@
  <string name="screen_room_details_notification_mode_custom">"Khusus"</string>
  <string name="screen_room_details_notification_mode_default">"Bawaan"</string>
  <string name="screen_room_details_notification_title">"Pemberitahuan"</string>
-  <string name="screen_room_details_room_name_label">"Nama ruangan"</string>
  <string name="screen_room_details_share_room_title">"Bagikan ruangan"</string>
  <string name="screen_room_details_updating_room">"Memperbarui ruangan…"</string>
  <string name="screen_room_member_list_pending_header_title">"Tertunda"</string>
@ -47,6 +46,7 @@
  <string name="screen_dm_details_unblock_alert_description">"Anda akan dapat melihat semua pesan dari mereka lagi."</string>
  <string name="screen_dm_details_unblock_user">"Buka blokir pengguna"</string>
  <string name="screen_room_details_leave_room_title">"Tinggalkan ruangan"</string>
+  <string name="screen_room_details_room_name_label">"Nama ruangan"</string>
  <string name="screen_room_details_security_title">"Keamanan"</string>
  <string name="screen_room_details_topic_title">"Topik"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Sebutan dan Kata Kunci saja"</string>
--- a/features/roomdetails/impl/src/main/res/values-it/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-it/translations.xml
@ -22,7 +22,6 @@
  <string name="screen_room_details_notification_mode_custom">"Personalizzato"</string>
  <string name="screen_room_details_notification_mode_default">"Predefinito"</string>
  <string name="screen_room_details_notification_title">"Notifiche"</string>
-  <string name="screen_room_details_room_name_label">"Nome stanza"</string>
  <string name="screen_room_details_share_room_title">"Condividi stanza"</string>
  <string name="screen_room_details_updating_room">"Aggiornamento della stanza…"</string>
  <string name="screen_room_member_list_pending_header_title">"In attesa"</string>
@ -49,6 +48,7 @@
  <string name="screen_dm_details_unblock_user">"Sblocca utente"</string>
  <string name="screen_room_details_leave_conversation_title">"Abbandona la conversazione"</string>
  <string name="screen_room_details_leave_room_title">"Esci dalla stanza"</string>
+  <string name="screen_room_details_room_name_label">"Nome stanza"</string>
  <string name="screen_room_details_security_title">"Sicurezza"</string>
  <string name="screen_room_details_topic_title">"Oggetto"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Solo menzioni e parole chiave"</string>
--- a/features/roomdetails/impl/src/main/res/values-ro/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ro/translations.xml
@ -20,7 +20,6 @@
  <string name="screen_room_details_notification_mode_custom">"Personalizat"</string>
  <string name="screen_room_details_notification_mode_default">"Implicit"</string>
  <string name="screen_room_details_notification_title">"Notificări"</string>
-  <string name="screen_room_details_room_name_label">"Numele camerei"</string>
  <string name="screen_room_details_share_room_title">"Partajați camera"</string>
  <string name="screen_room_details_updating_room">"Se actualizează camera…"</string>
  <string name="screen_room_member_list_pending_header_title">"În așteptare"</string>
@ -45,6 +44,7 @@
  <string name="screen_dm_details_unblock_alert_description">"La deblocarea utilizatorului, veți putea vedea din nou toate mesajele de la acesta."</string>
  <string name="screen_dm_details_unblock_user">"Deblocați utilizatorul"</string>
  <string name="screen_room_details_leave_room_title">"Părăsiți camera"</string>
+  <string name="screen_room_details_room_name_label">"Numele camerei"</string>
  <string name="screen_room_details_security_title">"Securitate"</string>
  <string name="screen_room_details_topic_title">"Subiect"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Numai mențiuni și cuvinte cheie"</string>
--- a/features/roomdetails/impl/src/main/res/values-ru/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ru/translations.xml
@ -23,10 +23,11 @@
  <string name="screen_room_details_notification_mode_custom">"Пользовательский"</string>
  <string name="screen_room_details_notification_mode_default">"По умолчанию"</string>
  <string name="screen_room_details_notification_title">"Уведомления"</string>
-  <string name="screen_room_details_room_name_label">"Название комнаты"</string>
  <string name="screen_room_details_share_room_title">"Поделиться комнатой"</string>
  <string name="screen_room_details_updating_room">"Обновление комнаты…"</string>
  <string name="screen_room_member_list_pending_header_title">"В ожидании"</string>
+  <string name="screen_room_member_list_role_administrator">"Администратор"</string>
+  <string name="screen_room_member_list_role_moderator">"Модератор"</string>
  <string name="screen_room_member_list_room_members_header_title">"Участники комнаты"</string>
  <string name="screen_room_notification_settings_allow_custom">"Разрешить пользовательские настройки"</string>
  <string name="screen_room_notification_settings_allow_custom_footnote">"Включение этого параметра отменяет настройки по умолчанию"</string>
@ -50,6 +51,7 @@
  <string name="screen_dm_details_unblock_user">"Разблокировать пользователя"</string>
  <string name="screen_room_details_leave_conversation_title">"Покинуть беседу"</string>
  <string name="screen_room_details_leave_room_title">"Покинуть комнату"</string>
+  <string name="screen_room_details_room_name_label">"Название комнаты"</string>
  <string name="screen_room_details_security_title">"Безопасность"</string>
  <string name="screen_room_details_topic_title">"Тема"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Только упоминания и ключевые слова"</string>
--- a/features/roomdetails/impl/src/main/res/values-sk/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
@ -23,10 +23,11 @@
  <string name="screen_room_details_notification_mode_custom">"Vlastné"</string>
  <string name="screen_room_details_notification_mode_default">"Predvolené"</string>
  <string name="screen_room_details_notification_title">"Oznámenia"</string>
-  <string name="screen_room_details_room_name_label">"Názov miestnosti"</string>
  <string name="screen_room_details_share_room_title">"Zdieľať miestnosť"</string>
  <string name="screen_room_details_updating_room">"Aktualizácia miestnosti…"</string>
  <string name="screen_room_member_list_pending_header_title">"Čaká sa"</string>
+  <string name="screen_room_member_list_role_administrator">"Administrátor"</string>
+  <string name="screen_room_member_list_role_moderator">"Moderátor"</string>
  <string name="screen_room_member_list_room_members_header_title">"Členovia miestnosti"</string>
  <string name="screen_room_notification_settings_allow_custom">"Povoliť vlastné nastavenie"</string>
  <string name="screen_room_notification_settings_allow_custom_footnote">"Zapnutím tohto nastavenia sa prepíše vaše predvolené nastavenie"</string>
@ -50,6 +51,7 @@
  <string name="screen_dm_details_unblock_user">"Odblokovať používateľa"</string>
  <string name="screen_room_details_leave_conversation_title">"Opustiť konverzáciu"</string>
  <string name="screen_room_details_leave_room_title">"Opustiť miestnosť"</string>
+  <string name="screen_room_details_room_name_label">"Názov miestnosti"</string>
  <string name="screen_room_details_security_title">"Bezpečnosť"</string>
  <string name="screen_room_details_topic_title">"Téma"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Iba zmienky a kľúčové slová"</string>
--- a/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml
@ -17,7 +17,6 @@
  <string name="screen_room_details_notification_mode_custom">"自訂"</string>
  <string name="screen_room_details_notification_mode_default">"預設"</string>
  <string name="screen_room_details_notification_title">"通知"</string>
-  <string name="screen_room_details_room_name_label">"聊天室名稱"</string>
  <string name="screen_room_details_share_room_title">"分享聊天室"</string>
  <string name="screen_room_details_updating_room">"正在更新聊天室…"</string>
  <string name="screen_room_member_list_pending_header_title">"待定"</string>
@ -32,6 +31,7 @@
  <string name="screen_dm_details_unblock_alert_action">"解除封鎖"</string>
  <string name="screen_dm_details_unblock_user">"解除封鎖使用者"</string>
  <string name="screen_room_details_leave_room_title">"離開聊天室"</string>
+  <string name="screen_room_details_room_name_label">"聊天室名稱"</string>
  <string name="screen_room_details_security_title">"安全性"</string>
  <string name="screen_room_details_topic_title">"主題"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"僅限提及與關鍵字"</string>
--- a/features/roomdetails/impl/src/main/res/values/localazy.xml
+++ b/features/roomdetails/impl/src/main/res/values/localazy.xml
@ -22,10 +22,11 @@
  <string name="screen_room_details_notification_mode_custom">"Custom"</string>
  <string name="screen_room_details_notification_mode_default">"Default"</string>
  <string name="screen_room_details_notification_title">"Notifications"</string>
-  <string name="screen_room_details_room_name_label">"Room name"</string>
  <string name="screen_room_details_share_room_title">"Share room"</string>
  <string name="screen_room_details_updating_room">"Updating room…"</string>
  <string name="screen_room_member_list_pending_header_title">"Pending"</string>
+  <string name="screen_room_member_list_role_administrator">"Admin"</string>
+  <string name="screen_room_member_list_role_moderator">"Moderator"</string>
  <string name="screen_room_member_list_room_members_header_title">"Room members"</string>
  <string name="screen_room_notification_settings_allow_custom">"Allow custom setting"</string>
  <string name="screen_room_notification_settings_allow_custom_footnote">"Turning this on will override your default setting"</string>
@ -49,6 +50,7 @@
  <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_room_name_label">"Room name"</string>
  <string name="screen_room_details_security_title">"Security"</string>
  <string name="screen_room_details_topic_title">"Topic"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Mentions and Keywords only"</string>