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

Rename avatarURLString to avatarUrl

Browse source
This commit is contained in:
Benoit Marty 2024-01-19 15:56:51 +01:00
parent 47a5c74129
commit 603b10264b
12 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt
View file

@ -169,7 +169,7 @@ class InviteListPresenter @Inject constructor(
AvatarData( AvatarData(
id = roomId.value, id = roomId.value,
name = name, name = name,
url = avatarURLString, url = avatarUrl,
size = AvatarSize.RoomInviteItem, size = AvatarSize.RoomInviteItem,
) )
} }

6
features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt
View file

@ -428,7 +428,7 @@ class InviteListPresenterTests {
RoomSummaryDetails( RoomSummaryDetails(
roomId = A_ROOM_ID, roomId = A_ROOM_ID,
name = A_ROOM_NAME, name = A_ROOM_NAME,
avatarURLString = null, avatarUrl = null,
isDirect = false, isDirect = false,
lastMessage = null, lastMessage = null,
lastMessageTimestamp = null, lastMessageTimestamp = null,
@ -457,7 +457,7 @@ class InviteListPresenterTests {
RoomSummaryDetails( RoomSummaryDetails(
roomId = A_ROOM_ID, roomId = A_ROOM_ID,
name = A_ROOM_NAME, name = A_ROOM_NAME,
avatarURLString = null, avatarUrl = null,
isDirect = true, isDirect = true,
lastMessage = null, lastMessage = null,
lastMessageTimestamp = null, lastMessageTimestamp = null,
@ -483,7 +483,7 @@ class InviteListPresenterTests {
RoomSummaryDetails( RoomSummaryDetails(
roomId = id, roomId = id,
name = A_ROOM_NAME, name = A_ROOM_NAME,
avatarURLString = null, avatarUrl = null,
isDirect = false, isDirect = false,
lastMessage = null, lastMessage = null,
lastMessageTimestamp = null, lastMessageTimestamp = null,

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt
View file

@ -62,7 +62,7 @@ fun aRoomDetailsState(
name: String = "roomName", name: String = "roomName",
canonicalAlias: String? = null, canonicalAlias: String? = null,
isDirect: Boolean = true, isDirect: Boolean = true,
avatarURLString: String? = null, avatarUrl: String? = null,
lastMessage: RoomMessage? = null, lastMessage: RoomMessage? = null,
lastMessageTimestamp: Long? = null, lastMessageTimestamp: Long? = null,
unreadNotificationCount: Int = 0, unreadNotificationCount: Int = 0,
@ -72,7 +72,7 @@ fun aRoomDetailsState(
name = name, name = name,
canonicalAlias = canonicalAlias, canonicalAlias = canonicalAlias,
isDirect = isDirect, isDirect = isDirect,
avatarURLString = avatarURLString, avatarUrl = avatarUrl,
lastMessage = lastMessage, lastMessage = lastMessage,
lastMessageTimestamp = lastMessageTimestamp, lastMessageTimestamp = lastMessageTimestamp,
unreadNotificationCount = unreadNotificationCount, unreadNotificationCount = unreadNotificationCount,

2
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt
View file

@ -52,7 +52,7 @@ private fun aRoomSummary() = RoomSummary.Filled(
RoomSummaryDetails( RoomSummaryDetails(
roomId = RoomId("!roomId:domain"), roomId = RoomId("!roomId:domain"),
name = "Room", name = "Room",
avatarURLString = null, avatarUrl = null,
isDirect = false, isDirect = false,
lastMessage = null, lastMessage = null,
lastMessageTimestamp = null, lastMessageTimestamp = null,

2
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt
View file

@ -95,7 +95,7 @@ fun EditDefaultNotificationSettingView(
val avatarData = AvatarData( val avatarData = AvatarData(
id = summary.identifier(), id = summary.identifier(),
name = summary.details.name, name = summary.details.name,
url = summary.details.avatarURLString, url = summary.details.avatarUrl,
size = AvatarSize.CustomRoomNotificationSetting, size = AvatarSize.CustomRoomNotificationSetting,
) )
ListItem( ListItem(

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

@ -146,7 +146,7 @@ class RoomListDataSource @Inject constructor(
val avatarData = AvatarData( val avatarData = AvatarData(
id = roomSummary.identifier(), id = roomSummary.identifier(),
name = roomSummary.details.name, name = roomSummary.details.name,
url = roomSummary.details.avatarURLString, url = roomSummary.details.avatarUrl,
size = AvatarSize.RoomListItem, size = AvatarSize.RoomListItem,
) )
val roomIdentifier = roomSummary.identifier() val roomIdentifier = roomSummary.identifier()

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

@ -38,7 +38,7 @@ data class RoomSummaryDetails(
val name: String, val name: String,
val canonicalAlias: String? = null, val canonicalAlias: String? = null,
val isDirect: Boolean, val isDirect: Boolean,
val avatarURLString: String?, val avatarUrl: String?,
val lastMessage: RoomMessage?, val lastMessage: RoomMessage?,
val lastMessageTimestamp: Long?, val lastMessageTimestamp: Long?,
val unreadNotificationCount: Int, val unreadNotificationCount: Int,

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

@ -34,7 +34,7 @@ class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFacto
name = roomInfo.name ?: roomInfo.id, name = roomInfo.name ?: roomInfo.id,
canonicalAlias = roomInfo.canonicalAlias, canonicalAlias = roomInfo.canonicalAlias,
isDirect = roomInfo.isDirect, isDirect = roomInfo.isDirect,
avatarURLString = roomInfo.avatarUrl, avatarUrl = roomInfo.avatarUrl,
unreadNotificationCount = roomInfo.notificationCount.toInt(), unreadNotificationCount = roomInfo.notificationCount.toInt(),
lastMessage = latestRoomMessage, lastMessage = latestRoomMessage,
lastMessageTimestamp = latestRoomMessage?.originServerTs, lastMessageTimestamp = latestRoomMessage?.originServerTs,

8
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
View file

@ -34,7 +34,7 @@ fun aRoomSummaryFilled(
roomId: RoomId = A_ROOM_ID, roomId: RoomId = A_ROOM_ID,
name: String = A_ROOM_NAME, name: String = A_ROOM_NAME,
isDirect: Boolean = false, isDirect: Boolean = false,
avatarURLString: String? = null, avatarUrl: String? = null,
lastMessage: RoomMessage? = aRoomMessage(), lastMessage: RoomMessage? = aRoomMessage(),
lastMessageTimestamp: Long? = null, lastMessageTimestamp: Long? = null,
unreadNotificationCount: Int = 2, unreadNotificationCount: Int = 2,
@ -44,7 +44,7 @@ fun aRoomSummaryFilled(
roomId = roomId, roomId = roomId,
name = name, name = name,
isDirect = isDirect, isDirect = isDirect,
avatarURLString = avatarURLString, avatarUrl = avatarUrl,
lastMessage = lastMessage, lastMessage = lastMessage,
lastMessageTimestamp = lastMessageTimestamp, lastMessageTimestamp = lastMessageTimestamp,
unreadNotificationCount = unreadNotificationCount, unreadNotificationCount = unreadNotificationCount,
@ -56,7 +56,7 @@ fun aRoomSummaryDetails(
roomId: RoomId = A_ROOM_ID, roomId: RoomId = A_ROOM_ID,
name: String = A_ROOM_NAME, name: String = A_ROOM_NAME,
isDirect: Boolean = false, isDirect: Boolean = false,
avatarURLString: String? = null, avatarUrl: String? = null,
lastMessage: RoomMessage? = aRoomMessage(), lastMessage: RoomMessage? = aRoomMessage(),
lastMessageTimestamp: Long? = null, lastMessageTimestamp: Long? = null,
unreadNotificationCount: Int = 2, unreadNotificationCount: Int = 2,
@ -65,7 +65,7 @@ fun aRoomSummaryDetails(
roomId = roomId, roomId = roomId,
name = name, name = name,
isDirect = isDirect, isDirect = isDirect,
avatarURLString = avatarURLString, avatarUrl = avatarUrl,
lastMessage = lastMessage, lastMessage = lastMessage,
lastMessageTimestamp = lastMessageTimestamp, lastMessageTimestamp = lastMessageTimestamp,
unreadNotificationCount = unreadNotificationCount, unreadNotificationCount = unreadNotificationCount,

4
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
View file

@ -60,7 +60,7 @@ fun SelectedRoom(
Column( Column(
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
) { ) {
Avatar(AvatarData(roomSummary.roomId.value, roomSummary.name, roomSummary.avatarURLString, AvatarSize.SelectedRoom)) Avatar(AvatarData(roomSummary.roomId.value, roomSummary.name, roomSummary.avatarUrl, AvatarSize.SelectedRoom))
Text( Text(
text = roomSummary.name, text = roomSummary.name,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
@ -99,7 +99,7 @@ internal fun SelectedRoomPreview() = ElementPreview {
name = "roomName", name = "roomName",
canonicalAlias = null, canonicalAlias = null,
isDirect = true, isDirect = true,
avatarURLString = null, avatarUrl = null,
lastMessage = null, lastMessage = null,
lastMessageTimestamp = null, lastMessageTimestamp = null,
unreadNotificationCount = 0, unreadNotificationCount = 0,

4
libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt
View file

@ -75,7 +75,7 @@ private fun aRoomDetailsState(
name: String = "roomName", name: String = "roomName",
canonicalAlias: String? = null, canonicalAlias: String? = null,
isDirect: Boolean = true, isDirect: Boolean = true,
avatarURLString: String? = null, avatarUrl: String? = null,
lastMessage: RoomMessage? = null, lastMessage: RoomMessage? = null,
lastMessageTimestamp: Long? = null, lastMessageTimestamp: Long? = null,
unreadNotificationCount: Int = 0, unreadNotificationCount: Int = 0,
@ -85,7 +85,7 @@ private fun aRoomDetailsState(
name = name, name = name,
canonicalAlias = canonicalAlias, canonicalAlias = canonicalAlias,
isDirect = isDirect, isDirect = isDirect,
avatarURLString = avatarURLString, avatarUrl = avatarUrl,
lastMessage = lastMessage, lastMessage = lastMessage,
lastMessageTimestamp = lastMessageTimestamp, lastMessageTimestamp = lastMessageTimestamp,
unreadNotificationCount = unreadNotificationCount, unreadNotificationCount = unreadNotificationCount,

2
libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
View file

@ -223,7 +223,7 @@ private fun RoomSummaryView(
avatarData = AvatarData( avatarData = AvatarData(
id = summary.roomId.value, id = summary.roomId.value,
name = summary.name, name = summary.name,
url = summary.avatarURLString, url = summary.avatarUrl,
size = AvatarSize.RoomSelectRoomListItem, size = AvatarSize.RoomSelectRoomListItem,
), ),
) )