kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-15 06:40:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #4274 from Bnyro/master

Browse Source 
feat: remember position and tab in subscriptions fragment
This commit is contained in:
Bnyro 2023-07-20 10:56:19 +02:00 committed by GitHub
commit 6b65b1901b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package com.github.libretube.ui.fragments
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -44,7 +45,8 @@ class SubscriptionsFragment : Fragment() {
private val viewModel: SubscriptionsViewModel by activityViewModels() private val viewModel: SubscriptionsViewModel by activityViewModels()
private val playerModel: PlayerViewModel by activityViewModels() private val playerModel: PlayerViewModel by activityViewModels()
private var channelGroups: List<SubscriptionGroup> = listOf() private var channelGroups: List<SubscriptionGroup> = listOf()
private var selectedFilterGroup: Int = 0 private var selectedFilterGroup = 0
private var isCurrentTabSubChannels = false
var subscriptionsAdapter: VideosAdapter? = null var subscriptionsAdapter: VideosAdapter? = null
private var selectedSortOrder = PreferenceHelper.getInt(PreferenceKeys.FEED_SORT_ORDER, 0) private var selectedSortOrder = PreferenceHelper.getInt(PreferenceKeys.FEED_SORT_ORDER, 0)
@ -85,7 +87,7 @@ class SubscriptionsFragment : Fragment() {
binding.subFeed.layoutManager = VideosAdapter.getLayout(requireContext()) binding.subFeed.layoutManager = VideosAdapter.getLayout(requireContext())
if (viewModel.videoFeed.value == null || !loadFeedInBackground) { if (!isCurrentTabSubChannels && (viewModel.videoFeed.value == null || !loadFeedInBackground)) {
viewModel.videoFeed.value = null viewModel.videoFeed.value = null
viewModel.fetchFeed() viewModel.fetchFeed()
} }
@ -98,13 +100,11 @@ class SubscriptionsFragment : Fragment() {
} }
viewModel.videoFeed.observe(viewLifecycleOwner) { viewModel.videoFeed.observe(viewLifecycleOwner) {
if (!isShowingFeed() || it == null) return@observe if (!isCurrentTabSubChannels && it != null) showFeed()
showFeed()
} }
viewModel.subscriptions.observe(viewLifecycleOwner) { viewModel.subscriptions.observe(viewLifecycleOwner) {
if (isShowingFeed() || it == null) return@observe if (isCurrentTabSubChannels && it != null) showSubscriptions()
showSubscriptions()
} }
binding.subRefresh.setOnRefreshListener { binding.subRefresh.setOnRefreshListener {
@ -139,7 +139,9 @@ class SubscriptionsFragment : Fragment() {
binding.toggleSubs.visibility = View.VISIBLE binding.toggleSubs.visibility = View.VISIBLE
binding.toggleSubs.setOnClickListener { binding.toggleSubs.setOnClickListener {
if (isShowingFeed()) { binding.subProgress.isVisible = true
binding.subRefresh.isRefreshing = true
if (!isCurrentTabSubChannels) {
if (viewModel.subscriptions.value == null) { if (viewModel.subscriptions.value == null) {
viewModel.fetchSubscriptions() viewModel.fetchSubscriptions()
} else { } else {
@ -152,6 +154,7 @@ class SubscriptionsFragment : Fragment() {
binding.subChannelsContainer.visibility = View.GONE binding.subChannelsContainer.visibility = View.GONE
binding.subFeedContainer.visibility = View.VISIBLE binding.subFeedContainer.visibility = View.VISIBLE
} }
isCurrentTabSubChannels = !isCurrentTabSubChannels
} }
binding.scrollviewSub.viewTreeObserver.addOnScrollChangedListener { binding.scrollviewSub.viewTreeObserver.addOnScrollChangedListener {
@ -298,8 +301,6 @@ class SubscriptionsFragment : Fragment() {
private fun showSubscriptions() { private fun showSubscriptions() {
if (viewModel.subscriptions.value == null) return if (viewModel.subscriptions.value == null) return
binding.subRefresh.isRefreshing = false
val legacySubscriptions = PreferenceHelper.getBoolean( val legacySubscriptions = PreferenceHelper.getBoolean(
PreferenceKeys.LEGACY_SUBSCRIPTIONS, PreferenceKeys.LEGACY_SUBSCRIPTIONS,
false false
@ -326,14 +327,12 @@ class SubscriptionsFragment : Fragment() {
) )
} }
binding.subRefresh.isRefreshing = false
binding.subProgress.isGone = true
binding.subFeedContainer.visibility = View.GONE binding.subFeedContainer.visibility = View.GONE
val notLoaded = viewModel.subscriptions.value.isNullOrEmpty() val notLoaded = viewModel.subscriptions.value.isNullOrEmpty()
binding.subChannelsContainer.isGone = notLoaded binding.subChannelsContainer.isGone = notLoaded
binding.emptyFeed.isVisible = notLoaded binding.emptyFeed.isVisible = notLoaded
} }
private fun isShowingFeed(): Boolean {
return !binding.subChannelsContainer.isVisible
}
} }