diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt index 50fd8ac..1ccc894 100644 --- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt +++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt @@ -56,29 +56,16 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware { ) val tagGroup = binding.tagsGroup - val hiddenTagGroup = binding.hiddenTagsGroup val sourceGroup = binding.sourcesGroup CoroutineScope(Dispatchers.Main).launch { val tags = repository.getTags() - val hiddenTags = appSettingsService.getHiddenTags() - tags.filterNot { hiddenTags.contains(it.tag) }.forEach { tag -> + tags.forEach { tag -> val c = chipForTag(tag) tagGroup.addView(c) } - if (hiddenTags.isNotEmpty()) { - binding.filterHiddenTagsTitle.visibility = VISIBLE - binding.hiddenTagsGroup.visibility = VISIBLE - - tags.filter { hiddenTags.contains(it.tag) }.forEach { tag -> - val c = chipForTag(tag) - - hiddenTagGroup.addView(c) - } - } - repository.getSources().forEach { source -> val c = Chip(requireContext()) diff --git a/androidApp/src/main/res/layout/filter_fragment.xml b/androidApp/src/main/res/layout/filter_fragment.xml index 7354edc..1b3ea74 100644 --- a/androidApp/src/main/res/layout/filter_fragment.xml +++ b/androidApp/src/main/res/layout/filter_fragment.xml @@ -62,33 +62,6 @@ - - - - - - - - + app:layout_constraintTop_toBottomOf="@+id/tagsGroup" /> Temes API de Selfoss Nombre d\'elements carregats - Etiquetes ocultes Carrega articles en desplaçar Traducció L\'element URL no és vàlid. Estic intentant solucionar aquest problema perquè l\'aplicació no falli. @@ -84,7 +83,6 @@ Aquesta acció marcarà els elements com a llegits. Marca com a llegit en lliscar el dit No es marcaran els articles com a llegits en lliscar el dit d\'un article a l\'altre. - Etiquetes ocultes Marca com no llegit Sense connexió i memòria clau Els articles no es guardaran a la memòria del dispositiu i l\'aplicació no es podrà utilitzar sense connexió. diff --git a/androidApp/src/main/res/values-de-rDE/strings.xml b/androidApp/src/main/res/values-de-rDE/strings.xml index 3fad23c..c36ea3f 100644 --- a/androidApp/src/main/res/values-de-rDE/strings.xml +++ b/androidApp/src/main/res/values-de-rDE/strings.xml @@ -69,7 +69,6 @@ Designs selfoss API Loaded items number - Hidden Tags Load more articles on scroll Übersetzung The item url is invalid. I\'m looking into solving this issue so the app won\'t crash. @@ -84,7 +83,6 @@ Dies wird alle Elemente als gelesen markieren. Beim Wischen als gelesen markieren Don\'t mark articles as read when swiping. - Hidden Tags Eintrag als ungelesen markieren Offline and cache Articles won\'t be saved to the device memory, and the app won\'t be usable offline. diff --git a/androidApp/src/main/res/values-es-rES/strings.xml b/androidApp/src/main/res/values-es-rES/strings.xml index d3a9325..927ac30 100644 --- a/androidApp/src/main/res/values-es-rES/strings.xml +++ b/androidApp/src/main/res/values-es-rES/strings.xml @@ -69,7 +69,6 @@ Temas Api de Selfoss Número de artículos cargados - Etiquetas ocultas Cargar más artículos en desplazamiento Traducción La url del elemento no es válida. Estoy buscando resolver este problema para que la aplicación no colapse. @@ -84,7 +83,6 @@ Esto marcará todos los artículos como leídos. Marcar artículos como leídos al deslizar con el dedo hacia los lados No marcar artículos como leídos al deslizar con el dedo hacia los lados. - Etiquetas ocultas Marcar artículo como no leído Sin conexión y caché Los artículos no se guardarán en la memoria del dispositivo y la aplicación no se podrá utilizar sin conexión. diff --git a/androidApp/src/main/res/values-fa-rIR/strings.xml b/androidApp/src/main/res/values-fa-rIR/strings.xml index 9dc873d..fde0a56 100644 --- a/androidApp/src/main/res/values-fa-rIR/strings.xml +++ b/androidApp/src/main/res/values-fa-rIR/strings.xml @@ -69,7 +69,6 @@ Themes Selfoss Api Loaded items number - Hidden Tags Load more articles on scroll Translation The item url is invalid. I\'m looking into solving this issue so the app won\'t crash. @@ -84,7 +83,6 @@ This will mark all the items as read. Mark as read on swipe Don\'t mark articles as read when swiping. - Hidden Tags Mark item as unread Offline and cache Articles won\'t be saved to the device memory, and the app won\'t be usable offline. diff --git a/androidApp/src/main/res/values-fr-rFR/strings.xml b/androidApp/src/main/res/values-fr-rFR/strings.xml index 00da8f5..a12b07f 100644 --- a/androidApp/src/main/res/values-fr-rFR/strings.xml +++ b/androidApp/src/main/res/values-fr-rFR/strings.xml @@ -69,7 +69,6 @@ Thèmes Api Selfoss Nombre d\'articles chargés - Tags Cachés Charger plus d\'articles au scroll Traduction L’url de l’élément n’est pas valide. En attendant la résolution du problème, le lien ne s\'ouvrira pas. @@ -84,7 +83,6 @@ Marquer tous les éléments comme lus ? Marquer comme lu à la navigation. Ne pas marquer les articles comme lus à la navigation. - Tags Cachés Marquer l\'article comme non lu Hors ligne et cache Les articles ne seront pas enregistrés et l\'application ne sera pas utilisable hors ligne. diff --git a/androidApp/src/main/res/values-gl-rES/strings.xml b/androidApp/src/main/res/values-gl-rES/strings.xml index 023b280..e0763cc 100644 --- a/androidApp/src/main/res/values-gl-rES/strings.xml +++ b/androidApp/src/main/res/values-gl-rES/strings.xml @@ -69,7 +69,6 @@ Temas API de Selfoss Número de elementos cargados - Etiquetas ocultas Cargar máis artigos ao desprazarse Traducción A URL do elemento non é válida. Estou tratando de solucionar isto pra que a aplicación non falle. @@ -84,7 +83,6 @@ Isto marcara todos os elementos como lidos. Marcar artigos como lidos ao deslizar co dedo cara os lados Non marcar artigos como lidos ao deslizar co dedo cara os lados. - Etiquetas ocultas Marcar artículo como non lido Sen conexión e caché Os artigos non se gardaran na memoria do dispositivo e non se poderá utilizar a aplicación sen conexión. diff --git a/androidApp/src/main/res/values-in-rID/strings.xml b/androidApp/src/main/res/values-in-rID/strings.xml index 75dd5cf..80feafc 100644 --- a/androidApp/src/main/res/values-in-rID/strings.xml +++ b/androidApp/src/main/res/values-in-rID/strings.xml @@ -69,7 +69,6 @@ Tema Selfoss Api Item nomor dimuat - Hidden Tags Muat lebih banyak artikel saat membalik halaman Terjemahan Alamat tautan proyek tidak valid. Saya mencoba memecahkan masalah ini untuk menghindari aplikasi berhenti. @@ -84,7 +83,6 @@ This will mark all the items as read. Mark as read on swipe Don\'t mark articles as read when swiping. - Hidden Tags Mark item as unread Offline and cache Articles won\'t be saved to the device memory, and the app won\'t be usable offline. diff --git a/androidApp/src/main/res/values-it-rIT/strings.xml b/androidApp/src/main/res/values-it-rIT/strings.xml index 22c0ec5..4a1ef49 100644 --- a/androidApp/src/main/res/values-it-rIT/strings.xml +++ b/androidApp/src/main/res/values-it-rIT/strings.xml @@ -69,7 +69,6 @@ Temi Api di Selfoss Numero di elementi caricati - Tag nascosti Load more articles on scroll Traduzioni The item url is invalid. I\'m looking into solving this issue so the app won\'t crash. @@ -84,7 +83,6 @@ This will mark all the items as read. Mark as read on swipe Don\'t mark articles as read when swiping. - Hidden Tags Segna come non letto Offline and cache Articles won\'t be saved to the device memory, and the app won\'t be usable offline. diff --git a/androidApp/src/main/res/values-ko-rKR/strings.xml b/androidApp/src/main/res/values-ko-rKR/strings.xml index e220e24..92d25f2 100644 --- a/androidApp/src/main/res/values-ko-rKR/strings.xml +++ b/androidApp/src/main/res/values-ko-rKR/strings.xml @@ -69,7 +69,6 @@ Themes Selfoss Api Loaded items number - Hidden Tags Load more articles on scroll Translation The item url is invalid. I\'m looking into solving this issue so the app won\'t crash. @@ -84,7 +83,6 @@ This will mark all the items as read. Mark as read on swipe Don\'t mark articles as read when swiping. - Hidden Tags Mark item as unread Offline and cache Articles won\'t be saved to the device memory, and the app won\'t be usable offline. diff --git a/androidApp/src/main/res/values-nl-rNL/strings.xml b/androidApp/src/main/res/values-nl-rNL/strings.xml index 3b79cd4..c4228e2 100644 --- a/androidApp/src/main/res/values-nl-rNL/strings.xml +++ b/androidApp/src/main/res/values-nl-rNL/strings.xml @@ -69,7 +69,6 @@ Thema \'s Selfoss Api Geladen items nummer - Hidden Tags Laad meer artikelen door te bladeren Vertaling De URL is ongeldig. Ik probeer dit probleem op te lossen, zodat de toepassing niet wordt afgesloten. @@ -84,7 +83,6 @@ This will mark all the items as read. Mark as read on swipe Don\'t mark articles as read when swiping. - Hidden Tags Mark item as unread Offline and cache Articles won\'t be saved to the device memory, and the app won\'t be usable offline. diff --git a/androidApp/src/main/res/values-pt-rBR/strings.xml b/androidApp/src/main/res/values-pt-rBR/strings.xml index 0c92a87..c8938f7 100644 --- a/androidApp/src/main/res/values-pt-rBR/strings.xml +++ b/androidApp/src/main/res/values-pt-rBR/strings.xml @@ -69,7 +69,6 @@ Temas Selfoss Api Quantidade de itens carregados - Hidden Tags Carregar mais artigos ao realizar o scroll Traduções A url está inválida. Estou tentando resolver esse problema para que o aplicativo não encerre. @@ -84,7 +83,6 @@ Isso marcará todos os itens como lidos. Marcar Como Lida ao Abrir Não marca artigos como lido quando abrir. - Hidden Tags Mark item as unread Offline and cache Articles won\'t be saved to the device memory, and the app won\'t be usable offline. diff --git a/androidApp/src/main/res/values-pt-rPT/strings.xml b/androidApp/src/main/res/values-pt-rPT/strings.xml index d854673..4d8e98b 100644 --- a/androidApp/src/main/res/values-pt-rPT/strings.xml +++ b/androidApp/src/main/res/values-pt-rPT/strings.xml @@ -69,7 +69,6 @@ Temas Api de Selfoss Número de itens carregados - Hidden Tags Carregar mais artigos no pergaminho Tradução A url do item é inválido. Eu estou olhando para resolver esta questão, para que o app não vai falhar. @@ -84,7 +83,6 @@ This will mark all the items as read. Mark as read on swipe Don\'t mark articles as read when swiping. - Hidden Tags Mark item as unread Offline and cache Articles won\'t be saved to the device memory, and the app won\'t be usable offline. diff --git a/androidApp/src/main/res/values-si-rLK/strings.xml b/androidApp/src/main/res/values-si-rLK/strings.xml index 6da88a1..2c80858 100644 --- a/androidApp/src/main/res/values-si-rLK/strings.xml +++ b/androidApp/src/main/res/values-si-rLK/strings.xml @@ -69,7 +69,6 @@ Themes Selfoss Api Loaded items number - Hidden Tags Load more articles on scroll Translation The item url is invalid. I\'m looking into solving this issue so the app won\'t crash. @@ -84,7 +83,6 @@ This will mark all the items as read. Mark as read on swipe Don\'t mark articles as read when swiping. - Hidden Tags Mark item as unread Offline and cache Articles won\'t be saved to the device memory, and the app won\'t be usable offline. diff --git a/androidApp/src/main/res/values-tr-rTR/strings.xml b/androidApp/src/main/res/values-tr-rTR/strings.xml index 7d06c8c..50ecbbe 100644 --- a/androidApp/src/main/res/values-tr-rTR/strings.xml +++ b/androidApp/src/main/res/values-tr-rTR/strings.xml @@ -69,7 +69,6 @@ Temalar Selfoss Uygulaması Yüklenen öğe numarası - Hidden Tags Kaydırma üzerine daha fazla makale yükleyin Çeviri Öğe url geçersiz. Uygulama çökmeyeceği için bu sorunu çözmeye çalışıyorum. @@ -84,7 +83,6 @@ This will mark all the items as read. Mark as read on swipe Don\'t mark articles as read when swiping. - Hidden Tags Mark item as unread Offline and cache Articles won\'t be saved to the device memory, and the app won\'t be usable offline. diff --git a/androidApp/src/main/res/values-zh-rCN/strings.xml b/androidApp/src/main/res/values-zh-rCN/strings.xml index d7ef71b..cf2516f 100644 --- a/androidApp/src/main/res/values-zh-rCN/strings.xml +++ b/androidApp/src/main/res/values-zh-rCN/strings.xml @@ -69,7 +69,6 @@ 主题 塞尔福斯 Api 已加载项目编号 - 隐藏标签 翻页时载入更多文章 翻译 项目链接地址无效。我正在设法解决这个问题,以避免应用程序崩溃。 @@ -84,7 +83,6 @@ 这将标记所有项目为已读。 滑动时标为已读 滑动时不标记文章为已读 - 隐藏标签 标记条目为未读 离线和缓存 文章不会被保存到设备内存,应用程序在离线时将无法阅读它们 diff --git a/androidApp/src/main/res/values-zh-rTW/strings.xml b/androidApp/src/main/res/values-zh-rTW/strings.xml index 480e0bd..a45c2c1 100644 --- a/androidApp/src/main/res/values-zh-rTW/strings.xml +++ b/androidApp/src/main/res/values-zh-rTW/strings.xml @@ -69,7 +69,6 @@ 主题 塞尔福斯 Api 已加载项目编号 - Hidden Tags 翻页时载入更多文章 翻译 项目链接地址无效。我正在设法解决这个问题,以避免应用程序崩溃。 @@ -84,7 +83,6 @@ This will mark all the items as read. Mark as read on swipe Don\'t mark articles as read when swiping. - Hidden Tags Mark item as unread Offline and cache Articles won\'t be saved to the device memory, and the app won\'t be usable offline. diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index 6cf3322..e986416 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -69,7 +69,6 @@ Themes Selfoss Api Loaded items number - Hidden Tags Load more articles on scroll Translation The item url is invalid. I\'m looking into solving this issue so the app won\'t crash. @@ -84,7 +83,6 @@ This will mark all the items as read. Mark as read on swipe Don\'t mark articles as read when swiping. - Hidden Tags Mark item as unread Offline and cache Articles won\'t be saved to the device memory, and the app won\'t be usable offline. diff --git a/androidApp/src/main/res/xml/pref_general.xml b/androidApp/src/main/res/xml/pref_general.xml index 52b1649..fb128aa 100644 --- a/androidApp/src/main/res/xml/pref_general.xml +++ b/androidApp/src/main/res/xml/pref_general.xml @@ -14,15 +14,6 @@ android:title="@string/pref_api_items_number_title" app:iconSpaceReserved="false"/> - - ? = null private var _refreshMinutes: Long = 360 private var _markOnScroll: Boolean? = null private var _activeAlignment: Int? = null @@ -208,19 +207,6 @@ class AppSettingsService { return _refreshMinutes } - private fun refreshHiddenTags() { - if (settings.getString(HIDDEN_TAGS, "").isNotEmpty()) { - _hiddenTags = settings.getString(HIDDEN_TAGS, "").replace("\\s".toRegex(), "").split(",") - } - } - - fun getHiddenTags(): List { - if (_hiddenTags != null) { - refreshHiddenTags() - } - return _hiddenTags.orEmpty() - } - private fun refreshInfiniteLoadingEnabled() { _infiniteLoading = settings.getBoolean(INFINITE_LOADING, false) } @@ -357,7 +343,6 @@ class AppSettingsService { refreshPeriodicRefreshEnabled() refreshRefreshWhenChargingOnlyEnabled() refreshRefreshMinutes() - refreshHiddenTags() refreshInfiniteLoadingEnabled() refreshItemCachingEnabled() refreshNotifyNewItemsEnabled() @@ -461,7 +446,6 @@ class AppSettingsService { const val PERIODIC_REFRESH_MINUTES = "periodic_refresh_minutes" - const val HIDDEN_TAGS = "hidden_tags" const val INFINITE_LOADING = "infinite_loading"