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

Remove unavailable search options

Browse Source
This commit is contained in:
小白-白 authored and tarsin committed 2022-11-15 12:54:41 +08:00
1 parent 37f99ae706
commit 76dedce5da
17 files changed
+11 -76
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.kt
-6
View File
@@ -270,10 +270,6 @@ open class ListUrlBuilder : Cloneable, Parcelable {
advanceSearch = advanceSearch or AdvanceSearchTable.SH
}
"f_sdt" -> if ("on" == value) {
advanceSearch = advanceSearch or AdvanceSearchTable.SDT
}
"f_sto" -> if ("on" == value) {
advanceSearch = advanceSearch or AdvanceSearchTable.STO
}
@@ -366,7 +362,6 @@ open class ListUrlBuilder : Cloneable, Parcelable {
if (advanceSearch != -1) {
ub.addQuery("advsearch", "1")
if (advanceSearch and AdvanceSearchTable.SH != 0) ub.addQuery("f_sh", "on")
if (advanceSearch and AdvanceSearchTable.SDT != 0) ub.addQuery("f_sdt", "on")
if (advanceSearch and AdvanceSearchTable.STO != 0) ub.addQuery("f_sto", "on")
if (advanceSearch and AdvanceSearchTable.SFL != 0) ub.addQuery("f_sfl", "on")
if (advanceSearch and AdvanceSearchTable.SFU != 0) ub.addQuery("f_sfu", "on")
@@ -461,7 +456,6 @@ open class ListUrlBuilder : Cloneable, Parcelable {
if (advanceSearch != -1) {
ub.addQuery("advsearch", "1")
if (advanceSearch and AdvanceSearchTable.SH != 0) ub.addQuery("f_sh", "on")
if (advanceSearch and AdvanceSearchTable.SDT != 0) ub.addQuery("f_sdt", "on")
if (advanceSearch and AdvanceSearchTable.STO != 0) ub.addQuery("f_sto", "on")
if (advanceSearch and AdvanceSearchTable.SFL != 0) ub.addQuery("f_sfl", "on")
if (advanceSearch and AdvanceSearchTable.SFU != 0) ub.addQuery("f_sfu", "on")
app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
-1
View File
@@ -232,7 +232,6 @@ public final class MainActivity extends StageActivity
builder.setMode(ListUrlBuilder.MODE_IMAGE_SEARCH);
builder.setImagePath(temp.getPath());
builder.setUseSimilarityScan(true);
builder.setShowExpunged(true);
startScene(processAnnouncer(GalleryListScene.getStartAnnouncer(builder)));
return true;
}
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
-1
View File
@@ -1154,7 +1154,6 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
lub.setMode(ListUrlBuilder.MODE_IMAGE_SEARCH);
lub.setImagePath(temp.getPath());
lub.setUseSimilarityScan(true);
lub.setShowExpunged(true);
GalleryListScene.startScene(this, lub);
}
} catch (FileNotFoundException e) {
app/src/main/java/com/hippo/ehviewer/widget/AdvanceSearchTable.kt
+11 -17
View File
@@ -29,7 +29,6 @@ class AdvanceSearchTable @JvmOverloads constructor(
context: Context, attrs: AttributeSet? = null
) : LinearLayout(context, attrs) {
private var mSh: CheckBox
private var mSdt: CheckBox
private var mSto: CheckBox
private var mSr: CheckBox
private var mMinRating: TextInputLayout
@@ -47,20 +46,18 @@ class AdvanceSearchTable @JvmOverloads constructor(
inflater.inflate(R.layout.widget_advance_search_table, this)
val row0 = getChildAt(0) as ViewGroup
mSh = row0.getChildAt(0) as CheckBox
mSdt = row0.getChildAt(1) as CheckBox
mSto = row0.getChildAt(1) as CheckBox
val row1 = getChildAt(1) as ViewGroup
mSto = row1.getChildAt(0) as CheckBox
mSr = row1.getChildAt(0) as CheckBox
mMinRating = row1.getChildAt(1) as TextInputLayout
val row2 = getChildAt(2) as ViewGroup
mSr = row2.getChildAt(0) as CheckBox
mMinRating = row2.getChildAt(1) as TextInputLayout
val row3 = getChildAt(3) as ViewGroup
mSp = row3.getChildAt(0) as CheckBox
mSpf = row3.getChildAt(1) as EditText
mSpt = row3.getChildAt(3) as EditText
val row5 = getChildAt(5) as ViewGroup
mSfl = row5.getChildAt(0) as CheckBox
mSfu = row5.getChildAt(1) as CheckBox
mSft = row5.getChildAt(2) as CheckBox
mSp = row2.getChildAt(0) as CheckBox
mSpf = row2.getChildAt(1) as EditText
mSpt = row2.getChildAt(3) as EditText
val row4 = getChildAt(4) as ViewGroup
mSfl = row4.getChildAt(0) as CheckBox
mSfu = row4.getChildAt(1) as CheckBox
mSft = row4.getChildAt(2) as CheckBox
mSpt.setOnEditorActionListener { v: TextView, _: Int, _: KeyEvent? ->
val nextView = v.focusSearch(
@@ -87,7 +84,6 @@ class AdvanceSearchTable @JvmOverloads constructor(
get() {
var advanceSearch = 0
if (mSh.isChecked) advanceSearch = advanceSearch or SH
if (mSdt.isChecked) advanceSearch = advanceSearch or SDT
if (mSto.isChecked) advanceSearch = advanceSearch or STO
if (mSfl.isChecked) advanceSearch = advanceSearch or SFL
if (mSfu.isChecked) advanceSearch = advanceSearch or SFU
@@ -96,7 +92,6 @@ class AdvanceSearchTable @JvmOverloads constructor(
}
set(advanceSearch) {
mSh.isChecked = NumberUtils.int2boolean(advanceSearch and SH)
mSdt.isChecked = NumberUtils.int2boolean(advanceSearch and SDT)
mSto.isChecked = NumberUtils.int2boolean(advanceSearch and STO)
mSfl.isChecked = NumberUtils.int2boolean(advanceSearch and SFL)
mSfu.isChecked = NumberUtils.int2boolean(advanceSearch and SFU)
@@ -150,8 +145,7 @@ class AdvanceSearchTable @JvmOverloads constructor(
companion object {
const val SH = 0x1
const val SDT = 0x2
const val STO = 0x4
const val STO = 0x2
const val SFL = 0x100
const val SFU = 0x200
const val SFT = 0x400
app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java
-3
View File
@@ -58,7 +58,6 @@ public final class ImageSearchLayout extends LinearLayout implements View.OnClic
private View mSelectImage;
private CheckBox mSearchUSS;
private CheckBox mSearchOSC;
private CheckBox mSearchSE;
private Helper mHelper;
@@ -93,7 +92,6 @@ public final class ImageSearchLayout extends LinearLayout implements View.OnClic
mSelectImage = ViewUtils.$$(this, R.id.select_image);
mSearchUSS = (CheckBox) ViewUtils.$$(this, R.id.search_uss);
mSearchOSC = (CheckBox) ViewUtils.$$(this, R.id.search_osc);
mSearchSE = (CheckBox) ViewUtils.$$(this, R.id.search_se);
mSelectImage.setOnClickListener(this);
}
@@ -182,7 +180,6 @@ public final class ImageSearchLayout extends LinearLayout implements View.OnClic
builder.setImagePath(mImagePath);
builder.setUseSimilarityScan(mSearchUSS.isChecked());
builder.setOnlySearchCovers(mSearchOSC.isChecked());
builder.setShowExpunged(mSearchSE.isChecked());
}
@Override
app/src/main/res/layout/widget_advance_search_table.xml
-17
View File
@@ -38,23 +38,6 @@
android:layout_weight="1"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/search_sdt" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/advance_search_table_item_margin"
android:layout_marginBottom="@dimen/advance_search_table_item_margin">
<com.google.android.material.checkbox.MaterialCheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/search_sto" />
</LinearLayout>
app/src/main/res/layout/widget_image_search.xml
-11
View File
@@ -72,17 +72,6 @@
<TableRow>
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/search_se"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:checked="false"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/search_se" />
<Space
android:layout_width="0dp"
android:layout_height="wrap_content"
app/src/main/res/values-de/strings.xml
-2
View File
@@ -99,7 +99,6 @@
<string name="search_specify_tag">Ein Etikett spezifizieren</string>
<string name="search_enable_advance">Erweitere Optionen aktivieren</string>
<string name="search_sh">Gelöschte Galerien anzeigen</string>
<string name="search_sdt">Nach unwichtigen Etiketten suchen</string>
<string name="search_sto">Nur die Galerien mit Torrentdateien anzeigen</string>
<string name="search_sr">Mindestpunktzahl: </string>
<string name="search_sp">Seiten: </string>
@@ -111,7 +110,6 @@
<string name="select_image">Bild wählen</string>
<string name="search_uss">Ähnlichkeitscan aktivieren</string>
<string name="search_osc">Nur nach Umschläge suchen</string>
<string name="search_se">Die gelöschten Galerien anzeigen</string>
<string name="select_image_first">Wähle ein Bild</string>
<string name="add_to_favourites">Zu den Favoriten hinzufügen</string>
<string name="stop_downloading">Download stoppen</string>
app/src/main/res/values-es/strings.xml
-2
View File
@@ -120,14 +120,12 @@
<string name="search_tip">Búsqueda normal: Solo busca.\n\nBúsqueda de suscripción: Buscar etiquetas suscriptas.n\nUploader especifico: Listar de galerías subidas por el uploader. Otras opciones serán ignoradas.\n\nEtiquetas específicas: Listar las galerías que contienen la etiqueta. Solo se acepta una etiqueta. Otras opciones serán ignoradas.</string>
<string name="search_sh">Mostrar galerías borradas</string>
<string name="search_sdt">Buscar etiquetas Low-Power</string>
<string name="search_sto">Mostrar solo galerías con torrents</string>
<string name="search_sr">Valoración mínima:</string>
<string name="search_subscription_search">Búsqueda de etiquetas suscritas</string>
<string name="select_image">Seleccionar imagen</string>
<string name="search_uss">Usar búsqueda similar</string>
<string name="search_osc">Buscar solo portadas</string>
<string name="search_se">Mostrar borrados</string>
<string name="select_image_first">Seleccione la imagen primero</string>
<string name="search_sp">Páginas:</string>
<string name="search_sp_to">hasta</string>
app/src/main/res/values-fr/strings.xml
-2
View File
@@ -135,7 +135,6 @@
<string name="search_tip">Recherche normale : faire recherche.\n\nRecherche dans les tags suivis : seulement rechercher dans les tags suivis.\n\nSpécifer un uploader : faire la liste des galeries mises en ligne par l\'uploader spécifié. Autres options sont ignorées.\n\nSpécifier un tag : faire la liste des galeries qui contiennent le tag spécifié. Vous ne pouvez spécifier qu\'un tag. Autres options sont ignorées.</string>
<string name="search_sh">Montrer les galeries supprimées</string>
<string name="search_sdt">Chercher des tags faibles</string>
<string name="search_sto">Seulement montrer galeries avec des fiches torrent</string>
<string name="search_sr">Minimum note :</string>
<string name="search_sp">Pages : </string>
@@ -148,7 +147,6 @@
<string name="select_image">Sélectionner une image</string>
<string name="search_uss">Activer le scannage de similarité</string>
<string name="search_osc">Chercher seulement les couverture</string>
<string name="search_se">Montrer les galeries supprimées</string>
<string name="select_image_first">Sélectionnez une image</string>
<string name="add_to_favourites">Ajouter à favori</string>
app/src/main/res/values-ja/strings.xml
-2
View File
@@ -133,7 +133,6 @@
<string name="search_tip">普通検索：検索します。\n\n購読検索：購読しているタグで検索します。\n\nアップローダを検索：このアップローダーがアップロードしたギャラリーをリストします。他のオプションは無視されます。\n\nタグを検索：指定したタグを含むギャラリーをリストします。他のオプションは無視されます。</string>
<string name="search_sh">削除済みのギャラリーを表示</string>
<string name="search_sdt">低希望タグを検索</string>
<string name="search_sto">Torrentのあるギャラリーのみを表示</string>
<string name="search_sr">評価の下限：</string>
<string name="search_sp">ページ：</string>
@@ -147,7 +146,6 @@
<string name="select_image">画像を選択</string>
<string name="search_uss">類似検索を有効化</string>
<string name="search_osc">カバーのみを検索</string>
<string name="search_se">削除済みのギャラリーを表示</string>
<string name="select_image_first">画像を選択してください</string>
<string name="add_to_favourites">お気に入りに追加</string>
app/src/main/res/values-ko/strings.xml
-2
View File
@@ -137,14 +137,12 @@
<string name="search_tip">일반 검색: 그냥 검색합니다.\n\n업로더 지정: 해당 업로더가 업로드한 갤러리를 검색합니다. 다른 옵션은 무시됩니다.\n\n태그 지정: 해당 태그를 포함한 갤러리를 검색합니다. 하나의 태그만 지정할 수 있으며, 다른 옵션은 무시됩니다.</string>
<string name="search_sh">Expunged 갤러리 표시</string>
<string name="search_sdt">Low-Power 태그 검색</string>
<string name="search_sto">토렌트 파일이 있는 갤러리만 검색</string>
<string name="search_sr">최소 평점:</string>
<string name="select_image">이미지 선택</string>
<string name="search_uss">유사한 이미지 검색</string>
<string name="search_osc">커버만 검색</string>
<string name="search_se">Expunged 이미지 표시</string>
<string name="select_image_first">먼저 이미지를 선택해 주세요.</string>
<string name="add_to_favourites">즐겨찾기에 추가</string>
app/src/main/res/values-th/strings.xml
-2
View File
@@ -137,14 +137,12 @@
<string name="search_tip">ค้นหาแบบธรรมดา: ค้นหาแบบง๊ายง่าย\n\nระบุผู้อัพโหลด: ค้นหาแกลเลอรี่ที่อัพโหลดโดยระบุชื่อผู้ใช้ของคนอัพโหลด โดยตัวเลือกอื่นๆจะถูกข้ามไป\n\nระบุป้ายกำกับ: ค้นหาแกลเลอรี่ที่ถูกใส่ป้ายกำกับหรือแท็กไว้ในแต่ละแกลเลอรี่ ระบุได้เพียงหนึ่งป้ายกำกับ ตัวเลือกอื่นๆจะถูกข้ามไป</string>
<string name="search_sh">แสดงแกลเลอรี่ที่ถูกลบออก</string>
<string name="search_sdt">ค้นหาแท็กที่ไม่โด่งดัง</string>
<string name="search_sto">แสดงผลเฉพาะแกลเลอรี่ที่มีไฟล์ Torrents</string>
<string name="search_sr">เรตติ้งขั้นต่ำ:</string>
<string name="select_image">เลือกรูปภาพ</string>
<string name="search_uss">ใช้สแกนหาความเหมือน</string>
<string name="search_osc">ค้นหาเฉพาะหน้าปก</string>
<string name="search_se">แสดงเรื่องที่โดนลบ</string>
<string name="select_image_first">โปรดเลือกรูปภาพก่อน</string>
<string name="add_to_favourites">เพิ่มเข้าในรายการโปรด</string>
app/src/main/res/values-zh-rCN/strings.xml
-2
View File
@@ -146,7 +146,6 @@
<string name="search_tip">一般搜索：就是搜索。\n\n订阅搜素：在订阅中搜索。\n\n指定上传者：列出该上传者上传的画廊。其他选项会被忽略。\n\n指定标签：列出含有该标签的画廊。其他选项会被忽略。</string>
<string name="search_sh">仅显示被删除的画廊</string>
<string name="search_sdt">仅搜索低愿力标签</string>
<string name="search_sto">仅显示有种子的画廊</string>
<string name="search_sr">最低评分：</string>
<string name="search_sp">页数：</string>
@@ -159,7 +158,6 @@
<string name="select_image">选择图片</string>
<string name="search_uss">使用相似搜索</string>
<string name="search_osc">只搜索封面</string>
<string name="search_se">显示被删除的画廊</string>
<string name="select_image_first">请先选择图片</string>
<string name="add_to_favourites">收藏</string>
app/src/main/res/values-zh-rHK/strings.xml
-2
View File
@@ -146,7 +146,6 @@
<string name="search_tip">一般搜索：就是搜索。\n\n訂閲搜素：在訂閲中搜索。\n\n指定上傳者：列出該上傳者上傳的畫廊。其他選項會被忽略。\n\n指定標籤：列出含有該標籤的畫廊。其他選項會被忽略。</string>
<string name="search_sh">僅顯示被刪除的畫廊</string>
<string name="search_sdt">僅搜索低願力標籤</string>
<string name="search_sto">僅顯示有種子的畫廊</string>
<string name="search_sr">最低評分：</string>
<string name="search_sp">頁數：</string>
@@ -159,7 +158,6 @@
<string name="select_image">選擇圖片</string>
<string name="search_uss">使用相似搜索</string>
<string name="search_osc">只搜索封面</string>
<string name="search_se">顯示被刪除的畫廊</string>
<string name="select_image_first">請先選擇圖片</string>
<string name="add_to_favourites">收藏</string>
app/src/main/res/values-zh-rTW/strings.xml
-2
View File
@@ -146,7 +146,6 @@
<string name="search_tip">一般搜尋：就是搜尋。\n\n訂閱搜尋：在訂閱中搜尋。\n\n指定上傳者：列出該上傳者上傳的圖庫。其他選項會被忽略。\n\n指定標籤：列出含有該標籤的圖庫。其他選項會被忽略。</string>
<string name="search_sh">只顯示已被移除的圖庫</string>
<string name="search_sdt">只搜尋標籤:低願力</string>
<string name="search_sto">只顯示有種子的圖庫</string>
<string name="search_sr">最低評分：</string>
<string name="search_sp">頁數：</string>
@@ -159,7 +158,6 @@
<string name="select_image">選擇圖片</string>
<string name="search_uss">使用相似性搜尋</string>
<string name="search_osc">只搜尋封面</string>
<string name="search_se">顯示被刪除的圖庫</string>
<string name="select_image_first">請先選擇圖片</string>
<string name="add_to_favourites">收藏</string>
app/src/main/res/values/strings.xml
-2
View File
@@ -188,7 +188,6 @@
<string name="search_tip">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.</string>
<string name="search_sh">Only Show Expunged Galleries</string>
<string name="search_sdt">Only Search Low-Power Tags</string>
<string name="search_sto">Only Show Galleries With Torrents</string>
<string name="search_sr">Minimum Rating:</string>
<string name="search_sp">Pages:</string>
@@ -203,7 +202,6 @@
<string name="select_image">Select image</string>
<string name="search_uss">Use similarity scan</string>
<string name="search_osc">Only search covers</string>
<string name="search_se">Show expunged</string>
<string name="select_image_first">Please select image first</string>
<string name="add_to_favourites">Add to favourites</string>