Update dependency org.matrix.rustcomponents:sdk-android to v0.2.31 (#3145)

* Update dependency org.matrix.rustcomponents:sdk-android to v0.2.31 * Use new Rust client side sorting API * Make `RoomListEntriesUpdate.describe()` an extension function * Remove `RoomListSummary.Filled` and `RoomListSummary.Empty` * Fix icon sizes to pass the lint checks * Update screenshots --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín <jorgem@element.io> Co-authored-by: ElementBot <benoitm+elementbot@element.io>
2024-07-05 15:25:42 +00:00
parent b0846de5e1
commit 8aa4fbdade
46 changed files with 303 additions and 358 deletions
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectEvents.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectEvents.kt
@@ -16,10 +16,10 @@

 package io.element.android.libraries.roomselect.impl

-import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
+import io.element.android.libraries.matrix.api.roomlist.RoomSummary

 sealed interface RoomSelectEvents {
-    data class SetSelectedRoom(val room: RoomSummaryDetails) : RoomSelectEvents
+    data class SetSelectedRoom(val room: RoomSummary) : RoomSelectEvents

    // TODO remove to restore multi-selection
    data object RemoveSelectedRoom : RoomSelectEvents
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenter.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenter.kt
@@ -29,7 +29,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
-import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
+import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.roomselect.api.RoomSelectMode
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
@@ -45,7 +45,7 @@ class RoomSelectPresenter @AssistedInject constructor(

    @Composable
    override fun present(): RoomSelectState {
-        var selectedRooms by remember { mutableStateOf(persistentListOf<RoomSummaryDetails>()) }
+        var selectedRooms by remember { mutableStateOf(persistentListOf<RoomSummary>()) }
        var searchQuery by remember { mutableStateOf("") }
        var isSearchActive by remember { mutableStateOf(false) }

--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectSearchDataSource.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectSearchDataSource.kt
@@ -22,7 +22,6 @@ import io.element.android.libraries.matrix.api.roomlist.RoomList
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
-import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import io.element.android.libraries.matrix.api.roomlist.loadAllIncrementally
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
@@ -48,11 +47,9 @@ class RoomSelectSearchDataSource @Inject constructor(
        source = RoomList.Source.All,
    )

-    val roomSummaries: Flow<PersistentList<RoomSummaryDetails>> = roomList.filteredSummaries
+    val roomSummaries: Flow<PersistentList<RoomSummary>> = roomList.filteredSummaries
        .map { roomSummaries ->
            roomSummaries
-                .filterIsInstance<RoomSummary.Filled>()
-                .map { it.details }
                .filter { it.currentUserMembership == CurrentUserMembership.JOINED }
                .distinctBy { it.roomId } // This should be removed once we're sure no duplicate Rooms can be received
                .toPersistentList()
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectState.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectState.kt
@@ -17,15 +17,15 @@
 package io.element.android.libraries.roomselect.impl

 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
-import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
+import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.roomselect.api.RoomSelectMode
 import kotlinx.collections.immutable.ImmutableList

 data class RoomSelectState(
    val mode: RoomSelectMode,
-    val resultState: SearchBarResultState<ImmutableList<RoomSummaryDetails>>,
+    val resultState: SearchBarResultState<ImmutableList<RoomSummary>>,
    val query: String,
    val isSearchActive: Boolean,
-    val selectedRooms: ImmutableList<RoomSummaryDetails>,
+    val selectedRooms: ImmutableList<RoomSummary>,
    val eventSink: (RoomSelectEvents) -> Unit
 )
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt
@@ -20,7 +20,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 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.roomlist.RoomSummaryDetails
+import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.matrix.ui.components.aRoomSummaryDetails
 import io.element.android.libraries.roomselect.api.RoomSelectMode
 import kotlinx.collections.immutable.ImmutableList
@@ -52,10 +52,10 @@ open class RoomSelectStateProvider : PreviewParameterProvider<RoomSelectState> {

 private fun aRoomSelectState(
    mode: RoomSelectMode = RoomSelectMode.Forward,
-    resultState: SearchBarResultState<ImmutableList<RoomSummaryDetails>> = SearchBarResultState.Initial(),
+    resultState: SearchBarResultState<ImmutableList<RoomSummary>> = SearchBarResultState.Initial(),
    query: String = "",
    isSearchActive: Boolean = false,
-    selectedRooms: ImmutableList<RoomSummaryDetails> = persistentListOf(),
+    selectedRooms: ImmutableList<RoomSummary> = persistentListOf(),
 ) = RoomSelectState(
    mode = mode,
    resultState = resultState,
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
@@ -56,7 +56,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
+import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.matrix.ui.components.SelectedRoom
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.roomselect.api.RoomSelectMode
@@ -73,13 +73,13 @@ fun RoomSelectView(
    modifier: Modifier = Modifier,
 ) {
    @Suppress("UNUSED_PARAMETER")
-    fun onRoomRemoved(roomSummaryDetails: RoomSummaryDetails) {
+    fun onRoomRemoved(roomSummary: RoomSummary) {
        // TODO toggle selection when multi-selection is enabled
        state.eventSink(RoomSelectEvents.RemoveSelectedRoom)
    }

    @Composable
-    fun SelectedRoomsHelper(isForwarding: Boolean, selectedRooms: ImmutableList<RoomSummaryDetails>) {
+    fun SelectedRoomsHelper(isForwarding: Boolean, selectedRooms: ImmutableList<RoomSummary>) {
        if (isForwarding) return
        SelectedRooms(
            selectedRooms = selectedRooms,
@@ -193,8 +193,8 @@ fun RoomSelectView(

@Composable
 private fun SelectedRooms(
-    selectedRooms: ImmutableList<RoomSummaryDetails>,
-    onRemoveRoom: (RoomSummaryDetails) -> Unit,
+    selectedRooms: ImmutableList<RoomSummary>,
+    onRemoveRoom: (RoomSummary) -> Unit,
    modifier: Modifier = Modifier,
 ) {
    LazyRow(
@@ -210,9 +210,9 @@ private fun SelectedRooms(

@Composable
 private fun RoomSummaryView(
-    summary: RoomSummaryDetails,
+    summary: RoomSummary,
    isSelected: Boolean,
-    onSelection: (RoomSummaryDetails) -> Unit,
+    onSelection: (RoomSummary) -> Unit,
 ) {
    Row(
        modifier = Modifier
--- a/libraries/roomselect/impl/src/test/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenterTest.kt
+++ b/libraries/roomselect/impl/src/test/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenterTest.kt
@@ -23,8 +23,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
-import io.element.android.libraries.matrix.api.roomlist.RoomSummary
-import io.element.android.libraries.matrix.test.room.aRoomSummaryDetails
+import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.libraries.roomselect.api.RoomSelectMode
 import io.element.android.tests.testutils.WarmUpRule
@@ -69,7 +68,7 @@ class RoomSelectPresenterTest {
    @Test
    fun `present - update query`() = runTest {
        val roomListService = FakeRoomListService().apply {
-            postAllRooms(listOf(RoomSummary.Filled(aRoomSummaryDetails())))
+            postAllRooms(listOf(aRoomSummary()))
        }
        val presenter = createRoomSelectPresenter(
            roomListService = roomListService
@@ -78,7 +77,7 @@ class RoomSelectPresenterTest {
            presenter.present()
        }.test {
            val initialState = awaitItem()
-            assertThat(awaitItem().resultState as? SearchBarResultState.Results).isEqualTo(SearchBarResultState.Results(listOf(aRoomSummaryDetails())))
+            assertThat(awaitItem().resultState as? SearchBarResultState.Results).isEqualTo(SearchBarResultState.Results(listOf(aRoomSummary())))
            initialState.eventSink(RoomSelectEvents.ToggleSearchActive)
            skipItems(1)
            initialState.eventSink(RoomSelectEvents.UpdateQuery("string not contained"))
@@ -98,7 +97,7 @@ class RoomSelectPresenterTest {
    @Test
    fun `present - select and remove a room`() = runTest {
        val roomListService = FakeRoomListService().apply {
-            postAllRooms(listOf(RoomSummary.Filled(aRoomSummaryDetails())))
+            postAllRooms(listOf(aRoomSummary()))
        }
        val presenter = createRoomSelectPresenter(
            roomListService = roomListService,
@@ -107,7 +106,7 @@ class RoomSelectPresenterTest {
            presenter.present()
        }.test {
            val initialState = awaitItem()
-            val summary = aRoomSummaryDetails()
+            val summary = aRoomSummary()
            initialState.eventSink(RoomSelectEvents.SetSelectedRoom(summary))
            assertThat(awaitItem().selectedRooms).isEqualTo(persistentListOf(summary))
            initialState.eventSink(RoomSelectEvents.RemoveSelectedRoom)