Support lift Appbar when scroll, use CollapsingAppbar on gallery detail for long title

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

@@ -0,0 +1,19 @@
+package com.hippo.ehviewer.ui.scene
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.hippo.ehviewer.R
+
+abstract class CollapsingToolbarScene : ToolbarScene() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?, savedInstanceState: Bundle?
+    ): View? {
+        val view = inflater.inflate(R.layout.scene_collapsing_toolbar, container, false) as ViewGroup
+        mToolbar = view.findViewById(R.id.toolbar)
+        val contentView = onCreateViewWithToolbar(inflater, view, savedInstanceState)
+        return view.apply { addView(contentView, 0) }
+    }
+}

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

@@ -61,6 +61,7 @@ import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
+import androidx.core.widget.NestedScrollView;
 
 import com.google.android.material.progressindicator.CircularProgressIndicator;
 import com.google.android.material.snackbar.Snackbar;
@@ -120,7 +121,6 @@ import com.hippo.yorozuya.AssertUtils;
 import com.hippo.yorozuya.FileUtils;
 import com.hippo.yorozuya.IOUtils;
 import com.hippo.yorozuya.IntIdGenerator;
-import com.hippo.yorozuya.SimpleHandler;
 import com.hippo.yorozuya.ViewUtils;
 import com.hippo.yorozuya.collect.IntList;
 
@@ -135,7 +135,7 @@ import java.util.List;
 
 import okhttp3.HttpUrl;
 import rikka.core.res.ResourcesKt;
