mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-10 09:57:47 +01:00
Simplify if/else
This commit is contained in:
parent
0febdfb715
commit
82ac2b3223
2 changed files with 8 additions and 15 deletions
|
@ -125,31 +125,23 @@ public class CatalogueListPresenter extends BasePresenter {
|
|||
// If going to search mode
|
||||
else if (mSearchName.equals("") && !query.equals("")) {
|
||||
mSearchMode = true;
|
||||
mSearchName = query;
|
||||
adapter.setItems(new ArrayList<>());
|
||||
getMangasFromSearch(1);
|
||||
}
|
||||
// If going to normal mode
|
||||
else if (!mSearchName.equals("") && query.equals("")) {
|
||||
mSearchMode = false;
|
||||
mSearchName = query;
|
||||
adapter.setItems(new ArrayList<>());
|
||||
getMangasFromSource(1);
|
||||
}
|
||||
// If query changes
|
||||
else {
|
||||
mSearchName = query;
|
||||
adapter.setItems(new ArrayList<>());
|
||||
getMangasFromSearch(1);
|
||||
}
|
||||
|
||||
mSearchName = query;
|
||||
adapter.getItems().clear();
|
||||
loadMoreMangas(1);
|
||||
view.setScrollListener();
|
||||
}
|
||||
|
||||
public void loadMoreMangas(int page) {
|
||||
if (!mSearchMode) {
|
||||
getMangasFromSource(page);
|
||||
} else {
|
||||
if (mSearchMode) {
|
||||
getMangasFromSearch(page);
|
||||
} else {
|
||||
getMangasFromSource(page);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -40,6 +40,7 @@ public abstract class Source {
|
|||
.flatMap(response -> Observable.just(parsePopularMangasFromHtml(response)));
|
||||
}
|
||||
|
||||
// Get mangas from the source with a query
|
||||
public Observable<List<Manga>> searchMangasFromNetwork(String query, int page) {
|
||||
return mNetworkService
|
||||
.getStringResponse(getSearchUrl(query, page), mNetworkService.NULL_CACHE_CONTROL, mRequestHeaders)
|
||||
|
|
Loading…
Reference in a new issue