Bump version

README.md

@@ -64,11 +64,15 @@ EhViewer fork dedicated to lightweight and high-performance
 
 with Material Design 3 and Dynamic Color Support
 
+Maintained by Tarsin Norbin aka 飛鳥澪 (asuka-mio)
+
+Also thanks @txyyh for her help in docs, release notes, design and 1.7.x.x maintenance
+
 # Download
 
 <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/releases"><img alt="Get it on GitHub" src="art/get-it-on-github.svg" width="200px"/></a> <a href="https://github.com/Ehviewer-Overhauled/fdroid-repo"><img alt="Git it on F-Droid" src="art/get-it-on-fdroid.svg" width="200px"/></a>
 
-App is divided into two versions: 1.7 and 1.8 . Version 1.8 support Android 12 and above, also the develop mainline. Version 1.7 support Android 11 and below, drop down some spicetify functions for Android 12 to make app useable on lower Android System
+There are two development branches: 1.8.x.x and 1.7.x.x . Version 1.8 only support platform api 31 (aka Android S) and above, also the develop mainline. Version 1.7 should only be used on Android 11 and below, since these platforms lack native api of image decoding.
 
 # Screenshot
 

app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "moe.tarsin.ehviewer"
         minSdkVersion 31
         targetSdkVersion 33
-        versionCode 180019
-        versionName "1.8.3.0-beta01"
+        versionCode 180020
+        versionName "1.8.3.0-beta02"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
     }
 
@@ -172,7 +172,7 @@ dependencies {
     implementation 'androidx.webkit:webkit:1.5.0'
 
     implementation 'com.drakeet.drawer:drawer:1.0.3'
-    implementation 'com.google.android.material:material:1.8.0-alpha02'
+    implementation 'com.google.android.material:material:1.7.0'
 
     implementation 'com.squareup.okhttp3:okhttp-bom:5.0.0-alpha.10'
     implementation 'com.squareup.okhttp3:okhttp'

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

@@ -0,0 +1,20 @@
+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)
+        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/FavoritesScene.java

@@ -837,8 +837,20 @@ public class FavoritesScene extends BaseScene implements
             else
                 pages = Integer.MAX_VALUE;
 
-            mHelper.prevPg = result.prevPage;
-            mHelper.nextPg = result.nextPage;
+            String prev = result.prevPage, next = result.nextPage;
+            switch (mHelper.operation) {
+                case -1:
+                    if (prev != null) mHelper.upperPage = prev;
+                    break;
+                case 1:
+                    if (next != null) mHelper.lowerPage = next;
+                    break;
+                default:
+                    mHelper.upperPage = prev;
+                    mHelper.lowerPage = next;
+                    break;
+            }
+
             mHelper.onGetPageData(taskId, pages, mHelper.pgCounter + 1, result.galleryInfoList);
 
             if (mDrawerAdapter != null) {
@@ -1158,9 +1170,10 @@ public class FavoritesScene extends BaseScene implements
     }
 
     private class FavoritesHelper extends GalleryInfoContentHelper {
+        public String upperPage = null;
+        public String lowerPage = null;
+        public int operation = 0;
         public int pgCounter = 0;
-        public String prevPg = null;
-        public String nextPg = null;
 
         @Override
         protected void getPageData(final int taskId, int type, int page) {
@@ -1208,7 +1221,7 @@ public class FavoritesScene extends BaseScene implements
                         url = mUrlBuilder.build();
                     }
 
-                    mUrlBuilder.setNext(nextPg);
+                    mUrlBuilder.setNext(lowerPage);
                     EhRequest request = new EhRequest();
                     request.setMethod(EhClient.METHOD_MODIFY_FAVORITES);
                     request.setCallback(new GetFavoritesListener(getContext(),
@@ -1221,15 +1234,21 @@ public class FavoritesScene extends BaseScene implements
                 final String keyword = mUrlBuilder.getKeyword();
                 SimpleHandler.getInstance().post(() -> onGetFavoritesLocal(keyword, taskId));
             } else {
-                String prevPage = null, nextPage = null;
-                if (page != 0) {
-                    if (page >= mHelper.getPageForTop())
-                        nextPage = nextPg;
-                    else
-                        prevPage = prevPg;
+                String prev = null, next = null;
+                if (jumpTo != null) {
+                    next = Integer.toString(minGid);
+                    operation = 0;
+                } else if (page != 0) {
+                    if (page >= mHelper.getPageForTop()) {
+                        next = lowerPage;
+                        operation = 1;
+                    } else {
+                        prev = upperPage;
+                        operation = -1;
+                    }
                 }
-                mUrlBuilder.setPrev(prevPage);
-                mUrlBuilder.setNext(jumpTo == null ? nextPage : Integer.toString(minGid));
+                mUrlBuilder.setPrev(prev);
+                mUrlBuilder.setNext(next);
 
                 mUrlBuilder.setJumpTo(jumpTo);
                 jumpTo = null;
@@ -1305,23 +1324,24 @@ public class FavoritesScene extends BaseScene implements
         @Override
         protected void beforeRefresh() {
             super.beforeRefresh();
-            prevPg = null;
-            nextPg = null;
+            upperPage = null;
+            lowerPage = null;
+            operation = 0;
         }
 
         @Override
         protected Parcelable saveInstanceState(Parcelable superState) {
             Bundle bundle = (Bundle) super.saveInstanceState(superState);
-            bundle.putString(KEY_PREV_PAGE, prevPg);
-            bundle.putString(KEY_NEXT_PAGE, nextPg);
+            bundle.putString(KEY_UPPER_PAGE, upperPage);
+            bundle.putString(KEY_LOWER_PAGE, lowerPage);
             return bundle;
         }
 
         @Override
         protected Parcelable restoreInstanceState(Parcelable state) {
             Bundle bundle = (Bundle) state;
-            prevPg = bundle.getString(KEY_PREV_PAGE);
-            nextPg = bundle.getString(KEY_NEXT_PAGE);
+            upperPage = bundle.getString(KEY_UPPER_PAGE);
+            lowerPage = bundle.getString(KEY_LOWER_PAGE);
             return super.restoreInstanceState(state);
         }
     }

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

@@ -170,8 +170,9 @@ public final class GalleryCommentsScene extends ToolbarScene
     @Override
     public View onCreateViewWithToolbar(LayoutInflater inflater,
                                         @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.scene_gallery_comments, container, false);
+        ViewGroup view = (ViewGroup) 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);
@@ -179,6 +180,15 @@ public final class GalleryCommentsScene extends ToolbarScene
         mFabLayout = (FabLayout) ViewUtils.$$(view, R.id.fab_layout);
         mFab = (FloatingActionButton) ViewUtils.$$(view, R.id.fab);
         mRefreshLayout = (SwipeRefreshLayout) ViewUtils.$$(view, R.id.refresh_layout);
+
+
+        // Workaround for fab and edittext render out of screen
+        view.removeView(mFabLayout);
+        view.removeView((View) mEditPanel.getParent());
+        assert container != null;
+        container.addView(mFabLayout);
+        container.addView((View) mEditPanel.getParent());
+
         ViewCompat.setWindowInsetsAnimationCallback(view, new WindowInsetsAnimationHelper(
                 WindowInsetsAnimationCompat.Callback.DISPATCH_MODE_STOP,
                 mEditPanel,

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";
@@ -163,14 +163,10 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
     private ViewTransition mViewTransition;
     // Header
     @Nullable
-    private FrameLayout mHeader;
-    @Nullable
-    private View mColorBg;
+    private LinearLayout mHeader;
     @Nullable
     private LoadImageView mThumb;
     @Nullable
-    private TextView mTitle;
-    @Nullable
     private TextView mUploader;
     @Nullable
     private TextView mCategory;
@@ -574,7 +570,8 @@ 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);
+        setLiftOnScrollTargetView(mainView);
         View progressView = ViewUtils.$$(main, R.id.progress_view);
         mTip = (TextView) ViewUtils.$$(main, R.id.tip);
         mViewTransition = new ViewTransition(mainView, progressView, mTip);
@@ -587,10 +584,8 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         mTip.setCompoundDrawables(null, drawable, null, null);
         mTip.setOnClickListener(this);
 
-        mHeader = (FrameLayout) ViewUtils.$$(mainView, R.id.header);
-        mColorBg = ViewUtils.$$(mHeader, R.id.color_bg);
+        mHeader = (LinearLayout) ViewUtils.$$(mainView, R.id.header);
         mThumb = (LoadImageView) ViewUtils.$$(mHeader, R.id.thumb);
-        mTitle = (TextView) ViewUtils.$$(mHeader, R.id.title);
         mUploader = (TextView) ViewUtils.$$(mHeader, R.id.uploader);
         mCategory = (TextView) ViewUtils.$$(mHeader, R.id.category);
         mActionGroup = (ViewGroup) ViewUtils.$$(mHeader, R.id.action_card);
@@ -659,11 +654,9 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         if (prepareData()) {
             if (mGalleryDetail != null) {
                 bindViewSecond();
-                setTransitionName();
                 adjustViewVisibility(STATE_NORMAL, false);
             } else if (mGalleryInfo != null) {
                 bindViewFirst();
-                setTransitionName();
                 adjustViewVisibility(STATE_REFRESH_HEADER, false);
             } else {
                 adjustViewVisibility(STATE_REFRESH, false);
@@ -690,9 +683,7 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         mViewTransition = null;
 
         mHeader = null;
-        mColorBg = null;
         mThumb = null;
-        mTitle = null;
         mUploader = null;
         mCategory = null;
         mActionGroup = null;
@@ -784,33 +775,6 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         return true;
     }
 
-    private boolean createCircularReveal() {
-        if (mColorBg == null) {
-            return false;
-        }
-
-        int w = mColorBg.getWidth();
-        int h = mColorBg.getHeight();
-        if (ViewCompat.isAttachedToWindow(mColorBg) && w != 0 && h != 0) {
-            Resources resources = getContext().getResources();
-            int keylineMargin = resources.getDimensionPixelSize(R.dimen.keyline_margin);
-            int thumbWidth = resources.getDimensionPixelSize(R.dimen.gallery_detail_thumb_width);
-            int thumbHeight = resources.getDimensionPixelSize(R.dimen.gallery_detail_thumb_height);
-
-            int x = thumbWidth / 2 + keylineMargin;
-            int y = thumbHeight / 2 + keylineMargin;
-
-            int radiusX = Math.max(Math.abs(x), Math.abs(w - x));
-            int radiusY = Math.max(Math.abs(y), Math.abs(h - y));
-            float radius = (float) Math.hypot(radiusX, radiusY);
-
-            ViewAnimationUtils.createCircularReveal(mColorBg, x, y, 0, radius).setDuration(300).start();
-            return true;
-        } else {
-            return false;
-        }
-    }
-
     private void adjustViewVisibility(int state, boolean animation) {
         if (state == mState) {
             return;
@@ -848,27 +812,20 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
                 mViewTransition.showView(2, animation);
                 break;
         }
-
-        if ((oldState == STATE_INIT || oldState == STATE_FAILED || oldState == STATE_REFRESH) &&
-                (state == STATE_NORMAL || state == STATE_REFRESH_HEADER) && ResourcesKt.resolveBoolean(getTheme(), androidx.appcompat.R.attr.isLightTheme, false)) {
-            if (!createCircularReveal()) {
-                SimpleHandler.getInstance().post(this::createCircularReveal);
-            }
-        }
     }
 
     private void bindViewFirst() {
         if (mGalleryDetail != null) {
             return;
         }
-        if (mThumb == null || mTitle == null || mUploader == null || mCategory == null) {
+        if (mThumb == null || mUploader == null || mCategory == null) {
             return;
         }
 
         if (ACTION_GALLERY_INFO.equals(mAction) && mGalleryInfo != null) {
             GalleryInfo gi = mGalleryInfo;
             mThumb.load(EhCacheKeyFactory.getThumbKey(gi.gid), gi.thumb);
-            mTitle.setText(EhUtils.getSuitableTitle(gi));
+            setTitle(EhUtils.getSuitableTitle(gi));
             mUploader.setText(gi.uploader);
             mUploader.setAlpha(gi.disowned ? .5f : 1f);
             mCategory.setText(EhUtils.getCategory(gi.category));
@@ -916,7 +873,7 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
                     })
                     .show();
         }
-        if (mThumb == null || mTitle == null || mUploader == null || mCategory == null ||
+        if (mThumb == null || mUploader == null || mCategory == null ||
                 mLanguage == null || mPages == null || mSize == null || mPosted == null ||
                 mFavoredTimes == null || mRatingText == null || mRating == null || mTorrent == null || mNewerVersion == null) {
             return;
@@ -925,7 +882,7 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         Resources resources = getResources();
 
         mThumb.load(EhCacheKeyFactory.getThumbKey(gd.gid), gd.thumb);
-        mTitle.setText(EhUtils.getSuitableTitle(gd));
+        setTitle(EhUtils.getSuitableTitle(gd));
         mUploader.setText(gd.uploader);
         mUploader.setAlpha(gd.disowned ? .5f : 1f);
         mCategory.setText(EhUtils.getCategory(gd.category));
@@ -1093,10 +1050,8 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
     private void setTransitionName() {
         long gid = getGid();
 
-        if (gid != -1 && mThumb != null &&
-                mTitle != null && mUploader != null && mCategory != null) {
+        if (gid != -1 && mThumb != null && mUploader != null && mCategory != null) {
             ViewCompat.setTransitionName(mThumb, TransitionNameFactory.getThumbTransitionName(gid));
-            ViewCompat.setTransitionName(mTitle, TransitionNameFactory.getTitleTransitionName(gid));
             ViewCompat.setTransitionName(mUploader, TransitionNameFactory.getUploaderTransitionName(gid));
             ViewCompat.setTransitionName(mCategory, TransitionNameFactory.getCategoryTransitionName(gid));
         }

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

@@ -45,6 +45,7 @@ import com.hippo.ehviewer.Settings;
 import com.hippo.ehviewer.client.EhClient;
 import com.hippo.ehviewer.client.EhRequest;
 import com.hippo.ehviewer.client.EhUrl;
+import com.hippo.ehviewer.client.data.GalleryDetail;
 import com.hippo.ehviewer.client.data.GalleryInfo;
 import com.hippo.ehviewer.client.data.GalleryPreview;
 import com.hippo.ehviewer.client.data.PreviewSet;
@@ -139,6 +140,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);
@@ -189,11 +191,8 @@ public class GalleryPreviewsScene extends ToolbarScene {
         super.onViewCreated(view, savedInstanceState);
         setTitle(R.string.gallery_previews);
         setNavigationIcon(R.drawable.v_arrow_left_dark_x24);
-    }
-
-    @Override
-    public int getMenuResId() {
-        return R.menu.scene_gallery_previews;
+        if (((GalleryDetail)mGalleryInfo).previewPages > 2)
+            showMenu(R.menu.scene_gallery_previews);
     }
 
     @Override

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 {
@@ -129,10 +128,11 @@ class HistoryScene : ToolbarScene() {
     override fun onCreateViewWithToolbar(
         inflater: LayoutInflater,
         container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
+    ): 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
+        setLiftOnScrollTargetView(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 +373,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.java

@@ -1,124 +0,0 @@
-/*
- * 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.
- */
-
-package com.hippo.ehviewer.ui.scene;
-
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.appcompat.widget.Toolbar;
-
-import com.hippo.ehviewer.R;
-
-public abstract class ToolbarScene extends BaseScene {
-
-    @Nullable
-    private Toolbar mToolbar;
-
-    private CharSequence mTempTitle;
-
-    @Nullable
-    public View onCreateViewWithToolbar(LayoutInflater inflater,
-                                        @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public final View onCreateView(@NonNull LayoutInflater inflater,
-                                   @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.scene_toolbar, container, false);
-        Toolbar toolbar = view.findViewById(R.id.toolbar);
-        FrameLayout contentPanel = view.findViewById(R.id.content_panel);
-
-        View contentView = onCreateViewWithToolbar(inflater, contentPanel, savedInstanceState);
-        if (contentView == null) {
-            return null;
-        } else {
-            mToolbar = toolbar;
-            contentPanel.addView(contentView, 0);
-            return view;
-        }
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mToolbar = null;
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        if (mToolbar != null) {
-            if (mTempTitle != null) {
-                mToolbar.setTitle(mTempTitle);
-                mTempTitle = null;
-            }
-
-            int menuResId = getMenuResId();
-            if (menuResId != 0) {
-                mToolbar.inflateMenu(menuResId);
-                mToolbar.setOnMenuItemClickListener(ToolbarScene.this::onMenuItemClick);
-            }
-            mToolbar.setNavigationOnClickListener(v -> onNavigationClick());
-        }
-    }
-
-    public int getMenuResId() {
-        return 0;
-    }
-
-    public boolean onMenuItemClick(MenuItem item) {
-        return false;
-    }
-
-    public void onNavigationClick() {
-    }
-
-    public void setNavigationIcon(@DrawableRes int resId) {
-        if (mToolbar != null) {
-            mToolbar.setNavigationIcon(resId);
-        }
-    }
-
-    public void setNavigationIcon(@Nullable Drawable icon) {
-        if (mToolbar != null) {
-            mToolbar.setNavigationIcon(icon);
-        }
-    }
-
-    public void setTitle(@StringRes int resId) {
-        setTitle(getString(resId));
-    }
-
-    public void setTitle(CharSequence title) {
-        if (mToolbar != null) {
-            mToolbar.setTitle(title);
-        } else {
-            mTempTitle = title;
-        }
-    }
-}

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

@@ -0,0 +1,107 @@
+/*
+ * 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.
+ */
+package com.hippo.ehviewer.ui.scene
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.size
+import com.google.android.material.appbar.AppBarLayout
+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(
+        inflater: LayoutInflater,
+        container: ViewGroup?, savedInstanceState: Bundle?
+    ): View
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?, savedInstanceState: Bundle?
+    ): 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) }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        mToolbar = null
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        mToolbar?.apply {
+            mTempTitle?.let { title = it }
+            val menuResId = getMenuResId()
+            if (menuResId != 0) {
+                inflateMenu(menuResId)
+                setOnMenuItemClickListener { item: MenuItem -> onMenuItemClick(item) }
+            }
+            setNavigationOnClickListener { onNavigationClick() }
+        }
+    }
+
+    fun hideMenu() {
+        mToolbar?.menu?.clear()
+    }
+
+    fun showMenu(menuResId: Int) {
+        if (mToolbar?.menu?.size != 0) return
+        mToolbar?.apply {
+            inflateMenu(menuResId)
+            setOnMenuItemClickListener { item: MenuItem -> onMenuItemClick(item) }
+        }
+    }
+
+    open fun getMenuResId(): Int {
+        return 0
+    }
+
+    open fun onMenuItemClick(item: MenuItem): Boolean {
+        return false
+    }
+
+    open fun onNavigationClick() {}
+
+    fun setNavigationIcon(@DrawableRes resId: Int) {
+        mToolbar?.setNavigationIcon(resId)
+    }
+
+    fun setTitle(@StringRes resId: Int) {
+        setTitle(getString(resId))
+    }
+
+    fun setTitle(title: CharSequence?) {
+        mToolbar?.title = title
+        mTempTitle = title
+    }
+
+    fun setLiftOnScrollTargetView(view: View?) {
+        mAppBarLayout?.setLiftOnScrollTargetView(view)
+    }
+}

app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt

@@ -136,7 +136,7 @@ abstract class GalleryInfoContentHelper : ContentHelper<GalleryInfo?>() {
         private const val KEY_DATA_MAP = "data_map"
         private const val KEY_MAX_GID = "max_gid"
         private const val KEY_MIN_GID = "min_gid"
-        const val KEY_PREV_PAGE = "prev_page"
-        const val KEY_NEXT_PAGE = "next_page"
+        const val KEY_UPPER_PAGE = "upper_page"
+        const val KEY_LOWER_PAGE = "lower_page"
     }
 }

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-television/gallery_detail_header.xml

@@ -17,247 +17,211 @@
   ~
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/header"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="wrap_content">
 
-        <View
-            android:id="@+id/color_bg"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:elevation="4dp"
-            app:fitsSystemWindowsInsets="top" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="28dp" />
-
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/title"
-            style="@style/TextAppearance.Material3.HeadlineSmall"
-            android:layout_width="wrap_content"
+        <com.google.android.material.card.MaterialCardView
+            style="@style/Widget.Material3.CardView.Elevated"
+            android:layout_width="540dp"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/keyline_margin"
+            android:layout_marginTop="@dimen/keyline_margin"
             android:layout_marginRight="@dimen/keyline_margin"
-            android:ellipsize="end"
-            android:maxLines="5" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.card.MaterialCardView
-                style="@style/Widget.Material3.CardView.Elevated"
-                android:layout_width="540dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/keyline_margin"
-                android:layout_marginTop="@dimen/keyline_margin"
-                android:layout_marginRight="@dimen/keyline_margin"
-                android:layout_marginBottom="@dimen/keyline_margin"
-                app:fitsSystemWindowsInsets="top">
+            android:layout_marginBottom="@dimen/keyline_margin"
+            app:fitsSystemWindowsInsets="top">
 
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/header_content"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/header_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-                    <com.google.android.material.card.MaterialCardView
-                        android:id="@+id/thumb_card"
-                        style="@style/Widget.Material3.CardView.Filled"
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/thumb_card"
+                    style="@style/Widget.Material3.CardView.Filled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <com.hippo.widget.LoadImageView
+                        android:id="@+id/thumb"
+                        android:layout_width="256dp"
+                        android:layout_height="@dimen/gallery_detail_thumb_height" />
+
+                </com.google.android.material.card.MaterialCardView>
+
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/info"
+                    style="@style/Widget.Material3.CardView.Filled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="@dimen/keyline_margin"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:nextFocusRight="@+id/read"
+                    android:orientation="vertical"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
+                        android:padding="8dp">
 
-                        <com.hippo.widget.LoadImageView
-                            android:id="@+id/thumb"
-                            android:layout_width="256dp"
-                            android:layout_height="@dimen/gallery_detail_thumb_height" />
 
-                    </com.google.android.material.card.MaterialCardView>
-
-                    <com.google.android.material.card.MaterialCardView
-                        android:id="@+id/info"
-                        style="@style/Widget.Material3.CardView.Filled"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginEnd="@dimen/keyline_margin"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:nextFocusRight="@+id/read"
-                        android:orientation="vertical"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
+                        <TextView
+                            android:id="@+id/language"
+                            style="@style/TextAppearance.Material3.BodySmall"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:padding="8dp">
+                            android:gravity="left"
+                            android:singleLine="true"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <TextView
+                            android:id="@+id/size"
+                            style="@style/TextAppearance.Material3.BodySmall"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:gravity="right"
+                            android:singleLine="true"
+                            app:layout_constraintBaseline_toBaselineOf="@id/language"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintHorizontal_bias="1.0"
+                            app:layout_constraintStart_toEndOf="@id/language" />
 
 
-                            <TextView
-                                android:id="@+id/language"
-                                style="@style/TextAppearance.Material3.BodySmall"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="left"
-                                android:singleLine="true"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
+                        <TextView
+                            android:id="@+id/favoredTimes"
+                            style="@style/TextAppearance.Material3.BodySmall"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:gravity="left"
+                            android:singleLine="true"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/language" />
 
-                            <TextView
-                                android:id="@+id/size"
-                                style="@style/TextAppearance.Material3.BodySmall"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="16dp"
-                                android:gravity="right"
-                                android:singleLine="true"
-                                app:layout_constraintBaseline_toBaselineOf="@id/language"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintHorizontal_bias="1.0"
-                                app:layout_constraintStart_toEndOf="@id/language" />
+                        <TextView
+                            android:id="@+id/pages"
+                            style="@style/TextAppearance.Material3.BodySmall"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:gravity="right"
+                            android:singleLine="true"
+                            app:layout_constraintBaseline_toBaselineOf="@id/favoredTimes"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintHorizontal_bias="1.0"
+                            app:layout_constraintStart_toEndOf="@id/favoredTimes" />
 
 
-                            <TextView
-                                android:id="@+id/favoredTimes"
-                                style="@style/TextAppearance.Material3.BodySmall"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="8dp"
-                                android:gravity="left"
-                                android:singleLine="true"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toBottomOf="@id/language" />
-
-                            <TextView
-                                android:id="@+id/pages"
-                                style="@style/TextAppearance.Material3.BodySmall"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="16dp"
-                                android:gravity="right"
-                                android:singleLine="true"
-                                app:layout_constraintBaseline_toBaselineOf="@id/favoredTimes"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintHorizontal_bias="1.0"
-                                app:layout_constraintStart_toEndOf="@id/favoredTimes" />
+                        <TextView
+                            android:id="@+id/posted"
+                            style="@style/TextAppearance.Material3.BodySmall"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:gravity="left"
+                            android:singleLine="true"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/favoredTimes" />
 
 
-                            <TextView
-                                android:id="@+id/posted"
-                                style="@style/TextAppearance.Material3.BodySmall"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="8dp"
-                                android:gravity="left"
-                                android:singleLine="true"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toBottomOf="@id/favoredTimes" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
+                </com.google.android.material.card.MaterialCardView>
 
-                        </androidx.constraintlayout.widget.ConstraintLayout>
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/uploader"
+                    style="@style/Widget.Material3.Chip.Assist"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/keyline_margin"
+                    android:ellipsize="end"
+                    android:nextFocusRight="@+id/read"
+                    android:nextFocusDown="@+id/rate"
+                    android:singleLine="true"
+                    android:textAllCaps="true"
+                    app:chipIcon="@drawable/file_upload_black_24dp"
+                    app:ensureMinTouchTargetSize="true"
+                    app:layout_constraintBottom_toBottomOf="@id/thumb_card"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
-                    </com.google.android.material.card.MaterialCardView>
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/category"
+                    style="@style/Widget.Material3.Chip.Assist"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/keyline_margin"
+                    android:ellipsize="end"
+                    android:nextFocusRight="@+id/read"
+                    android:singleLine="true"
+                    android:textAllCaps="true"
+                    app:chipIcon="@drawable/ic_baseline_label_24"
+                    app:ensureMinTouchTargetSize="true"
+                    app:layout_constraintBottom_toTopOf="@id/uploader"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
-                    <com.google.android.material.chip.Chip
-                        android:id="@+id/uploader"
-                        style="@style/Widget.Material3.Chip.Assist"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/keyline_margin"
-                        android:ellipsize="end"
-                        android:nextFocusRight="@+id/read"
-                        android:nextFocusDown="@+id/rate"
-                        android:singleLine="true"
-                        android:textAllCaps="true"
-                        app:chipIcon="@drawable/file_upload_black_24dp"
-                        app:ensureMinTouchTargetSize="true"
-                        app:layout_constraintBottom_toBottomOf="@id/thumb_card"
-                        app:layout_constraintEnd_toEndOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    <com.google.android.material.chip.Chip
-                        android:id="@+id/category"
-                        style="@style/Widget.Material3.Chip.Assist"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/keyline_margin"
-                        android:ellipsize="end"
-                        android:nextFocusRight="@+id/read"
-                        android:singleLine="true"
-                        android:textAllCaps="true"
-                        app:chipIcon="@drawable/ic_baseline_label_24"
-                        app:ensureMinTouchTargetSize="true"
-                        app:layout_constraintBottom_toTopOf="@id/uploader"
-                        app:layout_constraintEnd_toEndOf="parent" />
+        </com.google.android.material.card.MaterialCardView>
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+        <LinearLayout
+            android:id="@+id/action_card"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="@dimen/keyline_margin"
+            android:layout_marginRight="@dimen/keyline_margin"
+            android:orientation="vertical">
 
-            </com.google.android.material.card.MaterialCardView>
-
-            <LinearLayout
-                android:id="@+id/action_card"
+            <Button
+                android:id="@+id/read"
+                style="@style/Widget.Material3.Button"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/keyline_margin"
-                android:layout_marginRight="@dimen/keyline_margin"
-                android:orientation="vertical">
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:clickable="true"
+                android:focusable="true"
+                android:insetLeft="40dp"
+                android:insetTop="16dp"
+                android:insetRight="40dp"
+                android:text="@string/read">
 
-                <Button
-                    android:id="@+id/read"
-                    style="@style/Widget.Material3.Button"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:insetLeft="40dp"
-                    android:insetTop="16dp"
-                    android:insetRight="40dp"
-                    android:text="@string/read">
+                <requestFocus />
+            </Button>
 
-                    <requestFocus />
-                </Button>
-
-                <Button
-                    android:id="@+id/download"
-                    style="@style/Widget.Material3.Button.TonalButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:insetLeft="40dp"
-                    android:insetTop="16dp"
-                    android:insetRight="40dp"
-                    android:nextFocusDown="@+id/torrent" />
+            <Button
+                android:id="@+id/download"
+                style="@style/Widget.Material3.Button.TonalButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:clickable="true"
+                android:focusable="true"
+                android:insetLeft="40dp"
+                android:insetTop="16dp"
+                android:insetRight="40dp"
+                android:nextFocusDown="@+id/torrent" />
 
 
-                <android.widget.Space
-                    android:layout_width="match_parent"
-                    android:layout_height="80dp" />
+            <android.widget.Space
+                android:layout_width="match_parent"
+                android:layout_height="80dp" />
 
 
-            </LinearLayout>
         </LinearLayout>
     </LinearLayout>
-
-</FrameLayout>
+</LinearLayout>

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

@@ -16,7 +16,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <include layout="@layout/gallery_detail_header" />

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

@@ -14,223 +14,189 @@
   ~ limitations under the License.
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/header"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <View
-            android:id="@+id/color_bg"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:elevation="4dp"
-            app:fitsSystemWindowsInsets="top" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="28dp" />
-
-    </LinearLayout>
-
-    <LinearLayout
+    <com.google.android.material.card.MaterialCardView
+        style="@style/Widget.Material3.CardView.Elevated"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_marginLeft="@dimen/keyline_margin"
+        android:layout_marginTop="@dimen/keyline_margin"
+        android:layout_marginRight="@dimen/keyline_margin"
+        android:layout_marginBottom="@dimen/keyline_margin"
+        app:fitsSystemWindowsInsets="top">
 
-        <TextView
-            android:id="@+id/title"
-            style="@style/TextAppearance.Material3.HeadlineSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/keyline_margin"
-            android:layout_marginRight="@dimen/keyline_margin"
-            android:ellipsize="end"
-            android:maxLines="5" />
-
-        <com.google.android.material.card.MaterialCardView
-            style="@style/Widget.Material3.CardView.Elevated"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/header_content"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/keyline_margin"
-            android:layout_marginTop="@dimen/keyline_margin"
-            android:layout_marginRight="@dimen/keyline_margin"
-            android:layout_marginBottom="@dimen/keyline_margin"
-            app:fitsSystemWindowsInsets="top">
+            android:layout_height="wrap_content">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/header_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/thumb_card"
-                    style="@style/Widget.Material3.CardView.Filled"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <com.hippo.ehviewer.widget.FixedThumb
-                        android:id="@+id/thumb"
-                        android:layout_width="@dimen/gallery_detail_thumb_width"
-                        android:layout_height="@dimen/gallery_detail_thumb_height"
-                        app:alwaysCutAndScale="true"/>
-
-                </com.google.android.material.card.MaterialCardView>
-
-                <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/info"
-                    style="@style/Widget.Material3.CardView.Filled"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="@dimen/keyline_margin"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:orientation="vertical"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:padding="8dp">
-
-                        <TextView
-                            android:id="@+id/language"
-                            style="@style/TextAppearance.Material3.LabelMedium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="start"
-                            android:singleLine="true"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/size"
-                            style="@style/TextAppearance.Material3.LabelMedium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="16dp"
-                            android:gravity="end"
-                            android:singleLine="true"
-                            app:layout_constraintBaseline_toBaselineOf="@id/language"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintHorizontal_bias="1.0"
-                            app:layout_constraintStart_toEndOf="@id/language" />
-
-
-                        <TextView
-                            android:id="@+id/favoredTimes"
-                            style="@style/TextAppearance.Material3.LabelMedium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:gravity="start"
-                            android:singleLine="true"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@id/language" />
-
-                        <TextView
-                            android:id="@+id/pages"
-                            style="@style/TextAppearance.Material3.LabelMedium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="16dp"
-                            android:gravity="end"
-                            android:singleLine="true"
-                            app:layout_constraintBaseline_toBaselineOf="@id/favoredTimes"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintHorizontal_bias="1.0"
-                            app:layout_constraintStart_toEndOf="@id/favoredTimes" />
-
-
-                        <TextView
-                            android:id="@+id/posted"
-                            style="@style/TextAppearance.Material3.LabelMedium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:gravity="center"
-                            android:singleLine="true"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@id/favoredTimes" />
-
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                </com.google.android.material.card.MaterialCardView>
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/uploader"
-                    style="@style/Widget.Material3.Chip.Assist"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/keyline_margin"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:textAllCaps="true"
-                    app:chipIcon="@drawable/file_upload_black_24dp"
-                    app:ensureMinTouchTargetSize="true"
-                    app:layout_constraintBottom_toBottomOf="@id/thumb_card"
-                    app:layout_constraintEnd_toEndOf="parent" />
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/category"
-                    style="@style/Widget.Material3.Chip.Assist"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/keyline_margin"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:textAllCaps="true"
-                    app:chipIcon="@drawable/ic_baseline_label_24"
-                    app:chipSpacingHorizontal="8dp"
-                    app:ensureMinTouchTargetSize="true"
-                    app:layout_constraintBottom_toTopOf="@id/uploader"
-                    app:layout_constraintEnd_toEndOf="parent" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <LinearLayout
-            android:id="@+id/action_card"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/keyline_margin"
-            android:layout_marginRight="@dimen/keyline_margin"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/download"
-                style="@style/Widget.Material3.Button.TonalButton"
-                android:layout_width="0dp"
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/thumb_card"
+                style="@style/Widget.Material3.CardView.Filled"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="4dp"
-                android:layout_weight="1"
-                android:clickable="true"
-                android:focusable="true" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
-            <Button
-                android:id="@+id/read"
-                style="@style/Widget.Material3.Button"
-                android:layout_width="0dp"
+                <com.hippo.ehviewer.widget.FixedThumb
+                    android:id="@+id/thumb"
+                    android:layout_width="@dimen/gallery_detail_thumb_width"
+                    android:layout_height="@dimen/gallery_detail_thumb_height"
+                    app:alwaysCutAndScale="true" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/info"
+                style="@style/Widget.Material3.CardView.Filled"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="4dp"
-                android:layout_weight="1"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="@dimen/keyline_margin"
                 android:clickable="true"
                 android:focusable="true"
-                android:text="@string/read" />
+                android:orientation="vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="8dp">
+
+                    <TextView
+                        android:id="@+id/language"
+                        style="@style/TextAppearance.Material3.LabelMedium"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="start"
+                        android:singleLine="true"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/size"
+                        style="@style/TextAppearance.Material3.LabelMedium"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:gravity="end"
+                        android:singleLine="true"
+                        app:layout_constraintBaseline_toBaselineOf="@id/language"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="1.0"
+                        app:layout_constraintStart_toEndOf="@id/language" />
+
+
+                    <TextView
+                        android:id="@+id/favoredTimes"
+                        style="@style/TextAppearance.Material3.LabelMedium"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:gravity="start"
+                        android:singleLine="true"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/language" />
+
+                    <TextView
+                        android:id="@+id/pages"
+                        style="@style/TextAppearance.Material3.LabelMedium"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:gravity="end"
+                        android:singleLine="true"
+                        app:layout_constraintBaseline_toBaselineOf="@id/favoredTimes"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="1.0"
+                        app:layout_constraintStart_toEndOf="@id/favoredTimes" />
+
+
+                    <TextView
+                        android:id="@+id/posted"
+                        style="@style/TextAppearance.Material3.LabelMedium"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:gravity="center"
+                        android:singleLine="true"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/favoredTimes" />
+
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.chip.Chip
+                android:id="@+id/uploader"
+                style="@style/Widget.Material3.Chip.Assist"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/keyline_margin"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textAllCaps="true"
+                app:chipIcon="@drawable/file_upload_black_24dp"
+                app:ensureMinTouchTargetSize="true"
+                app:layout_constraintBottom_toBottomOf="@id/thumb_card"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <com.google.android.material.chip.Chip
+                android:id="@+id/category"
+                style="@style/Widget.Material3.Chip.Assist"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/keyline_margin"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textAllCaps="true"
+                app:chipIcon="@drawable/ic_baseline_label_24"
+                app:chipSpacingHorizontal="8dp"
+                app:ensureMinTouchTargetSize="true"
+                app:layout_constraintBottom_toTopOf="@id/uploader"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <LinearLayout
+        android:id="@+id/action_card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/keyline_margin"
+        android:layout_marginRight="@dimen/keyline_margin"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/download"
+            style="@style/Widget.Material3.Button.TonalButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="4dp"
+            android:layout_weight="1"
+            android:clickable="true"
+            android:focusable="true" />
+
+        <Button
+            android:id="@+id/read"
+            style="@style/Widget.Material3.Button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="4dp"
+            android:layout_weight="1"
+            android:clickable="true"
+            android:focusable="true"
+            android:text="@string/read" />
 
-        </LinearLayout>
     </LinearLayout>
-</FrameLayout>
+</LinearLayout>

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

@@ -0,0 +1,44 @@
+<?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">
+
+    <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
+            android:layout_width="match_parent"
+            android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:maxLines="3">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:layout_collapseMode="pin" />
+
+        </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:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <FrameLayout
         android:id="@+id/content"
@@ -34,10 +35,9 @@
             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:layout_gravity="end"
+            android:paddingStart="20dp"
+            android:paddingEnd="4dp"
             android:paddingBottom="8dp"
             app:fitsSystemWindowsInsets="bottom" />
 
@@ -57,7 +57,7 @@
         android:id="@+id/fab_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingRight="@dimen/corner_fab_margin"
+        android:paddingEnd="@dimen/corner_fab_margin"
         android:paddingBottom="@dimen/corner_fab_margin"
         app:fitsSystemWindowsInsets="bottom">
 

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

@@ -18,7 +18,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/refresh_layout"
@@ -32,7 +32,7 @@
             android:clipToPadding="false"
             android:paddingLeft="@dimen/keyline_margin"
             android:paddingRight="@dimen/keyline_margin"
-            app:fitsSystemWindowsInsets="bottom" />
+            app:fitsSystemWindowsInsets="top" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
@@ -47,42 +47,47 @@
         android:text="@string/no_one_comments_gallery"
         app:fitsSystemWindowsInsets="bottom" />
 
-    <LinearLayout
-        android:id="@+id/edit_panel"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:background="?attr/colorPrimaryContainer"
-        android:elevation="4dp"
-        android:orientation="horizontal"
-        android:visibility="invisible"
-        app:fitsSystemWindowsInsets="bottom">
+        android:layout_height="match_parent">
 
-        <EditText
-            android:id="@+id/edit_text"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:id="@+id/edit_panel"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@null"
-            android:gravity="left|center_vertical"
-            android:inputType="textMultiLine"
-            android:maxHeight="112dp"
-            android:minHeight="56dp"
-            android:padding="@dimen/keyline_margin"
-            android:textColor="?colorOnPrimarySurface" />
-
-        <ImageView
-            android:id="@+id/send"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
             android:layout_gravity="bottom"
-            android:background="?selectableItemBackgroundBorderless"
-            android:clickable="true"
-            android:focusable="true"
-            android:padding="16dp"
-            app:tint="?colorOnPrimarySurface" />
+            android:background="?attr/colorPrimaryContainer"
+            android:elevation="4dp"
+            android:orientation="horizontal"
+            android:visibility="invisible"
+            app:fitsSystemWindowsInsets="bottom">
 
-    </LinearLayout>
+            <EditText
+                android:id="@+id/edit_text"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@null"
+                android:gravity="left|center_vertical"
+                android:inputType="textMultiLine"
+                android:maxHeight="112dp"
+                android:minHeight="56dp"
+                android:padding="@dimen/keyline_margin"
+                android:textColor="?colorOnPrimarySurface" />
+
+            <ImageView
+                android:id="@+id/send"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:layout_gravity="bottom"
+                android:background="?selectableItemBackgroundBorderless"
+                android:clickable="true"
+                android:focusable="true"
+                android:padding="16dp"
+                app:tint="?colorOnPrimarySurface" />
+
+        </LinearLayout>
+    </FrameLayout>
 
     <com.hippo.widget.FabLayout
         android:id="@+id/fab_layout"

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

@@ -18,18 +18,17 @@
     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:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:overScrollMode="never"
-        android:scrollbars="none">
+        android:layout_height="match_parent">
 
         <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,10 @@
   ~ 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:layout_behavior="@string/appbar_scrolling_view_behavior"
     app:fitsSystemWindowsInsets="bottom" />

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:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <FrameLayout
         android:id="@+id/content"
@@ -34,10 +35,10 @@
             android:id="@+id/fast_scroller"
             android:layout_width="30dp"
             android:layout_height="match_parent"
-            android:layout_gravity="right"
-            android:paddingLeft="20dp"
+            android:layout_gravity="end"
+            android:paddingStart="20dp"
             android:paddingTop="8dp"
-            android:paddingRight="4dp"
+            android:paddingEnd="4dp"
             android:paddingBottom="8dp"
             app:fitsSystemWindowsInsets="bottom" />
 

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

@@ -14,30 +14,23 @@
   ~ 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">
+        android:fitsSystemWindows="true">
 
         <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|snap"
+            app:layout_scrollEffect="compress" />
     </com.google.android.material.appbar.AppBarLayout>
 
-    <FrameLayout
-        android:id="@+id/content_panel"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
-</LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -0,0 +1,76 @@
+<?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">
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.hippo.easyrecyclerview.EasyRecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </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>