diff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragment.java index 2836f81e8..10ccf4ad4 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragment.java @@ -147,6 +147,7 @@ public class SearchDepictionsFragment extends CommonsDaggerSupportFragment imple */ @Override public void initErrorView() { + isLoading = false; progressBar.setVisibility(GONE); bottomProgressBar.setVisibility(GONE); depictionNotFound.setVisibility(VISIBLE); @@ -195,10 +196,11 @@ public class SearchDepictionsFragment extends CommonsDaggerSupportFragment imple } @Override - public void loadingDepictions() { + public void loadingDepictions(boolean isLoading) { depictionNotFound.setVisibility(GONE); bottomProgressBar.setVisibility(View.VISIBLE); progressBar.setVisibility(GONE); + this.isLoading = isLoading; } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentContract.java b/app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentContract.java index 7b8419fc0..49ce776b3 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentContract.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentContract.java @@ -32,7 +32,7 @@ public interface SearchDepictionsFragmentContract { /** * load depictions */ - void loadingDepictions(); + void loadingDepictions(boolean isLoading); /** * clear adapter diff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentPresenter.java b/app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentPresenter.java index 84bdf1129..780fe0622 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentPresenter.java @@ -82,19 +82,19 @@ public class SearchDepictionsFragmentPresenter extends CommonsDaggerSupportFragm */ @Override public void updateDepictionList(String query, int pageSize, boolean reInitialise) { - this.query = query; - view.loadingDepictions(); - if (reInitialise) { - size = 0; - } - saveQuery(); - compositeDisposable.add(depictsClient.searchForDepictions(query, 25, offset) - .subscribeOn(ioScheduler) - .observeOn(mainThreadScheduler) - .timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS) - .doOnSubscribe(disposable -> saveQuery()) - .collect(ArrayList::new, ArrayList::add) - .subscribe(this::handleSuccess, this::handleError)); + this.query = query; + view.loadingDepictions(true); + if (reInitialise) { + size = 0; + } + saveQuery(); + compositeDisposable.add(depictsClient.searchForDepictions(query, 25, offset) + .subscribeOn(ioScheduler) + .observeOn(mainThreadScheduler) + .timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS) + .doOnSubscribe(disposable -> saveQuery()) + .collect(ArrayList::new, ArrayList::add) + .subscribe(this::handleSuccess, this::handleError)); } /**