-public class GalleryDetailScene extends ToolbarScene implements View.OnClickListener,
+public class GalleryDetailScene extends CollapsingToolbarScene implements View.OnClickListener,
         com.hippo.ehviewer.download.DownloadManager.DownloadInfoListener,
         View.OnLongClickListener {
     public final static String KEY_ACTION = "action";
@@ -570,7 +570,7 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         View view = inflater.inflate(R.layout.scene_gallery_detail, container, false);
 
         ViewGroup main = (ViewGroup) ViewUtils.$$(view, R.id.main);
-        ScrollView mainView = (ScrollView) ViewUtils.$$(main, R.id.scroll_view);
+        NestedScrollView mainView = (NestedScrollView) ViewUtils.$$(main, R.id.scroll_view);
         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/HistoryScene.kt

@@ -35,7 +35,6 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.hippo.app.BaseDialogBuilder
-import com.hippo.easyrecyclerview.EasyRecyclerView
 import com.hippo.easyrecyclerview.FastScroller
 import com.hippo.easyrecyclerview.HandlerDrawable
 import com.hippo.ehviewer.*
@@ -61,7 +60,7 @@ import kotlinx.coroutines.launch
 import rikka.core.res.resolveColor
 
 class HistoryScene : ToolbarScene() {
-    private var mRecyclerView: EasyRecyclerView? = null
+    private var mRecyclerView: RecyclerView? = null
     private val mAdapter: HistoryAdapter by lazy {
         HistoryAdapter(object : DiffUtil.ItemCallback<HistoryInfo>() {
             override fun areItemsTheSame(oldItem: HistoryInfo, newItem: HistoryInfo): Boolean {
@@ -132,7 +131,7 @@ class HistoryScene : ToolbarScene() {
     ): View {
         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 EasyRecyclerView
+        val recyclerView = ViewUtils.`$$`(content, R.id.recycler_view) as RecyclerView
         val mFastScroller = ViewUtils.`$$`(content, R.id.fast_scroller) as FastScroller
         val mTip = ViewUtils.`$$`(view, R.id.tip) as TextView
         ViewTransition(content, mTip)
@@ -373,7 +372,6 @@ class HistoryScene : ToolbarScene() {
         private val mGi: GalleryInfo
     ) : DialogInterface.OnClickListener {
         override fun onClick(dialog: DialogInterface, which: Int) {
-            mRecyclerView?.outOfCustomChoiceMode()
             val downloadManager = EhApplication.getDownloadManager(requireContext())
             val downloadInfo = downloadManager.getDownloadInfo(mGi.gid) ?: return
             val label = if (which == 0) null else mLabels[which]

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

@@ -23,10 +23,11 @@ import android.view.ViewGroup
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.AppBarLayout
 import com.hippo.ehviewer.R
 
 abstract class ToolbarScene : BaseScene() {
-    private var mToolbar: Toolbar? = null
+    protected var mToolbar: Toolbar? = null
     private var mTempTitle: CharSequence? = null
 
     abstract fun onCreateViewWithToolbar(
@@ -41,7 +42,7 @@ abstract class ToolbarScene : BaseScene() {
         val view = inflater.inflate(R.layout.scene_toolbar, container, false) as ViewGroup
         mToolbar = view.findViewById(R.id.toolbar)
         val contentView = onCreateViewWithToolbar(inflater, view, savedInstanceState)
-        return view.apply { addView(contentView, 1) }
+        return view.apply { addView(contentView, 0) }
     }
 
     override fun onDestroyView() {

app/src/main/java/com/hippo/widget/ContentLayout.java

@@ -88,8 +88,12 @@ public class ContentLayout extends FrameLayout {
         init(context);
     }
 
+    protected int getLayout() {
+        return R.layout.widget_content_layout;
+    }
+
     private void init(Context context) {
-        ((Activity) context).getLayoutInflater().inflate(R.layout.widget_content_layout, this);
+        ((Activity) context).getLayoutInflater().inflate(getLayout(), this);
         setClipChildren(false);
         setClipToPadding(false);
 

app/src/main/java/com/hippo/widget/ContentLayout2.kt

@@ -0,0 +1,13 @@
+package com.hippo.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import com.hippo.ehviewer.R
+
+class ContentLayout2 @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : ContentLayout(context, attrs) {
+    override fun getLayout(): Int {
+        return R.layout.widget_content_layout_2
+    }
+}

app/src/main/res/layout/scene_collapsing_toolbar.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            style="?attr/collapsingToolbarLayoutLargeStyle"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+            <TextView
+                android:id="@+id/collapsing_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            </TextView>
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:layout_collapseMode="pin"
+                app:layout_scrollFlags="scroll|enterAlways" />
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/scene_download.xml

@@ -17,7 +17,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    app:fitsSystemWindowsInsets="top">
 
     <FrameLayout
         android:id="@+id/content"
@@ -28,6 +29,8 @@
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:paddingTop="?actionBarSize"
+            android:clipToPadding="false"
             app:fitsSystemWindowsInsets="bottom" />
 
         <com.hippo.easyrecyclerview.FastScroller
@@ -36,7 +39,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="right"
             android:paddingLeft="20dp"
-            android:paddingTop="8dp"
+            android:paddingTop="?actionBarSize"
             android:paddingRight="4dp"
             android:paddingBottom="8dp"
             app:fitsSystemWindowsInsets="bottom" />

app/src/main/res/layout/scene_gallery_comments.xml

@@ -29,10 +29,11 @@
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:paddingTop="?actionBarSize"
             android:clipToPadding="false"
             android:paddingLeft="@dimen/keyline_margin"
             android:paddingRight="@dimen/keyline_margin"
-            app:fitsSystemWindowsInsets="bottom" />
+            app:fitsSystemWindowsInsets="bottom|top" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 

app/src/main/res/layout/scene_gallery_detail.xml

@@ -18,16 +18,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    app:fitsSystemWindowsInsets="top">
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:paddingTop="?collapsingToolbarLayoutLargeSize"
+        android:clipToPadding="false"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <include layout="@layout/gallery_detail_content" />
 
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/progress_view"

app/src/main/res/layout/scene_gallery_previews.xml

@@ -14,11 +14,11 @@
   ~ limitations under the License.
   -->
 
-<com.hippo.widget.ContentLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.hippo.widget.ContentLayout2 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/content_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipChildren="false"
     android:clipToPadding="false"
-    app:fitsSystemWindowsInsets="bottom" />
+    app:fitsSystemWindowsInsets="bottom|top" />

app/src/main/res/layout/scene_history.xml

@@ -17,7 +17,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    app:fitsSystemWindowsInsets="top">
 
     <FrameLayout
         android:id="@+id/content"
@@ -28,6 +29,8 @@
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:paddingTop="?actionBarSize"
+            android:clipToPadding="false"
             app:fitsSystemWindowsInsets="bottom" />
 
         <com.hippo.easyrecyclerview.FastScroller
@@ -36,7 +39,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="right"
             android:paddingLeft="20dp"
-            android:paddingTop="8dp"
+            android:paddingTop="?actionBarSize"
             android:paddingRight="4dp"
             android:paddingBottom="8dp"
             app:fitsSystemWindowsInsets="bottom" />

app/src/main/res/layout/scene_toolbar.xml

@@ -14,24 +14,22 @@
   ~ limitations under the License.
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="4dp"
-        android:fitsSystemWindows="true"
-        app:liftOnScroll="true">
+        app:fitsSystemWindowsInsets="top">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:layout_scrollFlags="scroll|enterAlways|snap" />
+            app:layout_scrollFlags="scroll|enterAlways" />
     </com.google.android.material.appbar.AppBarLayout>
 
-</LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/widget_content_layout_2.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2015 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/progress"
+        style="@style/ProgressView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
+    <TextView
+        android:id="@+id/tip"
+        style="@style/TextAppearance.AppCompat.Medium"
+        android:layout_width="228dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawablePadding="8dp"
+        android:gravity="center_horizontal" />
+
+    <FrameLayout
+        android:id="@+id/content_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipChildren="false">
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipChildren="false">
+
+            <com.hippo.easyrecyclerview.EasyRecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingTop="?actionBarSize"
+                android:clipToPadding="false" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+        <com.google.android.material.progressindicator.LinearProgressIndicator
+            android:id="@+id/bottom_progress"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:indeterminate="true"
+            android:visibility="gone"
+            app:fitsSystemWindowsInsets="end"
+            app:hideAnimationBehavior="inward"
+            app:showAnimationBehavior="outward" />
+
+        <com.hippo.easyrecyclerview.FastScroller
+            android:id="@+id/fast_scroller"
+            android:layout_width="30dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:paddingLeft="20dp"
+            android:paddingTop="8dp"
+            android:paddingRight="4dp"
+            android:paddingBottom="8dp" />
+
+    </FrameLayout>
+
+</merge>