yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add subscription search

Browse Source
This commit is contained in:
seven332 committed 2019-03-21 18:31:32 +08:00
1 parent 1d70572d92
commit c5566aa5e8
8 files changed
+37 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.java
+8
View File
@@ -146,10 +146,18 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
mMinRating = minRating;
}
public int getPageFrom() {
return mPageFrom;
}
public void setPageFrom(int pageFrom) {
mPageFrom = pageFrom;
}
public int getPageTo() {
return mPageTo;
}
public void setPageTo(int pageTo) {
mPageTo = pageTo;
}
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+12 -2
View File
@@ -419,9 +419,19 @@ public final class GalleryListScene extends BaseScene
if (ListUrlBuilder.MODE_NORMAL == urlBuilder.getMode() &&
EhUtils.NONE == category &&
TextUtils.isEmpty(keyword)) {
TextUtils.isEmpty(keyword) &&
urlBuilder.getAdvanceSearch() == -1 &&
urlBuilder.getMinRating() == -1 &&
urlBuilder.getPageFrom() == -1 &&
urlBuilder.getPageTo() == -1) {
return resources.getString(appName ? R.string.app_name : R.string.homepage);
} else if (ListUrlBuilder.MODE_SUBSCRIPTION == urlBuilder.getMode()) {
} else if (ListUrlBuilder.MODE_SUBSCRIPTION == urlBuilder.getMode() &&
EhUtils.NONE == category &&
TextUtils.isEmpty(keyword) &&
urlBuilder.getAdvanceSearch() == -1 &&
urlBuilder.getMinRating() == -1 &&
urlBuilder.getPageFrom() == -1 &&
urlBuilder.getPageTo() == -1) {
return resources.getString(R.string.subscription);
} else if (ListUrlBuilder.MODE_WHATS_HOT == urlBuilder.getMode()) {
return resources.getString(R.string.whats_hot);
app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java
+3
View File
@@ -243,6 +243,9 @@ public class SearchLayout extends EasyRecyclerView implements CompoundButton.OnC
case R.id.search_normal_search:
urlBuilder.setMode(ListUrlBuilder.MODE_NORMAL);
break;
case R.id.search_subscription_search:
urlBuilder.setMode(ListUrlBuilder.MODE_SUBSCRIPTION);
break;
case R.id.search_specify_uploader:
urlBuilder.setMode(ListUrlBuilder.MODE_UPLOADER);
break;