ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 12:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename isFetchingSearchResults to showSearchLoader

Browse Source
This commit is contained in:
ganfra
2024-01-05 15:54:50 +01:00
parent a0ba83c863
commit 44b6a97c90
14 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserSearchResult.kt
+1 -1
View File
@@ -25,5 +25,5 @@ data class UserSearchResult(
data class UserSearchResultState(
val results: List<UserSearchResult>,
val isFetchingSearchResults: Boolean,
val isSearching: Boolean,
)
libraries/usersearch/impl/src/main/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepository.kt
+2 -2
View File
@@ -47,7 +47,7 @@ class MatrixUserRepository @Inject constructor(
null
}
if (shouldQueryProfile || shouldFetchSearchResults) {
emit(UserSearchResultState(isFetchingSearchResults = shouldFetchSearchResults, results = listOfNotNull(fakeSearchResult)))
emit(UserSearchResultState(isSearching = shouldFetchSearchResults, results = listOfNotNull(fakeSearchResult)))
}
if (shouldFetchSearchResults) {
val results = fetchSearchResults(query, shouldQueryProfile)
@@ -73,7 +73,7 @@ class MatrixUserRepository @Inject constructor(
?: UserSearchResult(MatrixUser(UserId(query)), isUnresolved = true))
}
return UserSearchResultState(results = results, isFetchingSearchResults = false)
return UserSearchResultState(results = results, isSearching = false)
}
companion object {
libraries/usersearch/impl/src/test/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepositoryTest.kt
+6 -6
View File
@@ -55,11 +55,11 @@ internal class MatrixUserRepositoryTest {
result.test {
awaitItem().also {
assertThat(it.isFetchingSearchResults).isTrue()
assertThat(it.isSearching).isTrue()
assertThat(it.results).isEmpty()
}
awaitItem().also {
assertThat(it.isFetchingSearchResults).isFalse()
assertThat(it.isSearching).isFalse()
assertThat(it.results).isEmpty()
}
awaitComplete()
@@ -76,11 +76,11 @@ internal class MatrixUserRepositoryTest {
result.test {
awaitItem().also {
assertThat(it.isFetchingSearchResults).isTrue()
assertThat(it.isSearching).isTrue()
assertThat(it.results).isEmpty()
}
awaitItem().also {
assertThat(it.isFetchingSearchResults).isFalse()
assertThat(it.isSearching).isFalse()
assertThat(it.results).isEqualTo(aMatrixUserList().toUserSearchResults())
}
awaitComplete()
@@ -96,7 +96,7 @@ internal class MatrixUserRepositoryTest {
result.test {
awaitItem().also {
assertThat(it.isFetchingSearchResults).isTrue()
assertThat(it.isSearching).isTrue()
assertThat(it.results).isEqualTo(listOf(placeholderResult()))
}
cancelAndConsumeRemainingEvents()
@@ -112,7 +112,7 @@ internal class MatrixUserRepositoryTest {
result.test {
awaitItem().also {
assertThat(it.isFetchingSearchResults).isTrue()
assertThat(it.isSearching).isTrue()
assertThat(it.results).isEmpty()
}
cancelAndConsumeRemainingEvents()