feat: improved automatic scrolling

1 files changed, 9 insertions, 1 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java
index bf33bf996..ca9f0f614 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java
@@ -14,6 +14,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.List;
@@ -181,7 +182,14 @@ public class StackFragment extends Fragment implements DragAndDropTab<CardAdapte
      */
     public void scrollToBottom() {
         activity.runOnUiThread(() -> {
-            binding.recyclerView.smoothScrollToPosition(adapter.getItemCount());
+            LinearLayoutManager layoutManager = (LinearLayoutManager) binding.recyclerView.getLayoutManager();
+            int currentItem = layoutManager.findFirstVisibleItemPosition();
+
+            if (adapter.getItemCount() - currentItem < 40) {
+                binding.recyclerView.smoothScrollToPosition(adapter.getItemCount());
+            } else {
+                binding.recyclerView.scrollToPosition(adapter.getItemCount() - 1);
+            }
         });
     }
 }
\ No newline at end of file