diff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java index 64983d9e5..24ea6ca37 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java @@ -57,6 +57,8 @@ public class SearchCategoryFragment extends CommonsDaggerSupportFragment { @BindView(R.id.imagesNotFound) TextView categoriesNotFoundView; String query; + @BindView(R.id.bottomProgressBar) + ProgressBar bottomProgressBar; @Inject RecentSearchesDao recentSearchesDao; @Inject MediaWikiApi mwApi; @@ -128,7 +130,8 @@ public class SearchCategoryFragment extends CommonsDaggerSupportFragment { handleNoInternet(); return; } - progressBar.setVisibility(View.VISIBLE); + bottomProgressBar.setVisibility(View.VISIBLE); + progressBar.setVisibility(GONE); queryList.clear(); categoriesAdapter.clear(); Observable.fromCallable(() -> mwApi.searchCategory(query,queryList.size())) @@ -144,7 +147,8 @@ public class SearchCategoryFragment extends CommonsDaggerSupportFragment { */ public void addCategoriesToList(String query) { this.query = query; - progressBar.setVisibility(View.VISIBLE); + bottomProgressBar.setVisibility(View.VISIBLE); + progressBar.setVisibility(GONE); Observable.fromCallable(() -> mwApi.searchCategory(query,queryList.size())) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -160,6 +164,7 @@ public class SearchCategoryFragment extends CommonsDaggerSupportFragment { private void handlePaginationSuccess(List mediaList) { queryList.addAll(mediaList); progressBar.setVisibility(View.GONE); + bottomProgressBar.setVisibility(GONE); categoriesAdapter.addAll(mediaList); categoriesAdapter.notifyDataSetChanged(); } @@ -178,7 +183,8 @@ public class SearchCategoryFragment extends CommonsDaggerSupportFragment { } else { - progressBar.setVisibility(View.GONE); + bottomProgressBar.setVisibility(View.GONE); + progressBar.setVisibility(GONE); categoriesAdapter.addAll(mediaList); categoriesAdapter.notifyDataSetChanged(); diff --git a/app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java index c8130844a..2204b0951 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java @@ -59,6 +59,8 @@ public class SearchImageFragment extends CommonsDaggerSupportFragment { @BindView(R.id.imagesNotFound) TextView imagesNotFoundView; String query; + @BindView(R.id.bottomProgressBar) + ProgressBar bottomProgressBar; @Inject RecentSearchesDao recentSearchesDao; @Inject MediaWikiApi mwApi; @@ -135,6 +137,7 @@ public class SearchImageFragment extends CommonsDaggerSupportFragment { return; } progressBar.setVisibility(View.VISIBLE); + bottomProgressBar.setVisibility(GONE); queryList.clear(); imagesAdapter.clear(); Observable.fromCallable(() -> mwApi.searchImages(query,queryList.size())) @@ -151,7 +154,8 @@ public class SearchImageFragment extends CommonsDaggerSupportFragment { @SuppressLint("CheckResult") public void addImagesToList(String query) { this.query = query; - progressBar.setVisibility(View.VISIBLE); + bottomProgressBar.setVisibility(View.VISIBLE); + progressBar.setVisibility(GONE); Observable.fromCallable(() -> mwApi.searchImages(query,queryList.size())) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -166,6 +170,7 @@ public class SearchImageFragment extends CommonsDaggerSupportFragment { */ private void handlePaginationSuccess(List mediaList) { progressBar.setVisibility(View.GONE); + bottomProgressBar.setVisibility(GONE); if (mediaList.size() != 0 || !queryList.get(queryList.size() - 1).getFilename().equals(mediaList.get(mediaList.size() - 1).getFilename())) { queryList.addAll(mediaList); imagesAdapter.addAll(mediaList); @@ -187,8 +192,8 @@ public class SearchImageFragment extends CommonsDaggerSupportFragment { initErrorView(); } else { - - progressBar.setVisibility(View.GONE); + bottomProgressBar.setVisibility(View.GONE); + progressBar.setVisibility(GONE); imagesAdapter.addAll(mediaList); imagesAdapter.notifyDataSetChanged(); ((SearchActivity)getContext()).viewPagerNotifyDataSetChanged(); diff --git a/app/src/main/res/layout/fragment_browse_image.xml b/app/src/main/res/layout/fragment_browse_image.xml index af6a7860b..4f384f08b 100644 --- a/app/src/main/res/layout/fragment_browse_image.xml +++ b/app/src/main/res/layout/fragment_browse_image.xml @@ -16,18 +16,29 @@ android:layout_centerInParent="true" android:visibility="gone" /> + + /> + \ No newline at end of file