Explicitly set LiftOnScrollTargetView

app/src/main/java/com/hippo/ehviewer/ui/scene/CollapsingToolbarScene.kt

@@ -13,6 +13,7 @@ abstract class CollapsingToolbarScene : ToolbarScene() {
     ): View? {
         val view = inflater.inflate(R.layout.scene_collapsing_toolbar, container, false) as ViewGroup
         mToolbar = view.findViewById(R.id.toolbar)
+        mAppBarLayout = view.findViewById(R.id.appbar)
         val contentView = onCreateViewWithToolbar(inflater, view, savedInstanceState)
         return view.apply { addView(contentView, 0) }
     }

app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java

@@ -311,6 +311,7 @@ public class DownloadsScene extends ToolbarScene
 
         View content = ViewUtils.$$(view, R.id.content);
         mRecyclerView = (EasyRecyclerView) ViewUtils.$$(content, R.id.recycler_view);
+        setLiftOnScrollTargetView(mRecyclerView);
         mFastScroller = (FastScroller) ViewUtils.$$(content, R.id.fast_scroller);
         mFabLayout = (FabLayout) ViewUtils.$$(view, R.id.fab_layout);
         mTip = (TextView) ViewUtils.$$(view, R.id.tip);

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java

@@ -172,6 +172,7 @@ public final class GalleryCommentsScene extends ToolbarScene
                                         @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.scene_gallery_comments, container, false);
         mRecyclerView = (EasyRecyclerView) ViewUtils.$$(view, R.id.recycler_view);
+        setLiftOnScrollTargetView(mRecyclerView);
         TextView tip = (TextView) ViewUtils.$$(view, R.id.tip);
         mEditPanel = ViewUtils.$$(view, R.id.edit_panel);
         mSendImage = (ImageView) ViewUtils.$$(mEditPanel, R.id.send);

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java

@@ -571,6 +571,7 @@ public class GalleryDetailScene extends CollapsingToolbarScene implements View.O
 
         ViewGroup main = (ViewGroup) ViewUtils.$$(view, R.id.main);
         NestedScrollView mainView = (NestedScrollView) ViewUtils.$$(main, R.id.scroll_view);
+        setLiftOnScrollTargetView(mainView);
         View progressView = ViewUtils.$$(main, R.id.progress_view);
         mTip = (TextView) ViewUtils.$$(main, R.id.tip);
         mViewTransition = new ViewTransition(mainView, progressView, mTip);

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java

@@ -139,6 +139,7 @@ public class GalleryPreviewsScene extends ToolbarScene {
                 R.layout.scene_gallery_previews, container, false);
         mContentLayout.hideFastScroll();
         mRecyclerView = mContentLayout.getRecyclerView();
+        setLiftOnScrollTargetView(mRecyclerView);
 
         Context context = getContext();
         AssertUtils.assertNotNull(context);

app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt

@@ -132,6 +132,7 @@ class HistoryScene : ToolbarScene() {
         val view = inflater.inflate(R.layout.scene_history, container, false)
         val content = ViewUtils.`$$`(view, R.id.content)
         val recyclerView = ViewUtils.`$$`(content, R.id.recycler_view) as RecyclerView
+        setLiftOnScrollTargetView(recyclerView)
         val mFastScroller = ViewUtils.`$$`(content, R.id.fast_scroller) as FastScroller
         val mTip = ViewUtils.`$$`(view, R.id.tip) as TextView
         ViewTransition(content, mTip)

app/src/main/java/com/hippo/ehviewer/ui/scene/ToolbarScene.kt

@@ -28,6 +28,7 @@ import com.hippo.ehviewer.R
 
 abstract class ToolbarScene : BaseScene() {
     protected var mToolbar: Toolbar? = null
+    protected var mAppBarLayout: AppBarLayout? = null
     private var mTempTitle: CharSequence? = null
 
     abstract fun onCreateViewWithToolbar(
@@ -41,6 +42,7 @@ abstract class ToolbarScene : BaseScene() {
     ): View? {
         val view = inflater.inflate(R.layout.scene_toolbar, container, false) as ViewGroup
         mToolbar = view.findViewById(R.id.toolbar)
+        mAppBarLayout = view.findViewById(R.id.appbar)
         val contentView = onCreateViewWithToolbar(inflater, view, savedInstanceState)
         return view.apply { addView(contentView, 0) }
     }
@@ -85,4 +87,8 @@ abstract class ToolbarScene : BaseScene() {
         mToolbar?.title = title
         mTempTitle = title
     }
+
+    fun setLiftOnScrollTargetView(view: View?) {
+        mAppBarLayout?.setLiftOnScrollTargetView(view)
+    }
 }