baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Merge pull request #6550 from Douile/fix/clickthrough-feed-refresh

Browse source 
Disable feed click events while refresh overlay is shown
This commit is contained in:
Stypox 2021-08-01 13:11:24 +02:00 committed by GitHub
commit a9623f8e6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
View file

@ -96,6 +96,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
private var onSettingsChangeListener: SharedPreferences.OnSharedPreferenceChangeListener? = null private var onSettingsChangeListener: SharedPreferences.OnSharedPreferenceChangeListener? = null
private var updateListViewModeOnResume = false private var updateListViewModeOnResume = false
private var isRefreshing = false
init { init {
setHasOptionsMenu(true) setHasOptionsMenu(true)
@ -259,6 +260,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
feedBinding.refreshRootView.animate(false, 0) feedBinding.refreshRootView.animate(false, 0)
feedBinding.loadingProgressText.animate(true, 200) feedBinding.loadingProgressText.animate(true, 200)
feedBinding.swipeRefreshLayout.isRefreshing = true feedBinding.swipeRefreshLayout.isRefreshing = true
isRefreshing = true
} }
override fun hideLoading() { override fun hideLoading() {
@ -267,6 +269,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
feedBinding.refreshRootView.animate(true, 200) feedBinding.refreshRootView.animate(true, 200)
feedBinding.loadingProgressText.animate(false, 0) feedBinding.loadingProgressText.animate(false, 0)
feedBinding.swipeRefreshLayout.isRefreshing = false feedBinding.swipeRefreshLayout.isRefreshing = false
isRefreshing = false
} }
override fun showEmptyState() { override fun showEmptyState() {
@ -293,6 +296,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
feedBinding.refreshRootView.animate(false, 0) feedBinding.refreshRootView.animate(false, 0)
feedBinding.loadingProgressText.animate(false, 0) feedBinding.loadingProgressText.animate(false, 0)
feedBinding.swipeRefreshLayout.isRefreshing = false feedBinding.swipeRefreshLayout.isRefreshing = false
isRefreshing = false
} }
private fun handleProgressState(progressState: FeedState.ProgressState) { private fun handleProgressState(progressState: FeedState.ProgressState) {
@ -359,7 +363,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
private val listenerStreamItem = object : OnItemClickListener, OnItemLongClickListener { private val listenerStreamItem = object : OnItemClickListener, OnItemLongClickListener {
override fun onItemClick(item: Item<*>, view: View) { override fun onItemClick(item: Item<*>, view: View) {
if (item is StreamItem) { if (item is StreamItem && !isRefreshing) {
val stream = item.streamWithState.stream val stream = item.streamWithState.stream
NavigationHelper.openVideoDetailFragment( NavigationHelper.openVideoDetailFragment(
requireContext(), fm, requireContext(), fm,
@ -369,7 +373,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
} }
override fun onItemLongClick(item: Item<*>, view: View): Boolean { override fun onItemLongClick(item: Item<*>, view: View): Boolean {
if (item is StreamItem) { if (item is StreamItem && !isRefreshing) {
showStreamDialog(item.streamWithState.stream.toStreamInfoItem()) showStreamDialog(item.streamWithState.stream.toStreamInfoItem())
return true return true
} }