diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackLayoutManager.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackLayoutManager.java index 4b05169f..2732ee32 100644 --- a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackLayoutManager.java +++ b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackLayoutManager.java @@ -68,6 +68,10 @@ public boolean canScrollVertically() { @Override public int scrollHorizontallyBy(int dx, RecyclerView.Recycler recycler, RecyclerView.State s) { + if (state.topPosition == getItemCount()) { + return 0; + } + switch (state.status) { case Idle: if (setting.swipeableMethod.canSwipeManually()) { @@ -106,11 +110,16 @@ public int scrollHorizontallyBy(int dx, RecyclerView.Recycler recycler, Recycler case ManualSwipeAnimated: break; } + return 0; } @Override public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler, RecyclerView.State s) { + if (state.topPosition == getItemCount()) { + return 0; + } + switch (state.status) { case Idle: if (setting.swipeableMethod.canSwipeManually()) {