From ac5f839a7541f84a05744302b2b4c69b4d160c06 Mon Sep 17 00:00:00 2001 From: seven332 Date: Sun, 6 Mar 2016 21:01:57 +0800 Subject: [PATCH] Handle nav checked item in onViewCreated --- .../com/hippo/ehviewer/ui/scene/BaseScene.java | 11 +++++++++++ .../ehviewer/ui/scene/DownloadLabelScene.java | 7 ------- .../hippo/ehviewer/ui/scene/DownloadsScene.java | 12 +++++------- .../hippo/ehviewer/ui/scene/FavoritesScene.java | 11 +++++------ .../ehviewer/ui/scene/GalleryCommentsScene.java | 6 ------ .../ehviewer/ui/scene/GalleryDetailScene.java | 6 ------ .../ehviewer/ui/scene/GalleryInfoScene.java | 7 ------- .../ehviewer/ui/scene/GalleryListScene.java | 17 +++++------------ .../ehviewer/ui/scene/GalleryPreviewsScene.java | 7 ------- .../hippo/ehviewer/ui/scene/ProgressScene.java | 9 --------- .../hippo/ehviewer/ui/scene/WarningScene.java | 9 --------- 11 files changed, 26 insertions(+), 76 deletions(-) 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 13db7910f..db6631c61 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 @@ -28,6 +28,7 @@ import android.view.ViewGroup; import com.hippo.ehviewer.ui.MainActivity; import com.hippo.scene.SceneFragment; +import com.hippo.util.ActivityHelper; public abstract class BaseScene extends SceneFragment { @@ -75,6 +76,10 @@ public abstract class BaseScene extends SceneFragment { return true; } + public int getNavCheckedItem() { + return 0; + } + public View onCreateDrawerView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { return null; @@ -94,6 +99,12 @@ public abstract class BaseScene extends SceneFragment { } else { setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, Gravity.LEFT); } + + // Update nav checked item + setNavCheckedItem(getNavCheckedItem()); + + // Hide soft ime + ActivityHelper.hideSoftInput(getActivity()); } @Override diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java index f8a179d5a..8dfda64a8 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java @@ -50,7 +50,6 @@ import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; import com.hippo.ehviewer.dao.DownloadLabel; -import com.hippo.util.ActivityHelper; import com.hippo.view.ViewTransition; import com.hippo.yorozuya.ViewUtils; @@ -140,12 +139,6 @@ public class DownloadLabelScene extends ToolbarScene { super.onViewCreated(view, savedInstanceState); setTitle(R.string.label); setNavigationIcon(R.drawable.v_arrow_left_dark_x24); - - // Clear nav checked item - setNavCheckedItem(0); - - // Hide IME - ActivityHelper.hideSoftInput(getActivity()); } @Override diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java index 2a328ae6b..85b6df00e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java @@ -72,7 +72,6 @@ import com.hippo.rippleold.RippleSalon; import com.hippo.scene.Announcer; import com.hippo.scene.TransitionHelper; import com.hippo.unifile.UniFile; -import com.hippo.util.ActivityHelper; import com.hippo.util.ApiHelper; import com.hippo.view.ViewTransition; import com.hippo.widget.FabLayout; @@ -116,6 +115,11 @@ public class DownloadsScene extends ToolbarScene @WholeLifeCircle private List mList; + @Override + public int getNavCheckedItem() { + return R.id.nav_downloads; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -237,12 +241,6 @@ public class DownloadsScene extends ToolbarScene super.onViewCreated(view, savedInstanceState); updateTitle(); setNavigationIcon(R.drawable.v_arrow_left_dark_x24); - - // Clear nav checked item - setNavCheckedItem(R.id.nav_downloads); - - // Hide IME - ActivityHelper.hideSoftInput(getActivity()); } @Override 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 163b56357..60357c989 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 @@ -179,6 +179,11 @@ public class FavoritesScene extends BaseScene implements } }; + @Override + public int getNavCheckedItem() { + return R.id.nav_favourite; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -341,12 +346,6 @@ public class FavoritesScene extends BaseScene implements Settings.putRecentFavCat(mUrlBuilder.getFavCat()); } - @Override - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - setNavCheckedItem(R.id.nav_whats_hot); - } - @Override public void onDestroyView() { super.onDestroyView(); 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 262f67742..f0f6da17c 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 @@ -181,12 +181,6 @@ public final class GalleryCommentsScene extends ToolbarScene super.onViewCreated(view, savedInstanceState); setTitle(R.string.gallery_comments); setNavigationIcon(R.drawable.v_arrow_left_dark_x24); - - // Clear nav checked item - setNavCheckedItem(0); - - // Hide IME - ActivityHelper.hideSoftInput(getActivity()); } @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 17fd6c303..ac8e9214a 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 @@ -516,12 +516,6 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene @Override public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - - // Clear nav checked item - setNavCheckedItem(0); - - // Hide IME - ActivityHelper.hideSoftInput(getActivity()); } @Override 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 1d5982d7e..c79c65e39 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 @@ -38,7 +38,6 @@ import com.hippo.ehviewer.client.EhUrl; import com.hippo.ehviewer.client.EhUtils; import com.hippo.ehviewer.client.data.GalleryDetail; import com.hippo.rippleold.RippleSalon; -import com.hippo.util.ActivityHelper; import com.hippo.yorozuya.LayoutUtils; import java.util.ArrayList; @@ -170,12 +169,6 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler super.onViewCreated(view, savedInstanceState); setTitle(R.string.gallery_info); setNavigationIcon(R.drawable.v_arrow_left_dark_x24); - - // Clear nav checked item - setNavCheckedItem(0); - - // Hide IME - ActivityHelper.hideSoftInput(getActivity()); } @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 701d62c76..f8ed586c0 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 @@ -69,7 +69,6 @@ import com.hippo.scene.Announcer; import com.hippo.scene.SceneFragment; import com.hippo.scene.StageActivity; import com.hippo.scene.TransitionHelper; -import com.hippo.util.ActivityHelper; import com.hippo.util.ApiHelper; import com.hippo.util.DrawableManager; import com.hippo.view.ViewTransition; @@ -151,6 +150,11 @@ public final class GalleryListScene extends BaseScene } }; + @Override + public int getNavCheckedItem() { + return mNavCheckedId; + } + private void handleArgs(Bundle args) { if (args == null) { return; @@ -327,17 +331,6 @@ 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); - - // Hide IME - ActivityHelper.hideSoftInput(getActivity()); - } - @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 571bef465..013d27c91 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 @@ -47,7 +47,6 @@ import com.hippo.ehviewer.client.data.LargePreviewSet; import com.hippo.ehviewer.client.exception.EhException; import com.hippo.scene.SceneFragment; import com.hippo.scene.StageActivity; -import com.hippo.util.ActivityHelper; import com.hippo.widget.ContentLayout; import com.hippo.widget.LoadImageView; import com.hippo.widget.Slider; @@ -152,12 +151,6 @@ public class GalleryPreviewsScene extends ToolbarScene { super.onViewCreated(view, savedInstanceState); setTitle(R.string.gallery_previews); setNavigationIcon(R.drawable.v_arrow_left_dark_x24); - - // Clear nav checked item - setNavCheckedItem(0); - - // Hide IME - ActivityHelper.hideSoftInput(getActivity()); } @Override diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java index 504a280ef..345265b52 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java @@ -32,7 +32,6 @@ import com.hippo.ehviewer.client.EhRequest; import com.hippo.scene.Announcer; import com.hippo.scene.SceneFragment; import com.hippo.scene.StageActivity; -import com.hippo.util.ActivityHelper; import com.hippo.util.ExceptionUtils; import com.hippo.view.ViewTransition; @@ -173,14 +172,6 @@ public final class ProgressScene extends BaseScene implements View.OnClickListen return view; } - @Override - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - // Hide IME - ActivityHelper.hideSoftInput(getActivity()); - } - @Override public void onClick(View v) { if (mTip == v) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java index 74303ea86..1a91eedd8 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java @@ -29,7 +29,6 @@ import com.hippo.ehviewer.client.EhUtils; import com.hippo.ehviewer.ui.annotation.ViewLifeCircle; import com.hippo.rippleold.RippleSalon; import com.hippo.scene.Announcer; -import com.hippo.util.ActivityHelper; import com.hippo.yorozuya.ViewUtils; public final class WarningScene extends BaseScene implements View.OnClickListener { @@ -69,14 +68,6 @@ public final class WarningScene extends BaseScene implements View.OnClickListene return view; } - @Override - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - // Hide IME - ActivityHelper.hideSoftInput(getActivity()); - } - @Override public void onDestroyView() { super.onDestroyView();