Merge pull request #2095 from element-hq/revert-2080-feature/bma/room…

…ListBadges Revert "Room list badges"
element-hq · Dec 22, 2023 · b7480a0 · b7480a0
2 parents deff2d8 + 580bcab
commit b7480a0
Show file tree

Hide file tree

Showing 71 changed files with 235 additions and 388 deletions.
diff --git a/.idea/dictionaries/shared.xml b/.idea/dictionaries/shared.xml
diff --git a/...t/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt b/...t/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,
             )
 

diff --git a/...l/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt b/...l/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,
         )
     )
 

diff --git a/...ogout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPresenterTest.kt b/...ogout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPresenterTest.kt
@@ -71,7 +71,7 @@ class LogoutPresenterTest {
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
-            skipItems(3)
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.isLastSession).isTrue()
             assertThat(initialState.backupUploadState).isEqualTo(BackupUploadState.Unknown)

diff --git a/.../kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt b/.../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,
+)
diff --git a/...kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTests.kt b/...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()

diff --git a/...atures/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt b/...atures/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,
     )
 )
diff --git a/...ndroid/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt b/...ndroid/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(

diff --git a/.../features/preferences/impl/notifications/EditDefaultNotificationSettingsPresenterTests.kt b/.../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()
         }
     }
 

diff --git a/...t/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt b/...t/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),

diff --git a/...pl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt b/...pl/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,
-        )
-    }
-}
-
-@Composable
-private fun OnGoingCallIcon(
-    hasRoomCall: Boolean,
-) {
-    if (hasRoomCall) {
-        Icon(
-            modifier = Modifier.size(16.dp),
-            imageVector = CompoundIcons.VideoCallSolid,
-            contentDescription = null,
-            tint = ElementTheme.colors.unreadIndicator,
-        )
+        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 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)
-            }
-        }
     }
 }
 

diff --git a/...rc/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSource.kt b/...rc/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSource.kt
@@ -146,23 +146,22 @@ 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()
                 RoomListRoomSummary(
                     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