Merge pull request #2130 from element-hq/feature/bma/roomListBadge

Some rework on the codebase

.idea/dictionaries/shared.xml

@@ -16,6 +16,7 @@
             <w>snackbar</w>
             <w>swipeable</w>
             <w>textfields</w>
+            <w>tombstoned</w>
         </words>
     </dictionary>
 </component>

features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt

@@ -169,7 +169,7 @@ class InviteListPresenter @Inject constructor(
             AvatarData(
                 id = roomId.value,
                 name = name,
-                url = avatarURLString,
+                url = avatarUrl,
                 size = AvatarSize.RoomInviteItem,
             )
         }

features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt

@@ -30,7 +30,6 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
-import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID_2
@@ -39,6 +38,7 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_NAME
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.aRoomSummaryDetails
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.libraries.push.api.notifications.NotificationDrawerManager
 import io.element.android.libraries.push.test.notifications.FakeNotificationDrawerManager
@@ -425,13 +425,12 @@ class InviteListPresenterTests {
         postInviteRooms(
             listOf(
                 RoomSummary.Filled(
-                    RoomSummaryDetails(
+                    aRoomSummaryDetails(
                         roomId = A_ROOM_ID,
                         name = A_ROOM_NAME,
-                        avatarURLString = null,
+                        avatarUrl = null,
                         isDirect = false,
                         lastMessage = null,
-                        lastMessageTimestamp = null,
                         unreadNotificationCount = 0,
                         inviter = RoomMember(
                             userId = A_USER_ID,
@@ -454,13 +453,12 @@ class InviteListPresenterTests {
         postInviteRooms(
             listOf(
                 RoomSummary.Filled(
-                    RoomSummaryDetails(
+                    aRoomSummaryDetails(
                         roomId = A_ROOM_ID,
                         name = A_ROOM_NAME,
-                        avatarURLString = null,
+                        avatarUrl = null,
                         isDirect = true,
                         lastMessage = null,
-                        lastMessageTimestamp = null,
                         unreadNotificationCount = 0,
                         inviter = RoomMember(
                             userId = A_USER_ID,
@@ -480,13 +478,12 @@ class InviteListPresenterTests {
     }
 
     private fun aRoomSummary(id: RoomId = A_ROOM_ID) = RoomSummary.Filled(
-        RoomSummaryDetails(
+        aRoomSummaryDetails(
             roomId = id,
             name = A_ROOM_NAME,
-            avatarURLString = null,
+            avatarUrl = null,
             isDirect = false,
             lastMessage = null,
-            lastMessageTimestamp = null,
             unreadNotificationCount = 0,
         )
     )

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt

@@ -18,9 +18,6 @@ package io.element.android.features.messages.impl.forward
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.message.RoomMessage
-import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
@@ -51,30 +48,3 @@ fun aForwardMessagesState(
     forwardingSucceeded = forwardingSucceeded,
     eventSink = {}
 )
-
-internal fun aForwardMessagesRoomList() = persistentListOf(
-    aRoomDetailsState(),
-    aRoomDetailsState(roomId = RoomId("!room2:domain"), canonicalAlias = "#element-x-room:matrix.org"),
-)
-
-fun aRoomDetailsState(
-    roomId: RoomId = RoomId("!room:domain"),
-    name: String = "roomName",
-    canonicalAlias: String? = null,
-    isDirect: Boolean = true,
-    avatarURLString: String? = null,
-    lastMessage: RoomMessage? = null,
-    lastMessageTimestamp: Long? = null,
-    unreadNotificationCount: Int = 0,
-    inviter: RoomMember? = null,
-) = RoomSummaryDetails(
-    roomId = roomId,
-    name = name,
-    canonicalAlias = canonicalAlias,
-    isDirect = isDirect,
-    avatarURLString = avatarURLString,
-    lastMessage = lastMessage,
-    lastMessageTimestamp = lastMessageTimestamp,
-    unreadNotificationCount = unreadNotificationCount,
-    inviter = inviter,
-)

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTests.kt

@@ -23,7 +23,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
-import io.element.android.libraries.matrix.test.room.aRoomSummaryDetail
+import io.element.android.libraries.matrix.test.room.aRoomSummaryDetails
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.test.runTest
@@ -54,7 +54,7 @@ class ForwardMessagesPresenterTests {
             presenter.present()
         }.test {
             skipItems(1)
-            val summary = aRoomSummaryDetail()
+            val summary = aRoomSummaryDetails()
             presenter.onRoomSelected(listOf(summary.roomId))
             val forwardingState = awaitItem()
             assertThat(forwardingState.isForwarding).isTrue()
@@ -74,7 +74,7 @@ class ForwardMessagesPresenterTests {
             // Test failed forwarding
             room.givenForwardEventResult(Result.failure(Throwable("error")))
             skipItems(1)
-            val summary = aRoomSummaryDetail()
+            val summary = aRoomSummaryDetails()
             presenter.onRoomSelected(listOf(summary.roomId))
             skipItems(1)
             val failedForwardState = awaitItem()

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt

@@ -21,7 +21,7 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
-import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
+import io.element.android.libraries.matrix.ui.components.aRoomSummaryDetails
 import kotlinx.collections.immutable.persistentListOf
 
 open class EditDefaultNotificationSettingStateProvider : PreviewParameterProvider<EditDefaultNotificationSettingState> {
@@ -49,13 +49,12 @@ private fun anEditDefaultNotificationSettingsState(
 )
 
 private fun aRoomSummary() = RoomSummary.Filled(
-    RoomSummaryDetails(
+    aRoomSummaryDetails(
         roomId = RoomId("!roomId:domain"),
         name = "Room",
-        avatarURLString = null,
+        avatarUrl = null,
         isDirect = false,
         lastMessage = null,
-        lastMessageTimestamp = null,
         unreadNotificationCount = 0,
         notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
     )

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt

@@ -84,7 +84,7 @@ fun EditDefaultNotificationSettingView(
         if (state.roomsWithUserDefinedMode.isNotEmpty()) {
             PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_edit_custom_settings_section_title)) {
                 state.roomsWithUserDefinedMode.forEach { summary ->
-                    val subtitle = when (summary.details.notificationMode) {
+                    val subtitle = when (summary.details.userDefinedNotificationMode) {
                         RoomNotificationMode.ALL_MESSAGES -> stringResource(id = R.string.screen_notification_settings_edit_mode_all_messages)
                         RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> {
                             stringResource(id = R.string.screen_notification_settings_edit_mode_mentions_and_keywords)
@@ -95,7 +95,7 @@ fun EditDefaultNotificationSettingView(
                     val avatarData = AvatarData(
                         id = summary.identifier(),
                         name = summary.details.name,
-                        url = summary.details.avatarURLString,
+                        url = summary.details.avatarUrl,
                         size = AvatarSize.CustomRoomNotificationSetting,
                     )
                     ListItem(

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/EditDefaultNotificationSettingsPresenterTests.kt

@@ -29,7 +29,7 @@ import io.element.android.libraries.matrix.test.A_THROWABLE
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
-import io.element.android.libraries.matrix.test.room.aRoomSummaryDetail
+import io.element.android.libraries.matrix.test.room.aRoomSummaryDetails
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.tests.testutils.awaitLastSequentialItem
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
@@ -72,11 +72,11 @@ class EditDefaultNotificationSettingsPresenterTests {
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
-            roomListService.postAllRooms(listOf(RoomSummary.Filled(aRoomSummaryDetail(notificationMode = RoomNotificationMode.ALL_MESSAGES))))
+            roomListService.postAllRooms(listOf(RoomSummary.Filled(aRoomSummaryDetails(notificationMode = RoomNotificationMode.ALL_MESSAGES))))
             val loadedState = consumeItemsUntilPredicate { state ->
-                state.roomsWithUserDefinedMode.any { it.details.notificationMode == RoomNotificationMode.ALL_MESSAGES }
+                state.roomsWithUserDefinedMode.any { it.details.userDefinedNotificationMode == RoomNotificationMode.ALL_MESSAGES }
             }.last()
-            assertThat(loadedState.roomsWithUserDefinedMode.any { it.details.notificationMode == RoomNotificationMode.ALL_MESSAGES }).isTrue()
+            assertThat(loadedState.roomsWithUserDefinedMode.any { it.details.userDefinedNotificationMode == RoomNotificationMode.ALL_MESSAGES }).isTrue()
         }
     }
 

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

@@ -173,7 +173,7 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
         verticalAlignment = Alignment.CenterVertically,
     ) {
         // Video call
-        if (room.hasOngoingCall) {
+        if (room.hasRoomCall) {
             Icon(
                 modifier = Modifier.size(16.dp),
                 imageVector = CompoundIcons.VideoCallSolid,
@@ -191,7 +191,7 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
 @Composable
 private fun NotificationIcon(room: RoomListRoomSummary) {
     val tint = if (room.hasUnread) ElementTheme.colors.unreadIndicator else ElementTheme.colors.iconQuaternary
-    when (room.notificationMode) {
+    when (room.userDefinedNotificationMode) {
         null, RoomNotificationMode.ALL_MESSAGES -> return
         RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY ->
             Icon(

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSource.kt

@@ -146,7 +146,7 @@ class RoomListDataSource @Inject constructor(
                 val avatarData = AvatarData(
                     id = roomSummary.identifier(),
                     name = roomSummary.details.name,
-                    url = roomSummary.details.avatarURLString,
+                    url = roomSummary.details.avatarUrl,
                     size = AvatarSize.RoomListItem,
                 )
                 val roomIdentifier = roomSummary.identifier()
@@ -160,8 +160,8 @@ class RoomListDataSource @Inject constructor(
                         roomLastMessageFormatter.format(message.event, roomSummary.details.isDirect)
                     }.orEmpty(),
                     avatarData = avatarData,
-                    notificationMode = roomSummary.details.notificationMode,
+                    userDefinedNotificationMode = roomSummary.details.userDefinedNotificationMode,
-                    hasOngoingCall = roomSummary.details.hasOngoingCall,
+                    hasRoomCall = roomSummary.details.hasRoomCall,
                     isDm = roomSummary.details.isDm,
                 )
             }

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummary.kt

@@ -32,7 +32,7 @@ data class RoomListRoomSummary(
     val lastMessage: CharSequence? = null,
     val avatarData: AvatarData = AvatarData(id, name, size = AvatarSize.RoomListItem),
     val isPlaceholder: Boolean = false,
-    val notificationMode: RoomNotificationMode? = null,
+    val userDefinedNotificationMode: RoomNotificationMode? = null,
-    val hasOngoingCall: Boolean = false,
+    val hasRoomCall: Boolean = false,
     val isDm: Boolean = false,
 )

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

@@ -26,13 +26,13 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
     override val values: Sequence<RoomListRoomSummary>
         get() = sequenceOf(
             aRoomListRoomSummary(),
-            aRoomListRoomSummary().copy(lastMessage = null),
+            aRoomListRoomSummary(lastMessage = null),
-            aRoomListRoomSummary().copy(hasUnread = true, notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY),
+            aRoomListRoomSummary(hasUnread = true, notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY),
-            aRoomListRoomSummary().copy(timestamp = "88:88", notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY),
+            aRoomListRoomSummary(timestamp = "88:88", notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY),
-            aRoomListRoomSummary().copy(timestamp = "88:88", notificationMode = RoomNotificationMode.MUTE),
+            aRoomListRoomSummary(timestamp = "88:88", notificationMode = RoomNotificationMode.MUTE),
-            aRoomListRoomSummary().copy(timestamp = "88:88", hasUnread = true),
+            aRoomListRoomSummary(timestamp = "88:88", hasUnread = true),
-            aRoomListRoomSummary().copy(isPlaceholder = true, timestamp = "88:88"),
+            aRoomListRoomSummary(isPlaceholder = true, timestamp = "88:88"),
-            aRoomListRoomSummary().copy(
+            aRoomListRoomSummary(
                 name = "A very long room name that should be truncated",
                 lastMessage = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt" +
                     " ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea com" +
@@ -40,17 +40,27 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                 timestamp = "yesterday",
                 hasUnread = true,
             ),
-            aRoomListRoomSummary().copy(hasUnread = true, hasOngoingCall = true),
+            aRoomListRoomSummary(hasUnread = true, hasRoomCall = true),
         )
 }
 
-fun aRoomListRoomSummary() = RoomListRoomSummary(
+fun aRoomListRoomSummary(
+    lastMessage: String? = "Last message",
+    notificationMode: RoomNotificationMode? = null,
+    hasUnread: Boolean = false,
+    timestamp: String? = "88:88",
+    hasRoomCall: Boolean = false,
+    isPlaceholder: Boolean = false,
+    name: String = "Room name",
+) = RoomListRoomSummary(
     id = "!roomId",
     roomId = RoomId("!roomId:domain"),
-    name = "Room name",
+    name = name,
-    hasUnread = false,
+    hasUnread = hasUnread,
-    timestamp = null,
+    timestamp = timestamp,
-    lastMessage = "Last message",
+    lastMessage = lastMessage,
     avatarData = AvatarData("!roomId", "Room name", size = AvatarSize.RoomListItem),
-    isPlaceholder = false,
+    isPlaceholder = isPlaceholder,
+    userDefinedNotificationMode = notificationMode,
+    hasRoomCall = hasRoomCall,
 )

features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt

@@ -122,7 +122,7 @@ class RoomListPresenterTests {
     fun `present - should start with no user and then load user with error`() = runTest {
         val matrixClient = FakeMatrixClient(
             userDisplayName = Result.failure(AN_EXCEPTION),
-            userAvatarURLString = Result.failure(AN_EXCEPTION),
+            userAvatarUrl = Result.failure(AN_EXCEPTION),
         )
         val scope = CoroutineScope(coroutineContext + SupervisorJob())
         val presenter = createRoomListPresenter(client = matrixClient, coroutineScope = scope)
@@ -384,11 +384,11 @@ class RoomListPresenterTests {
             notificationSettingsService.setRoomNotificationMode(A_ROOM_ID, userDefinedMode)
 
             val updatedState = consumeItemsUntilPredicate { state ->
-                state.roomList.any { it.id == A_ROOM_ID.value && it.notificationMode == userDefinedMode }
+                state.roomList.any { it.id == A_ROOM_ID.value && it.userDefinedNotificationMode == userDefinedMode }
             }.last()
 
             val room = updatedState.roomList.find { it.id == A_ROOM_ID.value }
-            assertThat(room?.notificationMode).isEqualTo(userDefinedMode)
+            assertThat(room?.userDefinedNotificationMode).isEqualTo(userDefinedMode)
             cancelAndIgnoreRemainingEvents()
             scope.cancel()
         }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt

@@ -72,7 +72,7 @@ interface MatrixClient : Closeable {
      */
     suspend fun logout(ignoreSdkError: Boolean): String?
     suspend fun loadUserDisplayName(): Result<String>
-    suspend fun loadUserAvatarURLString(): Result<String?>
+    suspend fun loadUserAvatarUrl(): Result<String?>
     suspend fun getAccountManagementUrl(action: AccountManagementAction?): Result<String?>
     suspend fun uploadMedia(mimeType: String, data: ByteArray, progressCallback: ProgressCallback?): Result<String>
     fun roomMembershipObserver(): RoomMembershipObserver

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt

@@ -36,14 +36,15 @@ sealed interface RoomSummary {
 data class RoomSummaryDetails(
     val roomId: RoomId,
     val name: String,
-    val canonicalAlias: String? = null,
+    val canonicalAlias: String?,
     val isDirect: Boolean,
-    val avatarURLString: String?,
+    val avatarUrl: String?,
     val lastMessage: RoomMessage?,
-    val lastMessageTimestamp: Long?,
     val unreadNotificationCount: Int,
-    val inviter: RoomMember? = null,
+    val inviter: RoomMember?,
-    val notificationMode: RoomNotificationMode? = null,
+    val userDefinedNotificationMode: RoomNotificationMode?,
-    val hasOngoingCall: Boolean = false,
+    val hasRoomCall: Boolean,
-    val isDm: Boolean = false,
+    val isDm: Boolean,
-)
+) {
+    val lastMessageTimestamp = lastMessage?.originServerTs
+}

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/CurrentUser.kt

@@ -19,11 +19,11 @@ package io.element.android.libraries.matrix.api.user
 import io.element.android.libraries.matrix.api.MatrixClient
 
 /**
- * Get the current user, as [MatrixUser], using  [MatrixClient.loadUserAvatarURLString]
+ * Get the current user, as [MatrixUser], using  [MatrixClient.loadUserAvatarUrl]
  * and [MatrixClient.loadUserDisplayName].
  */
 suspend fun MatrixClient.getCurrentUser(): MatrixUser {
-    val userAvatarUrl = loadUserAvatarURLString().getOrNull()
+    val userAvatarUrl = loadUserAvatarUrl().getOrNull()
     val userDisplayName = loadUserDisplayName().getOrNull()
     return MatrixUser(
         userId = sessionId,

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

@@ -428,7 +428,7 @@ class RustMatrixClient(
         }
     }
 
-    override suspend fun loadUserAvatarURLString(): Result<String?> = withContext(sessionDispatcher) {
+    override suspend fun loadUserAvatarUrl(): Result<String?> = withContext(sessionDispatcher) {
         runCatching {
             client.avatarUrl()
         }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt

@@ -34,13 +34,12 @@ class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFacto
             name = roomInfo.name ?: roomInfo.id,
             canonicalAlias = roomInfo.canonicalAlias,
             isDirect = roomInfo.isDirect,
-            avatarURLString = roomInfo.avatarUrl,
+            avatarUrl = roomInfo.avatarUrl,
             unreadNotificationCount = roomInfo.notificationCount.toInt(),
             lastMessage = latestRoomMessage,
-            lastMessageTimestamp = latestRoomMessage?.originServerTs,
             inviter = roomInfo.inviter?.let(RoomMemberMapper::map),
-            notificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode),
+            userDefinedNotificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode),
-            hasOngoingCall = roomInfo.hasRoomCall,
+            hasRoomCall = roomInfo.hasRoomCall,
             isDm = roomInfo.isDirect && roomInfo.activeMembersCount.toLong() == 2L,
         )
     }

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt

@@ -48,7 +48,7 @@ import kotlinx.coroutines.delay
 class FakeMatrixClient(
     override val sessionId: SessionId = A_SESSION_ID,
     private val userDisplayName: Result<String> = Result.success(A_USER_NAME),
-    private val userAvatarURLString: Result<String> = Result.success(AN_AVATAR_URL),
+    private val userAvatarUrl: Result<String> = Result.success(AN_AVATAR_URL),
     override val roomListService: RoomListService = FakeRoomListService(),
     override val mediaLoader: MatrixMediaLoader = FakeMediaLoader(),
     private val sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(),
@@ -135,8 +135,8 @@ class FakeMatrixClient(
         return userDisplayName
     }
 
-    override suspend fun loadUserAvatarURLString(): Result<String?> {
+    override suspend fun loadUserAvatarUrl(): Result<String?> {
-        return userAvatarURLString
+        return userAvatarUrl
     }
 
     override suspend fun getAccountManagementUrl(action: AccountManagementAction?): Result<String?> {

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt

@@ -19,6 +19,7 @@ package io.element.android.libraries.matrix.test.room
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.message.RoomMessage
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
@@ -34,42 +35,46 @@ fun aRoomSummaryFilled(
     roomId: RoomId = A_ROOM_ID,
     name: String = A_ROOM_NAME,
     isDirect: Boolean = false,
-    avatarURLString: String? = null,
+    avatarUrl: String? = null,
     lastMessage: RoomMessage? = aRoomMessage(),
-    lastMessageTimestamp: Long? = null,
     unreadNotificationCount: Int = 2,
     notificationMode: RoomNotificationMode? = null,
 ) = RoomSummary.Filled(
-    aRoomSummaryDetail(
+    aRoomSummaryDetails(
         roomId = roomId,
         name = name,
         isDirect = isDirect,
-        avatarURLString = avatarURLString,
+        avatarUrl = avatarUrl,
         lastMessage = lastMessage,
-        lastMessageTimestamp = lastMessageTimestamp,
         unreadNotificationCount = unreadNotificationCount,
         notificationMode = notificationMode,
     )
 )
 
-fun aRoomSummaryDetail(
+fun aRoomSummaryDetails(
     roomId: RoomId = A_ROOM_ID,
     name: String = A_ROOM_NAME,
     isDirect: Boolean = false,
-    avatarURLString: String? = null,
+    avatarUrl: String? = null,
     lastMessage: RoomMessage? = aRoomMessage(),
-    lastMessageTimestamp: Long? = null,
     unreadNotificationCount: Int = 2,
     notificationMode: RoomNotificationMode? = null,
+    inviter: RoomMember? = null,
+    canonicalAlias: String? = null,
+    hasRoomCall: Boolean = false,
+    isDm: Boolean = false,
 ) = RoomSummaryDetails(
     roomId = roomId,
     name = name,
     isDirect = isDirect,
-    avatarURLString = avatarURLString,
+    avatarUrl = avatarUrl,
     lastMessage = lastMessage,
-    lastMessageTimestamp = lastMessageTimestamp,
     unreadNotificationCount = unreadNotificationCount,
-    notificationMode = notificationMode
+    userDefinedNotificationMode = notificationMode,
+    inviter = inviter,
+    canonicalAlias = canonicalAlias,
+    hasRoomCall = hasRoomCall,
+    isDm = isDm,
 )
 
 fun aRoomMessage(

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt

@@ -44,6 +44,9 @@ import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.matrix.api.room.message.RoomMessage
 import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import io.element.android.libraries.ui.strings.CommonStrings
 
@@ -60,7 +63,7 @@ fun SelectedRoom(
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            Avatar(AvatarData(roomSummary.roomId.value, roomSummary.name, roomSummary.avatarURLString, AvatarSize.SelectedRoom))
+            Avatar(AvatarData(roomSummary.roomId.value, roomSummary.name, roomSummary.avatarUrl, AvatarSize.SelectedRoom))
             Text(
                 text = roomSummary.name,
                 overflow = TextOverflow.Ellipsis,
@@ -94,17 +97,33 @@ fun SelectedRoom(
 @Composable
 internal fun SelectedRoomPreview() = ElementPreview {
     SelectedRoom(
-        roomSummary = RoomSummaryDetails(
+        roomSummary = aRoomSummaryDetails(),
-            roomId = RoomId("!room:domain"),
-            name = "roomName",
-            canonicalAlias = null,
-            isDirect = true,
-            avatarURLString = null,
-            lastMessage = null,
-            lastMessageTimestamp = null,
-            unreadNotificationCount = 0,
-            inviter = null,
-        ),
         onRoomRemoved = {},
     )
 }
+
+fun aRoomSummaryDetails(
+    roomId: RoomId = RoomId("!room:domain"),
+    name: String = "roomName",
+    canonicalAlias: String? = null,
+    isDirect: Boolean = true,
+    avatarUrl: String? = null,
+    lastMessage: RoomMessage? = null,
+    inviter: RoomMember? = null,
+    notificationMode: RoomNotificationMode? = null,
+    hasRoomCall: Boolean = false,
+    isDm: Boolean = false,
+    unreadNotificationCount: Int = 0
+) = RoomSummaryDetails(
+    roomId = roomId,
+    name = name,
+    canonicalAlias = canonicalAlias,
+    isDirect = isDirect,
+    avatarUrl = avatarUrl,
+    lastMessage = lastMessage,
+    inviter = inviter,
+    userDefinedNotificationMode = notificationMode,
+    hasRoomCall = hasRoomCall,
+    isDm = isDm,
+    unreadNotificationCount = unreadNotificationCount,
+)

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt

@@ -297,7 +297,7 @@ class DefaultNotificationDrawerManager @Inject constructor(
                 operation = {
                     // myUserDisplayName cannot be empty else NotificationCompat.MessagingStyle() will crash
                     val myUserDisplayName = client.loadUserDisplayName().getOrNull() ?: sessionId.value
-                    val userAvatarUrl = client.loadUserAvatarURLString().getOrNull()
+                    val userAvatarUrl = client.loadUserAvatarUrl().getOrNull()
                     MatrixUser(
                         userId = sessionId,
                         displayName = myUserDisplayName,

libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt

@@ -19,9 +19,8 @@ package io.element.android.libraries.roomselect.impl
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.message.RoomMessage
 import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
+import io.element.android.libraries.matrix.ui.components.aRoomSummaryDetails
 import io.element.android.libraries.roomselect.api.RoomSelectMode
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -41,7 +40,7 @@ open class RoomSelectStateProvider : PreviewParameterProvider<RoomSelectState> {
                 resultState = SearchBarResultState.Results(aForwardMessagesRoomList()),
                 query = "Test",
                 isSearchActive = true,
-                selectedRooms = persistentListOf(aRoomDetailsState(roomId = RoomId("!room2:domain")))
+                selectedRooms = persistentListOf(aRoomSummaryDetails(roomId = RoomId("!room2:domain")))
             ),
             // Add other states here
         )
@@ -62,32 +61,10 @@ private fun aRoomSelectState(
 )
 
 private fun aForwardMessagesRoomList() = persistentListOf(
-    aRoomDetailsState(),
+    aRoomSummaryDetails(),
-    aRoomDetailsState(
+    aRoomSummaryDetails(
         roomId = RoomId("!room2:domain"),
         name = "Room with alias",
         canonicalAlias = "#alias:example.org",
     ),
 )
-
-private fun aRoomDetailsState(
-    roomId: RoomId = RoomId("!room:domain"),
-    name: String = "roomName",
-    canonicalAlias: String? = null,
-    isDirect: Boolean = true,
-    avatarURLString: String? = null,
-    lastMessage: RoomMessage? = null,
-    lastMessageTimestamp: Long? = null,
-    unreadNotificationCount: Int = 0,
-    inviter: RoomMember? = null,
-) = RoomSummaryDetails(
-    roomId = roomId,
-    name = name,
-    canonicalAlias = canonicalAlias,
-    isDirect = isDirect,
-    avatarURLString = avatarURLString,
-    lastMessage = lastMessage,
-    lastMessageTimestamp = lastMessageTimestamp,
-    unreadNotificationCount = unreadNotificationCount,
-    inviter = inviter,
-)

libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt

@@ -223,7 +223,7 @@ private fun RoomSummaryView(
             avatarData = AvatarData(
                 id = summary.roomId.value,
                 name = summary.name,
-                url = summary.avatarURLString,
+                url = summary.avatarUrl,
                 size = AvatarSize.RoomSelectRoomListItem,
             ),
         )

libraries/roomselect/impl/src/test/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenterTests.kt

@@ -23,7 +23,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.room.aRoomSummaryDetail
+import io.element.android.libraries.matrix.test.room.aRoomSummaryDetails
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.libraries.roomselect.api.RoomSelectMode
 import io.element.android.tests.testutils.WarmUpRule
@@ -72,7 +72,7 @@ class RoomSelectPresenterTests {
     @Test
     fun `present - update query`() = runTest {
         val roomListService = FakeRoomListService().apply {
-            postAllRooms(listOf(RoomSummary.Filled(aRoomSummaryDetail())))
+            postAllRooms(listOf(RoomSummary.Filled(aRoomSummaryDetails())))
         }
         val client = FakeMatrixClient(roomListService = roomListService)
         val presenter = aPresenter(client = client)
@@ -80,7 +80,7 @@ class RoomSelectPresenterTests {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            assertThat(awaitItem().resultState as? SearchBarResultState.Results).isEqualTo(SearchBarResultState.Results(listOf(aRoomSummaryDetail())))
+            assertThat(awaitItem().resultState as? SearchBarResultState.Results).isEqualTo(SearchBarResultState.Results(listOf(aRoomSummaryDetails())))
 
             initialState.eventSink(RoomSelectEvents.UpdateQuery("string not contained"))
             assertThat(awaitItem().query).isEqualTo("string not contained")
@@ -96,7 +96,7 @@ class RoomSelectPresenterTests {
         }.test {
             val initialState = awaitItem()
             skipItems(1)
-            val summary = aRoomSummaryDetail()
+            val summary = aRoomSummaryDetails()
 
             initialState.eventSink(RoomSelectEvents.SetSelectedRoom(summary))
             assertThat(awaitItem().selectedRooms).isEqualTo(persistentListOf(summary))

tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_0,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fde0cc6b7268856b611db66b66b22c51df155f605988fc54f5c7ba18e5f1f713
+oid sha256:cf71e045231208529eb524abce7b246a0ac6283c422f9695d560071fda7085f2
-size 11456
+size 12820

tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_1,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca1cb753204502aa929f52e8b222b86bd845086f841fb9ff2936886e1dcea526
+oid sha256:34972a9257a96b4ac77edf06e5f29ebc2d8e581dcaef131ecba9730cb0f48c1c
-size 8778
+size 10176

tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_2,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5315627c3cae4b07d3df50054d9a689148517b8fd0a0e88b160ff3f447513999
+oid sha256:7ef683a74c785d57190508952f18ed5c669ff32a38cbc4f5b66d02330115843b
-size 12653
+size 14103

tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_8,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:004de09febcc9962bdc710a258f82083ba4ebca1c2831da48db7a1c9038d2caf
+oid sha256:9c90561dc7355b1917ebe96bebc717de14aac5c4897ef3e8dd0b2aca8c51c362
-size 12154
+size 13610

tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_0,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7d6df9f2573241ad0096a1f93fb682713b8d50ffa4808419e246997027c5d43
+oid sha256:7fcbdfc3e45fa0f111cc384c54c40980913e52ff755e9380fba262a4c659a5c5
-size 11392
+size 12715

tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_1,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d321e5157196e32961e4915466656145299ea4768e5478151b649740c2f1594
+oid sha256:063d4415a254eef251f4c0f63827062259f76c0d8a1e309e64a4e7376fc04a9b
-size 8750
+size 10101

tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_2,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e86ea02d990c5db670a6aa3d9c17be62dad1192d687c1dc27177758b55cece3c
+oid sha256:fd40343c425b1c7499e72d0d4119f36d06200b54e72034f97c172e5c2dad57af
-size 12503
+size 13756

tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_8,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53248c6c1d0a05b8fd08bcd35a43a6463b03b9ad808b24f59d1fa7fe5d444d4f
+oid sha256:5efc2679fc43f952d1a41ffff7c5400baeb6f46e7faba0faef6409ea178c08de
-size 12051
+size 13319