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

Remove default value for constructor of RoomListRoomSummary.

Browse source
This commit is contained in:
Benoit Marty 2024-01-22 11:11:44 +01:00
parent 3ec86f9b5f
commit 5bcef21154
4 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -160,6 +160,7 @@ class RoomListDataSource @Inject constructor(
roomLastMessageFormatter.format(message.event, roomSummary.details.isDirect) roomLastMessageFormatter.format(message.event, roomSummary.details.isDirect)
}.orEmpty(), }.orEmpty(),
avatarData = avatarData, avatarData = avatarData,
isPlaceholder = false,
userDefinedNotificationMode = roomSummary.details.userDefinedNotificationMode, userDefinedNotificationMode = roomSummary.details.userDefinedNotificationMode,
hasRoomCall = roomSummary.details.hasRoomCall, hasRoomCall = roomSummary.details.hasRoomCall,
isDm = roomSummary.details.isDm, isDm = roomSummary.details.isDm,

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

@ -18,7 +18,6 @@ package io.element.android.features.roomlist.impl.model
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.libraries.matrix.api.room.RoomNotificationMode import io.element.android.libraries.matrix.api.room.RoomNotificationMode
@ -26,13 +25,13 @@ import io.element.android.libraries.matrix.api.room.RoomNotificationMode
data class RoomListRoomSummary( data class RoomListRoomSummary(
val id: String, val id: String,
val roomId: RoomId, val roomId: RoomId,
val name: String = "", val name: String,
val hasUnread: Boolean = false, val hasUnread: Boolean,
val timestamp: String? = null, val timestamp: String?,
val lastMessage: CharSequence? = null, val lastMessage: CharSequence?,
val avatarData: AvatarData = AvatarData(id, name, size = AvatarSize.RoomListItem), val avatarData: AvatarData,
val isPlaceholder: Boolean = false, val isPlaceholder: Boolean,
val userDefinedNotificationMode: RoomNotificationMode? = null, val userDefinedNotificationMode: RoomNotificationMode?,
val hasRoomCall: Boolean = false, val hasRoomCall: Boolean,
val isDm: Boolean = false, val isDm: Boolean,
) )

6
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryPlaceholders.kt
View file

@ -29,7 +29,11 @@ object RoomListRoomSummaryPlaceholders {
name = "Short name", name = "Short name",
timestamp = "hh:mm", timestamp = "hh:mm",
lastMessage = "Last message for placeholder", lastMessage = "Last message for placeholder",
avatarData = AvatarData(id, "S", size = AvatarSize.RoomListItem) avatarData = AvatarData(id, "S", size = AvatarSize.RoomListItem),
hasUnread = false,
userDefinedNotificationMode = null,
hasRoomCall = false,
isDm = false,
) )
} }

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

@ -442,4 +442,7 @@ private val aRoomListRoomSummary = RoomListRoomSummary(
lastMessage = "", lastMessage = "",
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),
isPlaceholder = false, isPlaceholder = false,
userDefinedNotificationMode = null,
hasRoomCall = false,
isDm = false,
) )