tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor fastscroller improvements

Browse source
This commit is contained in:
Karim Abou Zeid 2016-01-17 18:40:41 +01:00
commit c74bd99df3
1 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/kabouzeid/gramophone/views/FastScroller.java
View file

@ -65,7 +65,6 @@ public class FastScroller extends FrameLayout {
@Override @Override
public boolean onTouchEvent(@NonNull MotionEvent event) { public boolean onTouchEvent(@NonNull MotionEvent event) {
if (event.getAction() == MotionEvent.ACTION_DOWN || event.getAction() == MotionEvent.ACTION_MOVE) { if (event.getAction() == MotionEvent.ACTION_DOWN || event.getAction() == MotionEvent.ACTION_MOVE) {
setHandlePosition(event.getY());
handle.setPressed(true); handle.setPressed(true);
setRecyclerViewPosition(event.getY()); setRecyclerViewPosition(event.getY());
showIfHidden(); showIfHidden();
@ -87,7 +86,7 @@ public class FastScroller extends FrameLayout {
if (recyclerView != null) { if (recyclerView != null) {
int itemCount = recyclerView.getAdapter().getItemCount(); int itemCount = recyclerView.getAdapter().getItemCount();
float proportion = y / (float) getHeightMinusPadding(); float proportion = y / (float) getHeightMinusPadding();
int targetPos = getValueInRange(0, itemCount - 1, (int) (proportion * (float) itemCount)); int targetPos = getValueInRange(0, itemCount - 1, Math.round(proportion * (float) itemCount));
recyclerView.scrollToPosition(targetPos); recyclerView.scrollToPosition(targetPos);
} }
} }
@ -100,7 +99,7 @@ public class FastScroller extends FrameLayout {
private void setHandlePosition(float y) { private void setHandlePosition(float y) {
float position = y / getHeightMinusPadding(); float position = y / getHeightMinusPadding();
int handleHeight = handle.getHeight(); int handleHeight = handle.getHeight();
handle.setY(getValueInRange(0, getHeightMinusPadding() - handleHeight, (int) ((getHeightMinusPadding() - handleHeight) * position))); handle.setY(getValueInRange(0, getHeightMinusPadding() - handleHeight, Math.round((getHeightMinusPadding() - handleHeight) * position)));
} }
private void showImpl() { private void showImpl() {
@ -160,19 +159,10 @@ public class FastScroller extends FrameLayout {
private float computeHandlePosition() { private float computeHandlePosition() {
View firstVisibleView = recyclerView.getChildAt(0); View firstVisibleView = recyclerView.getChildAt(0);
int firstVisiblePosition = recyclerView.getChildAdapterPosition(firstVisibleView); int firstVisiblePosition = recyclerView.getChildAdapterPosition(firstVisibleView);
int visibleRange = recyclerView.getChildCount();
int lastVisiblePosition = firstVisiblePosition + visibleRange;
int itemCount = recyclerView.getAdapter().getItemCount(); int itemCount = recyclerView.getAdapter().getItemCount();
int position;
if (firstVisiblePosition == 0) { float proportion = (float) firstVisiblePosition / (float) itemCount;
position = 0; return getHeightMinusPadding() * proportion + recyclerView.getChildCount() * proportion;
} else if (lastVisiblePosition == itemCount - 1) {
position = itemCount - 1;
} else {
position = firstVisiblePosition;
}
float proportion = (float) position / (float) itemCount;
return getHeightMinusPadding() * proportion;
} }
public void updateHandlePosition() { public void updateHandlePosition() {