kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 16:30:31 +05:30
Code Issues Projects Releases Wiki Activity

fix: add pagination to subscriptions list

Browse Source
This commit is contained in:
Bnyro 2023-09-08 17:45:42 +02:00
parent caef216c96
commit b22e026ec0
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt
View File

@ -16,8 +16,9 @@ import com.github.libretube.ui.viewholders.SubscriptionChannelViewHolder
class SubscriptionChannelAdapter( class SubscriptionChannelAdapter(
private val subscriptions: MutableList<Subscription> private val subscriptions: MutableList<Subscription>
) : RecyclerView.Adapter<SubscriptionChannelViewHolder>() { ) : RecyclerView.Adapter<SubscriptionChannelViewHolder>() {
private var visibleCount = 20
override fun getItemCount() = subscriptions.size override fun getItemCount() = minOf(visibleCount, subscriptions.size)
override fun onCreateViewHolder( override fun onCreateViewHolder(
parent: ViewGroup, parent: ViewGroup,
@ -28,6 +29,13 @@ class SubscriptionChannelAdapter(
return SubscriptionChannelViewHolder(binding) return SubscriptionChannelViewHolder(binding)
} }
fun updateItems() {
val oldSize = visibleCount
visibleCount += minOf(10, subscriptions.size - oldSize)
if (visibleCount == oldSize) return
notifyItemRangeInserted(oldSize, visibleCount)
}
override fun onBindViewHolder(holder: SubscriptionChannelViewHolder, position: Int) { override fun onBindViewHolder(holder: SubscriptionChannelViewHolder, position: Int) {
val subscription = subscriptions[position] val subscription = subscriptions[position]

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

@ -49,7 +49,8 @@ class SubscriptionsFragment : Fragment() {
private var selectedFilterGroup = 0 private var selectedFilterGroup = 0
private var isCurrentTabSubChannels = false private var isCurrentTabSubChannels = false
var subscriptionsAdapter: VideosAdapter? = null var feedAdapter: VideosAdapter? = null
private var channelsAdapter: SubscriptionChannelAdapter? = null
private var selectedSortOrder = PreferenceHelper.getInt(PreferenceKeys.FEED_SORT_ORDER, 0) private var selectedSortOrder = PreferenceHelper.getInt(PreferenceKeys.FEED_SORT_ORDER, 0)
set(value) { set(value) {
PreferenceHelper.putInt(PreferenceKeys.FEED_SORT_ORDER, value) PreferenceHelper.putInt(PreferenceKeys.FEED_SORT_ORDER, value)
@ -155,7 +156,11 @@ class SubscriptionsFragment : Fragment() {
viewModel.videoFeed.value != null // scroll view is at bottom viewModel.videoFeed.value != null // scroll view is at bottom
) { ) {
binding.subRefresh.isRefreshing = true binding.subRefresh.isRefreshing = true
subscriptionsAdapter?.updateItems() if (isCurrentTabSubChannels) {
channelsAdapter?.updateItems()
} else {
feedAdapter?.updateItems()
}
binding.subRefresh.isRefreshing = false binding.subRefresh.isRefreshing = false
} }
} }
@ -315,11 +320,11 @@ class SubscriptionsFragment : Fragment() {
binding.subFeedContainer.isGone = notLoaded binding.subFeedContainer.isGone = notLoaded
binding.emptyFeed.isVisible = notLoaded binding.emptyFeed.isVisible = notLoaded
subscriptionsAdapter = VideosAdapter( feedAdapter = VideosAdapter(
sortedFeed.toMutableList(), sortedFeed.toMutableList(),
showAllAtOnce = false showAllAtOnce = false
) )
binding.subFeed.adapter = subscriptionsAdapter binding.subFeed.adapter = feedAdapter
binding.toggleSubsText.text = getString(R.string.subscriptions) binding.toggleSubsText.text = getString(R.string.subscriptions)
PreferenceHelper.updateLastFeedWatchedTime() PreferenceHelper.updateLastFeedWatchedTime()
@ -345,7 +350,8 @@ class SubscriptionsFragment : Fragment() {
binding.subChannels.adapter = LegacySubscriptionAdapter(subscriptions) binding.subChannels.adapter = LegacySubscriptionAdapter(subscriptions)
} else { } else {
binding.subChannels.layoutManager = LinearLayoutManager(context) binding.subChannels.layoutManager = LinearLayoutManager(context)
binding.subChannels.adapter = SubscriptionChannelAdapter(subscriptions.toMutableList()) channelsAdapter = SubscriptionChannelAdapter(subscriptions.toMutableList())
binding.subChannels.adapter = channelsAdapter
} }
binding.subRefresh.isRefreshing = false binding.subRefresh.isRefreshing = false

2
app/src/main/java/com/github/libretube/ui/sheets/VideoOptionsBottomSheet.kt
View File

@ -132,7 +132,7 @@ class VideoOptionsBottomSheet(
// get the current fragment // get the current fragment
val fragment = navHostFragment?.childFragmentManager?.fragments val fragment = navHostFragment?.childFragmentManager?.fragments
?.firstOrNull() as? SubscriptionsFragment ?.firstOrNull() as? SubscriptionsFragment
fragment?.subscriptionsAdapter?.removeItemById(videoId) fragment?.feedAdapter?.removeItemById(videoId)
} }
onVideoChanged() onVideoChanged()
} }