Skip to content

Correctly display error(s) in SearchResultsFragment. #5793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Correctly display error(s) in SearchResultsFragment. #5793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/src/main/java/org/wikipedia/search/SearchResultsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.Lifecycle
Expand Down Expand Up @@ -74,6 +75,12 @@ class SearchResultsFragment : Fragment() {
launch {
searchResultsAdapter.loadStateFlow.collectLatest {
callback()?.onSearchProgressBar(it.append is LoadState.Loading || it.refresh is LoadState.Loading)
if (it.refresh is LoadState.Error) {
binding.searchErrorView.setError((it.refresh as LoadState.Error).error)
binding.searchErrorView.isVisible = true
return@collectLatest
}
binding.searchErrorView.isVisible = false
val showEmpty = (it.append is LoadState.NotLoading && it.append.endOfPaginationReached && searchResultsAdapter.itemCount == 0)
if (showEmpty) {
searchResultsConcatAdapter.addAdapter(noSearchResultAdapter)
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/fragment_search_results.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone" />
android:layout_marginHorizontal="16dp"
android:visibility="gone"
tools:visibility="visible"/>

</FrameLayout>
Loading