Added fix for setExpanded

Author: henrytao-me

smooth-app-bar-layout/src/main/java/me/henrytao/smoothappbarlayout/BaseBehavior.java

@@ -53,6 +53,8 @@ protected abstract void onScrollChanged(CoordinatorLayout coordinatorLayout, App
 
   private DragCallback mDragCallbackListener;
 
+  private boolean mIsCollapsed;
+
   private boolean mIsOnInit = false;
 
   private boolean mIsPullDownFromTop;
@@ -147,6 +149,14 @@ public int getCurrentOffset() {
     return mCurrentOffset;
   }
 
+  public View getScrollTarget() {
+    return vScrollTarget;
+  }
+
+  public boolean isCollapsed() {
+    return mIsCollapsed;
+  }
+
   public void setOverrideOnScrollListener(boolean overrideOnScrollListener) {
     mOverrideOnScrollListener = overrideOnScrollListener;
   }
@@ -186,6 +196,7 @@ protected long getViewTag(View target, boolean createIfNotExist) {
 
   protected void syncOffset(AppBarLayout child, int newOffset) {
     Utils.log("syncOffset | %d", newOffset);
+    mIsCollapsed = newOffset == mCurrentOffset && mCurrentOffset != 0;
     setTopAndBottomOffset(newOffset);
     if (child instanceof SmoothAppBarLayout && ((SmoothAppBarLayout) child).mHaveChildWithInterpolator && mCoordinatorLayout != null) {
       mCoordinatorLayout.dispatchDependentViewsChanged(child);

smooth-app-bar-layout/src/main/java/me/henrytao/smoothappbarlayout/SmoothAppBarLayout.java

@@ -24,6 +24,8 @@
 import android.support.design.widget.CoordinatorLayout;
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.ViewPager;
+import android.support.v4.widget.NestedScrollView;
+import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -110,6 +112,65 @@ public void removeOnOffsetChangedListener(OnOffsetChangedListener listener) {
     }
   }
 
+  @Override
+  public void setExpanded(boolean expanded) {
+    setExpanded(expanded, false);
+  }
+
+  @Override
+  public void setExpanded(boolean expanded, boolean animate) {
+    CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) getLayoutParams();
+    Behavior behavior = (Behavior) params.getBehavior();
+    if (behavior == null) {
+      super.setExpanded(expanded, animate);
+      return;
+    }
+    View view = behavior.getScrollTarget();
+    if (!expanded && !behavior.isCollapsed()) {
+      int minOffset = Math.abs(behavior.getMinOffset(this));
+      if (view instanceof RecyclerView) {
+        RecyclerView recyclerView = (RecyclerView) view;
+        int offset = minOffset - recyclerView.computeVerticalScrollOffset();
+        if (animate) {
+          recyclerView.smoothScrollBy(0, offset);
+        } else {
+          recyclerView.scrollBy(0, offset);
+        }
+      } else if (view instanceof NestedScrollView) {
+        NestedScrollView nestedScrollView = (NestedScrollView) view;
+        if (animate) {
+          nestedScrollView.smoothScrollTo(0, minOffset);
+        } else {
+          nestedScrollView.scrollTo(0, minOffset);
+        }
+      }
+    } else if (expanded) {
+      if (view instanceof RecyclerView) {
+        RecyclerView recyclerView = (RecyclerView) view;
+        if (animate) {
+          if (behavior.isCollapsed()) {
+            recyclerView.smoothScrollToPosition(0);
+          } else {
+            recyclerView.smoothScrollBy(0, -recyclerView.computeVerticalScrollOffset());
+          }
+        } else {
+          if (behavior.isCollapsed()) {
+            recyclerView.scrollToPosition(0);
+          } else {
+            recyclerView.scrollBy(0, -recyclerView.computeVerticalScrollOffset());
+          }
+        }
+      } else if (view instanceof NestedScrollView) {
+        NestedScrollView nestedScrollView = (NestedScrollView) view;
+        if (animate) {
+          nestedScrollView.smoothScrollTo(0, 0);
+        } else {
+          nestedScrollView.scrollTo(0, 0);
+        }
+      }
+    }
+  }
+
   @Override
   protected void onAttachedToWindow() {
     super.onAttachedToWindow();