Map roomInfo.numUnreadNotifications to RoomSummaryDetails.numUnreadNotifications
This commit is contained in:
parent
c95d75d1c8
commit
fe0e82b5d6
7 changed files with 11 additions and 0 deletions
|
|
@ -43,6 +43,7 @@ class RoomListRoomSummaryFactory @Inject constructor(
|
||||||
avatarData = AvatarData(id, "S", size = AvatarSize.RoomListItem),
|
avatarData = AvatarData(id, "S", size = AvatarSize.RoomListItem),
|
||||||
numberOfUnreadMessages = 0,
|
numberOfUnreadMessages = 0,
|
||||||
numberOfUnreadMentions = 0,
|
numberOfUnreadMentions = 0,
|
||||||
|
numberOfUnreadNotifications = 0,
|
||||||
userDefinedNotificationMode = null,
|
userDefinedNotificationMode = null,
|
||||||
hasRoomCall = false,
|
hasRoomCall = false,
|
||||||
isDm = false,
|
isDm = false,
|
||||||
|
|
@ -69,6 +70,7 @@ class RoomListRoomSummaryFactory @Inject constructor(
|
||||||
name = roomSummary.details.name,
|
name = roomSummary.details.name,
|
||||||
numberOfUnreadMessages = roomSummary.details.numUnreadMessages,
|
numberOfUnreadMessages = roomSummary.details.numUnreadMessages,
|
||||||
numberOfUnreadMentions = roomSummary.details.numUnreadMentions,
|
numberOfUnreadMentions = roomSummary.details.numUnreadMentions,
|
||||||
|
numberOfUnreadNotifications = roomSummary.details.numUnreadNotifications,
|
||||||
timestamp = lastMessageTimestampFormatter.format(roomSummary.details.lastMessageTimestamp),
|
timestamp = lastMessageTimestampFormatter.format(roomSummary.details.lastMessageTimestamp),
|
||||||
lastMessage = roomSummary.details.lastMessage?.let { message ->
|
lastMessage = roomSummary.details.lastMessage?.let { message ->
|
||||||
roomLastMessageFormatter.format(message.event, roomSummary.details.isDirect)
|
roomLastMessageFormatter.format(message.event, roomSummary.details.isDirect)
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@ data class RoomListRoomSummary(
|
||||||
val name: String,
|
val name: String,
|
||||||
val numberOfUnreadMessages: Int,
|
val numberOfUnreadMessages: Int,
|
||||||
val numberOfUnreadMentions: Int,
|
val numberOfUnreadMentions: Int,
|
||||||
|
val numberOfUnreadNotifications: Int,
|
||||||
val timestamp: String?,
|
val timestamp: String?,
|
||||||
val lastMessage: CharSequence?,
|
val lastMessage: CharSequence?,
|
||||||
val avatarData: AvatarData,
|
val avatarData: AvatarData,
|
||||||
|
|
|
||||||
|
|
@ -88,6 +88,7 @@ internal fun aRoomListRoomSummary(
|
||||||
name: String = "Room name",
|
name: String = "Room name",
|
||||||
numberOfUnreadMessages: Int = 0,
|
numberOfUnreadMessages: Int = 0,
|
||||||
numberOfUnreadMentions: Int = 0,
|
numberOfUnreadMentions: Int = 0,
|
||||||
|
numberOfUnreadNotifications: Int = 0,
|
||||||
lastMessage: String? = "Last message",
|
lastMessage: String? = "Last message",
|
||||||
timestamp: String? = lastMessage?.let { "88:88" },
|
timestamp: String? = lastMessage?.let { "88:88" },
|
||||||
isPlaceholder: Boolean = false,
|
isPlaceholder: Boolean = false,
|
||||||
|
|
@ -101,6 +102,7 @@ internal fun aRoomListRoomSummary(
|
||||||
name = name,
|
name = name,
|
||||||
numberOfUnreadMessages = numberOfUnreadMessages,
|
numberOfUnreadMessages = numberOfUnreadMessages,
|
||||||
numberOfUnreadMentions = numberOfUnreadMentions,
|
numberOfUnreadMentions = numberOfUnreadMentions,
|
||||||
|
numberOfUnreadNotifications = numberOfUnreadNotifications,
|
||||||
timestamp = timestamp,
|
timestamp = timestamp,
|
||||||
lastMessage = lastMessage,
|
lastMessage = lastMessage,
|
||||||
avatarData = avatarData,
|
avatarData = avatarData,
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ data class RoomSummaryDetails(
|
||||||
val lastMessage: RoomMessage?,
|
val lastMessage: RoomMessage?,
|
||||||
val numUnreadMessages: Int,
|
val numUnreadMessages: Int,
|
||||||
val numUnreadMentions: Int,
|
val numUnreadMentions: Int,
|
||||||
|
val numUnreadNotifications: Int,
|
||||||
val inviter: RoomMember?,
|
val inviter: RoomMember?,
|
||||||
val userDefinedNotificationMode: RoomNotificationMode?,
|
val userDefinedNotificationMode: RoomNotificationMode?,
|
||||||
val hasRoomCall: Boolean,
|
val hasRoomCall: Boolean,
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@ class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFacto
|
||||||
avatarUrl = roomInfo.avatarUrl,
|
avatarUrl = roomInfo.avatarUrl,
|
||||||
numUnreadMentions = roomInfo.numUnreadMentions.toInt(),
|
numUnreadMentions = roomInfo.numUnreadMentions.toInt(),
|
||||||
numUnreadMessages = roomInfo.numUnreadMessages.toInt(),
|
numUnreadMessages = roomInfo.numUnreadMessages.toInt(),
|
||||||
|
numUnreadNotifications = roomInfo.numUnreadNotifications.toInt(),
|
||||||
lastMessage = latestRoomMessage,
|
lastMessage = latestRoomMessage,
|
||||||
inviter = roomInfo.inviter?.let(RoomMemberMapper::map),
|
inviter = roomInfo.inviter?.let(RoomMemberMapper::map),
|
||||||
userDefinedNotificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode),
|
userDefinedNotificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode),
|
||||||
|
|
|
||||||
|
|
@ -61,6 +61,7 @@ fun aRoomSummaryDetails(
|
||||||
lastMessage: RoomMessage? = aRoomMessage(),
|
lastMessage: RoomMessage? = aRoomMessage(),
|
||||||
numUnreadMentions: Int = 0,
|
numUnreadMentions: Int = 0,
|
||||||
numUnreadMessages: Int = 0,
|
numUnreadMessages: Int = 0,
|
||||||
|
numUnreadNotifications: Int = 0,
|
||||||
notificationMode: RoomNotificationMode? = null,
|
notificationMode: RoomNotificationMode? = null,
|
||||||
inviter: RoomMember? = null,
|
inviter: RoomMember? = null,
|
||||||
canonicalAlias: String? = null,
|
canonicalAlias: String? = null,
|
||||||
|
|
@ -74,6 +75,7 @@ fun aRoomSummaryDetails(
|
||||||
lastMessage = lastMessage,
|
lastMessage = lastMessage,
|
||||||
numUnreadMentions = numUnreadMentions,
|
numUnreadMentions = numUnreadMentions,
|
||||||
numUnreadMessages = numUnreadMessages,
|
numUnreadMessages = numUnreadMessages,
|
||||||
|
numUnreadNotifications = numUnreadNotifications,
|
||||||
userDefinedNotificationMode = notificationMode,
|
userDefinedNotificationMode = notificationMode,
|
||||||
inviter = inviter,
|
inviter = inviter,
|
||||||
canonicalAlias = canonicalAlias,
|
canonicalAlias = canonicalAlias,
|
||||||
|
|
|
||||||
|
|
@ -115,6 +115,7 @@ fun aRoomSummaryDetails(
|
||||||
isDm: Boolean = false,
|
isDm: Boolean = false,
|
||||||
numUnreadMentions: Int = 0,
|
numUnreadMentions: Int = 0,
|
||||||
numUnreadMessages: Int = 0,
|
numUnreadMessages: Int = 0,
|
||||||
|
numUnreadNotifications: Int = 0,
|
||||||
) = RoomSummaryDetails(
|
) = RoomSummaryDetails(
|
||||||
roomId = roomId,
|
roomId = roomId,
|
||||||
name = name,
|
name = name,
|
||||||
|
|
@ -128,4 +129,5 @@ fun aRoomSummaryDetails(
|
||||||
isDm = isDm,
|
isDm = isDm,
|
||||||
numUnreadMentions = numUnreadMentions,
|
numUnreadMentions = numUnreadMentions,
|
||||||
numUnreadMessages = numUnreadMessages,
|
numUnreadMessages = numUnreadMessages,
|
||||||
|
numUnreadNotifications = numUnreadNotifications,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue