mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue 3137 (#3637)

Browse source 
* Fix issue 3137

* Remove import Timber

* Remove unnecessary space
This commit is contained in:
vvijayalakshmi21 2020-04-10 16:10:36 +05:30 • committed by GitHub
parent 62f176443b
commit 46847f0d77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragment.java
View file

@ -147,6 +147,7 @@ public class SearchDepictionsFragment extends CommonsDaggerSupportFragment imple
*/ */
@Override @Override
public void initErrorView() { public void initErrorView() {
isLoading = false;
progressBar.setVisibility(GONE); progressBar.setVisibility(GONE);
bottomProgressBar.setVisibility(GONE); bottomProgressBar.setVisibility(GONE);
depictionNotFound.setVisibility(VISIBLE); depictionNotFound.setVisibility(VISIBLE);
@ -195,10 +196,11 @@ public class SearchDepictionsFragment extends CommonsDaggerSupportFragment imple
} }
@Override @Override
public void loadingDepictions() { public void loadingDepictions(boolean isLoading) {
depictionNotFound.setVisibility(GONE); depictionNotFound.setVisibility(GONE);
bottomProgressBar.setVisibility(View.VISIBLE); bottomProgressBar.setVisibility(View.VISIBLE);
progressBar.setVisibility(GONE); progressBar.setVisibility(GONE);
this.isLoading = isLoading;
} }
@Override @Override

2
app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentContract.java
View file

@ -32,7 +32,7 @@ public interface SearchDepictionsFragmentContract {
/** /**
* load depictions * load depictions
*/ */
void loadingDepictions(); void loadingDepictions(boolean isLoading);
/** /**
* clear adapter * clear adapter

26
app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentPresenter.java
View file

@ -82,19 +82,19 @@ public class SearchDepictionsFragmentPresenter extends CommonsDaggerSupportFragm
*/ */
@Override @Override
public void updateDepictionList(String query, int pageSize, boolean reInitialise) { public void updateDepictionList(String query, int pageSize, boolean reInitialise) {
this.query = query; this.query = query;
view.loadingDepictions(); view.loadingDepictions(true);
if (reInitialise) { if (reInitialise) {
size = 0; size = 0;
} }
saveQuery(); saveQuery();
compositeDisposable.add(depictsClient.searchForDepictions(query, 25, offset) compositeDisposable.add(depictsClient.searchForDepictions(query, 25, offset)
.subscribeOn(ioScheduler) .subscribeOn(ioScheduler)
.observeOn(mainThreadScheduler) .observeOn(mainThreadScheduler)
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS) .timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.doOnSubscribe(disposable -> saveQuery()) .doOnSubscribe(disposable -> saveQuery())
.collect(ArrayList<DepictedItem>::new, ArrayList::add) .collect(ArrayList<DepictedItem>::new, ArrayList::add)
.subscribe(this::handleSuccess, this::handleError)); .subscribe(this::handleSuccess, this::handleError));
} }
/** /**