mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-12-29 04:17:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132 from OHermesJunior/divider-drawer

Browse Source 
Add preferences label and divider in nav drawer.
This commit is contained in:
Docile-Alligator 2020-06-20 12:23:51 +08:00 committed by GitHub
commit f3862e1c8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/NavigationDrawerRecyclerViewAdapter.java
View File

@ -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_DIVIDER = 3;
private static final int VIEW_TYPE_SUBSCRIBED_SUBREDDIT = 4; private static final int VIEW_TYPE_SUBSCRIBED_SUBREDDIT = 4;
private static final int VIEW_TYPE_ACCOUNT = 5; 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 Context context;
private Resources resources; private Resources resources;
@ -90,9 +90,9 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re
return VIEW_TYPE_SUBSCRIBED_SUBREDDIT; return VIEW_TYPE_SUBSCRIBED_SUBREDDIT;
} else if (position == 0) { } else if (position == 0) {
return VIEW_TYPE_NAV_HEADER; 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; return VIEW_TYPE_MENU_GROUP_TITLE;
} else if (position == 12) { } else if (position == 16) {
return VIEW_TYPE_DIVIDER; return VIEW_TYPE_DIVIDER;
} else { } else {
return VIEW_TYPE_MENU_ITEM; return VIEW_TYPE_MENU_ITEM;
@ -214,6 +214,8 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re
((MenuGroupTitleViewHolder) holder).titleTextView.setText(R.string.label_account); ((MenuGroupTitleViewHolder) holder).titleTextView.setText(R.string.label_account);
} else if (position == 6) { } else if (position == 6) {
((MenuGroupTitleViewHolder) holder).titleTextView.setText(R.string.label_post); ((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) { } else if (holder instanceof MenuItemViewHolder) {
int stringId = 0; int stringId = 0;
@ -401,7 +403,7 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re
if (subscribedSubreddits != null) { if (subscribedSubreddits != null) {
return CURRENT_MENU_ITEMS + subscribedSubreddits.size(); return CURRENT_MENU_ITEMS + subscribedSubreddits.size();
} }
return CURRENT_MENU_ITEMS; return CURRENT_MENU_ITEMS - 1;
} else { } else {
return 4; return 4;
} }
@ -448,7 +450,7 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re
this.isNSFWEnabled = isNSFWEnabled; this.isNSFWEnabled = isNSFWEnabled;
if (isInMainPage) { if (isInMainPage) {
if (isLoggedIn) { if (isLoggedIn) {
notifyItemChanged(CURRENT_MENU_ITEMS - 2); notifyItemChanged(CURRENT_MENU_ITEMS - 3);
} else { } else {
notifyItemChanged(2); notifyItemChanged(2);
} }

1
app/src/main/res/values/strings.xml
View File

@ -313,6 +313,7 @@
<string name="label_account">Account</string> <string name="label_account">Account</string>
<string name="label_post">Post</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> <string name="account_switched">Account Switched. So all other pages are gone.</string>