Fix that top padding is shown in a certain condition in ToolbarContro…

…l examples. #38
ksoichiro · Jan 11, 2015 · 379c6ce · 379c6ce
1 parent a44b835
commit 379c6ce
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/...thub/ksoichiro/android/observablescrollview/samples/ScrollFromBottomListViewActivity.java b/...thub/ksoichiro/android/observablescrollview/samples/ScrollFromBottomListViewActivity.java
@@ -77,8 +77,8 @@ public void run() {
 
     @Override
     public void onScrollChanged(int scrollY, boolean firstScroll, boolean dragging) {
-        if (dragging) {
-            int toolbarHeight = mToolbarView.getHeight();
+        int toolbarHeight = mToolbarView.getHeight();
+        if (dragging || scrollY < toolbarHeight) {
             if (firstScroll) {
                 float currentHeaderTranslationY = ViewHelper.getTranslationY(mHeaderView);
                 if (-toolbarHeight < currentHeaderTranslationY && toolbarHeight < scrollY) {

diff --git a/.../ksoichiro/android/observablescrollview/samples/ScrollFromBottomRecyclerViewActivity.java b/.../ksoichiro/android/observablescrollview/samples/ScrollFromBottomRecyclerViewActivity.java
@@ -75,8 +75,8 @@ public void run() {
 
     @Override
     public void onScrollChanged(int scrollY, boolean firstScroll, boolean dragging) {
-        if (dragging) {
-            int toolbarHeight = mToolbarView.getHeight();
+        int toolbarHeight = mToolbarView.getHeight();
+        if (dragging || scrollY < toolbarHeight) {
             if (firstScroll) {
                 float currentHeaderTranslationY = ViewHelper.getTranslationY(mHeaderView);
                 if (-toolbarHeight < currentHeaderTranslationY && toolbarHeight < scrollY) {

diff --git a/...github/ksoichiro/android/observablescrollview/samples/ToolbarControlListViewActivity.java b/...github/ksoichiro/android/observablescrollview/samples/ToolbarControlListViewActivity.java
@@ -74,8 +74,8 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun
 
     @Override
     public void onScrollChanged(int scrollY, boolean firstScroll, boolean dragging) {
-        if (dragging) {
-            int toolbarHeight = mToolbarView.getHeight();
+        int toolbarHeight = mToolbarView.getHeight();
+        if (dragging || scrollY < toolbarHeight) {
             if (firstScroll) {
                 float currentHeaderTranslationY = ViewHelper.getTranslationY(mHeaderView);
                 if (-toolbarHeight < currentHeaderTranslationY && toolbarHeight < scrollY) {

diff --git a/...ub/ksoichiro/android/observablescrollview/samples/ToolbarControlRecyclerViewActivity.java b/...ub/ksoichiro/android/observablescrollview/samples/ToolbarControlRecyclerViewActivity.java
@@ -58,8 +58,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
     @Override
     public void onScrollChanged(int scrollY, boolean firstScroll, boolean dragging) {
-        if (dragging) {
-            int toolbarHeight = mToolbarView.getHeight();
+        int toolbarHeight = mToolbarView.getHeight();
+        if (dragging || scrollY < toolbarHeight) {
             if (firstScroll) {
                 float currentHeaderTranslationY = ViewHelper.getTranslationY(mHeaderView);
                 if (-toolbarHeight < currentHeaderTranslationY && toolbarHeight < scrollY) {

diff --git a/...thub/ksoichiro/android/observablescrollview/samples/ToolbarControlScrollViewActivity.java b/...thub/ksoichiro/android/observablescrollview/samples/ToolbarControlScrollViewActivity.java
@@ -52,8 +52,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
     @Override
     public void onScrollChanged(int scrollY, boolean firstScroll, boolean dragging) {
-        if (dragging) {
-            int toolbarHeight = mToolbarView.getHeight();
+        int toolbarHeight = mToolbarView.getHeight();
+        if (dragging || scrollY < toolbarHeight) {
             if (firstScroll) {
                 float currentHeaderTranslationY = ViewHelper.getTranslationY(mHeaderView);
                 if (-toolbarHeight < currentHeaderTranslationY && toolbarHeight < scrollY) {

diff --git a/.../github/ksoichiro/android/observablescrollview/samples/ToolbarControlWebViewActivity.java b/.../github/ksoichiro/android/observablescrollview/samples/ToolbarControlWebViewActivity.java
@@ -60,8 +60,8 @@ protected void onCreate(Bundle savedInstanceState) {
     private ObservableScrollViewCallbacks mScrollViewScrollCallbacks = new ObservableScrollViewCallbacks() {
         @Override
         public void onScrollChanged(int scrollY, boolean firstScroll, boolean dragging) {
-            if (mDragging) {
-                int toolbarHeight = mToolbarView.getHeight();
+            int toolbarHeight = mToolbarView.getHeight();
+            if (mDragging || scrollY < toolbarHeight) {
                 if (mFirstScroll) {
                     mFirstScroll = false;
                     float currentHeaderTranslationY = ViewHelper.getTranslationY(mHeaderView);