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 36897f53d..f14f6892a 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 @@ -266,38 +266,18 @@ open class ListUrlBuilder : Cloneable, Parcelable { enableAdvanceSearch = true } - "f_sname" -> if ("on" == value) { - advanceSearch = advanceSearch or AdvanceSearchTable.SNAME + "f_sh" -> if ("on" == value) { + advanceSearch = advanceSearch or AdvanceSearchTable.SH } - "f_stags" -> if ("on" == value) { - advanceSearch = advanceSearch or AdvanceSearchTable.STAGS - } - - "f_sdesc" -> if ("on" == value) { - advanceSearch = advanceSearch or AdvanceSearchTable.SDESC - } - - "f_storr" -> if ("on" == value) { - advanceSearch = advanceSearch or AdvanceSearchTable.STORR + "f_sdt" -> if ("on" == value) { + advanceSearch = advanceSearch or AdvanceSearchTable.SDT } "f_sto" -> if ("on" == value) { advanceSearch = advanceSearch or AdvanceSearchTable.STO } - "f_sdt1" -> if ("on" == value) { - advanceSearch = advanceSearch or AdvanceSearchTable.SDT1 - } - - "f_sdt2" -> if ("on" == value) { - advanceSearch = advanceSearch or AdvanceSearchTable.SDT2 - } - - "f_sh" -> if ("on" == value) { - advanceSearch = advanceSearch or AdvanceSearchTable.SH - } - "f_sfl" -> if ("on" == value) { advanceSearch = advanceSearch or AdvanceSearchTable.SFL } @@ -385,26 +365,9 @@ open class ListUrlBuilder : Cloneable, Parcelable { // Advance search if (advanceSearch != -1) { ub.addQuery("advsearch", "1") - if (advanceSearch and AdvanceSearchTable.SNAME != 0) ub.addQuery( - "f_sname", - "on" - ) - if (advanceSearch and AdvanceSearchTable.STAGS != 0) ub.addQuery( - "f_stags", - "on" - ) - if (advanceSearch and AdvanceSearchTable.SDESC != 0) ub.addQuery( - "f_sdesc", - "on" - ) - if (advanceSearch and AdvanceSearchTable.STORR != 0) ub.addQuery( - "f_storr", - "on" - ) - if (advanceSearch and AdvanceSearchTable.STO != 0) ub.addQuery("f_sto", "on") - if (advanceSearch and AdvanceSearchTable.SDT1 != 0) ub.addQuery("f_sdt1", "on") - if (advanceSearch and AdvanceSearchTable.SDT2 != 0) ub.addQuery("f_sdt2", "on") 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") if (advanceSearch and AdvanceSearchTable.SFT != 0) ub.addQuery("f_sft", "on") @@ -497,26 +460,9 @@ open class ListUrlBuilder : Cloneable, Parcelable { } if (advanceSearch != -1) { ub.addQuery("advsearch", "1") - if (advanceSearch and AdvanceSearchTable.SNAME != 0) ub.addQuery( - "f_sname", - "on" - ) - if (advanceSearch and AdvanceSearchTable.STAGS != 0) ub.addQuery( - "f_stags", - "on" - ) - if (advanceSearch and AdvanceSearchTable.SDESC != 0) ub.addQuery( - "f_sdesc", - "on" - ) - if (advanceSearch and AdvanceSearchTable.STORR != 0) ub.addQuery( - "f_storr", - "on" - ) - if (advanceSearch and AdvanceSearchTable.STO != 0) ub.addQuery("f_sto", "on") - if (advanceSearch and AdvanceSearchTable.SDT1 != 0) ub.addQuery("f_sdt1", "on") - if (advanceSearch and AdvanceSearchTable.SDT2 != 0) ub.addQuery("f_sdt2", "on") 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") if (advanceSearch and AdvanceSearchTable.SFT != 0) ub.addQuery("f_sft", "on") 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 2f5f3fa77..1d62ce9d8 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/AdvanceSearchTable.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/AdvanceSearchTable.kt @@ -28,14 +28,9 @@ import com.hippo.yorozuya.NumberUtils class AdvanceSearchTable @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null ) : LinearLayout(context, attrs) { - private var mSname: CheckBox - private var mStags: CheckBox - private var mSdesc: CheckBox - private var mStorr: CheckBox - private var mSto: CheckBox - private var mSdt1: CheckBox - private var mSdt2: CheckBox private var mSh: CheckBox + private var mSdt: CheckBox + private var mSto: CheckBox private var mSr: CheckBox private var mMinRating: TextInputLayout private var mSp: CheckBox @@ -51,28 +46,21 @@ class AdvanceSearchTable @JvmOverloads constructor( val inflater = LayoutInflater.from(context) inflater.inflate(R.layout.widget_advance_search_table, this) val row0 = getChildAt(0) as ViewGroup - mSname = row0.getChildAt(0) as CheckBox - mStags = row0.getChildAt(1) as CheckBox + mSh = row0.getChildAt(0) as CheckBox + mSdt = row0.getChildAt(1) as CheckBox val row1 = getChildAt(1) as ViewGroup - mSdesc = row1.getChildAt(0) as CheckBox - mStorr = row1.getChildAt(1) as CheckBox + mSto = row1.getChildAt(0) as CheckBox val row2 = getChildAt(2) as ViewGroup - mSto = row2.getChildAt(0) as CheckBox - mSdt1 = row2.getChildAt(1) as CheckBox + mSr = row2.getChildAt(0) as CheckBox + mMinRating = row2.getChildAt(1) as TextInputLayout val row3 = getChildAt(3) as ViewGroup - mSdt2 = row3.getChildAt(0) as CheckBox - mSh = row3.getChildAt(1) as CheckBox - val row4 = getChildAt(4) as ViewGroup - mSr = row4.getChildAt(0) as CheckBox - mMinRating = row4.getChildAt(1) as TextInputLayout + mSp = row3.getChildAt(0) as CheckBox + mSpf = row3.getChildAt(1) as EditText + mSpt = row3.getChildAt(3) as EditText val row5 = getChildAt(5) as ViewGroup - mSp = row5.getChildAt(0) as CheckBox - mSpf = row5.getChildAt(1) as EditText - mSpt = row5.getChildAt(3) as EditText - val row7 = getChildAt(7) as ViewGroup - mSfl = row7.getChildAt(0) as CheckBox - mSfu = row7.getChildAt(1) as CheckBox - mSft = row7.getChildAt(2) as CheckBox + mSfl = row5.getChildAt(0) as CheckBox + mSfu = row5.getChildAt(1) as CheckBox + mSft = row5.getChildAt(2) as CheckBox mSpt.setOnEditorActionListener { v: TextView, _: Int, _: KeyEvent? -> val nextView = v.focusSearch( @@ -98,31 +86,18 @@ class AdvanceSearchTable @JvmOverloads constructor( var advanceSearch: Int get() { var advanceSearch = 0 - if (mSname.isChecked) advanceSearch = advanceSearch or SNAME - if (mStags.isChecked) advanceSearch = advanceSearch or STAGS - if (mSdesc.isChecked) advanceSearch = advanceSearch or SDESC - if (mStorr.isChecked) advanceSearch = advanceSearch or STORR - if (mSto.isChecked) advanceSearch = advanceSearch or STO - if (mSdt1.isChecked) advanceSearch = advanceSearch or SDT1 - if (mSdt2.isChecked) advanceSearch = advanceSearch or SDT2 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 if (mSft.isChecked) advanceSearch = advanceSearch or SFT return advanceSearch } set(advanceSearch) { - mSname.isChecked = - NumberUtils.int2boolean(advanceSearch and SNAME) - mStags.isChecked = - NumberUtils.int2boolean(advanceSearch and STAGS) - mSdesc.isChecked = - NumberUtils.int2boolean(advanceSearch and SDESC) - mStorr.isChecked = NumberUtils.int2boolean(advanceSearch and STORR) - mSto.isChecked = NumberUtils.int2boolean(advanceSearch and STO) - mSdt1.isChecked = NumberUtils.int2boolean(advanceSearch and SDT1) - mSdt2.isChecked = NumberUtils.int2boolean(advanceSearch and SDT2) 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) mSft.isChecked = NumberUtils.int2boolean(advanceSearch and SFT) @@ -174,14 +149,9 @@ class AdvanceSearchTable @JvmOverloads constructor( } companion object { - const val SNAME = 0x1 - const val STAGS = 0x2 - const val SDESC = 0x4 - const val STORR = 0x8 - const val STO = 0x10 - const val SDT1 = 0x20 - const val SDT2 = 0x40 - const val SH = 0x80 + const val SH = 0x1 + const val SDT = 0x2 + const val STO = 0x4 const val SFL = 0x100 const val SFU = 0x200 const val SFT = 0x400 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 40a241078..a8e4b51a5 100644 --- a/app/src/main/res/layout/widget_advance_search_table.xml +++ b/app/src/main/res/layout/widget_advance_search_table.xml @@ -26,38 +26,9 @@ android:layout_gravity="center_vertical" android:layout_marginRight="@dimen/advance_search_table_item_margin" android:layout_weight="1" - android:checked="true" android:minWidth="0dp" android:minHeight="0dp" - android:text="@string/search_sname" /> - - - - - - - + android:text="@string/search_sh" /> + android:text="@string/search_sdt" /> - - - - - - - - - Einen Uploader spezifizieren Ein Etikett spezifizieren Erweitere Optionen aktivieren - Nach Galerie suchen - Nach Galerie-Etikett suchen - Nach Galeriebeschreibungen suchen - Nach Torrentdateien suchen - Nur die Galerien mit Torrentdateien anzeigen - Nach unwichtigen Etiketten suchen - Nach unerwünschten Etiketten suchen Gelöschte Galerien anzeigen + Nach unwichtigen Etiketten suchen + Nur die Galerien mit Torrentdateien anzeigen Mindestpunktzahl: Seiten: zu diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ac09975db..ac9e6fb9a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -120,14 +120,9 @@ 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. - Buscar galerías - Buscar etiquetas de galería - Buscar descripción de galería - Buscar nombres de archivo torrent - Mostrar solo galerías con torrents - Buscar etiquetas Low-Power - Buscar etiquetas pobres 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 diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d8e7eab4a..41f1ddcc7 100755 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -135,14 +135,9 @@ 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. - Chercher une galerie - Chercher tags galerie - Chercher la description galerie - Chercher un nom de fiche torrent - Seulement montrer galeries avec des fiches torrent - Chercher des tags faibles - Chercher des tags peu acceptés Montrer les galeries supprimées + Chercher des tags faibles + Seulement montrer galeries avec des fiches torrent Minimum note : Pages : à diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f1797163e..b5bea3424 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -133,14 +133,9 @@ 普通検索：検索します。\n\n購読検索：購読しているタグで検索します。\n\nアップローダを検索：このアップローダーがアップロードしたギャラリーをリストします。他のオプションは無視されます。\n\nタグを検索：指定したタグを含むギャラリーをリストします。他のオプションは無視されます。 - ギャラリーを検索 - ギャラリータグを検索 - ギャラリー説明を検索 - Torrentファイル名を検索 - Torrentのあるギャラリーのみを表示 - 低希望タグを検索 - 低評価タグを検索 削除済みのギャラリーを表示 + 低希望タグを検索 + Torrentのあるギャラリーのみを表示 評価の下限： ページ： から diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b1289d139..8665c9880 100755 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -137,14 +137,9 @@ 일반 검색: 그냥 검색합니다.\n\n업로더 지정: 해당 업로더가 업로드한 갤러리를 검색합니다. 다른 옵션은 무시됩니다.\n\n태그 지정: 해당 태그를 포함한 갤러리를 검색합니다. 하나의 태그만 지정할 수 있으며, 다른 옵션은 무시됩니다. - 갤러리 검색 - 갤러래 태그 검색 - 갤러리 설명 검색 - 토렌트 파일 이름 검색 - 토렌트 파일이 있는 갤러리만 검색 - Low-Power 태그 검색 - Downvoted 태그 검색 Expunged 갤러리 표시 + Low-Power 태그 검색 + 토렌트 파일이 있는 갤러리만 검색 최소 평점: 이미지 선택 diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index f07ada3d7..c07bb14a6 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -137,14 +137,9 @@ ค้นหาแบบธรรมดา: ค้นหาแบบง๊ายง่าย\n\nระบุผู้อัพโหลด: ค้นหาแกลเลอรี่ที่อัพโหลดโดยระบุชื่อผู้ใช้ของคนอัพโหลด โดยตัวเลือกอื่นๆจะถูกข้ามไป\n\nระบุป้ายกำกับ: ค้นหาแกลเลอรี่ที่ถูกใส่ป้ายกำกับหรือแท็กไว้ในแต่ละแกลเลอรี่ ระบุได้เพียงหนึ่งป้ายกำกับ ตัวเลือกอื่นๆจะถูกข้ามไป - ค้นหาแกลเลอรี่ - ค้นหาแท็กของแกลเลอรี่ - ค้นหาคำอธิบายของแกลเลอรี่ - ค้นหาชื่อไฟล์ Torrent - แสดงผลเฉพาะแกลเลอรี่ที่มีไฟล์ Torrents - ค้นหาแท็กที่ไม่โด่งดัง - ค้นหาแท็กที่ถูกโหวตไม่เห็นด้วย แสดงแกลเลอรี่ที่ถูกลบออก + ค้นหาแท็กที่ไม่โด่งดัง + แสดงผลเฉพาะแกลเลอรี่ที่มีไฟล์ Torrents เรตติ้งขั้นต่ำ: เลือกรูปภาพ diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bd9f1dcdd..041d438e4 100755 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -146,14 +146,9 @@ 一般搜索：就是搜索。\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 45236bde4..15b7d8f2d 100755 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -146,14 +146,9 @@ 一般搜索：就是搜索。\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 5cdfb81df..c75650f71 100755 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -146,14 +146,9 @@ 一般搜尋：就是搜尋。\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 ceca1955a..8a5fb9fd0 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -188,14 +188,9 @@ 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 - Search Gallery Description - Search Torrent Filenames + Only Show Expunged Galleries + Only Search Low-Power Tags Only Show Galleries With Torrents - Search Low-Power Tags - Search Downvoted Tags - Show Expunged Galleries Minimum Rating: Pages: to