Revert "Room list badges"

.idea/dictionaries/shared.xml

@@ -16,7 +16,6 @@
             <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

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

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

@@ -30,6 +30,7 @@ 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
@@ -38,7 +39,6 @@ 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,12 +425,14 @@ class InviteListPresenterTests {
         postInviteRooms(
             listOf(
                 RoomSummary.Filled(
-                    aRoomSummaryDetails(
+                    RoomSummaryDetails(
                         roomId = A_ROOM_ID,
                         name = A_ROOM_NAME,
-                        avatarUrl = null,
+                        avatarURLString = null,
                         isDirect = false,
                         lastMessage = null,
+                        lastMessageTimestamp = null,
+                        unreadNotificationCount = 0,
                         inviter = RoomMember(
                             userId = A_USER_ID,
                             displayName = A_USER_NAME,
@@ -452,12 +454,14 @@ class InviteListPresenterTests {
         postInviteRooms(
             listOf(
                 RoomSummary.Filled(
-                    aRoomSummaryDetails(
+                    RoomSummaryDetails(
                         roomId = A_ROOM_ID,
                         name = A_ROOM_NAME,
-                        avatarUrl = null,
+                        avatarURLString = null,
                         isDirect = true,
                         lastMessage = null,
+                        lastMessageTimestamp = null,
+                        unreadNotificationCount = 0,
                         inviter = RoomMember(
                             userId = A_USER_ID,
                             displayName = A_USER_NAME,
@@ -476,12 +480,14 @@ class InviteListPresenterTests {
     }
 
     private fun aRoomSummary(id: RoomId = A_ROOM_ID) = RoomSummary.Filled(
-        aRoomSummaryDetails(
+        RoomSummaryDetails(
             roomId = id,
             name = A_ROOM_NAME,
-            avatarUrl = null,
+            avatarURLString = 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,6 +18,9 @@ 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
 
@@ -48,3 +51,30 @@ 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.aRoomSummaryDetails
+import io.element.android.libraries.matrix.test.room.aRoomSummaryDetail
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.test.runTest
@@ -55,7 +55,7 @@ class ForwardMessagesPresenterTests {
             presenter.present()
         }.test {
             skipItems(1)
-            val summary = aRoomSummaryDetails()
+            val summary = aRoomSummaryDetail()
             presenter.onRoomSelected(listOf(summary.roomId))
             val forwardingState = awaitItem()
             assertThat(forwardingState.isForwarding).isTrue()
@@ -75,7 +75,7 @@ class ForwardMessagesPresenterTests {
             // Test failed forwarding
             room.givenForwardEventResult(Result.failure(Throwable("error")))
             skipItems(1)
-            val summary = aRoomSummaryDetails()
+            val summary = aRoomSummaryDetail()
             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

@@ -24,7 +24,7 @@ import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import kotlinx.collections.immutable.persistentListOf
 
-open class EditDefaultNotificationSettingStateProvider : PreviewParameterProvider<EditDefaultNotificationSettingState> {
+open class EditDefaultNotificationSettingStateProvider: PreviewParameterProvider<EditDefaultNotificationSettingState> {
     override val values: Sequence<EditDefaultNotificationSettingState>
         get() = sequenceOf(
             anEditDefaultNotificationSettingsState(),
@@ -52,14 +52,11 @@ private fun aRoomSummary() = RoomSummary.Filled(
     RoomSummaryDetails(
         roomId = RoomId("!roomId:domain"),
         name = "Room",
-        avatarUrl = null,
+        avatarURLString = null,
         isDirect = false,
         lastMessage = null,
-        userDefinedNotificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
-        canonicalAlias = null,
-        inviter = null,
-        hasRoomCall = false,
-        numUnreadMentions = 0,
-        numUnreadMessages = 0,
+        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

@@ -86,7 +86,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.userDefinedNotificationMode) {
+                    val subtitle = when (summary.details.notificationMode) {
                         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)
@@ -97,7 +97,7 @@ fun EditDefaultNotificationSettingView(
                     val avatarData = AvatarData(
                         id = summary.identifier(),
                         name = summary.details.name,
-                        url = summary.details.avatarUrl,
+                        url = summary.details.avatarURLString,
                         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.aRoomSummaryDetails
+import io.element.android.libraries.matrix.test.room.aRoomSummaryDetail
 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(aRoomSummaryDetails(notificationMode = RoomNotificationMode.ALL_MESSAGES))))
+            roomListService.postAllRooms(listOf(RoomSummary.Filled(aRoomSummaryDetail(notificationMode = RoomNotificationMode.ALL_MESSAGES))))
             val loadedState = consumeItemsUntilPredicate { state ->
-                state.roomsWithUserDefinedMode.any { it.details.userDefinedNotificationMode == RoomNotificationMode.ALL_MESSAGES }
+                state.roomsWithUserDefinedMode.any { it.details.notificationMode == RoomNotificationMode.ALL_MESSAGES }
             }.last()
-            assertThat(loadedState.roomsWithUserDefinedMode.any { it.details.userDefinedNotificationMode == RoomNotificationMode.ALL_MESSAGES }).isTrue()
+            assertThat(loadedState.roomsWithUserDefinedMode.any { it.details.notificationMode == RoomNotificationMode.ALL_MESSAGES }).isTrue()
         }
     }
 

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

@@ -71,7 +71,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
     return persistentListOf(
         RoomListRoomSummary(
             name = "Room",
-            numberOfUnreadMessages = 1,
+            hasUnread = true,
             timestamp = "14:18",
             lastMessage = "A very very very very long message which suites on two lines",
             avatarData = AvatarData("!id", "R", size = AvatarSize.RoomListItem),
@@ -80,7 +80,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
         ),
         RoomListRoomSummary(
             name = "Room#2",
-            numberOfUnreadMessages = 0,
+            hasUnread = false,
             timestamp = "14:16",
             lastMessage = "A short message",
             avatarData = AvatarData("!id", "Z", size = AvatarSize.RoomListItem),

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

@@ -43,7 +43,6 @@ import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummaryProvider
-import io.element.android.features.roomlist.impl.model.isTimestampHighlighted
 import io.element.android.libraries.core.extensions.orEmpty
 import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom
 import io.element.android.libraries.designsystem.components.avatar.Avatar
@@ -142,7 +141,7 @@ private fun RowScope.NameAndTimestampRow(room: RoomListRoomSummary) {
     Text(
         text = room.timestamp ?: "",
         style = ElementTheme.typography.fontBodySmMedium,
-        color = if (room.isTimestampHighlighted()) {
+        color = if (room.hasUnread) {
             ElementTheme.colors.unreadIndicator
         } else {
             MaterialTheme.roomListRoomMessageDate()
@@ -174,77 +173,40 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
         verticalAlignment = Alignment.CenterVertically,
     ) {
         // Video call
-        OnGoingCallIcon(
-            room.hasRoomCall,
-        )
-        // Other indicators
-        NotificationIcons(
-            room.userDefinedNotificationMode,
-            room.numberOfUnreadMessages,
-            room.numberOfUnreadMentions,
-        )
+        if (room.hasOngoingCall) {
+            Icon(
+                modifier = Modifier.size(16.dp),
+                imageVector = CompoundIcons.VideoCallSolid,
+                contentDescription = null,
+                tint = ElementTheme.colors.unreadIndicator,
+            )
+        }
+        NotificationIcon(room)
+        if (room.hasUnread) {
+            UnreadIndicatorAtom()
+        }
     }
 }
 
 @Composable
-private fun OnGoingCallIcon(
-    hasRoomCall: Boolean,
-) {
-    if (hasRoomCall) {
-        Icon(
-            modifier = Modifier.size(16.dp),
-            imageVector = CompoundIcons.VideoCallSolid,
-            contentDescription = null,
-            tint = ElementTheme.colors.unreadIndicator,
-        )
-    }
-}
-
-@Composable
-private fun RowScope.NotificationIcons(
-    userDefinedNotificationMode: RoomNotificationMode?,
-    numberOfUnreadMessages: Int,
-    numberOfUnreadMentions: Int,
-) {
-    when (userDefinedNotificationMode) {
-        null,
-        RoomNotificationMode.ALL_MESSAGES -> {
-            if (numberOfUnreadMentions > 0) {
-                Icon(
-                    modifier = Modifier.size(16.dp),
-                    contentDescription = null,
-                    imageVector = CompoundIcons.Mention,
-                    tint = ElementTheme.colors.unreadIndicator,
-                )
-                UnreadIndicatorAtom()
-            } else if (numberOfUnreadMessages > 0) {
-                UnreadIndicatorAtom()
-            }
-        }
-        RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> {
-            if (numberOfUnreadMentions > 0) {
-                Icon(
-                    modifier = Modifier.size(16.dp),
-                    contentDescription = null,
-                    imageVector = CompoundIcons.Mention,
-                    tint = ElementTheme.colors.unreadIndicator,
-                )
-                UnreadIndicatorAtom()
-            } else if (numberOfUnreadMessages > 0) {
-                UnreadIndicatorAtom(color = ElementTheme.colors.iconQuaternary)
-            }
-        }
-        RoomNotificationMode.MUTE -> {
+private fun NotificationIcon(room: RoomListRoomSummary) {
+    val tint = if (room.hasUnread) ElementTheme.colors.unreadIndicator else ElementTheme.colors.iconQuaternary
+    when (room.notificationMode) {
+        null, RoomNotificationMode.ALL_MESSAGES -> return
+        RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY ->
+            Icon(
+                modifier = Modifier.size(16.dp),
+                contentDescription = null,
+                imageVector = CompoundIcons.Mention,
+                tint = tint,
+            )
+        RoomNotificationMode.MUTE ->
             Icon(
                 modifier = Modifier.size(16.dp),
                 contentDescription = null,
                 imageVector = CompoundIcons.NotificationsSolidOff,
-                tint = ElementTheme.colors.iconQuaternary,
+                tint = tint,
             )
-            if (numberOfUnreadMessages > 0 || numberOfUnreadMentions > 0) {
-                UnreadIndicatorAtom(color = ElementTheme.colors.iconQuaternary)
-            }
-        }
     }
 }
 

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.avatarUrl,
+                    url = roomSummary.details.avatarURLString,
                     size = AvatarSize.RoomListItem,
                 )
                 val roomIdentifier = roomSummary.identifier()
@@ -154,15 +154,14 @@ class RoomListDataSource @Inject constructor(
                     id = roomSummary.identifier(),
                     roomId = RoomId(roomIdentifier),
                     name = roomSummary.details.name,
-                    numberOfUnreadMessages = roomSummary.details.numUnreadMessages,
-                    numberOfUnreadMentions = roomSummary.details.numUnreadMentions,
+                    hasUnread = roomSummary.details.unreadNotificationCount > 0,
                     timestamp = lastMessageTimestampFormatter.format(roomSummary.details.lastMessageTimestamp),
                     lastMessage = roomSummary.details.lastMessage?.let { message ->
                         roomLastMessageFormatter.format(message.event, roomSummary.details.isDirect)
                     }.orEmpty(),
                     avatarData = avatarData,
-                    userDefinedNotificationMode = roomSummary.details.userDefinedNotificationMode,
-                    hasRoomCall = roomSummary.details.hasRoomCall,
+                    notificationMode = roomSummary.details.notificationMode,
+                    hasOngoingCall = roomSummary.details.hasOngoingCall,
                 )
             }
             null -> null

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

@@ -27,22 +27,11 @@ data class RoomListRoomSummary(
     val id: String,
     val roomId: RoomId,
     val name: String = "",
+    val hasUnread: Boolean = false,
     val timestamp: String? = null,
     val lastMessage: CharSequence? = null,
     val avatarData: AvatarData = AvatarData(id, name, size = AvatarSize.RoomListItem),
     val isPlaceholder: Boolean = false,
-    val userDefinedNotificationMode: RoomNotificationMode? = null,
-    val numberOfUnreadMessages: Int = 0,
-    val numberOfUnreadMentions: Int = 0,
-    val hasRoomCall: Boolean = false,
+    val notificationMode: RoomNotificationMode? = null,
+    val hasOngoingCall: Boolean = false,
 )
-
-fun RoomListRoomSummary.isTimestampHighlighted(): Boolean {
-    return hasRoomCall ||
-        when (userDefinedNotificationMode) {
-            null,
-            RoomNotificationMode.ALL_MESSAGES -> numberOfUnreadMessages > 0 || numberOfUnreadMentions > 0
-            RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> numberOfUnreadMentions > 0
-            RoomNotificationMode.MUTE -> false
-        }
-}

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

@@ -25,83 +25,32 @@ import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSummary> {
     override val values: Sequence<RoomListRoomSummary>
         get() = sequenceOf(
-            listOf(
-                aRoomListRoomSummary(isPlaceholder = true),
-                aRoomListRoomSummary(timestamp = null),
-                aRoomListRoomSummary(lastMessage = "Last message"),
-                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" +
-                        "modo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
-                    timestamp = "yesterday",
-                    numberOfUnreadMessages = 1,
-                ),
+            aRoomListRoomSummary(),
+            aRoomListRoomSummary().copy(lastMessage = null),
+            aRoomListRoomSummary().copy(hasUnread = true, notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY),
+            aRoomListRoomSummary().copy(timestamp = "88:88", notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY),
+            aRoomListRoomSummary().copy(timestamp = "88:88", notificationMode = RoomNotificationMode.MUTE),
+            aRoomListRoomSummary().copy(timestamp = "88:88", hasUnread = true),
+            aRoomListRoomSummary().copy(isPlaceholder = true, timestamp = "88:88"),
+            aRoomListRoomSummary().copy(
+                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" +
+                    "modo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
+                timestamp = "yesterday",
+                hasUnread = true,
             ),
-            listOf(false, true).map { hasCall ->
-                listOf(
-                    RoomNotificationMode.ALL_MESSAGES,
-                    RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
-                    RoomNotificationMode.MUTE,
-                ).map { roomNotificationMode ->
-                    listOf(
-                        aRoomListRoomSummary(
-                            name = roomNotificationMode.name,
-                            lastMessage = "No activity" + if (hasCall) ", call" else "",
-                            notificationMode = roomNotificationMode,
-                            numberOfUnreadMessages = 0,
-                            numberOfUnreadMentions = 0,
-                            hasOngoingCall = hasCall,
-                        ),
-                        aRoomListRoomSummary(
-                            name = roomNotificationMode.name,
-                            lastMessage = "New messages" + if (hasCall) ", call" else "",
-                            notificationMode = roomNotificationMode,
-                            numberOfUnreadMessages = 1,
-                            numberOfUnreadMentions = 0,
-                            hasOngoingCall = hasCall,
-                        ),
-                        aRoomListRoomSummary(
-                            name = roomNotificationMode.name,
-                            lastMessage = "New messages, mentions" + if (hasCall) ", call" else "",
-                            notificationMode = roomNotificationMode,
-                            numberOfUnreadMessages = 1,
-                            numberOfUnreadMentions = 1,
-                            hasOngoingCall = hasCall,
-                        ),
-                        aRoomListRoomSummary(
-                            name = roomNotificationMode.name,
-                            lastMessage = "New mentions" + if (hasCall) ", call" else "",
-                            notificationMode = roomNotificationMode,
-                            numberOfUnreadMessages = 0,
-                            numberOfUnreadMentions = 1,
-                            hasOngoingCall = hasCall,
-                        ),
-                    )
-                }.flatten()
-            }.flatten(),
-        ).flatten()
+            aRoomListRoomSummary().copy(hasUnread = true, hasOngoingCall = true),
+        )
 }
 
-fun aRoomListRoomSummary(
-    lastMessage: String? = null,
-    notificationMode: RoomNotificationMode? = null,
-    numberOfUnreadMessages: Int = 0,
-    numberOfUnreadMentions: Int = 0,
-    timestamp: String? = "88:88",
-    hasOngoingCall: Boolean = false,
-    isPlaceholder: Boolean = false,
-    name: String = "Room name",
-) = RoomListRoomSummary(
+fun aRoomListRoomSummary() = RoomListRoomSummary(
     id = "!roomId",
     roomId = RoomId("!roomId:domain"),
-    name = name,
-    numberOfUnreadMessages = numberOfUnreadMessages,
-    numberOfUnreadMentions = numberOfUnreadMentions,
-    timestamp = timestamp,
-    lastMessage = lastMessage,
+    name = "Room name",
+    hasUnread = false,
+    timestamp = null,
+    lastMessage = "Last message",
     avatarData = AvatarData("!roomId", "Room name", size = AvatarSize.RoomListItem),
-    isPlaceholder = isPlaceholder,
-    userDefinedNotificationMode = notificationMode,
-    hasRoomCall = hasOngoingCall,
+    isPlaceholder = false,
 )

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

@@ -123,7 +123,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),
-            userAvatarUrl = Result.failure(AN_EXCEPTION),
+            userAvatarURLString = Result.failure(AN_EXCEPTION),
         )
         val scope = CoroutineScope(coroutineContext + SupervisorJob())
         val presenter = createRoomListPresenter(client = matrixClient, coroutineScope = scope)
@@ -385,11 +385,11 @@ class RoomListPresenterTests {
             notificationSettingsService.setRoomNotificationMode(A_ROOM_ID, userDefinedMode)
 
             val updatedState = consumeItemsUntilPredicate { state ->
-                state.roomList.any { it.id == A_ROOM_ID.value && it.userDefinedNotificationMode == userDefinedMode }
+                state.roomList.any { it.id == A_ROOM_ID.value && it.notificationMode == userDefinedMode }
             }.last()
 
             val room = updatedState.roomList.find { it.id == A_ROOM_ID.value }
-            assertThat(room?.userDefinedNotificationMode).isEqualTo(userDefinedMode)
+            assertThat(room?.notificationMode).isEqualTo(userDefinedMode)
             cancelAndIgnoreRemainingEvents()
             scope.cancel()
         }
@@ -439,8 +439,7 @@ private val aRoomListRoomSummary = RoomListRoomSummary(
     id = A_ROOM_ID.value,
     roomId = A_ROOM_ID,
     name = A_ROOM_NAME,
-    numberOfUnreadMentions = 1,
-    numberOfUnreadMessages = 2,
+    hasUnread = true,
     timestamp = A_FORMATTED_DATE,
     lastMessage = "",
     avatarData = AvatarData(id = A_ROOM_ID.value, name = A_ROOM_NAME, size = AvatarSize.RoomListItem),

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 loadUserAvatarUrl(): Result<String?>
+    suspend fun loadUserAvatarURLString(): 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,15 +36,13 @@ sealed interface RoomSummary {
 data class RoomSummaryDetails(
     val roomId: RoomId,
     val name: String,
-    val canonicalAlias: String?,
+    val canonicalAlias: String? = null,
     val isDirect: Boolean,
-    val avatarUrl: String?,
+    val avatarURLString: String?,
     val lastMessage: RoomMessage?,
-    val numUnreadMessages: Int,
-    val numUnreadMentions: Int,
-    val inviter: RoomMember?,
-    val userDefinedNotificationMode: RoomNotificationMode?,
-    val hasRoomCall: Boolean,
-) {
-    val lastMessageTimestamp = lastMessage?.originServerTs
-}
+    val lastMessageTimestamp: Long?,
+    val unreadNotificationCount: Int,
+    val inviter: RoomMember? = null,
+    val notificationMode: RoomNotificationMode? = null,
+    val hasOngoingCall: Boolean = false,
+)

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.loadUserAvatarUrl]
+ * Get the current user, as [MatrixUser], using  [MatrixClient.loadUserAvatarURLString]
  * and [MatrixClient.loadUserDisplayName].
  */
 suspend fun MatrixClient.getCurrentUser(): MatrixUser {
-    val userAvatarUrl = loadUserAvatarUrl().getOrNull()
+    val userAvatarUrl = loadUserAvatarURLString().getOrNull()
     val userDisplayName = loadUserDisplayName().getOrNull()
     return MatrixUser(
         userId = sessionId,

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

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

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

@@ -35,13 +35,13 @@ class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFacto
             name = roomInfo.name ?: roomInfo.id,
             canonicalAlias = roomInfo.canonicalAlias,
             isDirect = roomInfo.isDirect,
-            avatarUrl = roomInfo.avatarUrl,
+            avatarURLString = roomInfo.avatarUrl,
+            unreadNotificationCount = roomInfo.notificationCount.toInt(),
             lastMessage = latestRoomMessage,
+            lastMessageTimestamp = latestRoomMessage?.originServerTs,
             inviter = roomInfo.inviter?.let(RoomMemberMapper::map),
-            userDefinedNotificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode),
-            hasRoomCall = roomInfo.hasRoomCall,
-            numUnreadMentions = roomInfo.numUnreadMentions.toInt(),
-            numUnreadMessages = roomInfo.numUnreadMessages.toInt(),
+            notificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode),
+            hasOngoingCall = roomInfo.hasRoomCall,
         )
     }
 }

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 userAvatarUrl: Result<String> = Result.success(AN_AVATAR_URL),
+    private val userAvatarURLString: Result<String> = Result.success(AN_AVATAR_URL),
     override val roomListService: RoomListService = FakeRoomListService(),
     override val mediaLoader: MatrixMediaLoader = FakeMediaLoader(),
     private val sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(),
@@ -136,8 +136,8 @@ class FakeMatrixClient(
         return userDisplayName
     }
 
-    override suspend fun loadUserAvatarUrl(): Result<String?> {
-        return userAvatarUrl
+    override suspend fun loadUserAvatarURLString(): Result<String?> {
+        return userAvatarURLString
     }
 
     override suspend fun getAccountManagementUrl(action: AccountManagementAction?): Result<String?> {

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

@@ -19,7 +19,6 @@ 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
@@ -35,48 +34,42 @@ fun aRoomSummaryFilled(
     roomId: RoomId = A_ROOM_ID,
     name: String = A_ROOM_NAME,
     isDirect: Boolean = false,
-    avatarUrl: String? = null,
+    avatarURLString: String? = null,
     lastMessage: RoomMessage? = aRoomMessage(),
-    numUnreadMentions: Int = 1,
-    numUnreadMessages: Int = 2,
+    lastMessageTimestamp: Long? = null,
+    unreadNotificationCount: Int = 2,
     notificationMode: RoomNotificationMode? = null,
 ) = RoomSummary.Filled(
-    aRoomSummaryDetails(
+    aRoomSummaryDetail(
         roomId = roomId,
         name = name,
         isDirect = isDirect,
-        avatarUrl = avatarUrl,
+        avatarURLString = avatarURLString,
         lastMessage = lastMessage,
-        numUnreadMentions = numUnreadMentions,
-        numUnreadMessages = numUnreadMessages,
+        lastMessageTimestamp = lastMessageTimestamp,
+        unreadNotificationCount = unreadNotificationCount,
         notificationMode = notificationMode,
     )
 )
 
-fun aRoomSummaryDetails(
+fun aRoomSummaryDetail(
     roomId: RoomId = A_ROOM_ID,
     name: String = A_ROOM_NAME,
     isDirect: Boolean = false,
-    avatarUrl: String? = null,
+    avatarURLString: String? = null,
     lastMessage: RoomMessage? = aRoomMessage(),
+    lastMessageTimestamp: Long? = null,
+    unreadNotificationCount: Int = 2,
     notificationMode: RoomNotificationMode? = null,
-    inviter: RoomMember? = null,
-    canonicalAlias: String? = null,
-    hasOngoingCall: Boolean = false,
-    numUnreadMentions: Int = 0,
-    numUnreadMessages: Int = 0,
 ) = RoomSummaryDetails(
     roomId = roomId,
     name = name,
     isDirect = isDirect,
-    avatarUrl = avatarUrl,
+    avatarURLString = avatarURLString,
     lastMessage = lastMessage,
-    userDefinedNotificationMode = notificationMode,
-    canonicalAlias = canonicalAlias,
-    inviter = inviter,
-    hasRoomCall = hasOngoingCall,
-    numUnreadMentions = numUnreadMentions,
-    numUnreadMessages = numUnreadMessages,
+    lastMessageTimestamp = lastMessageTimestamp,
+    unreadNotificationCount = unreadNotificationCount,
+    notificationMode = notificationMode
 )
 
 fun aRoomMessage(

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

@@ -44,9 +44,6 @@ 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
 
@@ -63,7 +60,7 @@ fun SelectedRoom(
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            Avatar(AvatarData(roomSummary.roomId.value, roomSummary.name, roomSummary.avatarUrl, AvatarSize.SelectedRoom))
+            Avatar(AvatarData(roomSummary.roomId.value, roomSummary.name, roomSummary.avatarURLString, AvatarSize.SelectedRoom))
             Text(
                 text = roomSummary.name,
                 overflow = TextOverflow.Ellipsis,
@@ -97,33 +94,17 @@ fun SelectedRoom(
 @Composable
 internal fun SelectedRoomPreview() = ElementPreview {
     SelectedRoom(
-        roomSummary = aRoomSummaryDetails(),
+        roomSummary = RoomSummaryDetails(
+            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,
-    hasOngoingCall: Boolean = false,
-    numUnreadMentions: Int = 0,
-    numUnreadMessages: Int = 0,
-) = RoomSummaryDetails(
-    roomId = roomId,
-    name = name,
-    canonicalAlias = canonicalAlias,
-    isDirect = isDirect,
-    avatarUrl = avatarUrl,
-    lastMessage = lastMessage,
-    inviter = inviter,
-    userDefinedNotificationMode = notificationMode,
-    hasRoomCall = hasOngoingCall,
-    numUnreadMentions = numUnreadMentions,
-    numUnreadMessages = numUnreadMessages,
-)

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.loadUserAvatarUrl().getOrNull()
+                    val userAvatarUrl = client.loadUserAvatarURLString().getOrNull()
                     MatrixUser(
                         userId = sessionId,
                         displayName = myUserDisplayName,

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

@@ -19,8 +19,9 @@ 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
@@ -40,7 +41,7 @@ open class RoomSelectStateProvider : PreviewParameterProvider<RoomSelectState> {
                 resultState = SearchBarResultState.Results(aForwardMessagesRoomList()),
                 query = "Test",
                 isSearchActive = true,
-                selectedRooms = persistentListOf(aRoomSummaryDetails(roomId = RoomId("!room2:domain")))
+                selectedRooms = persistentListOf(aRoomDetailsState(roomId = RoomId("!room2:domain")))
             ),
             // Add other states here
         )
@@ -61,10 +62,32 @@ private fun aRoomSelectState(
 )
 
 private fun aForwardMessagesRoomList() = persistentListOf(
-    aRoomSummaryDetails(),
-    aRoomSummaryDetails(
+    aRoomDetailsState(),
+    aRoomDetailsState(
         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

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

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

@@ -24,7 +24,7 @@ import io.element.android.libraries.roomselect.api.RoomSelectMode
 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.aRoomSummaryDetails
+import io.element.android.libraries.matrix.test.room.aRoomSummaryDetail
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.collections.immutable.persistentListOf
@@ -73,7 +73,7 @@ class RoomSelectPresenterTests {
     @Test
     fun `present - update query`() = runTest {
         val roomListService = FakeRoomListService().apply {
-            postAllRooms(listOf(RoomSummary.Filled(aRoomSummaryDetails())))
+            postAllRooms(listOf(RoomSummary.Filled(aRoomSummaryDetail())))
         }
         val client = FakeMatrixClient(roomListService = roomListService)
         val presenter = aPresenter(client = client)
@@ -81,7 +81,7 @@ class RoomSelectPresenterTests {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            assertThat(awaitItem().resultState as? SearchBarResultState.Results).isEqualTo(SearchBarResultState.Results(listOf(aRoomSummaryDetails())))
+            assertThat(awaitItem().resultState as? SearchBarResultState.Results).isEqualTo(SearchBarResultState.Results(listOf(aRoomSummaryDetail())))
 
             initialState.eventSink(RoomSelectEvents.UpdateQuery("string not contained"))
             assertThat(awaitItem().query).isEqualTo("string not contained")
@@ -97,7 +97,7 @@ class RoomSelectPresenterTests {
         }.test {
             val initialState = awaitItem()
             skipItems(1)
-            val summary = aRoomSummaryDetails()
+            val summary = aRoomSummaryDetail()
 
             initialState.eventSink(RoomSelectEvents.SetSelectedRoom(summary))
             assertThat(awaitItem().selectedRooms).isEqualTo(persistentListOf(summary))