Merge pull request #9 from colymore/scroll-state-changed-delegate

Call delegate ScrollListener on scrollChangeState

Author: oscarsj

library/src/main/java/com/tuenti/buttonmenu/animator/ScrollAnimator.java

@@ -94,7 +94,8 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun
 
 			@Override
 			public void onScrollStateChanged(AbsListView view, int scrollState) {
-				//Empty
+				notifyScrollStateChangedToAdditionalScrollListener(view, scrollState);
+
 			}
 		});
 	}
@@ -175,6 +176,12 @@ private void notifyScrollToAdditionalScrollListener(AbsListView view, int firstV
 		}
 	}
 
+	private void notifyScrollStateChangedToAdditionalScrollListener(AbsListView view, int scrollState) {
+		if (additionalScrollListener != null) {
+			additionalScrollListener.onScrollStateChanged(view, scrollState);
+		}
+	}
+
 	/**
 	 * Perform the "translateY" animation using the new scroll position and the old scroll position to show or hide
 	 * the animated view.

library/src/test/java/com/tuenti/buttonmenu/animator/ScrollAnimatorTest.java

@@ -48,6 +48,7 @@ public class ScrollAnimatorTest {
 	private static final int TOTAL_ITEM_COUNT = 10;
 	private static final int ANY_FIRST_VISIBLE_ITEM = 2;
 	private static final int ANY_VISIBLE_ITEM_COUNT = 3;
+	private static final int ANY_SCROLL_ACTION = 0;
 	private static final int HIDDEN_Y_POSITION = 0;
 	private static final int SHOW_Y_POSITION = ANIMATED_VIEW_HEIGHT;
 
@@ -103,6 +104,17 @@ public void shouldNotifyAdditionalScrollListenerOnScroll() {
 		verify(mockedScrollListener).onScroll(listView, ANY_FIRST_VISIBLE_ITEM, ANY_VISIBLE_ITEM_COUNT, TOTAL_ITEM_COUNT);
 	}
 
+	@Test
+	public void shouldNotifyAdditionalScrollListenerOnScrollStateChanged() {
+		OnScrollListener mockedScrollListener = mock(OnScrollListener.class);
+		scrollAnimator.setAdditionalScrollListener(mockedScrollListener);
+		scrollAnimator.configureListView(listView);
+
+		doAnyScrollAction();
+
+		verify(mockedScrollListener).onScrollStateChanged(listView, ANY_SCROLL_ACTION);
+	}
+
 	@Test
 	public void shouldReleaseListViewScrollListener() {
 		scrollAnimator.configureListView(listView);
@@ -152,6 +164,12 @@ private void scrollToAnyPosition(int firstVisibleItem, int visibleItemCount, int
 		scrollListener.onScroll(listView, firstVisibleItem, visibleItemCount, totalItemCount);
 	}
 
+	private void doAnyScrollAction() {
+		verify(listView).setOnScrollListener(scrollListenerCaptor.capture());
+		scrollListener = scrollListenerCaptor.getValue();
+		scrollListener.onScrollStateChanged(listView, ANY_SCROLL_ACTION);
+	}
+
 	private void setUpListView() {
 		View topChild = mock(View.class);
 		when(topChild.getHeight()).thenReturn(ANIMATED_VIEW_HEIGHT);