diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java index 50833a800..d27a52388 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java @@ -39,6 +39,9 @@ public class BaseScene extends SceneFragment { } } + /** + * @param resId 0 for clear + */ public void setNavCheckedItem(@IdRes int resId) { FragmentActivity activity = getActivity(); if (activity instanceof MainActivity) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java index 21cd36624..3658a535d 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java @@ -148,6 +148,9 @@ public final class GalleryCommentsScene extends ToolbarScene super.onViewCreated(view, savedInstanceState); setTitle(R.string.gallery_comments); setNavigationIcon(VectorDrawable.create(getContext(), R.drawable.ic_arrow_left)); + + // Clear nav checked item + setNavCheckedItem(0); } @Override diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index 5ee2d5bbf..c26b9e38a 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -401,6 +401,14 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene return view; } + @Override + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + // Clear nav checked item + setNavCheckedItem(0); + } + @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java index 0a86c5934..db8eba35d 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java @@ -164,6 +164,9 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler super.onViewCreated(view, savedInstanceState); setTitle(R.string.gallery_info); setNavigationIcon(VectorDrawable.create(getContext(), R.drawable.ic_arrow_left)); + + // Clear nav checked item + setNavCheckedItem(0); } @Override 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 409de411f..c45c18e01 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 @@ -137,6 +137,8 @@ public final class GalleryListScene extends BaseScene private boolean mHasFirstRefresh = false; + private int mNavCheckedId = 0; + @Override public int getLaunchMode() { return LAUNCH_MODE_SINGLE_TOP; @@ -247,6 +249,7 @@ public final class GalleryListScene extends BaseScene checkedItemId = 0; } setNavCheckedItem(checkedItemId); + mNavCheckedId = checkedItemId; } @Nullable @@ -318,6 +321,14 @@ public final class GalleryListScene extends BaseScene return view; } + @Override + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + // Update nav checked item + setNavCheckedItem(mNavCheckedId); + } + @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java index adfb0217a..b89196b31 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java @@ -150,6 +150,9 @@ public class GalleryPreviewsScene extends ToolbarScene { super.onViewCreated(view, savedInstanceState); setTitle(R.string.gallery_previews); setNavigationIcon(VectorDrawable.create(getContext(), R.drawable.ic_arrow_left)); + + // Clear nav checked item + setNavCheckedItem(0); } @Override