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 963f9df8a..82d9c06f0 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 @@ -128,7 +128,9 @@ public class FavoritesScene extends BaseScene implements mFabLayout.setSecondaryFabVisibilityAt(3, false); mFabLayout.setSecondaryFabVisibilityAt(4, false); mFabLayout.setSecondaryFabVisibilityAt(5, false); + mFabLayout.setSecondaryFabVisibilityAt(6, false); } + updateJumpFab(); } }; @Nullable @@ -287,6 +289,7 @@ public class FavoritesScene extends BaseScene implements mSearchBar.setHelper(this); mSearchBar.setAllowEmptySearch(false); updateSearchBar(); + updateJumpFab(); mSearchBarMover = new SearchBarMover(this, mSearchBar, mRecyclerView); int colorID = ResourcesKt.resolveColor(getTheme(), com.google.android.material.R.attr.colorOnSurface); @@ -348,8 +351,6 @@ public class FavoritesScene extends BaseScene implements mSearchBar.setEditTextHint(getString(R.string.favorites_search_bar_hint, favCatName)); } - mFabLayout.setSecondaryFabVisibilityAt(1, favCat != FavListUrlBuilder.FAV_CAT_LOCAL); - mOldFavCat = favCatName; mOldKeyword = keyword; @@ -357,6 +358,13 @@ public class FavoritesScene extends BaseScene implements Settings.putRecentFavCat(mUrlBuilder.getFavCat()); } + // Hide jump fab on local fav cat + private void updateJumpFab() { + if (mFabLayout != null && mUrlBuilder != null) { + mFabLayout.setSecondaryFabVisibilityAt(1, mUrlBuilder.getFavCat() != FavListUrlBuilder.FAV_CAT_LOCAL); + } + } + @Override public void onDestroyView() { super.onDestroyView(); @@ -492,6 +500,7 @@ public class FavoritesScene extends BaseScene implements mUrlBuilder.setKeyword(null); mUrlBuilder.setFavCat(newFavCat); updateSearchBar(); + updateJumpFab(); mHelper.refresh(); closeDrawer(Gravity.RIGHT); @@ -714,7 +723,11 @@ public class FavoritesScene extends BaseScene implements } switch (position) { - case 3: { // Download + case 3: { // Check all + mRecyclerView.checkAll(); + break; + } + case 4: { // Download Activity activity = getMainActivity(); if (activity != null) { CommonOperations.startDownload(getMainActivity(), mModifyGiList, false); @@ -725,7 +738,7 @@ public class FavoritesScene extends BaseScene implements } break; } - case 4: { // Delete + case 5: { // Delete DeleteDialogHelper helper = new DeleteDialogHelper(); new BaseDialogBuilder(context) .setTitle(R.string.delete_favorites_dialog_title) @@ -735,7 +748,7 @@ public class FavoritesScene extends BaseScene implements .show(); break; } - case 5: { // Move + case 6: { // Move MoveDialogHelper helper = new MoveDialogHelper(); // First is local favorite, the other 10 is cloud favorite String[] array = new String[11]; @@ -767,6 +780,7 @@ public class FavoritesScene extends BaseScene implements mFabLayout.setSecondaryFabVisibilityAt(3, true); mFabLayout.setSecondaryFabVisibilityAt(4, true); mFabLayout.setSecondaryFabVisibilityAt(5, true); + mFabLayout.setSecondaryFabVisibilityAt(6, true); } } diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml index 7a6dcddb5..08410741b 100644 --- a/app/src/main/res/layout/scene_favorites.xml +++ b/app/src/main/res/layout/scene_favorites.xml @@ -61,6 +61,13 @@ android:layout_height="wrap_content" app:srcCompat="@drawable/v_refresh_dark_x24" /> + +