From f6a42cc8a0e411f92a0f303f58fd3e90a00d0bc6 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 23 Jan 2023 18:02:10 +0100
Subject: [PATCH] Simplify scroll listeners

---
 .../java/com/github/libretube/ui/fragments/ChannelFragment.kt | 4 +---
 .../com/github/libretube/ui/fragments/PlaylistFragment.kt     | 4 +---
 .../github/libretube/ui/fragments/SubscriptionsFragment.kt    | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
index 0cc3070d5..625f4eda9 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
@@ -91,9 +91,7 @@ class ChannelFragment : BaseFragment() {
 
         binding.channelScrollView.viewTreeObserver
             .addOnScrollChangedListener {
-                if (binding.channelScrollView.getChildAt(0).bottom
-                    == (binding.channelScrollView.height + binding.channelScrollView.scrollY)
-                ) {
+                if (!binding.channelScrollView.canScrollVertically(1)) {
                     try {
                         onScrollEnd.invoke()
                     } catch (e: Exception) {
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
index a5f8b476a..a38ce7b70 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
@@ -212,9 +212,7 @@ class PlaylistFragment : BaseFragment() {
                 binding.playlistRecView.adapter = playlistAdapter
                 binding.playlistScrollview.viewTreeObserver
                     .addOnScrollChangedListener {
-                        if (binding.playlistScrollview.getChildAt(0).bottom
-                            == (binding.playlistScrollview.height + binding.playlistScrollview.scrollY)
-                        ) {
+                        if (!binding.playlistScrollview.canScrollVertically(1)) {
                             if (isLoading) return@addOnScrollChangedListener
 
                             // append more playlists to the recycler view
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
index 18ed8e8f4..3cfecbb8a 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
@@ -137,9 +137,7 @@ class SubscriptionsFragment : BaseFragment() {
 
         binding.scrollviewSub.viewTreeObserver
             .addOnScrollChangedListener {
-                if (binding.scrollviewSub.getChildAt(0).bottom
-                    == (binding.scrollviewSub.height + binding.scrollviewSub.scrollY)
-                ) {
+                if (!binding.scrollviewSub.canScrollVertically(1)) {
                     // scroll view is at bottom
                     if (viewModel.videoFeed.value == null) return@addOnScrollChangedListener
                     binding.subRefresh.isRefreshing = true