Skip to content

Disable feed click events while refresh overlay is shown #6550

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.

Sign up for GitHub

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

Merged
Stypox merged 2 commits into from
Aug 1, 2021
Merged

Disable feed click events while refresh overlay is shown #6550

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb1a138
#6081: Disable feed click handlers during refresh
Douile Jun 22, 2021
2e053ea
Fix crash when refreshing feed
Douile Jul 11, 2021
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
8 changes: 6 additions & 2 deletions app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {

private var onSettingsChangeListener: SharedPreferences.OnSharedPreferenceChangeListener? = null
private var updateListViewModeOnResume = false
private var isRefreshing = false

init {
setHasOptionsMenu(true)
Expand Down Expand Up @@ -268,6 +269,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
feedBinding.refreshRootView.animate(false, 0)
feedBinding.loadingProgressText.animate(true, 200)
feedBinding.swipeRefreshLayout.isRefreshing = true
isRefreshing = true
}

override fun hideLoading() {
Expand All @@ -276,6 +278,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
feedBinding.refreshRootView.animate(true, 200)
feedBinding.loadingProgressText.animate(false, 0)
feedBinding.swipeRefreshLayout.isRefreshing = false
isRefreshing = false
}

override fun showEmptyState() {
Expand All @@ -302,6 +305,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
feedBinding.refreshRootView.animate(false, 0)
feedBinding.loadingProgressText.animate(false, 0)
feedBinding.swipeRefreshLayout.isRefreshing = false
isRefreshing = false
}

private fun handleProgressState(progressState: FeedState.ProgressState) {
Expand Down Expand Up @@ -363,7 +367,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {

private val listenerStreamItem = object : OnItemClickListener, OnItemLongClickListener {
override fun onItemClick(item: Item<*>, view: View) {
if (item is StreamItem) {
if (item is StreamItem && !isRefreshing) {
val stream = item.streamWithState.stream
NavigationHelper.openVideoDetailFragment(
requireContext(), fm,
Expand All @@ -373,7 +377,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
}

override fun onItemLongClick(item: Item<*>, view: View): Boolean {
if (item is StreamItem) {
if (item is StreamItem && !isRefreshing) {
showStreamDialog(item.streamWithState.stream.toStreamInfoItem())
return true
}
Expand Down