Skip to content

Fix arrow scroll #10

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

Open
ptsekov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix arrow scroll #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions loopingviewpager/src/main/java/com/kenilt/loopingviewpager/widget/LoopingViewPager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class LoopingViewPager : ViewPager {
private var originalAdapter: PagerAdapter? = null
private var internalAdapter: PagerAdapter? = null
private val pageChangeListenerMap = HashMap<OnPageChangeListener, InternalOnPageChangeListener>()
private var insideArrowScroll: Boolean = false

constructor(context: Context) : super(context)

Expand Down Expand Up @@ -100,11 +101,16 @@ class LoopingViewPager : ViewPager {
}

override fun setCurrentItem(item: Int, smoothScroll: Boolean) {
// setCurrentItem() assumes it is passed an item position from the
// original adapter, however when it is invoked from within arrowScroll()
// it is passed an item position from the internal adapter, so the code
// should account for it.
val originalItem = if (insideArrowScroll) getPagerPosition(originalAdapter, item) else item
val count = adapter?.count ?: 0
if (item == 0 && currentItem == count - 1) {
if (originalItem == 0 && currentItem == count - 1) {
super.setCurrentItem(count + 2, smoothScroll)
} else {
super.setCurrentItem(getInternalPosition(originalAdapter, item), smoothScroll)
super.setCurrentItem(getInternalPosition(originalAdapter, originalItem), smoothScroll)
}
}

Expand All @@ -123,6 +129,13 @@ class LoopingViewPager : ViewPager {
}
}

override fun arrowScroll(direction: Int): Boolean {
insideArrowScroll = true
val handled = super.arrowScroll(direction)
insideArrowScroll = false
return handled
}

private fun handleSetCurrentItem(position: Int) {
val itemCount = internalAdapter?.count ?: 0
if (itemCount <= 1) return
Expand Down