Skip to content

feat: remove legacy subscription view #7406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ object PreferenceKeys {
const val GRID_COLUMNS_LANDSCAPE = "grid_landscape"
const val LABEL_VISIBILITY = "label_visibility"
const val APP_ICON = "icon_change"
const val LEGACY_SUBSCRIPTIONS = "legacy_subscriptions"
const val LEGACY_SUBSCRIPTIONS_COLUMNS = "legacy_subscriptions_columns"
const val NEW_VIDEOS_BADGE = "new_videos_badge"
const val PLAYLISTS_ORDER = "playlists_order"
const val PLAYLIST_SORT_ORDER = "playlist_sort_order"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import com.github.libretube.helpers.NavBarHelper
import com.github.libretube.helpers.NavigationHelper
import com.github.libretube.helpers.PreferenceHelper
import com.github.libretube.obj.SelectableOption
import com.github.libretube.ui.adapters.LegacySubscriptionAdapter
import com.github.libretube.ui.adapters.SubscriptionChannelAdapter
import com.github.libretube.ui.adapters.VideoCardsAdapter
import com.github.libretube.ui.base.DynamicLayoutManagerFragment
Expand Down Expand Up @@ -81,7 +80,6 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
field = value
}

private val legacySubscriptionsAdapter = LegacySubscriptionAdapter()
private val channelsAdapter = SubscriptionChannelAdapter()

