diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java index 2f520bd2f..f300e4119 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java @@ -582,16 +582,14 @@ public class FavoritesScene extends SearchBarScene implements if (!mRecyclerView.isInCustomChoice()) { switch (position) { - // Open right - case 0 -> openDrawer(Gravity.RIGHT); // Go to - case 1 -> { + case 0 -> { if (mHelper.canGoTo()) showGoToDialog(); } // Refresh - case 2 -> mHelper.refresh(); + case 1 -> mHelper.refresh(); // Last page - case 3 -> mHelper.goToPage(Integer.MAX_VALUE - 1); + case 2 -> mHelper.goToPage(Integer.MAX_VALUE - 1); } view.setExpanded(false); return; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index f7ace766b..a24c162dd 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -480,12 +480,11 @@ public final class GalleryListScene extends SearchBarScene if (isTopList != mIsTopList) { mIsTopList = isTopList; recreateDrawerView(); - mFabLayout.getSecondaryFabAt(0).setImageResource(isTopList ? R.drawable.ic_baseline_format_list_numbered_24 : R.drawable.v_magnify_x24); } // Update fab visibility - mFabLayout.setSecondaryFabVisibilityAt(1, !isPopular); - mFabLayout.setSecondaryFabVisibilityAt(3, !isTopList && !isPopular); + mFabLayout.setSecondaryFabVisibilityAt(0, !isPopular); + mFabLayout.setSecondaryFabVisibilityAt(2, !isTopList && !isPopular); // Update normal search mode mSearchLayout.setNormalSearchMode(mode == ListUrlBuilder.MODE_SUBSCRIPTION @@ -890,16 +889,14 @@ public final class GalleryListScene extends SearchBarScene } switch (position) { - // Open right - case 0 -> openDrawer(Gravity.RIGHT); // Go to - case 1 -> { + case 0 -> { if (mHelper.canGoTo()) showGoToDialog(); } // Refresh - case 2 -> mHelper.refresh(); + case 1 -> mHelper.refresh(); // Last page - case 3 -> mHelper.goToPage(Integer.MAX_VALUE - 1); + case 2 -> mHelper.goToPage(Integer.MAX_VALUE - 1); } view.setExpanded(false); diff --git a/app/src/main/res/anim/enter_from_top.xml b/app/src/main/res/anim/enter_from_top.xml deleted file mode 100644 index ec0431ba0..000000000 --- a/app/src/main/res/anim/enter_from_top.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/anim/exit_to_top.xml b/app/src/main/res/anim/exit_to_top.xml deleted file mode 100644 index 3a6f3e9db..000000000 --- a/app/src/main/res/anim/exit_to_top.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml index faabb0b4b..dfea66f2c 100644 --- a/app/src/main/res/layout/scene_favorites.xml +++ b/app/src/main/res/layout/scene_favorites.xml @@ -36,12 +36,6 @@ android:paddingBottom="@dimen/corner_fab_margin" app:fitsSystemWindowsInsets="top|bottom"> - - - -