From 23617015364ab3ef40728e0d047c990f1fa8dd57 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 28 Nov 2024 10:34:45 +0100 Subject: [PATCH 01/13] ShowsDistillationFragment: remove unused binding property --- .../seriesguide/shows/ShowsDistillationFragment.kt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsDistillationFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsDistillationFragment.kt index 771deb5760..bad923775c 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsDistillationFragment.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsDistillationFragment.kt @@ -33,7 +33,6 @@ import com.google.android.material.tabs.TabLayout.OnTabSelectedListener class ShowsDistillationFragment : AppCompatDialogFragment() { private val model: ShowsDistillationViewModel by viewModels() - private var binding: DialogShowsDistillationBinding? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -178,11 +177,6 @@ class ShowsDistillationFragment : AppCompatDialogFragment() { } - override fun onDestroyView() { - super.onDestroyView() - binding = null - } - companion object { private const val TAG = "shows-distillation-dialog" From d1dcbbc2895f54cebe5cece7c825e2811b2c4478 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 28 Nov 2024 12:20:49 +0100 Subject: [PATCH 02/13] WatchProviderFilter: disable reset button if no provider is selected --- CHANGELOG.md | 2 ++ .../shows/WatchProviderFilterView.kt | 31 ++++++++++++++++++- .../streaming/SgWatchProviderHelper.kt | 4 +-- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f4a54f1cf..01e7d9fe26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ Releases marked with 🧪 (or previously with the "beta" suffix) were released o ### Unreleased +* 🔧 Shows: when viewing the stream or purchase provider filters, the reset button is shown as + disabled when no provider is selected. * 📝 Latest user interface translations from Crowdin. ### 2024.5.1 - 2024-11-21 🧪 diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/WatchProviderFilterView.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/WatchProviderFilterView.kt index 5fb0fd2f55..dca96a2ca0 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/shows/WatchProviderFilterView.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/shows/WatchProviderFilterView.kt @@ -4,6 +4,7 @@ package com.battlelancer.seriesguide.shows import android.content.res.Configuration +import androidx.annotation.StringRes import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -21,6 +22,7 @@ import androidx.compose.material3.Checkbox import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.PlainTooltip import androidx.compose.material3.Surface @@ -29,6 +31,7 @@ import androidx.compose.material3.TooltipBox import androidx.compose.material3.TooltipDefaults import androidx.compose.material3.rememberTooltipState import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment @@ -84,16 +87,25 @@ fun WatchProviderList( } HorizontalDivider() Row { + // Disabling makes it easier to see if any of the shown provider filters is enabled, + // however, it prevents re-setting not shown providers. Which should not matter as + // only shown ones are considered for filtering (see + // SgWatchProviderHelper.filterLocalWatchProviders). + val isResetEnabled = watchProviders.find { it.filter_local } != null Row( modifier = Modifier .weight(1f) .clickable( + enabled = isResetEnabled, role = Role.Button, onClick = onProviderIncludeAny ) .padding(16.dp) ) { - Text(stringResource(id = R.string.action_reset)) + TextWithDisabledState( + id = R.string.action_reset, + enabled = isResetEnabled + ) } val descriptionStreamSettingsButton = stringResource(id = R.string.action_stream_settings) @@ -117,6 +129,23 @@ fun WatchProviderList( } } +@Composable +fun TextWithDisabledState(@StringRes id: Int, enabled: Boolean) { + // https://developer.android.com/develop/ui/compose/designsystems/material2-material3#emphasis-and + // https://developer.android.com/develop/ui/compose/designsystems/material3#emphasis + CompositionLocalProvider( + LocalContentColor.provides( + if (enabled) { + MaterialTheme.colorScheme.onSurface + } else { + MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f) + } + ) + ) { + Text(stringResource(id = id)) + } +} + @Composable fun WatchProviderFilterItem( item: SgWatchProvider, diff --git a/app/src/main/java/com/battlelancer/seriesguide/streaming/SgWatchProviderHelper.kt b/app/src/main/java/com/battlelancer/seriesguide/streaming/SgWatchProviderHelper.kt index 4f13d18519..231f458d6c 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/streaming/SgWatchProviderHelper.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/streaming/SgWatchProviderHelper.kt @@ -55,8 +55,8 @@ interface SgWatchProviderHelper { @Query("SELECT sg_watch_provider.* FROM sg_watch_provider JOIN sg_watch_provider_show_mappings ON sg_watch_provider.provider_id=sg_watch_provider_show_mappings.provider_id WHERE type=:type GROUP BY _id ORDER BY provider_name COLLATE UNICODE ASC") fun usedWatchProvidersFlow(type: Int): Flow> - /* Note: never just get those with filter_local=1 as once a show does not longer use a provider - it is not longer shown in the filter UI, so it can not be disabled. */ + /* Note: never just get those with filter_local=1 as once a show does no longer use a provider + it is no longer shown in the filter UI, so it can not be disabled. */ @Query("SELECT sg_watch_provider.* FROM sg_watch_provider JOIN sg_watch_provider_show_mappings ON sg_watch_provider.provider_id=sg_watch_provider_show_mappings.provider_id WHERE type=:type AND filter_local=1 GROUP BY _id") fun filterLocalWatchProviders(type: Int): Flow> From 34ab4d494106e548a62f462a1ca6f893f5a38132 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 28 Nov 2024 14:57:47 +0100 Subject: [PATCH 03/13] ListWidgetPreferenceFragment: use generic sort by string --- .../seriesguide/appwidget/ListWidgetPreferenceFragment.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/battlelancer/seriesguide/appwidget/ListWidgetPreferenceFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/appwidget/ListWidgetPreferenceFragment.kt index 9148b92b3e..41c34166a8 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/appwidget/ListWidgetPreferenceFragment.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/appwidget/ListWidgetPreferenceFragment.kt @@ -21,8 +21,8 @@ import androidx.preference.Preference import androidx.preference.PreferenceCategory import androidx.preference.PreferenceGroup import com.battlelancer.seriesguide.R -import com.battlelancer.seriesguide.ui.BasePreferencesFragment import com.battlelancer.seriesguide.settings.WidgetSettings +import com.battlelancer.seriesguide.ui.BasePreferencesFragment import com.battlelancer.seriesguide.util.Utils /** @@ -58,7 +58,7 @@ class ListWidgetPreferenceFragment : BasePreferencesFragment() { // Shows only sort order. showsSortPref = createListPref( WidgetSettings.KEY_PREFIX_WIDGET_SHOWS_SORT_ORDER + appWidgetId, - R.string.action_shows_sort, + R.string.sort, R.array.widgetShowSortOrder, R.array.widgetShowSortOrderData, getString(R.string.widget_default_show_sort_order) From 3fd6a805e5de61449e4641787f485449aad7e272 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 28 Nov 2024 14:59:15 +0100 Subject: [PATCH 04/13] Shows distillation: use generic sort by string --- app/src/main/res/layout/dialog_shows_distillation.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/dialog_shows_distillation.xml b/app/src/main/res/layout/dialog_shows_distillation.xml index 24e431436d..44ca0d8e38 100644 --- a/app/src/main/res/layout/dialog_shows_distillation.xml +++ b/app/src/main/res/layout/dialog_shows_distillation.xml @@ -26,7 +26,7 @@ + android:text="@string/sort" /> From 2b336034c2062508e0cd8c286472c4ae159d4c3f Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 28 Nov 2024 14:59:49 +0100 Subject: [PATCH 05/13] Strings: remove unused action_shows_sort string --- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-cy/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 3 ++- app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-eo/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-gl/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 1 - app/src/main/res/values-hu/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-iw/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-mk/strings.xml | 1 - app/src/main/res/values-nb/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-pt-rPT/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-sk/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-ta/strings.xml | 1 - app/src/main/res/values-th/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-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 39 files changed, 2 insertions(+), 39 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index b44aeeb093..c998c40bcb 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -164,7 +164,6 @@ مستبعدة اظهار الجميع هل تريد إظهار كل المسلسلات المخفية %s مرة أخرى؟ - ترتيب المسلسلات العنوان آخر حلقة أقدم حلقة diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 7b0839a09c..7befe6b1c4 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -160,7 +160,6 @@ Без тези Виж всички скрити Направи всички скрити сериали (%s) видими? - Сортирай сериалите Заглавие Последен епизод Най-старият епизод diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 3dbcc6fd77..30d707ac36 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -160,7 +160,6 @@ exclosos Fes tot els ocults visibles Fer totes les sèries amagades (%s) visibles un altre cop? - Ordena sèries Títol Últim episodi Episodi més antic diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index fca7438f9e..52c29a32b9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -162,7 +162,6 @@ Vyloučené Zviditelnit všechny skryté Znovu zviditelnit všechny skryté seriály (%s)? - Seřadit seriály Název Nejnovější díl Nejstarší díl diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index be4d0d4a62..f0914e55fb 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -164,7 +164,6 @@ Eithriedig Gwneud pob cudd yn weladwy Gwneud pob sioe gudd (%s) yn weladwy eto? - Trefnu sioeau Teitl Y bennod ddiweddaraf Y bennod hynaf diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 952c7ad7de..39d1ccf3d9 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -160,7 +160,6 @@ Ekskluderet Gør alle skjulte synlige Gør alle skjulte serier (%s) synlige igen? - Sortér serier Titel Seneste episode Ældste episode diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1a6977573a..09e01e2ab3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -150,6 +150,8 @@ Serie wieder sichtbar Serie hinzufügen Serien filtern + Filtern und sortieren + Allgemein Filter zurücksetzen Favoriten Nicht angesehen @@ -160,7 +162,6 @@ Ausgeschlossen Alle ausgebl. sichtbar machen Alle ausgeblendeten Serien (%s) wieder sichtbar machen? - Serien sortieren Titel Neueste Folge Älteste Folge diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 2c83fb06be..14a7c8c85d 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -160,7 +160,6 @@ Εξαιρούνται Εμφάνιση όλων των κρυφών Να γίνουν όλες οι κρυφές σειρές (%s) φανερές ξανά; - Ταξινόμηση σειρών Τίτλος Νεότερο επεισόδιο Παλαιότερο επεισόδιο diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index c3c98742a0..a22ef82d33 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -160,7 +160,6 @@ Excluded Videbligu ĉiujn kaŝitajn Ĉu videbligu ĉiujn kaŝitajn televidaĵojn (%s) denove? - Ordigi televidaĵojn Titolo Lasta epizodo Plej maljuna epizodo diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 49693a17be..018590b72b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -160,7 +160,6 @@ Excluido Todo visible ¿Hacer visibles todas las series ocultas (%s) de nuevo? - Ordenar series Título Último episodio Episodio más antiguo diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 32396d5060..662f31a5b1 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -160,7 +160,6 @@ مستثتی شده آشکارسازی همه‌ی پنهان‌شده‌ها آشکارسازی مجدد همه‌ی (%s) برنامه‌ی تلویزیونی? - چینش آثار نمایشی عنوان جدیدترین قسمت قدیمی‌ترین قسمت diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 573ac725bf..70e6491347 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -160,7 +160,6 @@ Poissuljettu Paljasta kaikki piilotetut Paljastetaanko kaikki piilotetut ohjelmat (%s)? - Lajittele ohjelmat Nimi Uusin jakso Vanhin jakso diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 04bd4b99e6..2a3a46295b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -160,7 +160,6 @@ Exclus Rendre visible tous les cachés Rendre les séries cachées (%s) visibles à nouveau ? - Trier les séries Titre Dernier épisode Épisode le plus ancien diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 2f0f0d3981..531a4af118 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -160,7 +160,6 @@ Excluded Amosar todos os ocultos Amosar todas as series ocultas (%s) de novo? - Ordenar series Título Último episodio Episodio máis antigo diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 1fcdefda30..17665638f6 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -161,7 +161,6 @@ Excluded Postavi sve skrivene kao vidljive Prikaži ponovno sve (%s) skrivene serije? - Sortiraj serije Naslov Zadnja epizoda Najstarija epizoda diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 318274c5de..4da6a37e47 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -160,7 +160,6 @@ Kizárva Elrejtett szöveg mutatása Az összes elrejtett sorozat (%s) mutatása? - Sorozatok rendezése Cím Legújabb epizód Legrégebbi epizód diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index a350a5a3cd..dec9b76d75 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -159,7 +159,6 @@ Excluded Perlihatkan yang tersembunyi Buat semua acara tersembunyi (%s) terlihat lagi ? - Sortir acara Judul Episode Terbaru Episode Terlama diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index de8c442c6e..ea21b44bc4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -160,7 +160,6 @@ Esclusi Rendi visibili tutti i nascosti Rendere tutte le serie TV nascoste (%s) di nuovo visibili? - Ordina le serie Titolo Episodio più recente Episodio più vecchio diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index ba861228f4..3ace78e692 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -162,7 +162,6 @@ לא כולל הצג את כל המוסתרים הצג שוב את כל הסדרות המוסתרות (%s)? - מיון סדרות שם הפרק האחרון הפרק הכי ישן diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e6f2d7d35b..b02d98afe6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -159,7 +159,6 @@ Excluded 非表示をすべて表示する 非表示の番組 (%s) をもう一度すべて表示しますか? - 番組を並び替え タイトル 最新のエピソード 最も古いエピソード diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index d9d6cce481..2f56bd02e0 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -159,7 +159,6 @@ Excluded Make all hidden visible Make all hidden shows (%s) visible again? - 프로그램 정렬 제목 최근 에피소드 오래된 에피소드 diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index cd8f2fdc94..be37b40b78 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -160,7 +160,6 @@ Excluded Make all hidden visible Make all hidden shows (%s) visible again? - Подреди серии Наслов Следна епизода Најстара епизода diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index a5ff2f897d..a0197a3314 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -160,7 +160,6 @@ Excluded Vis alle skjulte Gjøre alle skjulte programmer (%s) synlige igjen? - Sorter serier Tittel Nyeste episode Eldste episode diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 48a4e059d0..71011f8cea 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -160,7 +160,6 @@ Uitgesloten Alle verborgen tonen Alle verborgen series (%s) opnieuw zichtbaar maken? - Series sorteren Titel Laatste aflevering Oudste aflevering diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b2291a1c6d..0c1bde2b92 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -162,7 +162,6 @@ Wykluczone Przywróć ukryte seriale Przywrócić wszystkie ukryte seriale (%s)? - Sortuj seriale Tytuł Najnowszy odcinek Najstarszy odcinek diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 73658149f8..892ada9f1a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -160,7 +160,6 @@ Excluído Exibir todos os ocultos Tornar todas as séries ocultas (%s) visíveis novamente? - Ordenar séries Título Último episódio Episódio mais antigo diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 3c491a3bd7..1cb7e9e433 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -160,7 +160,6 @@ Excluído Tornar os ocultos visíveis Tornar todas as séries ocultas (%s) visíveis novamente? - Ordenar séries Título Episódios mais recentes Episódios mais antigos diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 731ab89614..205ba3573f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -161,7 +161,6 @@ Excluded Make all hidden visible Make all hidden shows (%s) visible again? - Sortați serialele Titlu Cel mai recent episod Cel mai vechi episod diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 58d054c558..71aba02023 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -162,7 +162,6 @@ Исключено Сделать всё скрытое видимым Сделать все скрытые сериалы (%s) снова видимыми? - Сортировать сериалы Название Последний эпизод Старейший эпизод diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index bd2afaef11..2e7333e019 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -162,7 +162,6 @@ Vylúčené Zviditeľniť všetky skryté Zviditeľniť všetky skryté seriály (%s)? - Zoradiť seriály Názov Najnovšia epizóda Najstaršia epizóda diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 768ab724fb..30101e7135 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -161,7 +161,6 @@ Искључено Учините све скривено видљивим Поставите све скривене серије (%s) поново видљиве? - Сортирај серије Наслов Poslednja epizoda Najstarija epizoda diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index eee01f9c0c..0ded0cebcd 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -160,7 +160,6 @@ Exkluderad Gör alla gömda synliga Göra alla gömda serier (%s) synliga igen? - Sortera serier Titel Senaste avsnitt Äldsta avsnitt diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index d85ca39bff..68a4b80cd2 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -160,7 +160,6 @@ Excluded Make all hidden visible Make all hidden shows (%s) visible again? - அடுக்கு காட்சிகள் தலைப்பு Latest episode Oldest episode diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index b978474ec2..ecb0772f5c 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -159,7 +159,6 @@ ไม่รวม เลิกซ่อนรายการทั้งหมด ทำให้รายการที่ซ่อนไว้ทั้งหมด (%s) กลับมาแสดงอีกครั้ง? - แสดงซีรีส์ ชื่อเรื่อง ตอนล่าสุด ตอนเก่าที่สุด diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 798c0088e7..ae0faff037 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -160,7 +160,6 @@ Hariç tutulan Tüm gizli öğeleri görünür yap Tüm (%s) gizli program tekrar görünür hale gelsin mi? - Dizileri sırala Başlık Son bölüme göre En eski bölüme göre diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 4328f6debe..7821ec9f96 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -162,7 +162,6 @@ Виключно Зробити все приховане видимим Зробити всі приховані серіали (%s) видимими знову? - Сортувати серіали за Назвою Найновішою серією Найстарішою серією diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b480341128..691a2c8083 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -159,7 +159,6 @@ 已排除 显示所有隐藏的节目 重新显示所有隐藏的节目（共 %s 个）吗？ - 排序节目 按片名 按最新一集 按最早一集 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5944fb255e..b4ffce948e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -159,7 +159,6 @@ 已排除 顯示所有隱藏的節目 Make all hidden shows (%s) visible again? - 排序節目 按節目名稱 按最新一集 按最舊一集 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9f0566c5de..b2df11ce8b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -172,7 +172,6 @@ Excluded Make all hidden visible Make all hidden shows (%s) visible again? - Sort shows Title Latest episode Oldest episode From 2354bdd603d851ac0850c23a10676284ed65ece4 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 28 Nov 2024 15:01:08 +0100 Subject: [PATCH 06/13] Shows: use more descriptive strings for filter and sort, show icons The menu option string now reflects that it's for filtering and sorting, the dialog tabs now make it more clear what are filters and what sort options. Also switch to scrollable tabs to avoid inconsistent text sizes and potential cut-off in other languages. --- CHANGELOG.md | 3 ++- app/src/main/res/layout/dialog_shows_distillation.xml | 9 +++++++-- app/src/main/res/menu/shows_menu.xml | 2 +- app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01e7d9fe26..f1003f6edc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,8 @@ Releases marked with 🧪 (or previously with the "beta" suffix) were released o ### Unreleased * 🔧 Shows: when viewing the stream or purchase provider filters, the reset button is shown as - disabled when no provider is selected. + disabled when no provider is selected. Also tabs are renamed and display icons to differentiate + filter from sort options. * 📝 Latest user interface translations from Crowdin. ### 2024.5.1 - 2024-11-21 🧪 diff --git a/app/src/main/res/layout/dialog_shows_distillation.xml b/app/src/main/res/layout/dialog_shows_distillation.xml index 44ca0d8e38..d96dfc4871 100644 --- a/app/src/main/res/layout/dialog_shows_distillation.xml +++ b/app/src/main/res/layout/dialog_shows_distillation.xml @@ -1,5 +1,6 @@ + android:background="?attr/sgColorDivider" + app:tabMode="scrollable"> + android:icon="@drawable/ic_filter_white_24dp" + android:text="@string/title_filter_general" /> diff --git a/app/src/main/res/menu/shows_menu.xml b/app/src/main/res/menu/shows_menu.xml index ae248a1b80..ca556984b0 100644 --- a/app/src/main/res/menu/shows_menu.xml +++ b/app/src/main/res/menu/shows_menu.xml @@ -16,7 +16,7 @@ android:id="@+id/menu_action_shows_filter" android:icon="@drawable/ic_filter_white_24dp" android:orderInCategory="1" - android:title="@string/action_shows_filter" + android:title="@string/action_filter_and_sort" app:showAsAction="ifRoom" /> Moved to hidden Show is visible again Add show + Filter and sort + General Filter shows Reset filters Favorites From 132a518a040842ccf68a2fdb809bbff8d3abb319 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 28 Nov 2024 15:05:38 +0100 Subject: [PATCH 07/13] Shows distillation: show scrollbars Except for Compose based view, which does not support them (yet). --- CHANGELOG.md | 1 + app/src/main/res/layout/view_filter_shows.xml | 3 ++- app/src/main/res/layout/view_sort_shows.xml | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1003f6edc..3affb546c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Releases marked with 🧪 (or previously with the "beta" suffix) were released o * 🔧 Shows: when viewing the stream or purchase provider filters, the reset button is shown as disabled when no provider is selected. Also tabs are renamed and display icons to differentiate filter from sort options. +* 🔨 Show scrollbars for show filter and sort options. * 📝 Latest user interface translations from Crowdin. ### 2024.5.1 - 2024-11-21 🧪 diff --git a/app/src/main/res/layout/view_filter_shows.xml b/app/src/main/res/layout/view_filter_shows.xml index e9763c43d6..a397135e6e 100644 --- a/app/src/main/res/layout/view_filter_shows.xml +++ b/app/src/main/res/layout/view_filter_shows.xml @@ -7,7 +7,8 @@ + android:layout_height="wrap_content" + android:scrollbars="vertical"> + android:layout_height="wrap_content" + android:scrollbars="vertical"> Date: Thu, 28 Nov 2024 15:31:05 +0100 Subject: [PATCH 08/13] Watch provider dialog: remove type specific title, use dialog title --- .../WatchProviderFilterDialogFragment.kt | 7 +------ .../layout/dialog_watch_provider_filter.xml | 19 ------------------- app/src/main/res/values/styles.xml | 5 ----- 3 files changed, 1 insertion(+), 30 deletions(-) diff --git a/app/src/main/java/com/battlelancer/seriesguide/streaming/WatchProviderFilterDialogFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/streaming/WatchProviderFilterDialogFragment.kt index 988d0156fa..0299f0b42c 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/streaming/WatchProviderFilterDialogFragment.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/streaming/WatchProviderFilterDialogFragment.kt @@ -49,12 +49,6 @@ class WatchProviderFilterDialogFragment : AppCompatDialogFragment() { val binding = DialogWatchProviderFilterBinding.inflate(layoutInflater) .also { binding = it } - val titleRes = when (type) { - Type.SHOWS -> R.string.action_shows_filter - Type.MOVIES -> R.string.action_movies_filter - } - binding.textViewTitle.setText(titleRes) - // watch region button binding.buttonWatchRegion.apply { text = StreamingSearch.getCurrentRegionOrSelectString(requireContext()) @@ -80,6 +74,7 @@ class WatchProviderFilterDialogFragment : AppCompatDialogFragment() { } return MaterialAlertDialogBuilder(requireContext()) + .setTitle(R.string.action_stream) .setView(binding.root) .setPositiveButton(R.string.dismiss, null) .setNegativeButton(R.string.action_reset) { _, _ -> diff --git a/app/src/main/res/layout/dialog_watch_provider_filter.xml b/app/src/main/res/layout/dialog_watch_provider_filter.xml index dc0a3c24c4..0ae15a9283 100644 --- a/app/src/main/res/layout/dialog_watch_provider_filter.xml +++ b/app/src/main/res/layout/dialog_watch_provider_filter.xml @@ -5,25 +5,6 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - ?attr/sgTextColorSecondaryDim - -