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

Fix compilation issue after rebase: String -> RoomAlias

Browse source
This commit is contained in:
Benoit Marty 2024-04-18 00:29:59 +02:00
parent 8082330bc5
commit 164506ebfb
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,6 +65,7 @@ import io.element.android.libraries.designsystem.theme.roomListRoomMessage
import io.element.android.libraries.designsystem.theme.roomListRoomMessageDate import io.element.android.libraries.designsystem.theme.roomListRoomMessageDate
import io.element.android.libraries.designsystem.theme.roomListRoomName import io.element.android.libraries.designsystem.theme.roomListRoomName
import io.element.android.libraries.designsystem.theme.unreadIndicator import io.element.android.libraries.designsystem.theme.unreadIndicator
import io.element.android.libraries.matrix.api.core.RoomAlias
import io.element.android.libraries.matrix.api.room.RoomNotificationMode import io.element.android.libraries.matrix.api.room.RoomNotificationMode
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
import timber.log.Timber import timber.log.Timber
@ -198,13 +199,13 @@ private fun NameAndTimestampRow(
private fun InviteSubtitle( private fun InviteSubtitle(
isDirect: Boolean, isDirect: Boolean,
inviteSender: InviteSender?, inviteSender: InviteSender?,
canonicalAlias: String?, canonicalAlias: RoomAlias?,
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
val subtitle = if (isDirect) { val subtitle = if (isDirect) {
inviteSender?.userId?.value inviteSender?.userId?.value
} else { } else {
canonicalAlias canonicalAlias?.value
} }
if (subtitle != null) { if (subtitle != null) {
Text( Text(

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

@ -18,6 +18,7 @@ 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.matrix.api.core.RoomAlias
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
@ -27,7 +28,7 @@ data class RoomListRoomSummary(
val displayType: RoomSummaryDisplayType, val displayType: RoomSummaryDisplayType,
val roomId: RoomId, val roomId: RoomId,
val name: String, val name: String,
val canonicalAlias: String?, val canonicalAlias: RoomAlias?,
val numberOfUnreadMessages: Int, val numberOfUnreadMessages: Int,
val numberOfUnreadMentions: Int, val numberOfUnreadMentions: Int,
val numberOfUnreadNotifications: Int, val numberOfUnreadNotifications: Int,

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

@ -19,6 +19,7 @@ package io.element.android.features.roomlist.impl.model
import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.tooling.preview.PreviewParameterProvider
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.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.matrix.api.core.RoomAlias
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.core.UserId import io.element.android.libraries.matrix.api.core.UserId
import io.element.android.libraries.matrix.api.room.RoomNotificationMode import io.element.android.libraries.matrix.api.room.RoomNotificationMode
@ -88,7 +89,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
userId = "@alice:matrix.org", userId = "@alice:matrix.org",
displayName = "Alice", displayName = "Alice",
), ),
canonicalAlias = "#alias:matrix.org", canonicalAlias = RoomAlias("#alias:matrix.org"),
), ),
aRoomListRoomSummary( aRoomListRoomSummary(
name = "Bob", name = "Bob",
@ -129,7 +130,7 @@ internal fun aRoomListRoomSummary(
isFavorite: Boolean = false, isFavorite: Boolean = false,
inviteSender: InviteSender? = null, inviteSender: InviteSender? = null,
displayType: RoomSummaryDisplayType = RoomSummaryDisplayType.ROOM, displayType: RoomSummaryDisplayType = RoomSummaryDisplayType.ROOM,
canonicalAlias: String? = null, canonicalAlias: RoomAlias? = null,
) = RoomListRoomSummary( ) = RoomListRoomSummary(
id = id, id = id,
roomId = RoomId(id), roomId = RoomId(id),