@@ -30,7 +30,6 @@ import com.github.libretube.helpers.NavBarHelper
30
30
import com.github.libretube.helpers.NavigationHelper
31
31
import com.github.libretube.helpers.PreferenceHelper
32
32
import com.github.libretube.obj.SelectableOption
33
- import com.github.libretube.ui.adapters.LegacySubscriptionAdapter
34
33
import com.github.libretube.ui.adapters.SubscriptionChannelAdapter
35
34
import com.github.libretube.ui.adapters.VideoCardsAdapter
36
35
import com.github.libretube.ui.base.DynamicLayoutManagerFragment
@@ -81,7 +80,6 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
81
80
field = value
82
81
}
83
82
84
- private val legacySubscriptionsAdapter = LegacySubscriptionAdapter ()
85
83
private val channelsAdapter = SubscriptionChannelAdapter ()
86
84
87
85
override fun setLayoutManagers (gridItems : Int ) {
@@ -97,24 +95,8 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
97
95
98
96
binding.subFeed.adapter = feedAdapter
99
97
100
- val legacySubscriptions = PreferenceHelper .getBoolean(
101
- PreferenceKeys .LEGACY_SUBSCRIPTIONS ,
102
- false
103
- )
104
-
105
- if (legacySubscriptions) {
106
- binding.subChannels.layoutManager = GridLayoutManager (
107
- context,
108
- PreferenceHelper .getString(
109
- PreferenceKeys .LEGACY_SUBSCRIPTIONS_COLUMNS ,
110
- " 3"
111
- ).toInt()
112
- )
113
- binding.subChannels.adapter = legacySubscriptionsAdapter
114
- } else {
115
- binding.subChannels.layoutManager = LinearLayoutManager (context)
116
- binding.subChannels.adapter = channelsAdapter
117
- }
98
+ binding.subChannels.layoutManager = LinearLayoutManager (context)
99
+ binding.subChannels.adapter = channelsAdapter
118
100
119
101
// Check if the AppBarLayout is fully expanded
120
102
binding.subscriptionsAppBar.addOnOffsetChangedListener { _, verticalOffset ->
@@ -426,13 +408,8 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
426
408
val subscriptions =
427
409
viewModel.subscriptions.value?.filterByGroup(selectedFilterGroup) ? : return
428
410
429
- val legacySubscriptions = PreferenceHelper .getBoolean(
430
- PreferenceKeys .LEGACY_SUBSCRIPTIONS ,
431
- false
432
- )
433
411
434
- val adapter = if (legacySubscriptions) legacySubscriptionsAdapter else channelsAdapter
435
- adapter.submitList(subscriptions) {
412
+ channelsAdapter.submitList(subscriptions) {
436
413
if (restoreScrollState) {
437
414
binding.subFeed.layoutManager?.onRestoreInstanceState(viewModel.subChannelsRecyclerViewState)
438
415
binding.subscriptionsAppBar.setExpanded(viewModel.subChannelsRecyclerViewState == null )
0 commit comments