Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify if/else

Browse Source
This commit is contained in:
inorichi 2015-10-13 00:15:03 +02:00
parent 0febdfb715
commit 82ac2b3223
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/eu/kanade/mangafeed/presenter/CatalogueListPresenter.java
View File

@ -125,31 +125,23 @@ public class CatalogueListPresenter extends BasePresenter {
// If going to search mode // If going to search mode
else if (mSearchName.equals("") && !query.equals("")) { else if (mSearchName.equals("") && !query.equals("")) {
mSearchMode = true; mSearchMode = true;
mSearchName = query;
adapter.setItems(new ArrayList<>());
getMangasFromSearch(1);
} }
// If going to normal mode // If going to normal mode
else if (!mSearchName.equals("") && query.equals("")) { else if (!mSearchName.equals("") && query.equals("")) {
mSearchMode = false; mSearchMode = false;
mSearchName = query;
adapter.setItems(new ArrayList<>());
getMangasFromSource(1);
} }
// If query changes
else {
mSearchName = query; mSearchName = query;
adapter.setItems(new ArrayList<>()); adapter.getItems().clear();
getMangasFromSearch(1); loadMoreMangas(1);
}
view.setScrollListener(); view.setScrollListener();
} }
public void loadMoreMangas(int page) { public void loadMoreMangas(int page) {
if (!mSearchMode) { if (mSearchMode) {
getMangasFromSource(page);
} else {
getMangasFromSearch(page); getMangasFromSearch(page);
} else {
getMangasFromSource(page);
} }
} }

1
app/src/main/java/eu/kanade/mangafeed/sources/Source.java
View File

@ -40,6 +40,7 @@ public abstract class Source {
.flatMap(response -> Observable.just(parsePopularMangasFromHtml(response))); .flatMap(response -> Observable.just(parsePopularMangasFromHtml(response)));
} }
// Get mangas from the source with a query
public Observable<List<Manga>> searchMangasFromNetwork(String query, int page) { public Observable<List<Manga>> searchMangasFromNetwork(String query, int page) {
return mNetworkService return mNetworkService
.getStringResponse(getSearchUrl(query, page), mNetworkService.NULL_CACHE_CONTROL, mRequestHeaders) .getStringResponse(getSearchUrl(query, page), mNetworkService.NULL_CACHE_CONTROL, mRequestHeaders)