Skip to content

Commit b62deb5

Browse files
committed
feat: remove legacy subscription view
Drops the legacy subscription view, which was marked as legacy ~3 years ago. Given the long time, lack of updates since, it should be safe to remove. This further reduces the amount of 'unnecessary' options. Ref: libre-tube#7276 Ref: libre-tube@298023b Closes: libre-tube#7403
1 parent 7186d69 commit b62deb5

File tree

5 files changed

+3
-104
lines changed

5 files changed

+3
-104
lines changed

app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt

-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ object PreferenceKeys {
2626
const val GRID_COLUMNS_LANDSCAPE = "grid_landscape"
2727
const val LABEL_VISIBILITY = "label_visibility"
2828
const val APP_ICON = "icon_change"
29-
const val LEGACY_SUBSCRIPTIONS = "legacy_subscriptions"
30-
const val LEGACY_SUBSCRIPTIONS_COLUMNS = "legacy_subscriptions_columns"
3129
const val NEW_VIDEOS_BADGE = "new_videos_badge"
3230
const val PLAYLISTS_ORDER = "playlists_order"
3331
const val PLAYLIST_SORT_ORDER = "playlist_sort_order"

app/src/main/java/com/github/libretube/ui/adapters/LegacySubscriptionAdapter.kt

-55
This file was deleted.

app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt

+3-26
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import com.github.libretube.helpers.NavBarHelper
3030
import com.github.libretube.helpers.NavigationHelper
3131
import com.github.libretube.helpers.PreferenceHelper
3232
import com.github.libretube.obj.SelectableOption
33-
import com.github.libretube.ui.adapters.LegacySubscriptionAdapter
3433
import com.github.libretube.ui.adapters.SubscriptionChannelAdapter
3534
import com.github.libretube.ui.adapters.VideoCardsAdapter
3635
import com.github.libretube.ui.base.DynamicLayoutManagerFragment
@@ -81,7 +80,6 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
8180
field = value
8281
}
8382

84-
private val legacySubscriptionsAdapter = LegacySubscriptionAdapter()
8583
private val channelsAdapter = SubscriptionChannelAdapter()
8684

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

9896
binding.subFeed.adapter = feedAdapter
9997

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
118100

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

429-
val legacySubscriptions = PreferenceHelper.getBoolean(
430-
PreferenceKeys.LEGACY_SUBSCRIPTIONS,
431-
false
432-
)
433411

434-
val adapter = if (legacySubscriptions) legacySubscriptionsAdapter else channelsAdapter
435-
adapter.submitList(subscriptions) {
412+
channelsAdapter.submitList(subscriptions) {
436413
if (restoreScrollState) {
437414
binding.subFeed.layoutManager?.onRestoreInstanceState(viewModel.subChannelsRecyclerViewState)
438415
binding.subscriptionsAppBar.setExpanded(viewModel.subChannelsRecyclerViewState == null)

app/src/main/res/values/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@
284284
<string name="maximum_image_cache">Max image cache size</string>
285285
<string name="copied_to_clipboard">Copied to clipboard</string>
286286
<string name="open_copied">Open</string>
287-
<string name="legacy_subscriptions">Legacy subscriptions view</string>
288287
<string name="device_info">Device Info</string>
289288
<string name="audio_video_summary">Quality and format</string>
290289
<string name="delete">Delete from downloads</string>

app/src/main/res/xml/appearance_settings.xml

-20
Original file line numberDiff line numberDiff line change
@@ -84,24 +84,4 @@
8484

8585
</PreferenceCategory>
8686

87-
<PreferenceCategory
88-
app:title="@string/legacy_subscriptions">
89-
90-
<SwitchPreferenceCompat
91-
app:defaultValue="false"
92-
app:icon="@drawable/ic_list"
93-
app:key="legacy_subscriptions"
94-
app:title="@string/legacy_subscriptions" />
95-
96-
<ListPreference
97-
android:entries="@array/grid"
98-
android:entryValues="@array/grid"
99-
app:defaultValue="3"
100-
app:icon="@drawable/ic_grid"
101-
app:dependency="legacy_subscriptions"
102-
app:key="legacy_subscriptions_columns"
103-
app:title="@string/grid" />
104-
105-
</PreferenceCategory>
106-
10787
</PreferenceScreen>

0 commit comments

Comments
 (0)