diff options
| author | Docile-Alligator <chineseperson5@gmail.com> | 2020-06-20 04:23:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 04:23:51 +0000 |
| commit | f3862e1c8ad10f0019ad18c733012029494ba078 (patch) | |
| tree | 19eb74213ef30cc1af90ff6f9c5de4bb323af173 | |
| parent | 88dea552dd3f61c84b651f7d1412155638fb22f6 (diff) | |
| parent | 09538f4600d9106421f3311d69c5fbae9ab90cf5 (diff) | |
| download | infinity-for-reddit-f3862e1c8ad10f0019ad18c733012029494ba078.tar infinity-for-reddit-f3862e1c8ad10f0019ad18c733012029494ba078.tar.gz infinity-for-reddit-f3862e1c8ad10f0019ad18c733012029494ba078.tar.bz2 infinity-for-reddit-f3862e1c8ad10f0019ad18c733012029494ba078.tar.lz infinity-for-reddit-f3862e1c8ad10f0019ad18c733012029494ba078.tar.xz infinity-for-reddit-f3862e1c8ad10f0019ad18c733012029494ba078.tar.zst infinity-for-reddit-f3862e1c8ad10f0019ad18c733012029494ba078.zip | |
Merge pull request #132 from OHermesJunior/divider-drawer
Add preferences label and divider in nav drawer.
Diffstat (limited to '')
| -rw-r--r-- | app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/NavigationDrawerRecyclerViewAdapter.java | 12 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/NavigationDrawerRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/NavigationDrawerRecyclerViewAdapter.java index 0491c1ed..7d038fa0 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/NavigationDrawerRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/NavigationDrawerRecyclerViewAdapter.java @@ -42,7 +42,7 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re private static final int VIEW_TYPE_DIVIDER = 3; private static final int VIEW_TYPE_SUBSCRIBED_SUBREDDIT = 4; private static final int VIEW_TYPE_ACCOUNT = 5; - private static final int CURRENT_MENU_ITEMS = 16; + private static final int CURRENT_MENU_ITEMS = 17; private Context context; private Resources resources; @@ -90,9 +90,9 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re return VIEW_TYPE_SUBSCRIBED_SUBREDDIT; } else if (position == 0) { return VIEW_TYPE_NAV_HEADER; - } else if (position == 1 || position == 6) { + } else if (position == 1 || position == 6 || position == 12) { return VIEW_TYPE_MENU_GROUP_TITLE; - } else if (position == 12) { + } else if (position == 16) { return VIEW_TYPE_DIVIDER; } else { return VIEW_TYPE_MENU_ITEM; @@ -214,6 +214,8 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re ((MenuGroupTitleViewHolder) holder).titleTextView.setText(R.string.label_account); } else if (position == 6) { ((MenuGroupTitleViewHolder) holder).titleTextView.setText(R.string.label_post); + } else if (position == 12) { + ((MenuGroupTitleViewHolder) holder).titleTextView.setText(R.string.label_preferences); } } else if (holder instanceof MenuItemViewHolder) { int stringId = 0; @@ -401,7 +403,7 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re if (subscribedSubreddits != null) { return CURRENT_MENU_ITEMS + subscribedSubreddits.size(); } - return CURRENT_MENU_ITEMS; + return CURRENT_MENU_ITEMS - 1; } else { return 4; } @@ -448,7 +450,7 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re this.isNSFWEnabled = isNSFWEnabled; if (isInMainPage) { if (isLoggedIn) { - notifyItemChanged(CURRENT_MENU_ITEMS - 2); + notifyItemChanged(CURRENT_MENU_ITEMS - 3); } else { notifyItemChanged(2); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 250a9b25..4b8e20e4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -313,6 +313,7 @@ <string name="label_account">Account</string> <string name="label_post">Post</string> + <string name="label_preferences">Preferences</string> <string name="account_switched">Account Switched. So all other pages are gone.</string> |