Add Konsist test to check that toPersistentList() is not used.

Same for `toPersistentSet()` and `toPersistentMap()`.
Fix existing issues.

libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectPresenter.kt

@@ -15,8 +15,9 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.sessionstorage.api.SessionStore
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 
 @Inject
 class AccountSelectPresenter(
@@ -24,7 +25,7 @@ class AccountSelectPresenter(
 ) : Presenter<AccountSelectState> {
     @Composable
     override fun present(): AccountSelectState {
-        val accounts by produceState(persistentListOf()) {
+        val accounts by produceState<ImmutableList<MatrixUser>>(persistentListOf()) {
             // Do not use sessionStore.sessionsFlow() to not make it change when an account is selected.
             value = sessionStore.getAllSessions()
                 .map {
@@ -34,7 +35,7 @@ class AccountSelectPresenter(
                         avatarUrl = it.userAvatarUrl,
                     )
                 }
-                .toPersistentList()
+                .toImmutableList()
         }
 
         return AccountSelectState(

libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectStateProvider.kt

@@ -10,7 +10,7 @@ package io.element.android.libraries.accountselect.impl
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 
 open class AccountSelectStateProvider : PreviewParameterProvider<AccountSelectState> {
     override val values: Sequence<AccountSelectState>
@@ -23,5 +23,5 @@ open class AccountSelectStateProvider : PreviewParameterProvider<AccountSelectSt
 private fun anAccountSelectState(
     accounts: List<MatrixUser> = listOf(),
 ) = AccountSelectState(
-    accounts = accounts.toPersistentList(),
+    accounts = accounts.toImmutableList(),
 )

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/AvatarCluster.kt

@@ -27,7 +27,7 @@ import io.element.android.libraries.designsystem.components.avatar.avatarShape
 import io.element.android.libraries.designsystem.preview.ElementThemedPreview
 import io.element.android.libraries.designsystem.preview.PreviewGroup
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import java.util.Collections
 import kotlin.math.PI
 import kotlin.math.cos
@@ -134,7 +134,7 @@ internal fun AvatarClusterPreview() = ElementThemedPreview {
             ) {
                 for (ngOfAvatars in 1..5) {
                     AvatarCluster(
-                        avatars = List(ngOfAvatars) { anAvatarData(it) }.toPersistentList(),
+                        avatars = List(ngOfAvatars) { anAvatarData(it) }.toImmutableList(),
                         avatarType = avatarType,
                     )
                 }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/FakeWaveformFactory.kt

@@ -8,7 +8,7 @@
 package io.element.android.libraries.designsystem.components.media
 
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import kotlin.random.Random
 
 /**
@@ -21,5 +21,5 @@ import kotlin.random.Random
 fun createFakeWaveform(length: Int = 1000): ImmutableList<Float> {
     val random = Random(seed = 2)
     return List(length) { random.nextFloat() }
-        .toPersistentList()
+        .toImmutableList()
 }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/WaveformPlaybackView.kt

@@ -39,7 +39,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import kotlin.math.roundToInt
 
 private const val DEFAULT_GRAPHICS_LAYER_ALPHA: Float = 0.99F
@@ -187,14 +187,14 @@ internal fun WaveformPlaybackViewPreview() = ElementPreview {
             showCursor = false,
             playbackProgress = 0.5f,
             onSeek = {},
-            waveform = aWaveForm().toPersistentList(),
+            waveform = aWaveForm().toImmutableList(),
         )
         WaveformPlaybackView(
             modifier = Modifier.height(34.dp),
             showCursor = true,
             playbackProgress = 0.5f,
             onSeek = {},
-            waveform = List(1024) { it / 1024f }.toPersistentList(),
+            waveform = List(1024) { it / 1024f }.toImmutableList(),
         )
     }
 }
@@ -215,7 +215,7 @@ private fun ImmutableList<Float>.normalisedData(maxSamplesCount: Int): Immutable
         this
     }
 
-    return result.toPersistentList()
+    return result.toImmutableList()
 }
 
 fun aWaveForm(): List<Float> {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsPreview.kt

@@ -28,14 +28,14 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 
 internal class CompoundIconChunkProvider : PreviewParameterProvider<IconChunk> {
     override val values: Sequence<IconChunk>
         get() {
             val chunks = CompoundIcons.allResIds.chunked(36)
             return chunks.mapIndexed { index, chunk ->
-                IconChunk(index = index + 1, total = chunks.size, icons = chunk.toPersistentList())
+                IconChunk(index = index + 1, total = chunks.size, icons = chunk.toImmutableList())
             }
                 .asSequence()
         }
@@ -46,7 +46,7 @@ internal class OtherIconChunkProvider : PreviewParameterProvider<IconChunk> {
         get() {
             val chunks = iconsOther.chunked(36)
             return chunks.mapIndexed { index, chunk ->
-                IconChunk(index = index + 1, total = chunks.size, icons = chunk.toPersistentList())
+                IconChunk(index = index + 1, total = chunks.size, icons = chunk.toImmutableList())
             }
                 .asSequence()
         }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomMembersWithRole.kt

@@ -12,7 +12,7 @@ import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.activeRoomMembers
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -38,7 +38,7 @@ fun BaseRoom.usersWithRole(role: RoomMember.Role): Flow<ImmutableList<RoomMember
         .combine(readyMembersFlow) { powerLevels, membersState ->
             membersState.activeRoomMembers()
                 .filter { powerLevels.contains(it.userId) }
-                .toPersistentList()
+                .toImmutableList()
         }
         .distinctUntilChanged()
 }

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

@@ -77,7 +77,7 @@ import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.cancel
@@ -238,11 +238,11 @@ class RustMatrixClient(
 
     override val ignoredUsersFlow = mxCallbackFlow<ImmutableList<UserId>> {
         // Fetch the initial value manually, the SDK won't return it automatically
-        channel.trySend(innerClient.ignoredUsers().map(::UserId).toPersistentList())
+        channel.trySend(innerClient.ignoredUsers().map(::UserId).toImmutableList())
 
         innerClient.subscribeToIgnoredUsers(object : IgnoredUsersListener {
             override fun call(ignoredUserIds: List<String>) {
-                channel.trySend(ignoredUserIds.map(::UserId).toPersistentList())
+                channel.trySend(ignoredUserIds.map(::UserId).toImmutableList())
             }
         })
     }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt

@@ -22,7 +22,7 @@ import io.element.android.libraries.matrix.impl.room.member.RoomMemberMapper
 import io.element.android.libraries.matrix.impl.room.powerlevels.RoomPowerLevelsValuesMapper
 import io.element.android.libraries.matrix.impl.room.tombstone.map
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.collections.immutable.toPersistentMap
+import kotlinx.collections.immutable.toImmutableMap
 import org.matrix.rustcomponents.sdk.Membership
 import org.matrix.rustcomponents.sdk.RoomHero
 import uniffi.matrix_sdk_base.EncryptionState
@@ -103,6 +103,6 @@ fun RoomHero.map(): MatrixUser = MatrixUser(
 fun mapPowerLevels(roomPowerLevels: RustRoomPowerLevels): RoomPowerLevels {
     return RoomPowerLevels(
         values = RoomPowerLevelsValuesMapper.map(roomPowerLevels.values()),
-        users = roomPowerLevels.userPowerLevels().mapKeys { (key, _) -> UserId(key) }.toPersistentMap()
+        users = roomPowerLevels.userPowerLevels().mapKeys { (key, _) -> UserId(key) }.toImmutableMap()
     )
 }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/JoinRule.kt

@@ -8,7 +8,7 @@
 package io.element.android.libraries.matrix.impl.room.join
 
 import io.element.android.libraries.matrix.api.room.join.JoinRule
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import org.matrix.rustcomponents.sdk.JoinRule as RustJoinRule
 
 fun RustJoinRule.map(): JoinRule {
@@ -17,9 +17,9 @@ fun RustJoinRule.map(): JoinRule {
         RustJoinRule.Private -> JoinRule.Private
         RustJoinRule.Knock -> JoinRule.Knock
         RustJoinRule.Invite -> JoinRule.Invite
-        is RustJoinRule.Restricted -> JoinRule.Restricted(rules.map { it.map() }.toPersistentList())
+        is RustJoinRule.Restricted -> JoinRule.Restricted(rules.map { it.map() }.toImmutableList())
         is RustJoinRule.Custom -> JoinRule.Custom(repr)
-        is RustJoinRule.KnockRestricted -> JoinRule.KnockRestricted(rules.map { it.map() }.toPersistentList())
+        is RustJoinRule.KnockRestricted -> JoinRule.KnockRestricted(rules.map { it.map() }.toImmutableList())
     }
 }
 

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt

@@ -8,9 +8,6 @@
 package io.element.android.libraries.matrix.impl.room
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.core.RoomAlias
-import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
@@ -34,7 +31,6 @@ import io.element.android.libraries.matrix.test.room.defaultRoomPowerLevelValues
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.collections.immutable.toPersistentList
 import org.junit.Test
 import org.matrix.rustcomponents.sdk.Membership
 import uniffi.matrix_sdk_base.EncryptionState
@@ -113,15 +109,15 @@ class RoomInfoMapperTest {
                 notificationCount = 11L,
                 userDefinedNotificationMode = RoomNotificationMode.MUTE,
                 hasRoomCall = true,
-                activeRoomCallParticipants = listOf(A_USER_ID_3).toImmutableList(),
-                heroes = listOf(
+                activeRoomCallParticipants = persistentListOf(A_USER_ID_3),
+                heroes = persistentListOf(
                     MatrixUser(
                         userId = A_USER_ID,
                         displayName = "displayName",
                         avatarUrl = "avatarUrl",
                     )
-                ).toImmutableList(),
-                pinnedEventIds = listOf(AN_EVENT_ID).toPersistentList(),
+                ),
+                pinnedEventIds = persistentListOf(AN_EVENT_ID),
                 creators = persistentListOf(A_USER_ID),
                 isMarkedUnread = false,
                 numUnreadMessages = 12L,
@@ -191,7 +187,7 @@ class RoomInfoMapperTest {
                 successorRoom = null,
                 isFavorite = true,
                 canonicalAlias = null,
-                alternativeAliases = emptyList<RoomAlias>().toPersistentList(),
+                alternativeAliases = persistentListOf(),
                 currentUserMembership = CurrentUserMembership.INVITED,
                 inviter = null,
                 activeMembersCount = 2L,
@@ -205,9 +201,9 @@ class RoomInfoMapperTest {
                 notificationCount = 11L,
                 userDefinedNotificationMode = null,
                 hasRoomCall = false,
-                activeRoomCallParticipants = emptyList<UserId>().toImmutableList(),
-                heroes = emptyList<MatrixUser>().toImmutableList(),
-                pinnedEventIds = emptyList<EventId>().toPersistentList(),
+                activeRoomCallParticipants = persistentListOf(),
+                heroes = persistentListOf(),
+                pinnedEventIds = persistentListOf(),
                 creators = persistentListOf(),
                 isMarkedUnread = true,
                 numUnreadMessages = 12L,

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

@@ -32,7 +32,6 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.collections.immutable.toPersistentList
 
 fun aRoomSummary(
     info: RoomInfo = aRoomInfo(),
@@ -109,7 +108,7 @@ fun aRoomSummary(
         userDefinedNotificationMode = userDefinedNotificationMode,
         hasRoomCall = hasRoomCall,
         activeRoomCallParticipants = activeRoomCallParticipants.toImmutableList(),
-        heroes = heroes.toPersistentList(),
+        heroes = heroes.toImmutableList(),
         pinnedEventIds = pinnedEventIds.toImmutableList(),
         creators = roomCreators.toImmutableList(),
         isMarkedUnread = isMarkedUnread,

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChange.kt

@@ -16,7 +16,7 @@ import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
@@ -46,7 +46,7 @@ fun JoinedRoom.roomMemberIdentityStateChange(waitForEncryption: Boolean): Flow<I
                         identityRoomMember = member,
                         identityState = identityStateChange.identityState,
                     )
-                }.toPersistentList()
+                }.toImmutableList()
             }.distinctUntilChanged()
         }
 }

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt

@@ -15,7 +15,7 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -69,7 +69,7 @@ class TimelineMediaItemsFactory(
                 newTimelineItemStates.add(cacheItem)
             }
         }
-        _timelineItems.emit(newTimelineItemStates.toPersistentList())
+        _timelineItems.emit(newTimelineItemStates.toImmutableList())
     }
 
     private fun buildAndCacheItem(

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt

@@ -53,7 +53,7 @@ import io.element.android.libraries.voiceplayer.api.VoiceMessageEvents
 import io.element.android.libraries.voiceplayer.api.VoiceMessageState
 import io.element.android.libraries.voiceplayer.api.VoiceMessageStateProvider
 import io.element.android.libraries.voiceplayer.api.aVoiceMessageState
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.delay
 
 @Composable
@@ -133,7 +133,7 @@ private fun VoiceInfoRow(
                 .height(34.dp),
             showCursor = state.showCursor,
             playbackProgress = state.progress,
-            waveform = voice.mediaInfo.waveform.orEmpty().toPersistentList(),
+            waveform = voice.mediaInfo.waveform.orEmpty().toImmutableList(),
             onSeek = {
                 state.eventSink(VoiceMessageEvents.Seek(it))
             },

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt

@@ -71,7 +71,7 @@ import io.element.android.libraries.mediaviewer.impl.local.player.rememberExoPla
 import io.element.android.libraries.mediaviewer.impl.local.player.seekToEnsurePlaying
 import io.element.android.libraries.mediaviewer.impl.local.player.togglePlay
 import io.element.android.libraries.mediaviewer.impl.local.rememberLocalMediaViewState
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.delay
 
 @SuppressLint("UnsafeOptInUsageError")
@@ -252,7 +252,7 @@ private fun ExoPlayerMediaAudioView(
                             .height(48.dp),
                         playbackProgress = mediaPlayerControllerState.progressAsFloat,
                         showCursor = true,
-                        waveform = waveform.toPersistentList(),
+                        waveform = waveform.toImmutableList(),
                         onSeek = {
                             exoPlayer.seekToEnsurePlaying((it * exoPlayer.duration).toLong())
                         },

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt

@@ -30,9 +30,9 @@ import io.element.android.libraries.mediaviewer.impl.model.mediaInfo
 import io.element.android.libraries.mediaviewer.impl.model.mediaSource
 import io.element.android.libraries.mediaviewer.impl.model.thumbnailSource
 import io.element.android.services.toolbox.api.systemclock.SystemClock
-import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -72,12 +72,12 @@ class MediaViewerDataSource(
     }
 
     @Composable
-    fun collectAsState(): State<PersistentList<MediaViewerPageData>> {
+    fun collectAsState(): State<ImmutableList<MediaViewerPageData>> {
         return remember { dataFlow() }.collectAsState(initialData())
     }
 
     @VisibleForTesting
-    internal fun dataFlow(): Flow<PersistentList<MediaViewerPageData>> {
+    internal fun dataFlow(): Flow<ImmutableList<MediaViewerPageData>> {
         return galleryDataSource.groupedMediaItemsFlow()
             .map { groupedItems ->
                 when (groupedItems) {
@@ -106,7 +106,7 @@ class MediaViewerDataSource(
             }
     }
 
-    private fun initialData(): PersistentList<MediaViewerPageData> {
+    private fun initialData(): ImmutableList<MediaViewerPageData> {
         val initialMediaItems =
             galleryDataSource.getLastData().dataOrNull()?.getItems(galleryMode).orEmpty()
         return buildMediaViewerPageList(initialMediaItems)
@@ -149,7 +149,7 @@ class MediaViewerDataSource(
                 )
             }
         }
-    }.toPersistentList()
+    }.toImmutableList()
 
     fun clearLoadingError(data: MediaViewerPageData.MediaViewerData) {
         localMediaStates[data.mediaSource.url]?.value = AsyncData.Uninitialized

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt

@@ -40,7 +40,7 @@ import io.element.android.libraries.mediaviewer.impl.R
 import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState
 import io.element.android.libraries.mediaviewer.impl.local.LocalMediaActions
 import io.element.android.libraries.ui.strings.CommonStrings
-import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
@@ -162,7 +162,7 @@ class MediaViewerPresenter(
     @Composable
     private fun NoMoreItemsBackwardSnackBarDisplayer(
         currentIndex: IntState,
-        data: State<PersistentList<MediaViewerPageData>>,
+        data: State<ImmutableList<MediaViewerPageData>>,
     ) {
         val isRenderingLoadingBackward by remember {
             derivedStateOf {
@@ -186,7 +186,7 @@ class MediaViewerPresenter(
     @Composable
     private fun NoMoreItemsForwardSnackBarDisplayer(
         currentIndex: IntState,
-        data: State<PersistentList<MediaViewerPageData>>,
+        data: State<ImmutableList<MediaViewerPageData>>,
     ) {
         val isRenderingLoadingForward by remember {
             derivedStateOf {

libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt

@@ -26,7 +26,7 @@ import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState
 import io.element.android.libraries.mediaviewer.impl.details.aMediaDeleteConfirmationState
 import io.element.android.libraries.mediaviewer.impl.details.aMediaDetailsBottomSheetState
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 
 open class MediaViewerStateProvider : PreviewParameterProvider<MediaViewerState> {
     override val values: Sequence<MediaViewerState>
@@ -204,7 +204,7 @@ fun aMediaViewerState(
     eventSink: (MediaViewerEvents) -> Unit = {},
 ) = MediaViewerState(
     initiallySelectedEventId = EventId("\$a:b"),
-    listData = listData.toPersistentList(),
+    listData = listData.toImmutableList(),
     currentIndex = currentIndex,
     snackbarMessage = null,
     canShowInfo = canShowInfo,

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

@@ -16,8 +16,8 @@ import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.roomlist.loadAllIncrementally
 import io.element.android.libraries.matrix.ui.model.SelectRoomInfo
 import io.element.android.libraries.matrix.ui.model.toSelectRoomInfo
-import kotlinx.collections.immutable.PersistentList
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOn
@@ -40,13 +40,13 @@ class RoomSelectSearchDataSource(
         source = RoomList.Source.All,
     )
 
-    val roomInfoList: Flow<PersistentList<SelectRoomInfo>> = roomList.filteredSummaries
+    val roomInfoList: Flow<ImmutableList<SelectRoomInfo>> = roomList.filteredSummaries
         .map { roomSummaries ->
             roomSummaries
                 .filter { it.info.currentUserMembership == CurrentUserMembership.JOINED }
                 .distinctBy { it.roomId } // This should be removed once we're sure no duplicate Rooms can be received
                 .map { roomSummary -> roomSummary.toSelectRoomInfo() }
-                .toPersistentList()
+                .toImmutableList()
         }
         .flowOn(coroutineDispatchers.computation)
 

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

@@ -53,7 +53,7 @@ import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.roomselect.api.RoomSelectMode
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 
 @Suppress("MultipleEmitters") // False positive
 @OptIn(ExperimentalMaterial3Api::class)
@@ -214,7 +214,7 @@ private fun RoomSummaryView(
             avatarType = AvatarType.Room(
                 heroes = roomInfo.heroes.map { user ->
                     user.getAvatarData(size = AvatarSize.RoomSelectRoomListItem)
-                }.toPersistentList(),
+                }.toImmutableList(),
                 isTombstoned = roomInfo.isTombstoned,
             ),
         )

libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt

@@ -35,7 +35,7 @@ import io.element.android.libraries.designsystem.components.media.drawWaveform
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import java.lang.Float.min
 
 private const val DEFAULT_GRAPHICS_LAYER_ALPHA: Float = 0.99F
@@ -62,21 +62,21 @@ fun LiveWaveformView(
     Box(
         contentAlignment = Alignment.CenterEnd,
         modifier = modifier
-            .fillMaxWidth()
-            .height(waveFormHeight)
-            .onSizeChanged { parentWidth = it.width }
+                .fillMaxWidth()
+                .height(waveFormHeight)
+                .onSizeChanged { parentWidth = it.width }
     ) {
         Canvas(
             modifier = Modifier
-                .width(Dp(waveformWidth))
-                .graphicsLayer(alpha = DEFAULT_GRAPHICS_LAYER_ALPHA)
-                .then(modifier)
+                    .width(Dp(waveformWidth))
+                    .graphicsLayer(alpha = DEFAULT_GRAPHICS_LAYER_ALPHA)
+                    .then(modifier)
         ) {
             val width = min(waveformWidth, parentWidth.toFloat())
             canvasSize = DpSize(width.dp, size.height.toDp())
             val countThatFitsWidth = (parentWidth.toFloat() / (lineWidth.toPx() + linePadding.toPx())).toInt()
             drawWaveform(
-                waveformData = levels.takeLast(countThatFitsWidth).toPersistentList(),
+                waveformData = levels.takeLast(countThatFitsWidth).toImmutableList(),
                 canvasSizePx = Size(canvasSize.width.toPx(), size.height),
                 brush = brush,
                 lineWidth = lineWidth,
@@ -91,11 +91,11 @@ fun LiveWaveformView(
 internal fun LiveWaveformViewPreview() = ElementPreview {
     Column {
         LiveWaveformView(
-            levels = List(100) { it.toFloat() / 100 }.toPersistentList(),
+            levels = List(100) { it.toFloat() / 100 }.toImmutableList(),
             modifier = Modifier.height(34.dp),
         )
         LiveWaveformView(
-            levels = List(40) { it.toFloat() / 40 }.toPersistentList(),
+            levels = List(40) { it.toFloat() / 40 }.toImmutableList(),
             modifier = Modifier.height(34.dp),
         )
     }

libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecording.kt

@@ -35,7 +35,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.ui.utils.time.formatShort
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
@@ -101,5 +101,5 @@ private fun RedRecordingDot() {
 @PreviewsDayNight
 @Composable
 internal fun VoiceMessageRecordingPreview() = ElementPreview {
-    VoiceMessageRecording(List(100) { it.toFloat() / 100 }.toPersistentList(), 0.seconds)
+    VoiceMessageRecording(List(100) { it.toFloat() / 100 }.toImmutableList(), 0.seconds)
 }