Merge remote-tracking branch 'upstream/develop' into feature/scroll-to-unread-messages

# Conflicts:
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
#	features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt

@@ -17,6 +17,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.coroutineScope
 import com.bumble.appyx.core.lifecycle.subscribe
@@ -171,6 +172,7 @@ class HomeFlowNode(
             if (loadingJoinedRoomJob.value.isLoading()) {
                 DelayedVisibility(duration = 400.milliseconds) {
                     ProgressDialog(
+                        properties = DialogProperties(dismissOnBackPress = true, dismissOnClickOutside = true),
                         onDismissRequest = {
                             loadingJoinedRoomJob.value.dataOrNull()?.cancel()
                             loadingJoinedRoomJob.value = AsyncData.Uninitialized

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/HomeTopBar.kt

@@ -57,6 +57,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.modifiers.backgroundVerticalGradient
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 import io.element.android.libraries.designsystem.theme.aliasScreenTitle
 import io.element.android.libraries.designsystem.theme.components.DropdownMenu
 import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem
@@ -65,8 +66,8 @@ import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.ui.components.aMatrixUser
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.testtags.TestTags
@@ -237,6 +238,7 @@ private fun SpaceFilterButton(
             else -> Unit
         }
     }
+
     val isSelected = spaceFiltersState is SpaceFiltersState.Selected
     IconButton(
         onClick = ::onClick,
@@ -320,7 +322,15 @@ private fun AccountIcon(
             Avatar(
                 avatarData = avatarData,
                 avatarType = AvatarType.User,
-                contentDescription = if (isCurrentAccount) stringResource(CommonStrings.common_settings) else null,
+                contentDescription = if (isCurrentAccount) {
+                    if (showAvatarIndicator) {
+                        stringResource(CommonStrings.a11y_settings_with_required_action)
+                    } else {
+                        stringResource(CommonStrings.common_settings)
+                    }
+                } else {
+                    null
+                },
             )
             if (showAvatarIndicator) {
                 RedIndicatorAtom(
@@ -337,7 +347,7 @@ private fun AccountIcon(
 internal fun HomeTopBarPreview() = ElementPreview {
     HomeTopBar(
         selectedNavigationItem = HomeNavigationBarItem.Chats,
-        currentUserAndNeighbors = persistentListOf(MatrixUser(UserId("@id:domain"), "Alice")),
+        currentUserAndNeighbors = persistentListOf(aMatrixUser(id = "@id:domain", displayName = USER_NAME_ALICE)),
         showAvatarIndicator = false,
         areSearchResultsDisplayed = false,
         scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()),
@@ -358,7 +368,7 @@ internal fun HomeTopBarPreview() = ElementPreview {
 internal fun HomeTopBarSpaceFiltersSelectedPreview() = ElementPreview {
     HomeTopBar(
         selectedNavigationItem = HomeNavigationBarItem.Chats,
-        currentUserAndNeighbors = persistentListOf(MatrixUser(UserId("@id:domain"), "Alice")),
+        currentUserAndNeighbors = persistentListOf(aMatrixUser(id = "@id:domain", displayName = USER_NAME_ALICE)),
         showAvatarIndicator = false,
         areSearchResultsDisplayed = false,
         scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()),
@@ -379,7 +389,7 @@ internal fun HomeTopBarSpaceFiltersSelectedPreview() = ElementPreview {
 internal fun HomeTopBarSpacesPreview() = ElementPreview {
     HomeTopBar(
         selectedNavigationItem = HomeNavigationBarItem.Spaces,
-        currentUserAndNeighbors = persistentListOf(MatrixUser(UserId("@id:domain"), "Alice")),
+        currentUserAndNeighbors = persistentListOf(aMatrixUser(id = "@id:domain", displayName = USER_NAME_ALICE)),
         showAvatarIndicator = false,
         areSearchResultsDisplayed = false,
         scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()),
@@ -400,7 +410,7 @@ internal fun HomeTopBarSpacesPreview() = ElementPreview {
 internal fun HomeTopBarWithIndicatorPreview() = ElementPreview {
     HomeTopBar(
         selectedNavigationItem = HomeNavigationBarItem.Chats,
-        currentUserAndNeighbors = persistentListOf(MatrixUser(UserId("@id:domain"), "Alice")),
+        currentUserAndNeighbors = persistentListOf(aMatrixUser(id = "@id:domain", displayName = USER_NAME_ALICE)),
         showAvatarIndicator = true,
         areSearchResultsDisplayed = false,
         scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()),

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt

@@ -29,6 +29,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
@@ -222,20 +223,17 @@ private fun NameAndTimestampRow(
         modifier = modifier.fillMaxWidth(),
         horizontalArrangement = spacedBy(16.dp)
     ) {
-        Row(
-            modifier = Modifier.weight(1f),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            // Name
-            Text(
-                style = ElementTheme.typography.fontBodyLgMedium,
-                text = name?.toSafeLength(ellipsize = true) ?: stringResource(id = CommonStrings.common_no_room_name),
-                fontStyle = FontStyle.Italic.takeIf { name == null },
-                color = ElementTheme.colors.roomListRoomName,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
-            )
-        }
+        Text(
+            modifier = Modifier
+                .weight(1f)
+                .clipToBounds(),
+            style = ElementTheme.typography.fontBodyLgMedium,
+            text = name?.toSafeLength(ellipsize = true) ?: stringResource(id = CommonStrings.common_no_room_name),
+            fontStyle = FontStyle.Italic.takeIf { name == null },
+            color = ElementTheme.colors.roomListRoomName,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis
+        )
         // Timestamp
         Text(
             text = timestamp ?: "",
@@ -262,12 +260,12 @@ private fun InviteSubtitle(
     }
     if (subtitle != null) {
         Text(
+            modifier = modifier.clipToBounds(),
             text = subtitle,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
             style = ElementTheme.typography.fontBodyMdRegular,
             color = ElementTheme.colors.roomListRoomMessage,
-            modifier = modifier,
         )
     }
 }
@@ -326,7 +324,9 @@ private fun MessagePreviewAndIndicatorRow(
                 val messagePreview = room.latestEvent.content()
                 val annotatedMessagePreview = messagePreview as? AnnotatedString ?: AnnotatedString(text = messagePreview.orEmpty().toString())
                 Text(
-                    modifier = Modifier.weight(1f),
+                    modifier = Modifier
+                        .weight(1f)
+                        .clipToBounds(),
                     text = annotatedMessagePreview,
                     color = ElementTheme.colors.roomListRoomMessage,
                     style = ElementTheme.typography.fontBodyMdRegular,
@@ -381,7 +381,9 @@ private fun InviteNameAndIndicatorRow(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
-            modifier = Modifier.weight(1f),
+            modifier = Modifier
+                .weight(1f)
+                .clipToBounds(),
             style = ElementTheme.typography.fontBodyLgMedium,
             text = name?.toSafeLength(ellipsize = true) ?: stringResource(id = CommonStrings.common_no_room_name),
             fontStyle = FontStyle.Italic.takeIf { name == null },

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt

@@ -19,7 +19,6 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
 import io.element.android.libraries.matrix.api.room.CallIntentConsensus
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.matrix.ui.model.getAvatarData

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt

@@ -11,6 +11,10 @@ package io.element.android.features.home.impl.model
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.designsystem.preview.LAST_MESSAGE
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
@@ -85,16 +89,16 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     displayType = RoomSummaryDisplayType.INVITE,
                     inviteSender = anInviteSender(
                         userId = UserId("@alice:matrix.org"),
-                        displayName = "Alice",
+                        displayName = USER_NAME_ALICE,
                     ),
                     canonicalAlias = RoomAlias("#alias:matrix.org"),
                 ),
                 aRoomListRoomSummary(
-                    name = "Bob",
+                    name = USER_NAME_BOB,
                     displayType = RoomSummaryDisplayType.INVITE,
                     inviteSender = anInviteSender(
                         userId = UserId("@bob:matrix.org"),
-                        displayName = "Bob",
+                        displayName = USER_NAME_BOB,
                     ),
                     isDm = true,
                 ),
@@ -103,7 +107,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     displayType = RoomSummaryDisplayType.INVITE,
                     inviteSender = anInviteSender(
                         userId = UserId("@bob:matrix.org"),
-                        displayName = "Bob",
+                        displayName = USER_NAME_BOB,
                     ),
                 ),
                 aRoomListRoomSummary(
@@ -111,7 +115,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     displayType = RoomSummaryDisplayType.INVITE,
                     inviteSender = anInviteSender(
                         userId = UserId("@bob:matrix.org"),
-                        displayName = "Bob",
+                        displayName = USER_NAME_BOB,
                     ),
                     isSpace = true
                 ),
@@ -147,7 +151,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
 
 internal fun anInviteSender(
     userId: UserId = UserId("@bob:domain"),
-    displayName: String = "Bob",
+    displayName: String = USER_NAME_BOB,
     avatarData: AvatarData = AvatarData(userId.value, displayName, size = AvatarSize.InviteSender),
 ) = InviteSender(
     userId = userId,
@@ -158,12 +162,12 @@ internal fun anInviteSender(
 
 internal fun aRoomListRoomSummary(
     id: String = "!roomId:domain",
-    name: String? = "Room name",
+    name: String? = ROOM_NAME,
     numberOfUnreadMessages: Long = 0,
     numberOfUnreadMentions: Long = 0,
     numberOfUnreadNotifications: Long = 0,
     isMarkedUnread: Boolean = false,
-    latestEvent: LatestEvent = LatestEvent.Synced("Last message"),
+    latestEvent: LatestEvent = LatestEvent.Synced(LAST_MESSAGE),
     timestamp: String? = latestEvent.takeIf { it !is LatestEvent.None }?.let { "88:88" },
     notificationMode: RoomNotificationMode? = null,
     hasRoomCall: Boolean = false,

features/home/impl/src/main/res/values-et/translations.xml

@@ -7,7 +7,7 @@
   <string name="banner_new_sound_title">"Oleme sinu helisid värskendanud"</string>
   <string name="banner_set_up_recovery_content">"Loo uus taastevõti, mida saad kasutada oma krüptitud sõnumite ajaloo taastamisel olukorras, kus kaotad ligipääsu oma seadmetele."</string>
   <string name="banner_set_up_recovery_submit">"Seadista andmete taastamine"</string>
-  <string name="banner_set_up_recovery_title">"Seadista taastamine"</string>
+  <string name="banner_set_up_recovery_title">"Varunda oma vestlused"</string>
   <string name="confirm_recovery_key_banner_message">"Säilitamaks ligipääsu vestluste ja krüptovõtmete varukoopiale, palun sisesta kinnituseks oma taastevõti."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Sisesta oma taastevõti"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Kas unustasid oma taastevõtme?"</string>

features/home/impl/src/main/res/values-fa/translations.xml

@@ -4,7 +4,7 @@
   <string name="banner_battery_optimization_submit_android">"از کار انداختن بهینه سازی"</string>
   <string name="banner_battery_optimization_title_android">"آگاهی‌ها نمی‌رسند؟"</string>
   <string name="banner_set_up_recovery_content">"بازگردانی تاریخچهٔ پیام‌ها و هویت رمزنگاشته‌تان با کلید بازیابی در صورت از دست دادن همهٔ افزاره‌های موجودتان."</string>
-  <string name="banner_set_up_recovery_submit">"برپایی بازیابی"</string>
+  <string name="banner_set_up_recovery_submit">"دریافت کلید بازیابی"</string>
   <string name="banner_set_up_recovery_title">"برپایی بازیابی"</string>
   <string name="confirm_recovery_key_banner_message">"کلید بازیابی خود را تأیید کنید تا دسترسی به حافظه کلیدها و تاریخچه پیام‌هایتان حفظ شود ."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"ورود کلید بازیابیتان"</string>
@@ -25,6 +25,7 @@
   <string name="screen_roomlist_empty_message">"آغاز با پیام دادن به کسی."</string>
   <string name="screen_roomlist_empty_title">"هنوز گپی وجود ندارد."</string>
   <string name="screen_roomlist_filter_favourites">"علاقه‌مندی‌ها"</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"می‌توانید در تنظیمات چت، یک چت را به موارد دلخواه خود اضافه کنید. فعلاً می‌توانید فیلترها را غیرفعال کنید تا چت‌های دیگر خود را ببینید."</string>
   <string name="screen_roomlist_filter_favourites_empty_state_title">"هنوز هیچ گپ مورد علاقه‌ای ندارید"</string>
   <string name="screen_roomlist_filter_invites">"دعوت‌ها"</string>
   <string name="screen_roomlist_filter_invites_empty_state_title">"هیچ دعوت منتظری ندارید."</string>

features/home/impl/src/main/res/values-pl/translations.xml

@@ -5,9 +5,9 @@
   <string name="banner_battery_optimization_title_android">"Powiadomienia nie dochodzą?"</string>
   <string name="banner_new_sound_message">"Sygnał powiadomień został zaktualizowany — jest wyraźniejszy, szybszy i mniej uciążliwy."</string>
   <string name="banner_new_sound_title">"Odświeżyliśmy Twoje dźwięki"</string>
-  <string name="banner_set_up_recovery_content">"Wygeneruj nowy klucz przywracania, którego można użyć do przywrócenia historii wiadomości szyfrowanych w przypadku utraty dostępu do swoich urządzeń."</string>
-  <string name="banner_set_up_recovery_submit">"Skonfiguruj przywracanie"</string>
-  <string name="banner_set_up_recovery_title">"Skonfiguruj przywracanie"</string>
+  <string name="banner_set_up_recovery_content">"Twoje czaty są automatycznie archiwizowane za pomocą szyfrowania end-to-end. Aby przywrócić tę kopię zapasową i swoją tożsamość cyfrową, wymagany będzie klucz przywracania."</string>
+  <string name="banner_set_up_recovery_submit">"Uzyskaj klucz przywracania"</string>
+  <string name="banner_set_up_recovery_title">"Utwórz kopię zapasową swoich czatów"</string>
   <string name="confirm_recovery_key_banner_message">"Potwierdź klucz przywracania, aby zachować dostęp do magazynu kluczy i historii wiadomości."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Wprowadź klucz przywracania"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Zapomniałeś klucza przywracania?"</string>
@@ -50,6 +50,7 @@ Nie masz żadnych nieprzeczytanych wiadomości!"</string>
   <string name="screen_roomlist_mark_as_read">"Oznacz jako przeczytane"</string>
   <string name="screen_roomlist_mark_as_unread">"Oznacz jako nieprzeczytane"</string>
   <string name="screen_roomlist_tombstoned_room_description">"Ten pokój został ulepszony"</string>
+  <string name="screen_roomlist_your_spaces">"Twoje przestrzenie"</string>
   <string name="session_verification_banner_message">"Wygląda na to, że używasz nowego urządzenia. Zweryfikuj się innym urządzeniem, aby uzyskać dostęp do zaszyfrowanych wiadomości."</string>
   <string name="session_verification_banner_title">"Potwierdź, że to Ty"</string>
 </resources>

features/home/impl/src/main/res/values-pt/translations.xml

@@ -6,7 +6,7 @@
   <string name="banner_new_sound_message">"O toque de notificação foi atualizado — mais claro, mais rápido e menos perturbador."</string>
   <string name="banner_new_sound_title">"Atualizámos os seus sons"</string>
   <string name="banner_set_up_recovery_content">"Recupera a tua identidade criptográfica e o histórico de mensagens com uma chave de recuperação se tiveres perdido todos os teus dispositivos existentes."</string>
-  <string name="banner_set_up_recovery_submit">"Configurar recuperação"</string>
+  <string name="banner_set_up_recovery_submit">"Chave de recuperação"</string>
   <string name="banner_set_up_recovery_title">"Configurar a recuperação"</string>
   <string name="confirm_recovery_key_banner_message">"Confirma a tua chave de recuperação para manteres o acesso ao teu armazenamento de chaves e ao histórico de mensagens."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Introduz a tua chave de recuperação"</string>

features/home/impl/src/main/res/values-zh/translations.xml

@@ -21,14 +21,14 @@
   <string name="screen_invites_decline_direct_chat_message">"你确定要拒绝与 %1$s 私聊？"</string>
   <string name="screen_invites_decline_direct_chat_title">"拒绝聊天"</string>
   <string name="screen_invites_empty_list">"没有邀请"</string>
-  <string name="screen_invites_invited_you">"%1$s （%2$s）邀请了你"</string>
+  <string name="screen_invites_invited_you">"%1$s（%2$s）邀请了你"</string>
   <string name="screen_migration_message">"此为一次性流程，感谢等待。"</string>
   <string name="screen_migration_title">"设置账户。"</string>
   <string name="screen_roomlist_a11y_create_message">"创建新的对话或房间"</string>
   <string name="screen_roomlist_clear_filters">"清除筛选条件"</string>
   <string name="screen_roomlist_empty_message">"通过向某人发送消息来开始。"</string>
   <string name="screen_roomlist_empty_title">"暂无聊天。"</string>
-  <string name="screen_roomlist_filter_favourites">"收藏夹"</string>
+  <string name="screen_roomlist_filter_favourites">"收藏"</string>
   <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"可以在聊天设置里将聊天添加到收藏夹。
 现在可以取消选择筛选器以查看其它对话。"</string>
   <string name="screen_roomlist_filter_favourites_empty_state_title">"你尚未收藏任何聊天"</string>
@@ -38,7 +38,7 @@
   <string name="screen_roomlist_filter_low_priority_empty_state_title">"你暂无任何低优先级聊天"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"你可以取消选择筛选器以查看其它对话"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"你暂无适用于此选项的聊天"</string>
-  <string name="screen_roomlist_filter_people">"用户"</string>
+  <string name="screen_roomlist_filter_people">"人员"</string>
   <string name="screen_roomlist_filter_people_empty_state_title">"你暂无任何私聊"</string>
   <string name="screen_roomlist_filter_rooms">"房间"</string>
   <string name="screen_roomlist_filter_rooms_empty_state_title">"你尚未进入任何房间"</string>