Rename avatarURLString to avatarUrl

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -60,7 +60,7 @@ fun SelectedRoom(
         Column(
             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 = roomSummary.name,
                 overflow = TextOverflow.Ellipsis,
@@ -99,7 +99,7 @@ internal fun SelectedRoomPreview() = ElementPreview {
             name = "roomName",
             canonicalAlias = null,
             isDirect = true,
-            avatarURLString = null,
+            avatarUrl = null,
             lastMessage = null,
             lastMessageTimestamp = null,
             unreadNotificationCount = 0,

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

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

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

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