Cleanup code

2023-12-15 15:42:03 +08:00
1 parent 57c12f7df0
commit eeffb12e3b
@@ -139,7 +139,6 @@
            android:launchMode="singleTask"
            android:taskAffinity=""
            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <activity android:name=".ui.WebViewActivity" />

        <service
            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
@@ -1,5 +0,0 @@
-package com.hippo.ehviewer.client.exception
-
-import com.hippo.ehviewer.R
-
-class CloudflareBypassException : EhException(R.string.cloudflare_bypass_failed)
@@ -1,18 +0,0 @@
-package com.hippo.ehviewer.ui
-
-import android.os.Bundle
-import com.hippo.ehviewer.ui.webview.WebViewScreen
-
-class WebViewActivity : EhActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val url = intent.extras?.getString(KEY_URL) ?: return
-        setMD3Content {
-            WebViewScreen(url = url) { finish() }
-        }
-    }
-
-    companion object {
-        const val KEY_URL = "url"
-    }
-}
@@ -1,6 +1,5 @@
 package com.hippo.ehviewer.ui.main

-import android.content.Intent
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -39,7 +38,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
@@ -51,17 +49,13 @@ import androidx.paging.compose.itemContentType
 import androidx.paging.compose.itemKey
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.client.exception.CloudflareBypassException
 import com.hippo.ehviewer.collectAsState
 import com.hippo.ehviewer.icons.EhIcons
 import com.hippo.ehviewer.icons.big.SadAndroid
-import com.hippo.ehviewer.ui.WebViewActivity
 import com.hippo.ehviewer.ui.screen.collectDetailSizeAsState
 import com.hippo.ehviewer.ui.tools.FastScrollLazyVerticalGrid
 import com.hippo.ehviewer.ui.tools.FastScrollLazyVerticalStaggeredGrid
-import com.hippo.ehviewer.ui.tools.LocalDialogState
 import com.hippo.ehviewer.util.ExceptionUtils
 import kotlinx.coroutines.CoroutineScope

@@ -81,7 +75,6 @@ fun GalleryList(
    onRefresh: suspend CoroutineScope.() -> Unit,
    onLoading: suspend CoroutineScope.() -> Unit,
 ) {
-    val context = LocalContext.current
    val layoutDirection = LocalLayoutDirection.current
    val marginH = dimensionResource(id = R.dimen.gallery_list_margin_h)
    val marginV = dimensionResource(id = R.dimen.gallery_list_margin_v)
@@ -175,7 +168,6 @@ fun GalleryList(
            }
        }

-        val dialogState = LocalDialogState.current
        when (val state = data.loadState.refresh) {
            is LoadState.Loading -> if (!refreshState.isRefreshing && scrollToTopOnRefresh) {
                LaunchedEffect(Unit) {
@@ -200,18 +192,6 @@ fun GalleryList(

            is LoadState.Error -> {
                Surface {
-                    LaunchedEffect(state) {
-                        if (state.error.cause is CloudflareBypassException) {
-                            dialogState.awaitPermissionOrCancel(title = R.string.cloudflare_bypass_failed) {
-                                Text(text = stringResource(id = R.string.open_in_webview))
-                            }
-                            context.startActivity(
-                                Intent(context, WebViewActivity::class.java).apply {
-                                    putExtra(WebViewActivity.KEY_URL, EhUrl.host)
-                                },
-                            )
-                        }
-                    }
                    ErrorTip(
                        modifier = Modifier.widthIn(max = 228.dp)
                            .clip(ShapeDefaults.Small).clickable { data.retry() },
@@ -138,6 +138,7 @@ fun DownloadsScreen(navigator: DestinationsNavigator) {
    val labelsList = DownloadManager.labelList

    val newLabel = stringResource(R.string.new_label_title)
+    val renameLabel = stringResource(R.string.rename_label_title)
    val labelsStr = stringResource(R.string.download_labels)
    val labelEmpty = stringResource(R.string.label_text_is_empty)
    val defaultInvalid = stringResource(R.string.label_text_is_invalid)
@@ -276,7 +277,7 @@ fun DownloadsScreen(navigator: DestinationsNavigator) {
                                        IconButton(
                                            onClick = {
                                                coroutineScope.launch {
-                                                    val new = dialogState.awaitInputText(title = newLabel, hint = labelsStr) { text ->
+                                                    val new = dialogState.awaitInputText(title = renameLabel, hint = labelsStr) { text ->
                                                        when {
                                                            text.isBlank() -> labelEmpty
                                                            text == defaultName -> defaultInvalid
@@ -59,21 +59,12 @@
    <string name="gallery_list_search_bar_hint_exhentai">ExHentai durchsuchen</string>
    <string name="gallery_list_search_bar_hint_e_hentai">E-Hentai durchsuchen</string>
    <string name="gallery_list_empty_hit">Die Welt ist so groß und der Panda sitzt ganz allein</string>
-    <string name="search">Suchen</string>
    <string name="keyword_search">Suche nach dem Schlüsselwort</string>
    <string name="image_search">Suche nach einem Bild</string>
-    <string name="search_normal">Normale Suche</string>
-    <string name="search_advance">Erweiterte Optionen</string>
    <string name="search_image">Suche nach einem Bild</string>
-    <string name="search_normal_search">Normale Suche</string>
-    <string name="search_subscription_search">Suche in gefolgten Etiketten</string>
-    <string name="search_specify_uploader">Einen Uploader spezifizieren</string>
-    <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_sto">Nur die Galerien mit Torrentdateien anzeigen</string>
    <string name="search_sr">Mindestpunktzahl: </string>
-    <string name="search_sp">Seiten: </string>
    <string name="search_sp_to">zu</string>
    <string name="search_sf">Standard-Filter deaktivieren für: </string>
    <string name="search_sfl">Sprache</string>
@@ -231,7 +222,6 @@
    <string name="add_filter">Blocker erstellen</string>
    <string name="filter_text">Blocker-Text</string>
    <string name="filter_tip">Die blockierten Galerien wurde in EHentai nicht angezeigt.\n\nTitel-Blocker: die Galerien, deren Titel das Wort enthalten, ausschließen.\n\nUploader-Blocker: Die vom Uploader hochgeladen Galerien ausschließen.\n\nEtikett-Blocker: Die Galerien, die die Etikett haben, ausschließen. Es wird länger dauern, Galerieliste zu laden.\n\nEtikettnamensraum-Blocker: Die Galerien, die den Etikettnamensraum haben, ausschließen. Es wird länger dauern, Galerieliste zu laden.</string>
-    <string name="search_tip">Normale Suche: Nur durchsuchen.\n\nSuche in gefolgten Etiketten: Nur die Galerien, die die gefolgten Etiketten haben, durchsuchen.\n\nUploader spezifizieren: Die Galerien, die vom Uploader hochgeladen sind, auflisten. Andere Optionen werden ignoriert.\n\nEtikett spezifizieren: Die Galerien, die das Etikett haben, auflisten. Nur ein Etikett kann eingegeben werden. Andere Optionen werden ignoriert.</string>
    <string name="u_config">EHentai-Einstellungen</string>
    <string name="apply_tip">Zum Speichern der Einstellungen auf Häkchen tippen</string>
    <string name="share_image">Das Bild teilen</string>
@@ -78,29 +78,17 @@
    <string name="gallery_list_search_bar_hint_e_hentai">Buscar E-Hentai</string>
    <string name="gallery_list_empty_hit">El mundo es grande y el panda está sentado solo</string>

-    <string name="search">Buscar</string>
-
    <string name="keyword_search">Búsqueda por palabras clave</string>
    <string name="image_search">Búsqueda de imagen</string>
-    <string name="search_normal">Búsqueda normal</string>
-    <string name="search_advance">Opciones avanzadas</string>
    <string name="search_image">Búsqueda de imágenes</string>
-    <string name="search_normal_search">Búsqueda general</string>
-    <string name="search_specify_uploader">Uploader específicos</string>
-    <string name="search_specify_tag">Etiquetas específicas</string>
-    <string name="search_enable_advance">Habilitar opciones avanzadas</string>
-
-    <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_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="select_image_first">Seleccione la imagen primero</string>
-    <string name="search_sp">Páginas:</string>
    <string name="search_sp_to">hasta</string>
    <string name="search_sf">Deshabilitar filtros para:</string>
    <string name="search_sfl">Lenguaje</string>
@@ -81,26 +81,14 @@
    <string name="gallery_list_empty_hit">Le monde est grand et le panda s\'assied tout seul.</string>
    <string name="gallery_list_empty_hit_subscription">Vous pouvez suivre des tags à Paramètres -> EH -> Mes tags.</string>

-    <string name="search">Chercher</string>
-
    <string name="keyword_search">Recherche du mot-clé</string>
    <string name="image_search">Recherche d\'une image</string>

-    <string name="search_normal">Recherche normale</string>
-    <string name="search_advance">Options avancées</string>
    <string name="search_image">Recherche d\'une image</string>
-    <string name="search_subscription_search">Recherche dans les tags suivis</string>
-    <string name="search_normal_search">Chercher</string>
-    <string name="search_specify_uploader">Spécifier un uploader</string>
-    <string name="search_specify_tag">Spécifier un tag</string>
-    <string name="search_enable_advance">Activer options avancées</string>
-
-    <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_sto">Seulement montrer galeries avec des fiches torrent</string>
    <string name="search_sr">Minimum note :</string>
-    <string name="search_sp">Pages : </string>
    <string name="search_sp_to">à</string>
    <string name="search_sf">Désactiver le filtre par défaut pour les items suivants :</string>
    <string name="search_sfl">Langue</string>
@@ -79,26 +79,14 @@
    <string name="gallery_list_empty_hit">何も見つかりませんでした。</string>
    <string name="gallery_list_empty_hit_subscription">リストは空です。設定->EH->マイタグにてタグを購読することができます。</string>

-    <string name="search">検索</string>
-
    <string name="keyword_search">キーワードで検索</string>
    <string name="image_search">画像で検索</string>

-    <string name="search_normal">検索</string>
-    <string name="search_advance">その他のオプション</string>
    <string name="search_image">画像検索</string>
-    <string name="search_normal_search">一般検索</string>
-    <string name="search_subscription_search">購読検索</string>
-    <string name="search_specify_uploader">アップローダを検索</string>
-    <string name="search_specify_tag">タグを検索</string>
-    <string name="search_enable_advance">その他のオプションを有効化</string>
-
-    <string name="search_tip">普通検索：検索します。\n\n購読検索：購読しているタグで検索します。\n\nアップローダを検索：このアップローダーがアップロードしたギャラリーをリストします。他のオプションは無視されます。\n\nタグを検索：指定したタグを含むギャラリーをリストします。他のオプションは無視されます。</string>

    <string name="search_sh">削除済みのギャラリーを表示</string>
    <string name="search_sto">Torrentのあるギャラリーのみを表示</string>
    <string name="search_sr">評価の下限：</string>
-    <string name="search_sp">ページ：</string>
    <string name="search_sp_to">から</string>
    <string name="search_sp_suffix">まで</string>
    <string name="search_sf">既定フィルターから下記のものを例外とする：</string>
@@ -82,20 +82,10 @@
    <string name="gallery_list_search_bar_open_gallery">갤러리 열기</string>
    <string name="gallery_list_empty_hit">The World is Big and the panda sit alone</string>

-    <string name="search">검색</string>
-
    <string name="keyword_search">키워드 검색</string>
    <string name="image_search">이미지 검색</string>

-    <string name="search_normal">일반 검색</string>
-    <string name="search_advance">고급 옵션</string>
    <string name="search_image">이미지 검색</string>
-    <string name="search_normal_search">일반 검색</string>
-    <string name="search_specify_uploader">업로더 지정</string>
-    <string name="search_specify_tag">태그 지정</string>
-    <string name="search_enable_advance">고급 옵션 사용</string>
-
-    <string name="search_tip">일반 검색: 그냥 검색합니다.\n\n업로더 지정: 해당 업로더가 업로드한 갤러리를 검색합니다. 다른 옵션은 무시됩니다.\n\n태그 지정: 해당 태그를 포함한 갤러리를 검색합니다. 하나의 태그만 지정할 수 있으며, 다른 옵션은 무시됩니다.</string>

    <string name="search_sh">Expunged 갤러리 표시</string>
    <string name="search_sto">토렌트 파일이 있는 갤러리만 검색</string>
@@ -36,18 +36,12 @@
    <string name="torrent_count">Torrent (%d)</string>
    <string name="share">Del</string>
    <string name="gallery_list_search_bar_open_gallery">Åpne galleriet</string>
-    <string name="search_normal_search">Normalt søk</string>
-    <string name="search_subscription_search">Abonnementssøk</string>
    <string name="search_sp_to">til</string>
    <string name="search_sfu">Opplaster</string>
    <string name="delete">Slett</string>
-    <string name="search">Søk</string>
    <string name="image_search">Bildesøk</string>
-    <string name="search_normal">Normalt søk</string>
    <string name="search_cover">Søk i omslag</string>
    <string name="search_image">Bildesøk</string>
-    <string name="search_specify_uploader">Angi opplaster</string>
-    <string name="search_specify_tag">Angi etikett</string>
    <string name="select_image">Velg bilde</string>
    <string name="star_3">3 stjerner</string>
    <string name="read">Les</string>
@@ -64,7 +58,6 @@
    <string name="refresh">Gjenoppfrisk</string>
    <string name="get_it">Skjønner</string>
    <string name="keyword_search">Nøkkelordssøk</string>
-    <string name="search_sp">Sider:</string>
    <string name="search_sft">Etiketter</string>
    <string name="any">Ubegrenset</string>
    <plurals name="page_count">
@@ -1,4 +1,3 @@
 <resources>
    <dimen name="bottom_sheet_width">480dp</dimen>
-    <dimen name="screen_edge_margin">24dp</dimen>
 </resources>
@@ -82,20 +82,10 @@
    <string name="gallery_list_search_bar_open_gallery">เปิดแกลเลอรี่</string>
    <string name="gallery_list_empty_hit">โลกนั้นนะมันกว้างงงงงใหญ่ไพรศาล และแพนด้านั่งโดดเดี่ยวเดียวดายในโลกกลมๆ</string>

-    <string name="search">ค้นหา</string>
-
    <string name="keyword_search">คีย์เวิร์ดในการค้นหา</string>
    <string name="image_search">ค้นหาด้วยรูป</string>

-    <string name="search_normal">ค้นหาแบบธรรมดา</string>
-    <string name="search_advance">ตัวเลือกขั้นสูง</string>
    <string name="search_image">ค้นหาด้วยรูปภาพ</string>
-    <string name="search_normal_search">ค้นหาแบบธรรมดา</string>
-    <string name="search_specify_uploader">ระบุผู้อัพโหลด</string>
-    <string name="search_specify_tag">ระบุป้ายกำกับ</string>
-    <string name="search_enable_advance">เปิดโหมดค้นหาขั้นสูง</string>
-
-    <string name="search_tip">ค้นหาแบบธรรมดา: ค้นหาแบบง๊ายง่าย\n\nระบุผู้อัพโหลด: ค้นหาแกลเลอรี่ที่อัพโหลดโดยระบุชื่อผู้ใช้ของคนอัพโหลด โดยตัวเลือกอื่นๆจะถูกข้ามไป\n\nระบุป้ายกำกับ: ค้นหาแกลเลอรี่ที่ถูกใส่ป้ายกำกับหรือแท็กไว้ในแต่ละแกลเลอรี่ ระบุได้เพียงหนึ่งป้ายกำกับ ตัวเลือกอื่นๆจะถูกข้ามไป</string>

    <string name="search_sh">แสดงแกลเลอรี่ที่ถูกลบออก</string>
    <string name="search_sto">แสดงผลเฉพาะแกลเลอรี่ที่มีไฟล์ Torrents</string>
@@ -46,17 +46,9 @@
    <string name="sign_in_failed">Giriş başarısız</string>
    <string name="get_it">Anladım</string>
    <string name="gallery_list_empty_hit">Dünya büyük olmasına rağmen pandacık yalnız oturuyor</string>
-    <string name="search">Arayın</string>
    <string name="keyword_search">Anahtar Kelime Arama</string>
    <string name="image_search">Görsel Arama</string>
-    <string name="search_normal">Normal Arama</string>
-    <string name="search_advance">Gelişmiş Seçenekler</string>
    <string name="search_image">Görsel Arama</string>
-    <string name="search_normal_search">Normal arama</string>
-    <string name="search_subscription_search">Abonelik araması</string>
-    <string name="search_specify_uploader">Belirli yükleyici</string>
-    <string name="search_specify_tag">Belirli etiket</string>
-    <string name="search_enable_advance">Gelişmiş seçenekleri etkinleştir</string>
    <string name="search_sh">Yalnızca Silinen Galerileri Gösteri</string>
    <string name="search_sto">Yalnızca Torrent\'li Galerileri Göster</string>
    <string name="search_sr">En Az Derecelendirme:</string>
@@ -91,7 +83,6 @@
    <string name="select_scene">Hangi galeri sitesini ziyaret etmek istiyorsunuz\?</string>
    <string name="gallery_list_search_bar_hint_e_hentai">E-Hentai\'de Arayın</string>
    <string name="gallery_list_empty_hit_subscription">Etiketlere Ayarlar-&gt;EH-&gt;Etiketlerim yerinden abone olun</string>
-    <string name="search_sp">Sayfa:</string>
    <string name="duplicate_quick_search">Aynı bir hızlı arama zaten var. Adı \"%s\".</string>
    <string name="search_sp_err1">Sayfa oranı en fazla 10un altında olamaz</string>
    <string name="readme">BENIOKU</string>
@@ -62,8 +62,6 @@
    <string name="sign_in_failed">登录失败</string>
    <string name="sign_in_failed_tip">若持续出错，请尝试“通过网页登录”或“通过 Cookie 登录”。</string>
    <string name="get_it">知道了</string>
-    <string name="cloudflare_bypass_failed">未能绕过 Cloudflare 验证</string>
-    <string name="open_in_webview">在 WebView 中打开链接以通过验证？</string>
    <!-- Select scene -->
    <string name="select_scene">你想选择哪个画廊站点？</string>
    <string name="select_scene_explain">e-hentai：对任何人开放\nexhentai：仅对登录用户开放</string>
@@ -74,22 +72,12 @@
    <string name="gallery_list_search_bar_open_gallery">打开画廊</string>
    <string name="gallery_list_empty_hit">什么都没有找到</string>
    <string name="gallery_list_empty_hit_subscription">请至 设置-&gt;EH-&gt;我的标签 订阅标签</string>
-    <string name="search">搜索</string>
    <string name="keyword_search">关键字搜索</string>
    <string name="image_search">图片搜索</string>
-    <string name="search_normal">普通搜索</string>
-    <string name="search_advance">高级选项</string>
    <string name="search_image">图片搜索</string>
-    <string name="search_normal_search">一般搜索</string>
-    <string name="search_subscription_search">订阅搜索</string>
-    <string name="search_specify_uploader">指定上传者</string>
-    <string name="search_specify_tag">指定标签</string>
-    <string name="search_enable_advance">启用高级选项</string>
-    <string name="search_tip">一般搜索：就是搜索。\n\n订阅搜素：在订阅中搜索。\n\n指定上传者：列出该上传者上传的画廊。其他选项会被忽略。\n\n指定标签：列出含有该标签的画廊。其他选项会被忽略。</string>
    <string name="search_sh">已删除</string>
    <string name="search_sto">有种子</string>
    <string name="search_sr">最低评分：</string>
-    <string name="search_sp">页数：</string>
    <string name="search_sp_to">到</string>
    <string name="search_sp_err1">页数最大值至少为 10</string>
    <string name="search_sp_err2">页数范围差至少为 20</string>
@@ -85,26 +85,14 @@
    <string name="gallery_list_empty_hit">什麼都沒有找到</string>
    <string name="gallery_list_empty_hit_subscription">請至 設置->EH->我的標籤 訂閲標籤</string>

-    <string name="search">搜索</string>
-
    <string name="keyword_search">關鍵字搜索</string>
    <string name="image_search">圖片搜索</string>

-    <string name="search_normal">普通搜索</string>
-    <string name="search_advance">高級選項</string>
    <string name="search_image">圖片搜索</string>
-    <string name="search_normal_search">一般搜索</string>
-    <string name="search_subscription_search">訂閲搜索</string>
-    <string name="search_specify_uploader">指定上傳者</string>
-    <string name="search_specify_tag">指定標籤</string>
-    <string name="search_enable_advance">啟用高級選項</string>
-
-    <string name="search_tip">一般搜索：就是搜索。\n\n訂閲搜素：在訂閲中搜索。\n\n指定上傳者：列出該上傳者上傳的畫廊。其他選項會被忽略。\n\n指定標籤：列出含有該標籤的畫廊。其他選項會被忽略。</string>

    <string name="search_sh">已刪除</string>
    <string name="search_sto">有種子</string>
    <string name="search_sr">最低評分：</string>
-    <string name="search_sp">頁數：</string>
    <string name="search_sp_to">到</string>
    <string name="search_sf">禁用排除項：</string>
    <string name="search_sfl">語言</string>
@@ -62,8 +62,6 @@
    <string name="sign_in_failed">登入失敗</string>
    <string name="sign_in_failed_tip">若持續出錯，請嘗試“通過網頁登入”或“通過 Cookie 登入”。</string>
    <string name="get_it">知道了</string>
-    <string name="cloudflare_bypass_failed">未能繞過 Cloudflare 驗證</string>
-    <string name="open_in_webview">在 WebView 中開啟網址以完成驗證？</string>
    <!-- Select scene -->
    <string name="select_scene">你想選擇哪個圖庫站台？</string>
    <string name="select_scene_explain">e-hentai：對任何人開放\nexhentai：僅對登入使用者開放</string>
@@ -74,22 +72,12 @@
    <string name="gallery_list_search_bar_open_gallery">開啟圖庫</string>
    <string name="gallery_list_empty_hit">什麼都沒找到</string>
    <string name="gallery_list_empty_hit_subscription">請至 設定-&gt;EH-&gt;我的標籤 訂閱標籤</string>
-    <string name="search">搜尋</string>
    <string name="keyword_search">關鍵字搜尋</string>
    <string name="image_search">圖片搜尋</string>
-    <string name="search_normal">一般搜尋</string>
-    <string name="search_advance">進階選項</string>
    <string name="search_image">圖片搜尋</string>
-    <string name="search_normal_search">一般搜尋</string>
-    <string name="search_subscription_search">訂閱搜尋</string>
-    <string name="search_specify_uploader">指定上傳者</string>
-    <string name="search_specify_tag">指定標籤</string>
-    <string name="search_enable_advance">啟用進階選項</string>
-    <string name="search_tip">一般搜尋：就是搜尋。\n\n訂閱搜尋：在訂閱中搜尋。\n\n指定上傳者：列出該上傳者上傳的圖庫。其他選項會被忽略。\n\n指定標籤：列出含有該標籤的圖庫。其他選項會被忽略。</string>
    <string name="search_sh">已被移除</string>
    <string name="search_sto">有種子</string>
    <string name="search_sr">最低評分：</string>
-    <string name="search_sp">頁數：</string>
    <string name="search_sp_to">到</string>
    <string name="search_sp_err1">頁數最大值至少為 10</string>
    <string name="search_sp_err2">頁數範圍差至少為 20</string>
@@ -56,6 +56,5 @@
    <dimen name="gallery_detail_thumb_height">192dp</dimen>

    <dimen name="bottom_sheet_width">0dp</dimen>
-    <dimen name="screen_edge_margin">16dp</dimen>

 </resources>
@@ -16,7 +16,6 @@

 <resources>

-    <item name="copy" type="id" />
    <item name="reader_pager" type="id" />

 </resources>
@@ -100,8 +100,6 @@
    <string name="sign_in_failed">Sign in failed</string>
    <string name="sign_in_failed_tip">If this issue continues, try \"Sign in via WebView\" or \"Sign in via cookies\".</string>
    <string name="get_it">Got it</string>
-    <string name="cloudflare_bypass_failed">Failed to bypass Cloudflare challenge</string>
-    <string name="open_in_webview">Open URL in WebView to finish the challenge?</string>
    <!-- Select scene -->
    <string name="select_scene">Which gallery site do you want to visit?</string>
    <string name="select_scene_explain">e-hentai: available for anyone\nexhentai: available for who has signed in</string>
@@ -112,22 +110,12 @@
    <string name="gallery_list_search_bar_open_gallery">Open the gallery</string>
    <string name="gallery_list_empty_hit">The World is Big and the panda sit alone</string>
    <string name="gallery_list_empty_hit_subscription">Subscribe to tags in Settings-&gt;EH-&gt;My tags</string>
-    <string name="search">Search</string>
    <string name="keyword_search">Keyword search</string>
    <string name="image_search">Image search</string>
-    <string name="search_normal">Normal Search</string>
-    <string name="search_advance">Advanced Options</string>
    <string name="search_image">Image Search</string>
-    <string name="search_normal_search">Normal search</string>
-    <string name="search_subscription_search">Subscription search</string>
-    <string name="search_specify_uploader">Specify uploader</string>
-    <string name="search_specify_tag">Specify tag</string>
-    <string name="search_enable_advance">Enable advance options</string>
-    <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">Expunged</string>
    <string name="search_sto">Has Torrent</string>
    <string name="search_sr">Minimum Rating:</string>
-    <string name="search_sp">Pages:</string>
    <string name="search_sp_to">to</string>
    <string name="search_sp_err1">The page range maximum cannot be below 10</string>
    <string name="search_sp_err2">The page range must be at least 20</string>