Room list room summary cleanup #2273
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * Copyright (c) 2024 New Vector Ltd | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.element.android.features.roomlist.impl.datasource | ||
|
|
||
| import io.element.android.features.roomlist.impl.model.RoomListRoomSummary | ||
| import io.element.android.libraries.core.extensions.orEmpty | ||
| import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter | ||
| import io.element.android.libraries.designsystem.components.avatar.AvatarData | ||
| import io.element.android.libraries.designsystem.components.avatar.AvatarSize | ||
| import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter | ||
| import io.element.android.libraries.matrix.api.core.RoomId | ||
| import io.element.android.libraries.matrix.api.roomlist.RoomSummary | ||
| import kotlinx.collections.immutable.ImmutableList | ||
| import kotlinx.collections.immutable.toImmutableList | ||
| import javax.inject.Inject | ||
|
|
||
| class RoomListRoomSummaryFactory @Inject constructor( | ||
| private val lastMessageTimestampFormatter: LastMessageTimestampFormatter, | ||
| private val roomLastMessageFormatter: RoomLastMessageFormatter, | ||
| ) { | ||
| fun createPlaceholder(id: String): RoomListRoomSummary { | ||
| return RoomListRoomSummary( | ||
| id = id, | ||
| roomId = RoomId("!aRoom:domain"), | ||
| isPlaceholder = true, | ||
| name = "Short name", | ||
| timestamp = "hh:mm", | ||
| lastMessage = "Last message for placeholder", | ||
| avatarData = AvatarData(id, "S", size = AvatarSize.RoomListItem), | ||
| hasUnread = false, | ||
| userDefinedNotificationMode = null, | ||
| hasRoomCall = false, | ||
| isDm = false, | ||
| ) | ||
| } | ||
|
|
||
| fun createFakeList(): ImmutableList<RoomListRoomSummary> { | ||
| return List(16) { | ||
| createPlaceholder("!fakeRoom$it:domain") | ||
| }.toImmutableList() | ||
| } | ||
|
|
||
| fun create(roomSummary: RoomSummary.Filled): RoomListRoomSummary { | ||
| val roomIdentifier = roomSummary.identifier() | ||
| val avatarData = AvatarData( | ||
| id = roomIdentifier, | ||
| name = roomSummary.details.name, | ||
| url = roomSummary.details.avatarUrl, | ||
| size = AvatarSize.RoomListItem, | ||
| ) | ||
| return RoomListRoomSummary( | ||
| id = roomIdentifier, | ||
| roomId = RoomId(roomIdentifier), | ||
| name = roomSummary.details.name, | ||
| hasUnread = roomSummary.details.unreadNotificationCount > 0, | ||
| timestamp = lastMessageTimestampFormatter.format(roomSummary.details.lastMessageTimestamp), | ||
| lastMessage = roomSummary.details.lastMessage?.let { message -> | ||
| roomLastMessageFormatter.format(message.event, roomSummary.details.isDirect) | ||
| }.orEmpty(), | ||
| avatarData = avatarData, | ||
| isPlaceholder = false, | ||
| userDefinedNotificationMode = roomSummary.details.userDefinedNotificationMode, | ||
| hasRoomCall = roomSummary.details.hasRoomCall, | ||
| isDm = roomSummary.details.isDm, | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
|
There was a problem hiding this comment. no timestamp if no message. There was a problem hiding this comment. I'm fine with not displaying the timestamp if there's no last message, but Could we change this return type to There was a problem hiding this comment.
I did not change any logic in the existing codebase, just wanted to have more coherent previews. But you're right, since if we want to change this, it should be done in a separate PR, as this one is only rework with no logical change. |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
id has changed, and so the avatar color.