From b549acc1de9c110ce8bc31240f63e58b8a199403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=99=BD-=E7=99=BD?= Date: Sat, 31 Dec 2022 13:48:15 +0800 Subject: [PATCH] Add page number limit --- .../java/com/hippo/ehviewer/widget/SearchLayout.kt | 11 +++++++++-- app/src/main/res/values-zh-rCN/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt index 659247af4..0fae5c908 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt @@ -207,8 +207,15 @@ class SearchLayout @JvmOverloads constructor( if (mEnableAdvance) { urlBuilder.advanceSearch = mTableAdvanceSearch.advanceSearch urlBuilder.minRating = mTableAdvanceSearch.minRating - urlBuilder.pageFrom = mTableAdvanceSearch.pageFrom - urlBuilder.pageTo = mTableAdvanceSearch.pageTo + val pageFrom = mTableAdvanceSearch.pageFrom + val pageTo = mTableAdvanceSearch.pageTo + if (pageTo != -1 && pageTo < 10) { + throw EhException(context.getString(R.string.search_sp_err1)) + } else if (pageFrom != -1 && pageTo != -1 && pageTo - pageFrom < 20) { + throw EhException(context.getString(R.string.search_sp_err2)) + } + urlBuilder.pageFrom = pageFrom + urlBuilder.pageTo = pageTo } } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 289d1223b..be4a967c2 100755 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -115,6 +115,8 @@ 最低评分: 页数: 到 + 页数最大值至少为 10 + 页数范围差至少为 20 禁用排除项: 语言 上传者 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6dd18ab37..12e9068e7 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -157,6 +157,8 @@ Minimum Rating: Pages: to + The page range maximum cannot be below 10 + The page range must be at least 20 Disable default filters for: