From e8638cb0b32989262b1bc4fdf5d96537c8eedd81 Mon Sep 17 00:00:00 2001 From: MCAxiaz Date: Mon, 1 Jul 2019 04:06:19 -0700 Subject: [PATCH] Hide Empty Search Results in Catalogues (#2066) * test2 * remove nothing_found view and associated resources --- .../global_search/CatalogueSearchHolder.kt | 20 +++++++---- .../res/drawable/ic_search_black_112dp.xml | 9 ----- ...atalogue_global_search_controller_card.xml | 35 ------------------- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-bn/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-ms/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sc/strings.xml | 1 - app/src/main/res/values-sr/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 29 files changed, 14 insertions(+), 76 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_search_black_112dp.xml diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchHolder.kt index d189ada45c..eefb379604 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchHolder.kt @@ -31,9 +31,6 @@ class CatalogueSearchHolder(view: View, val adapter: CatalogueSearchAdapter) : // Set layout horizontal. recycler.layoutManager = LinearLayoutManager(view.context, LinearLayoutManager.HORIZONTAL, false) recycler.adapter = mangaAdapter - - nothing_found_icon.setVectorCompat(R.drawable.ic_search_black_112dp, - view.context.getResourceColor(android.R.attr.textColorHint)) } /** @@ -54,15 +51,15 @@ class CatalogueSearchHolder(view: View, val adapter: CatalogueSearchAdapter) : when { results == null -> { progress.visible() - nothing_found.gone() + showHolder() } results.isEmpty() -> { progress.gone() - nothing_found.visible() + hideHolder() } else -> { progress.gone() - nothing_found.gone() + showHolder() } } if (results !== lastBoundResults) { @@ -96,4 +93,15 @@ class CatalogueSearchHolder(view: View, val adapter: CatalogueSearchAdapter) : return null } + + private fun showHolder() { + title.visible() + source_card.visible() + } + + private fun hideHolder() { + title.gone() + source_card.gone() + } + } diff --git a/app/src/main/res/drawable/ic_search_black_112dp.xml b/app/src/main/res/drawable/ic_search_black_112dp.xml deleted file mode 100644 index 05705a6079..0000000000 --- a/app/src/main/res/drawable/ic_search_black_112dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/catalogue_global_search_controller_card.xml b/app/src/main/res/layout/catalogue_global_search_controller_card.xml index 6d220c41b2..c5f81880db 100644 --- a/app/src/main/res/layout/catalogue_global_search_controller_card.xml +++ b/app/src/main/res/layout/catalogue_global_search_controller_card.xml @@ -36,41 +36,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" /> - - - - - - - - لا يمكن تحديد الإعداد الافتراضي مع الفئات الأخرى تم إضافة المانجا إلى مكتبتك البحث الشامل… - لا توجد نتائج! اﻷخيرة تصفح diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 17c2980572..d605db986a 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -397,7 +397,6 @@ Вход Други Глобално търсене… - Не бяха открити резултати! Последни Търсене Прекият път беше добавен към началния екран. diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index cbc91aef56..20fdf52d29 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -266,7 +266,6 @@ নির্ধারিতগুলো অন্যান্য ধরণের সাথে নির্বাচন করা যাবে না মাংগাটি আপনার মাংগাশালায় যোগ হয়েছে সার্বজনীন খোঁজ… - কোন ফলাফল পাওয়া যায়নি! সর্বশেষ ব্রাউজ diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index ae39ddeed0..e34cf03e56 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -134,7 +134,6 @@ Žádné další výsledky Manga byla přidána do vaší knihovny Globální vyhledávání… - Žádné výsledky! Manga byla odstraněna z databáze! Info Popis diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 09b2035369..4ca8aac08b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -398,7 +398,6 @@ Andere Globale Suche… - Keine Treffer gefunden! Letzte Umsehen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 00d75d39d4..67e80fbfbb 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -301,7 +301,6 @@ Το manga έχει προστεθεί στη βιβλιοθήκη σας \n Καθολική αναζήτηση… - Δεν βρέθηκαν αποτελέσματα! Τελευταίο Ξεφύλλισμα diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6ef35a667d..55b97f65e8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -395,7 +395,6 @@ También asegúrese de haber iniciado sesión en las fuentes que lo requieren an Local Otros Búsqueda global… - Ningún resultado encontrado! Recientes Explorar Acceso directo fue agregado a la pantalla de inicio. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4ef1f1c34e..e8eba2fa2a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -396,7 +396,6 @@ Assurez-vous que vous êtes connecté à des sources qui le demande avant de com Connexion Autre Recherche globale… - Aucun résultat ! Récents Explorer Un raccourci a été ajouté à la page d\'accueil. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 34da05d9e3..509eb79911 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -250,7 +250,6 @@ डिफ़ॉल्ट को अन्य श्रेणियों के साथ नहीं चुना जा सकता है मंगा को आपकी लाइब्रेरी में जोड़ा गया है वैश्विक खोज … - कोई परिणाम नहीं मिला! नवीनतम ब्राउज यह मंगा डेटाबेस से हटा दिया गया था! diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index cdfa74d5c0..59ae190535 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -400,7 +400,6 @@ Lokal Lainnya Pencarian global… - Tidak ada hasil! Terbaru Jelajahi diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c802af8f11..bd63cae337 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -476,7 +476,6 @@ Altro Predefinito non può essere selezionato con altre categorie Ricerca globale… - Nessun risultato! Ultimi Sfoglia diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e59864f8fb..f7e4d10bfd 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -237,7 +237,6 @@ 최소한 1개의 유효한 소스를 선택해주세요 더이상 결과 없음 전역 검색… - 결과가 없습니다! 최신 정보 설명 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 401c91d9a2..793c54f60e 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -268,7 +268,6 @@ Lalai tidak boleh dipilih bersama kategori lain Manga ini telah ditambahkan ke koleksi anda Carian keseluruhan… - Tiada sebarang hasil! Terkini Semak imbas diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 7515ee495d..ee21122e5c 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -365,7 +365,6 @@ Zorg ook dat je ingelogd bent voor bronnen die dit vereisen alvorens je het teru Lokaal Alternatief Globaal zoeken… - Geen resultaten gevonden! Recent Snelkoppeling toegevoegd aan startscherm. Bibliotheek diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 1b01f0e64e..c58a0d7bd7 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -398,7 +398,6 @@ Nie znaleziono źródła %1$s Inne Wyszukiwanie globalne… - Brak wyników! Przeglądaj Skrót został dodany do ekranu głównego. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index d58e375558..051b0001cd 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -362,7 +362,6 @@ Além disso, verifique se as fontes que requerem uma conta foram configuradas co Entrar Outras Pesquisa global… - Nenhum resultado encontrado! Mais recente Navegar O atalho foi adicionado à sua tela inicial. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 011f37610f..57f030db43 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -299,7 +299,6 @@ Modul implicit nu poate fi selectat cu alte categorii Manga-ul a fost adăugat bibliotecii tale Căutare globală… - Nici un rezultat găsit! Cel mai recent Caută diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 74a381fcef..e4143ff501 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -360,7 +360,6 @@ Локальная Другие Глобальный поиск… - Результат не найден! Последняя Смотреть Ярлык был добавлен на главный экран. diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index 7b04850ec1..f3a696e655 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -283,7 +283,6 @@ Predefinidu non podet èssere ischertadu cun àteras categorias Su manga est istadu annantu a sa biblioteca tua Chirca globale… - Perunu risultadu agatadu! Ùrtimos Esplora Custu manga est istadu bogadu dae sa base de datos! diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index f6e79afd81..fbd6e52708 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -283,7 +283,6 @@ Opšte je nemoguće označiti sa ostalim kategorijama Ova manga je dodata u biblioteku Globalno pretraživanje… - Nema pronađenih rezultata! Poslednje Pretraži Ova manga je uklonjena iz baze podataka! diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index b7debab873..4ba03fd027 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -300,7 +300,6 @@ Standard inte kan väljas med andra kategorier Mangan har lagts till i din bibliotek Global sökning… - Inga resultat hittades! Senaste Bläddra diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index cd808c059a..87a7a22428 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -281,7 +281,6 @@ Öntanımlı diğer kategorilerle birlikte seçilemez Manga kitaplığınıza eklendi Genel arama… - Sonuç bulunmadı! En son Göz at Bu manga veritabanından kaldırıldı! diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2ac2d5fd94..aaa4a877f8 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -282,7 +282,6 @@ Категорія за замовчуванням не може бути вибраною разом з іншими категоріями Цю мангу уже додано до бібліотеки Глобальний пошук… - Результатів не знайдено! Остання Переглянути Ця манга було видалена з бази даних! diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index f5619a7f19..e545080103 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -461,7 +461,6 @@ Mặc định không thể chọn với các danh mục khác Truyện này đã được thêm vào thư viện Tìm kiếm toàn cầu… - Không tìm thấy kết quả! Mới nhất Duyệt Tiêu đề diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3b23b8cd11..420b1cddfa 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -281,7 +281,6 @@ 默认标签不能与其它标签一起选择 已将此漫画添加至书架 全局搜索… - 找不到！ 最近更新 浏览 漫画已被移出数据库！ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4b0f0e6f3b..f72686b4f3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -328,7 +328,6 @@ Default can\'t be selected with other categories The manga has been added to your library Global search… - No results found! Latest Browse