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

Remove hasOngoingCall to hasRoomCall to match SDK name.

Browse source
This commit is contained in:
Benoit Marty 2024-01-19 16:16:57 +01:00
parent 371aec4427
commit 9b3a0c1f08
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -173,7 +173,7 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
// Video call // Video call
if (room.hasOngoingCall) { if (room.hasRoomCall) {
Icon( Icon(
modifier = Modifier.size(16.dp), modifier = Modifier.size(16.dp),
imageVector = CompoundIcons.VideoCallSolid, imageVector = CompoundIcons.VideoCallSolid,

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

@ -161,7 +161,7 @@ class RoomListDataSource @Inject constructor(
}.orEmpty(), }.orEmpty(),
avatarData = avatarData, avatarData = avatarData,
notificationMode = roomSummary.details.notificationMode, notificationMode = roomSummary.details.notificationMode,
hasOngoingCall = roomSummary.details.hasOngoingCall, hasRoomCall = roomSummary.details.hasRoomCall,
isDm = roomSummary.details.isDm, isDm = roomSummary.details.isDm,
) )
} }

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

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

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

@ -40,7 +40,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
timestamp = "yesterday", timestamp = "yesterday",
hasUnread = true, hasUnread = true,
), ),
aRoomListRoomSummary().copy(hasUnread = true, hasOngoingCall = true), aRoomListRoomSummary().copy(hasUnread = true, hasRoomCall = true),
) )
} }

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

@ -43,7 +43,7 @@ data class RoomSummaryDetails(
val unreadNotificationCount: Int, val unreadNotificationCount: Int,
val inviter: RoomMember? = null, val inviter: RoomMember? = null,
val notificationMode: RoomNotificationMode? = null, val notificationMode: RoomNotificationMode? = null,
val hasOngoingCall: Boolean = false, val hasRoomCall: Boolean = false,
val isDm: Boolean = false, val isDm: Boolean = false,
) { ) {
val lastMessageTimestamp = lastMessage?.originServerTs val lastMessageTimestamp = lastMessage?.originServerTs

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

@ -39,7 +39,7 @@ class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFacto
lastMessage = latestRoomMessage, lastMessage = latestRoomMessage,
inviter = roomInfo.inviter?.let(RoomMemberMapper::map), inviter = roomInfo.inviter?.let(RoomMemberMapper::map),
notificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode), notificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode),
hasOngoingCall = roomInfo.hasRoomCall, hasRoomCall = roomInfo.hasRoomCall,
isDm = roomInfo.isDirect && roomInfo.activeMembersCount.toLong() == 2L, isDm = roomInfo.isDirect && roomInfo.activeMembersCount.toLong() == 2L,
) )
} }