Navchecked item now handled internally

app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt

@@ -431,9 +431,6 @@ class MainActivity : EhActivity() {
         }
     }
 
-    fun setNavCheckedItem(@IdRes resId: Int) {
-    }
-
     @JvmOverloads
     fun showTip(@StringRes id: Int, length: Int, useToast: Boolean = false) {
         showTip(getString(id), length, useToast)

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

@@ -128,20 +128,6 @@ public abstract class BaseScene extends Fragment {
         return true;
     }
 
-    public int getNavCheckedItem() {
-        return 0;
-    }
-
-    /**
-     * @param resId 0 for clear
-     */
-    public void setNavCheckedItem(@IdRes int resId) {
-        FragmentActivity activity = getActivity();
-        if (activity instanceof MainActivity) {
-            ((MainActivity) activity).setNavCheckedItem(resId);
-        }
-    }
-
     public void recreateDrawerView() {
         MainActivity activity = getMainActivity();
         if (activity != null) {
@@ -198,9 +184,6 @@ public abstract class BaseScene extends Fragment {
             setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, GravityCompat.START);
         }
 
-        // Update nav checked item
-        setNavCheckedItem(getNavCheckedItem());
-
         // Hide soft ime
         hideSoftInput();
 

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

@@ -108,9 +108,6 @@ class DownloadsScene : BaseToolbarScene(), DownloadInfoListener, OnClickFabListe
     private var mLabelAdapter: DownloadLabelAdapter? = null
     private lateinit var mLabels: MutableList<String>
     private var mType = -1
-    override fun getNavCheckedItem(): Int {
-        return R.id.nav_downloads
-    }
 
     private fun initLabels() {
         context ?: return

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

@@ -154,11 +154,6 @@ public class FavoritesScene extends SearchBarScene implements
     // For modify action
     private boolean mModifyAdd;
 
-    @Override
-    public int getNavCheckedItem() {
-        return R.id.nav_favourite;
-    }
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

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

@@ -204,10 +204,6 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
         return R.menu.scene_gallery_list_searchbar_menu
     }
 
-    override fun getNavCheckedItem(): Int {
-        return mNavCheckedId
-    }
-
     private fun handleArgs(args: Bundle?) {
         val action = args?.getString(KEY_ACTION) ?: ACTION_HOMEPAGE
         mUrlBuilder = when (action) {
@@ -345,18 +341,6 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
             title = resources.getString(R.string.search)
         }
         setSearchBarHint(title)
-
-        // Update nav checked item
-        val checkedItemId: Int = when (mode) {
-            ListUrlBuilder.MODE_NORMAL -> if (EhUtils.NONE == category && TextUtils.isEmpty(keyword)) R.id.nav_homepage else 0
-            MODE_SUBSCRIPTION -> R.id.nav_subscription
-            MODE_WHATS_HOT -> R.id.nav_whats_hot
-            MODE_TOPLIST -> R.id.nav_toplist
-            ListUrlBuilder.MODE_TAG, ListUrlBuilder.MODE_UPLOADER, ListUrlBuilder.MODE_IMAGE_SEARCH -> 0
-            else -> throw IllegalStateException("Unexpected value: $mode")
-        }
-        navCheckedItem = checkedItemId
-        mNavCheckedId = checkedItemId
     }
 
     override fun onCreateViewWithToolbar(

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

@@ -112,10 +112,6 @@ class HistoryScene : BaseToolbarScene() {
         mFavouriteStatusRouter.removeListener(mFavouriteStatusRouterListener)
     }
 
-    override fun getNavCheckedItem(): Int {
-        return R.id.nav_history
-    }
-
     @SuppressLint("NotifyDataSetChanged")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)