mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-10-31 14:27:57 +01:00 
			
		
		
		
	Show loading progress bar in catalogue
This commit is contained in:
		| @@ -58,6 +58,7 @@ public class CatalogueListPresenter extends BasePresenter { | ||||
|         initializeSearch(); | ||||
|         initializeMangaDetailsLoader(); | ||||
|  | ||||
|         view.showProgressBar(); | ||||
|         getMangasFromSource(1); | ||||
|     } | ||||
|  | ||||
| @@ -154,6 +155,7 @@ public class CatalogueListPresenter extends BasePresenter { | ||||
|                 .map(this::networkToLocalManga) | ||||
|                 .toList() | ||||
|                 .subscribe(newMangas -> { | ||||
|                     view.hideProgressBar(); | ||||
|                     adapter.addItems(newMangas); | ||||
|                     if (mMangaDetailPublishSubject != null) | ||||
|                         mMangaDetailPublishSubject.onNext(Observable.just(newMangas)); | ||||
| @@ -174,7 +176,6 @@ public class CatalogueListPresenter extends BasePresenter { | ||||
|             mSearchViewPublishSubject.onNext(Observable.just(query)); | ||||
|     } | ||||
|  | ||||
|  | ||||
|     private void queryFromSearch(String query) { | ||||
|         // If search button clicked | ||||
|         if (mSearchName.equals("") && query.equals("")) { | ||||
| @@ -191,11 +192,15 @@ public class CatalogueListPresenter extends BasePresenter { | ||||
|  | ||||
|         mSearchName = query; | ||||
|         adapter.getItems().clear(); | ||||
|         view.showProgressBar(); | ||||
|         view.resetScrollListener(); | ||||
|         loadMoreMangas(1); | ||||
|     } | ||||
|  | ||||
|     public void loadMoreMangas(int page) { | ||||
|         if (page > 1) { | ||||
|             view.showGridProgressBar(); | ||||
|         } | ||||
|         if (mSearchMode) { | ||||
|             getMangasFromSearch(page); | ||||
|         } else { | ||||
|   | ||||
| @@ -7,6 +7,7 @@ import android.view.Menu; | ||||
| import android.view.View; | ||||
| import android.widget.GridView; | ||||
| import android.widget.ImageView; | ||||
| import android.widget.ProgressBar; | ||||
|  | ||||
| import butterknife.Bind; | ||||
| import butterknife.ButterKnife; | ||||
| @@ -24,6 +25,12 @@ public class CatalogueListActivity extends BaseActivity implements CatalogueList | ||||
|     @Bind(R.id.gridView) | ||||
|     GridView manga_list; | ||||
|  | ||||
|     @Bind(R.id.progress) | ||||
|     ProgressBar progress; | ||||
|  | ||||
|     @Bind(R.id.progress_grid) | ||||
|     ProgressBar progress_grid; | ||||
|  | ||||
|     private CatalogueListPresenter presenter; | ||||
|  | ||||
|     private EndlessScrollListener scrollListener; | ||||
| @@ -100,6 +107,22 @@ public class CatalogueListActivity extends BaseActivity implements CatalogueList | ||||
|         scrollListener.resetScroll(); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public void showProgressBar() { | ||||
|         progress.setVisibility(ProgressBar.VISIBLE); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public void showGridProgressBar() { | ||||
|         progress_grid.setVisibility(ProgressBar.VISIBLE); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public void hideProgressBar() { | ||||
|         progress.setVisibility(ProgressBar.GONE); | ||||
|         progress_grid.setVisibility(ProgressBar.GONE); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public ImageView getImageView(int position) { | ||||
|         View v = manga_list.getChildAt(position - | ||||
|   | ||||
| @@ -11,5 +11,8 @@ public interface CatalogueListView extends BaseView { | ||||
|     void setAdapter(EasyAdapter adapter); | ||||
|     void setScrollListener(); | ||||
|     void resetScrollListener(); | ||||
|     void showProgressBar(); | ||||
|     void showGridProgressBar(); | ||||
|     void hideProgressBar(); | ||||
|     ImageView getImageView(int position); | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user