diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt b/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt index f14f6892a..fdb5e23ad 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt @@ -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") diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java index 9602aea44..04f0676f2 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java @@ -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; } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index 7309f0539..4532097bf 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -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) { diff --git a/app/src/main/java/com/hippo/ehviewer/widget/AdvanceSearchTable.kt b/app/src/main/java/com/hippo/ehviewer/widget/AdvanceSearchTable.kt index 1d62ce9d8..4c2da71a1 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/AdvanceSearchTable.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/AdvanceSearchTable.kt @@ -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 diff --git a/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java index 0d2da3c00..687315725 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java @@ -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 diff --git a/app/src/main/res/layout/widget_advance_search_table.xml b/app/src/main/res/layout/widget_advance_search_table.xml index a8e4b51a5..a9a5c0f05 100644 --- a/app/src/main/res/layout/widget_advance_search_table.xml +++ b/app/src/main/res/layout/widget_advance_search_table.xml @@ -38,23 +38,6 @@ android:layout_weight="1" android:minWidth="0dp" android:minHeight="0dp" - android:text="@string/search_sdt" /> - - - - - diff --git a/app/src/main/res/layout/widget_image_search.xml b/app/src/main/res/layout/widget_image_search.xml index 8399771fa..25d99e340 100644 --- a/app/src/main/res/layout/widget_image_search.xml +++ b/app/src/main/res/layout/widget_image_search.xml @@ -72,17 +72,6 @@ - - Ein Etikett spezifizieren Erweitere Optionen aktivieren Gelöschte Galerien anzeigen - Nach unwichtigen Etiketten suchen Nur die Galerien mit Torrentdateien anzeigen Mindestpunktzahl: Seiten: @@ -111,7 +110,6 @@ Bild wählen Ähnlichkeitscan aktivieren Nur nach Umschläge suchen - Die gelöschten Galerien anzeigen Wähle ein Bild Zu den Favoriten hinzufügen Download stoppen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index a36693743..5acc01859 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -120,14 +120,12 @@ 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. Mostrar galerías borradas - Buscar etiquetas Low-Power Mostrar solo galerías con torrents Valoración mínima: Búsqueda de etiquetas suscritas Seleccionar imagen Usar búsqueda similar Buscar solo portadas - Mostrar borrados Seleccione la imagen primero Páginas: hasta diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 13d4dc0c3..e4a388ac8 100755 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -135,7 +135,6 @@ 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. Montrer les galeries supprimées - Chercher des tags faibles Seulement montrer galeries avec des fiches torrent Minimum note : Pages : @@ -148,7 +147,6 @@ Sélectionner une image Activer le scannage de similarité Chercher seulement les couverture - Montrer les galeries supprimées Sélectionnez une image Ajouter à favori diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 6f41a88b8..f6b77f36c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -133,7 +133,6 @@ 普通検索：検索します。\n\n購読検索：購読しているタグで検索します。\n\nアップローダを検索：このアップローダーがアップロードしたギャラリーをリストします。他のオプションは無視されます。\n\nタグを検索：指定したタグを含むギャラリーをリストします。他のオプションは無視されます。 削除済みのギャラリーを表示 - 低希望タグを検索 Torrentのあるギャラリーのみを表示 評価の下限： ページ： @@ -147,7 +146,6 @@ 画像を選択 類似検索を有効化 カバーのみを検索 - 削除済みのギャラリーを表示 画像を選択してください お気に入りに追加 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index f230fe7e9..f440f3f07 100755 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -137,14 +137,12 @@ 일반 검색: 그냥 검색합니다.\n\n업로더 지정: 해당 업로더가 업로드한 갤러리를 검색합니다. 다른 옵션은 무시됩니다.\n\n태그 지정: 해당 태그를 포함한 갤러리를 검색합니다. 하나의 태그만 지정할 수 있으며, 다른 옵션은 무시됩니다. Expunged 갤러리 표시 - Low-Power 태그 검색 토렌트 파일이 있는 갤러리만 검색 최소 평점: 이미지 선택 유사한 이미지 검색 커버만 검색 - Expunged 이미지 표시 먼저 이미지를 선택해 주세요. 즐겨찾기에 추가 diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 23066e92f..66d6b4051 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -137,14 +137,12 @@ ค้นหาแบบธรรมดา: ค้นหาแบบง๊ายง่าย\n\nระบุผู้อัพโหลด: ค้นหาแกลเลอรี่ที่อัพโหลดโดยระบุชื่อผู้ใช้ของคนอัพโหลด โดยตัวเลือกอื่นๆจะถูกข้ามไป\n\nระบุป้ายกำกับ: ค้นหาแกลเลอรี่ที่ถูกใส่ป้ายกำกับหรือแท็กไว้ในแต่ละแกลเลอรี่ ระบุได้เพียงหนึ่งป้ายกำกับ ตัวเลือกอื่นๆจะถูกข้ามไป แสดงแกลเลอรี่ที่ถูกลบออก - ค้นหาแท็กที่ไม่โด่งดัง แสดงผลเฉพาะแกลเลอรี่ที่มีไฟล์ Torrents เรตติ้งขั้นต่ำ: เลือกรูปภาพ ใช้สแกนหาความเหมือน ค้นหาเฉพาะหน้าปก - แสดงเรื่องที่โดนลบ โปรดเลือกรูปภาพก่อน เพิ่มเข้าในรายการโปรด diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f4a8513d5..1c858bca4 100755 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -146,7 +146,6 @@ 一般搜索：就是搜索。\n\n订阅搜素：在订阅中搜索。\n\n指定上传者：列出该上传者上传的画廊。其他选项会被忽略。\n\n指定标签：列出含有该标签的画廊。其他选项会被忽略。 仅显示被删除的画廊 - 仅搜索低愿力标签 仅显示有种子的画廊 最低评分： 页数： @@ -159,7 +158,6 @@ 选择图片 使用相似搜索 只搜索封面 - 显示被删除的画廊 请先选择图片 收藏 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 05acbe2ff..9764deafc 100755 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -146,7 +146,6 @@ 一般搜索：就是搜索。\n\n訂閲搜素：在訂閲中搜索。\n\n指定上傳者：列出該上傳者上傳的畫廊。其他選項會被忽略。\n\n指定標籤：列出含有該標籤的畫廊。其他選項會被忽略。 僅顯示被刪除的畫廊 - 僅搜索低願力標籤 僅顯示有種子的畫廊 最低評分： 頁數： @@ -159,7 +158,6 @@ 選擇圖片 使用相似搜索 只搜索封面 - 顯示被刪除的畫廊 請先選擇圖片 收藏 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0b2ddc247..d18d220ac 100755 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -146,7 +146,6 @@ 一般搜尋：就是搜尋。\n\n訂閱搜尋：在訂閱中搜尋。\n\n指定上傳者：列出該上傳者上傳的圖庫。其他選項會被忽略。\n\n指定標籤：列出含有該標籤的圖庫。其他選項會被忽略。 只顯示已被移除的圖庫 - 只搜尋標籤:低願力 只顯示有種子的圖庫 最低評分： 頁數： @@ -159,7 +158,6 @@ 選擇圖片 使用相似性搜尋 只搜尋封面 - 顯示被刪除的圖庫 請先選擇圖片 收藏 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3a0c3cde1..95ddafab7 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -188,7 +188,6 @@ 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. Only Show Expunged Galleries - Only Search Low-Power Tags Only Show Galleries With Torrents Minimum Rating: Pages: @@ -203,7 +202,6 @@ Select image Use similarity scan Only search covers - Show expunged Please select image first Add to favourites