Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Rename LatestEvent.Regular to LatestEvent.Synced

Browse source
This commit is contained in:
Benoit Marty 2025-12-02 16:54:50 +01:00
parent f5d902a6f3
commit 883341f363
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -91,7 +91,7 @@ class RoomListRoomSummaryFactory(
} }
is LatestEventValue.Remote -> { is LatestEventValue.Remote -> {
val content = roomLatestEventFormatter.format(latestEvent, dm).orEmpty() val content = roomLatestEventFormatter.format(latestEvent, dm).orEmpty()
LatestEvent.Regular( LatestEvent.Synced(
content = content, content = content,
) )
} }

4
features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/LatestEvent.kt
View file

@ -13,7 +13,7 @@ import androidx.compose.runtime.Immutable
sealed interface LatestEvent { sealed interface LatestEvent {
data object None : LatestEvent data object None : LatestEvent
data class Regular( data class Synced(
val content: CharSequence?, val content: CharSequence?,
) : LatestEvent ) : LatestEvent
@ -26,7 +26,7 @@ sealed interface LatestEvent {
fun content(): CharSequence? { fun content(): CharSequence? {
return when (this) { return when (this) {
is None -> null is None -> null
is Regular -> content is Synced -> content
is Sending -> content is Sending -> content
is Error -> null is Error -> null
} }

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

@ -28,7 +28,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
aRoomListRoomSummary(latestEvent = LatestEvent.None), aRoomListRoomSummary(latestEvent = LatestEvent.None),
aRoomListRoomSummary( aRoomListRoomSummary(
name = "A very long room name that should be truncated", name = "A very long room name that should be truncated",
latestEvent = LatestEvent.Regular( latestEvent = LatestEvent.Synced(
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt" + "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" + " 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." "modo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur."
@ -46,7 +46,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
listOf( listOf(
aRoomListRoomSummary( aRoomListRoomSummary(
name = roomNotificationMode.name, name = roomNotificationMode.name,
latestEvent = LatestEvent.Regular("No activity" + if (hasCall) ", call" else ""), latestEvent = LatestEvent.Synced("No activity" + if (hasCall) ", call" else ""),
notificationMode = roomNotificationMode, notificationMode = roomNotificationMode,
numberOfUnreadMessages = 0, numberOfUnreadMessages = 0,
numberOfUnreadMentions = 0, numberOfUnreadMentions = 0,
@ -54,7 +54,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
), ),
aRoomListRoomSummary( aRoomListRoomSummary(
name = roomNotificationMode.name, name = roomNotificationMode.name,
latestEvent = LatestEvent.Regular("New messages" + if (hasCall) ", call" else ""), latestEvent = LatestEvent.Synced("New messages" + if (hasCall) ", call" else ""),
notificationMode = roomNotificationMode, notificationMode = roomNotificationMode,
numberOfUnreadMessages = 1, numberOfUnreadMessages = 1,
numberOfUnreadMentions = 0, numberOfUnreadMentions = 0,
@ -62,7 +62,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
), ),
aRoomListRoomSummary( aRoomListRoomSummary(
name = roomNotificationMode.name, name = roomNotificationMode.name,
latestEvent = LatestEvent.Regular("New messages, mentions" + if (hasCall) ", call" else ""), latestEvent = LatestEvent.Synced("New messages, mentions" + if (hasCall) ", call" else ""),
notificationMode = roomNotificationMode, notificationMode = roomNotificationMode,
numberOfUnreadMessages = 1, numberOfUnreadMessages = 1,
numberOfUnreadMentions = 1, numberOfUnreadMentions = 1,
@ -70,7 +70,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
), ),
aRoomListRoomSummary( aRoomListRoomSummary(
name = roomNotificationMode.name, name = roomNotificationMode.name,
latestEvent = LatestEvent.Regular("New mentions" + if (hasCall) ", call" else ""), latestEvent = LatestEvent.Synced("New mentions" + if (hasCall) ", call" else ""),
notificationMode = roomNotificationMode, notificationMode = roomNotificationMode,
numberOfUnreadMessages = 0, numberOfUnreadMessages = 0,
numberOfUnreadMentions = 1, numberOfUnreadMentions = 1,
@ -154,7 +154,7 @@ internal fun aRoomListRoomSummary(
numberOfUnreadMentions: Long = 0, numberOfUnreadMentions: Long = 0,
numberOfUnreadNotifications: Long = 0, numberOfUnreadNotifications: Long = 0,
isMarkedUnread: Boolean = false, isMarkedUnread: Boolean = false,
latestEvent: LatestEvent = LatestEvent.Regular("Last message"), latestEvent: LatestEvent = LatestEvent.Synced("Last message"),
timestamp: String? = latestEvent.takeIf { it !is LatestEvent.None }?.let { "88:88" }, timestamp: String? = latestEvent.takeIf { it !is LatestEvent.None }?.let { "88:88" },
notificationMode: RoomNotificationMode? = null, notificationMode: RoomNotificationMode? = null,
hasRoomCall: Boolean = false, hasRoomCall: Boolean = false,

6
features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt
View file

@ -89,7 +89,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
name = "Room", name = "Room",
numberOfUnreadMessages = 1, numberOfUnreadMessages = 1,
timestamp = "14:18", timestamp = "14:18",
latestEvent = LatestEvent.Regular("A very very very very long message which suites on two lines"), latestEvent = LatestEvent.Synced("A very very very very long message which suites on two lines"),
avatarData = AvatarData("!id", "R", size = AvatarSize.RoomListItem), avatarData = AvatarData("!id", "R", size = AvatarSize.RoomListItem),
id = "!roomId:domain", id = "!roomId:domain",
), ),
@ -97,7 +97,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
name = "Room#2", name = "Room#2",
numberOfUnreadMessages = 0, numberOfUnreadMessages = 0,
timestamp = "14:16", timestamp = "14:16",
latestEvent = LatestEvent.Regular("A short message"), latestEvent = LatestEvent.Synced("A short message"),
avatarData = AvatarData("!id", "Z", size = AvatarSize.RoomListItem), avatarData = AvatarData("!id", "Z", size = AvatarSize.RoomListItem),
id = "!roomId2:domain", id = "!roomId2:domain",
), ),
@ -120,7 +120,7 @@ internal fun generateRoomListRoomSummaryList(
name = "Room#$index", name = "Room#$index",
numberOfUnreadMessages = 0, numberOfUnreadMessages = 0,
timestamp = "14:16", timestamp = "14:16",
latestEvent = LatestEvent.Regular("A message"), latestEvent = LatestEvent.Synced("A message"),
avatarData = AvatarData("!id$index", "${(65 + index % 26).toChar()}", size = AvatarSize.RoomListItem), avatarData = AvatarData("!id$index", "${(65 + index % 26).toChar()}", size = AvatarSize.RoomListItem),
id = "!roomId$index:domain", id = "!roomId$index:domain",
) )

2
features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
View file

@ -96,7 +96,7 @@ internal fun createRoomListRoomSummary(
numberOfUnreadNotifications = numberOfUnreadNotifications, numberOfUnreadNotifications = numberOfUnreadNotifications,
isMarkedUnread = isMarkedUnread, isMarkedUnread = isMarkedUnread,
timestamp = timestamp, timestamp = timestamp,
latestEvent = LatestEvent.Regular(""), latestEvent = LatestEvent.Synced(""),
avatarData = AvatarData(id = A_ROOM_ID.value, name = A_ROOM_NAME, size = AvatarSize.RoomListItem), avatarData = AvatarData(id = A_ROOM_ID.value, name = A_ROOM_NAME, size = AvatarSize.RoomListItem),
displayType = displayType, displayType = displayType,
userDefinedNotificationMode = userDefinedNotificationMode, userDefinedNotificationMode = userDefinedNotificationMode,