override fun setLayoutManagers(gridItems: Int) {
Expand All @@ -97,24 +95,8 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub

binding.subFeed.adapter = feedAdapter

val legacySubscriptions = PreferenceHelper.getBoolean(
PreferenceKeys.LEGACY_SUBSCRIPTIONS,
false
)

if (legacySubscriptions) {
binding.subChannels.layoutManager = GridLayoutManager(
context,
PreferenceHelper.getString(
PreferenceKeys.LEGACY_SUBSCRIPTIONS_COLUMNS,
"3"
).toInt()
)
binding.subChannels.adapter = legacySubscriptionsAdapter
} else {
binding.subChannels.layoutManager = LinearLayoutManager(context)
binding.subChannels.adapter = channelsAdapter
}
binding.subChannels.layoutManager = LinearLayoutManager(context)
binding.subChannels.adapter = channelsAdapter

// Check if the AppBarLayout is fully expanded
binding.subscriptionsAppBar.addOnOffsetChangedListener { _, verticalOffset ->
Expand Down Expand Up @@ -426,13 +408,8 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
val subscriptions =
viewModel.subscriptions.value?.filterByGroup(selectedFilterGroup) ?: return

val legacySubscriptions = PreferenceHelper.getBoolean(
PreferenceKeys.LEGACY_SUBSCRIPTIONS,
false
)

val adapter = if (legacySubscriptions) legacySubscriptionsAdapter else channelsAdapter
adapter.submitList(subscriptions) {
channelsAdapter.submitList(subscriptions) {
if (restoreScrollState) {
binding.subFeed.layoutManager?.onRestoreInstanceState(viewModel.subChannelsRecyclerViewState)
binding.subscriptionsAppBar.setExpanded(viewModel.subChannelsRecyclerViewState == null)
Expand Down

This file was deleted.

26 changes: 0 additions & 26 deletions app/src/main/res/layout/legacy_subscription_channel.xml

This file was deleted.

1 change: 0 additions & 1 deletion app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@
<string name="copied_to_clipboard">تم نسخها إلى الحافظة</string>
<string name="maximum_image_cache">الحد الأقصى لحجم ذاكرة التخزين المؤقت للصور</string>
<string name="open_copied">فتح</string>
<string name="legacy_subscriptions">طريقة عرض الاشتراكات القديمة</string>
<string name="device_info">معلومات الجهاز</string>
<string name="audio_video_summary">الجودة والشكل</string>
<string name="delete">حذف من التنزيلات</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-az/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@
<string name="copied_to_clipboard">Buferə köçürüldü</string>
<string name="maximum_image_cache">Maksimum şəkil qalığı həcmi</string>
<string name="open_copied">Aç</string>
<string name="legacy_subscriptions">Köhnə abunəliklər görünüşü</string>
<string name="device_info">Cihaz Məlumatı</string>
<string name="audio_video_summary">Keyfiyyət və format</string>
<string name="new_videos_badge">Yeni videolar üçün göstərici</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-b+en+Shaw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,6 @@
<string name="no_subtitles_available">𐑯𐑴 𐑕𐑳𐑚𐑑𐑲𐑑𐑩𐑤𐑟 𐑩𐑝𐑱𐑤𐑩𐑚𐑩𐑤</string>
<string name="repeat_mode_current">𐑒𐑳𐑮𐑩𐑯𐑑</string>
<string name="player_resize_mode">𐑮𐑰𐑕𐑲𐑟 𐑥𐑴𐑛</string>
<string name="legacy_subscriptions">𐑤𐑧𐑜𐑩𐑕𐑦 𐑕𐑩𐑚𐑕𐑒𐑮𐑦𐑐𐑖𐑩𐑯𐑟 𐑝𐑿</string>
<string name="device_info">𐑛𐑦𐑝𐑲𐑕 𐑦𐑯𐑓𐑴</string>
<string name="delete">𐑛𐑦𐑤𐑰𐑑 𐑓𐑮𐑪𐑥 𐑛𐑬𐑯𐑤𐑴𐑛𐑟</string>
<string name="renamePlaylist">𐑮𐑰𐑯𐑱𐑥 𐑐𐑤𐑱𐑤𐑦𐑕𐑑</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-b+es+419/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@
<string name="backup_restore">Copia de seguridad y restauración</string>
<string name="backup">Copia de seguridad</string>
<string name="picture_in_picture">Reproductor flotante</string>
<string name="legacy_subscriptions">Ver suscripciones en una cuadrícula</string>
<string name="device_info">Información del dispositivo</string>
<string name="share_with_time">Compartir con marca de tiempo</string>
<string name="export_subscriptions">Exportar suscripciones</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-be/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@
<string name="maximum_image_cache">Максімальны памер кэша малюнкаў</string>
<string name="copied_to_clipboard">Скапіравана ў буфер абмену</string>
<string name="open_copied">Адкрыты</string>
<string name="legacy_subscriptions">Састарэлы выгляд падпісак</string>
<string name="device_info">Інфармацыя пра прыладу</string>
<string name="audio_video_summary">Якасць і фармат</string>
<string name="delete">Выдаліць з загрузак</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,6 @@
<string name="queue_insert_related_videos">Вмъкни свързани видеоклипове</string>
<string name="stop">Спри</string>
<string name="autoplay_countdown_summary">Покажи обратно броене от 5 секунди преди автоматичното изпълнение на следващо видео</string>
<string name="legacy_subscriptions">Изглед на наследени абонаменти</string>
<string name="related_streams">Свързано съдържание</string>
<string name="faq">ЧЗВ</string>
<string name="sort_by">Сортирай по</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@
<string name="local_subscriptions">লোকাল সাবস্ক্রিপশন</string>
<string name="player_resize_mode">রিসাইজ মোড</string>
<string name="skip_segment">অংশটি স্কিপ করুন</string>
<string name="legacy_subscriptions">ঐতিহ্যবাহী সাবস্ক্রিপশন ভিউ</string>
<string name="device_info">ডিভাইসের তথ্য</string>
<string name="yt_shorts">শর্টস</string>
<string name="maximum_image_cache">সর্বোচ্চ ছবির ক্যাশ সাইজ</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@
<string name="defaults">Valors per defecte</string>
<string name="theme_monochrome">Monocrom minimalista</string>
<string name="seek_increment">Increment del salt</string>
<string name="legacy_subscriptions">Vista de subscripcions antigues</string>
<string name="device_info">Informació del dispositiu</string>
<string name="renamePlaylist">Canvia el nom de la llista de reproducció</string>
<string name="sb_custom_colors">Colors dels segments personalitzats</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-ckb/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@
<string name="backup_restore">پاشەکەوتکردن و گێڕانەوە</string>
<string name="picture_in_picture">دۆخی بچووککراوە (وێنە لەناو وێنە)</string>
<string name="maximum_image_cache">زۆرترین قەبارەی وێنەی کاتی</string>
<string name="legacy_subscriptions">بینینی بە شێوازی کۆنی هاوبەشییەکان</string>
<string name="device_info">زانیاری ئامێر</string>
<string name="player_resize_mode">شێوازی قەبارەگۆڕین</string>
<string name="play_next">لێدانی دواتر</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@
<string name="maximum_image_cache">Max. velikost mezipaměti obrázků</string>
<string name="copied_to_clipboard">Zkopírováno do schránky</string>
<string name="open_copied">Otevřít</string>
<string name="legacy_subscriptions">Staré zobrazení odběrů</string>
<string name="device_info">Informace o zařízení</string>
<string name="audio_video_summary">Kvalita a formát</string>
<string name="delete">Odstranit ze stažených</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@
<string name="copied_to_clipboard">Kopieret til udklipsholder</string>
<string name="maximum_image_cache">Maks. billedcachestørrelse</string>
<string name="open_copied">Åbn</string>
<string name="legacy_subscriptions">Ældre abonnementsvisning</string>
<string name="device_info">Enhedsoplysninger</string>
<string name="audio_video_summary">Kvalitet og format</string>
<string name="invalid_input">Ugyldigt input</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@
<string name="download_channel_description">Zeigt beim Herunterladen von Medien eine Benachrichtigung an.</string>
<string name="push_channel_description">Zeigt eine Benachrichtigung an, wenn neue Videos verfügbar sind.</string>
<string name="change_region">Trends scheinen in ihrem Land nicht verfügbar zu sein. Bitte ein unterstütztes Land in den Einstellungen auswählen.</string>
<string name="legacy_subscriptions">Altes Abo-Design</string>
<string name="device_info">Gerätespezifikationen</string>
<string name="network_wifi">Nur über WLAN</string>
<string name="share_with_time">Mit Zeitstempel teilen</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@
<string name="download_channel_name">Υπηρεσία λήψης</string>
<string name="navbar_order">Σειρά</string>
<string name="change_region">Οι τάσεις φαίνεται να μην είναι διαθέσιμες για την τρέχουσα περιοχή. Επιλέξτε άλλη στις ρυθμίσεις.</string>
<string name="legacy_subscriptions">Προβολή συνδρομών παλαιού τύπου</string>
<string name="nothing_selected">Τίποτα επιλεγμένο!</string>
<string name="no_subtitle">Χωρίς υποτίτλους</string>
<string name="download_paused">Το κατέβασμα τέθηκε σε παύση</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@
<string name="backup_restore">Copia de seguridad y restauración</string>
<string name="backup">Copia de seguridad</string>
<string name="picture_in_picture">Reproductor flotante</string>
<string name="legacy_subscriptions">Ver suscripciones en una cuadrícula</string>
<string name="device_info">Información del dispositivo</string>
<string name="share_with_time">Compartir con marca de tiempo</string>
<string name="export_subscriptions">Exportar suscripciones</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-et/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@
<string name="backup">Varundus</string>
<string name="maximum_image_cache">Piltide vahemälu suurim lubatud suurus</string>
<string name="copied_to_clipboard">Kopeeritud lõikelauale</string>
<string name="legacy_subscriptions">Vanas stiilis tellimuste vaade</string>
<string name="backup_customInstances">Kohandatud vaheserverid</string>
<string name="color">Värv</string>
<string name="invalid_color">Vigane värvikood!</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-eu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@
<string name="export_subscriptions">Harpidetzak esportatu</string>
<string name="skip_buttons_summary">Erakutsi botoiak hurrengo edo aurreko bideora joateko</string>
<string name="yt_shorts">Motzak</string>
<string name="legacy_subscriptions">Harpidetza zaharren ikuspegia</string>
<string name="device_info">Gailuaren informazioa</string>
<string name="no_subtitles_available">Ez dago azpititulurik erabilgarri</string>
<string name="repeat_mode">Errepikatze modua</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@
<item quantity="one">%d جریان جدید</item>
<item quantity="other">%d جریان جدید</item>
</plurals>
<string name="legacy_subscriptions">نمای اشتراک‌های قدیمی</string>
<string name="category_filler_summary">برای صحنه‌‌هایی که فقط برای پرکردن یا طنز اضافه شده‌اند و برای درک محتوای اصلی ویدیو لازم نیستند</string>
<string name="shareTo">هم‌رسانی نشانی با</string>
<string name="instance_api_url">نشانی رابط برنامه‌نویسی نمونه</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@
<string name="resize_mode_zoom">Zoomaa</string>
<string name="repeat_mode_none">Ei mitään</string>
<string name="maximum_image_cache">Kuva välimustin enimmäiskoko</string>
<string name="legacy_subscriptions">Vanha tilaukset näkymä</string>
<string name="audio_video_summary">Laatu ja formaatti</string>
<string name="delete">Poista latauksista</string>
<string name="wifi">Wi-Fi</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@
<string name="maximum_image_cache">Taille maximale du cache d’images</string>
<string name="open_copied">Ouvrir</string>
<string name="copied_to_clipboard">Copié dans le presse-papier</string>
<string name="legacy_subscriptions">Ancienne vue des abonnements</string>
<string name="device_info">Informations de l’appareil</string>
<string name="audio_video_summary">Qualité et format</string>
<string name="new_videos_badge">Indicateur de nouvelles vidéos</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-gu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@
<string name="notify_new_streams_summary">તમે અનુસરો છો તે સર્જકો તરફથી નવી સામગ્રી વિશેની સૂચનાઓ</string>
<string name="backup_restore_summary">સબસ્ક્રિપ્શન્સ, પ્લેલિસ્ટ્સ, આયાત અને નિકાસ કરો…</string>
<string name="error_occurred">ભૂલ</string>
<string name="legacy_subscriptions">વારસાગત સબસ્ક્રિપ્શન્સ દૃશ્ય</string>
<string name="required_network">આવશ્યક કનેક્શન</string>
<string name="translate">ભાષાંતર</string>
<string name="share_with_time">ટાઇમ કોડ સાથે વહેંચો</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@
<string name="maximum_image_cache">अधिकतम इमेज कैश आकार</string>
<string name="copied_to_clipboard">क्लिपबोर्ड पर कापी हुआ</string>
<string name="open_copied">खोलें</string>
<string name="legacy_subscriptions">लीगेसी सब्सक्रिप्शनस दृश्य</string>
<string name="audio_video_summary">गुणवत्ता और प्रारूप</string>
<string name="delete">डाउनलोडस से डिलीट करें</string>
<string name="renamePlaylist">प्लेलिस्ट का नाम बदलें</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
<string name="version">Verzió: %1$s</string>
<string name="error_occurred">Hiba</string>
<string name="copied">Másolva</string>
<string name="legacy_subscriptions">Régi feliratkozások nézet</string>
<string name="device_info">Eszközinformáció</string>
<string name="general_summary">Nyelv és régió</string>
<string name="worst_quality">Legrosszabb</string>
Expand Down
Loading
Loading