diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.java b/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.java index acc5d98af..3e77f5499 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.java +++ b/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.java @@ -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; } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index 8fd1f8157..0ffdfe6d6 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -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); diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java index bfd302996..38a83e8fc 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java @@ -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; diff --git a/app/src/main/res/layout/search_normal.xml b/app/src/main/res/layout/search_normal.xml index 06009fcbf..b4db5c097 100644 --- a/app/src/main/res/layout/search_normal.xml +++ b/app/src/main/res/layout/search_normal.xml @@ -42,6 +42,12 @@ android:layout_height="wrap_content" android:text="@string/search_normal_search"/> + + 高级选项 图片搜索 一般搜索 + 订阅搜索 指定上传者 指定标签 启用高级选项 - 一般搜索:就是搜索。\n\n指定上传者:列出该上传者上传的画廊。其他选项会被忽略。\n\n指定标签:列出含有该标签的画廊。其他选项会被忽略。 + 一般搜索:就是搜索。\n\n订阅搜素:在订阅中搜索。\n\n指定上传者:列出该上传者上传的画廊。其他选项会被忽略。\n\n指定标签:列出含有该标签的画廊。其他选项会被忽略。 搜索画廊 搜索画廊标签 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index fa3b99dc7..aa7007151 100755 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -135,11 +135,12 @@ 高級選項 圖片搜索 一般搜索 + 訂閲搜索 指定上傳者 指定標籤 啟用高級選項 - 一般搜索:就是搜索。\n\n指定上傳者:列出該上傳者上傳的畫廊。其他選項會被忽略。\n\n指定標籤:列出含有該標籤的畫廊。其他選項會被忽略。 + 一般搜索:就是搜索。\n\n訂閲搜素:在訂閲中搜索。\n\n指定上傳者:列出該上傳者上傳的畫廊。其他選項會被忽略。\n\n指定標籤:列出含有該標籤的畫廊。其他選項會被忽略。 搜索畫廊 搜索畫廊標籤 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 054f46c66..052e3c671 100755 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -135,11 +135,12 @@ 進階選項 圖片搜尋 一般搜尋 + 訂閱搜尋 指定上傳者 指定標籤 啟用進階選項 - 一般搜尋:就是搜尋。\n\n指定上傳者:列出該上傳者上傳的圖庫。其他選項會被忽略。\n\n指定標籤:列出含有該標籤的圖庫。其他選項會被忽略。 + 一般搜尋:就是搜尋。\n\n訂閱搜素:在訂閱中搜索。\n\n指定上傳者:列出該上傳者上傳的畫廊。其他選項會被忽略。\n\n指定標籤:列出含有該標籤的畫廊。其他選項會被忽略。 搜尋圖庫 搜尋圖庫的標籤 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 554edbcaa..6d5bfcec5 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -177,11 +177,12 @@ Advance Options Image Search Normal search + Subscription search Specify uploader Specify tag Enable advance options - Normal search: Simply search.\n\nSpecify uploader: Search for galleries uploaded by the specified uploader. All other options will be ignored.\n\nSpecify tag: Search for galleries that contain the specified tag. Only one tag accepted. Other options will be ignored. + Normal search: Simply search.\n\nSubscription search: Search in subscriptions.\n\nSpecify uploader: Search for galleries uploaded by the specified uploader. All other options will be ignored.\n\nSpecify tag: Search for galleries that contain the specified tag. Only one tag accepted. Other options will be ignored. Search Gallery Search Gallery Tags