diff options
Diffstat (limited to 'app')
3 files changed, 17 insertions, 4 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/NavigationDrawerRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/NavigationDrawerRecyclerViewAdapter.java index 9a51e181..1ecd8b25 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/NavigationDrawerRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/NavigationDrawerRecyclerViewAdapter.java @@ -126,7 +126,7 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re - (collapsePostSection ? POST_SECTION_ITEMS : 0) - (collapsePreferencesSection ? PREFERENCES_SECTION_ITEMS : 0)) { return VIEW_TYPE_MENU_GROUP_TITLE; - } else if (!favoriteSubscribedSubreddits.isEmpty() && position == CURRENT_MENU_ITEMS + } else if (!hideFavoriteSubredditsSection && !favoriteSubscribedSubreddits.isEmpty() && position == CURRENT_MENU_ITEMS - (collapseAccountSection ? ACCOUNT_SECTION_ITEMS : 0) - (collapsePostSection ? POST_SECTION_ITEMS : 0) - (collapsePreferencesSection ? PREFERENCES_SECTION_ITEMS : 0) @@ -135,7 +135,8 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re } else if (position > CURRENT_MENU_ITEMS - (collapseAccountSection ? ACCOUNT_SECTION_ITEMS : 0) - (collapsePostSection ? POST_SECTION_ITEMS : 0) - (collapsePreferencesSection ? PREFERENCES_SECTION_ITEMS : 0)) { - if (!favoriteSubscribedSubreddits.isEmpty() && !collapseFavoriteSubredditsSection && position <= CURRENT_MENU_ITEMS + if (!favoriteSubscribedSubreddits.isEmpty() && !hideFavoriteSubredditsSection && + !collapseFavoriteSubredditsSection && position <= CURRENT_MENU_ITEMS - (collapseAccountSection ? ACCOUNT_SECTION_ITEMS : 0) - (collapsePostSection ? POST_SECTION_ITEMS : 0) - (collapsePreferencesSection ? PREFERENCES_SECTION_ITEMS : 0) @@ -314,7 +315,7 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re } type = 2; } else { - if (!favoriteSubscribedSubreddits.isEmpty() && position == CURRENT_MENU_ITEMS + if (!hideFavoriteSubredditsSection && !favoriteSubscribedSubreddits.isEmpty() && position == CURRENT_MENU_ITEMS - (collapseAccountSection ? ACCOUNT_SECTION_ITEMS : 0) - (collapsePostSection ? POST_SECTION_ITEMS : 0) - (collapsePreferencesSection ? PREFERENCES_SECTION_ITEMS : 0)) { @@ -571,7 +572,7 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re itemClickListener.onSubscribedSubredditClick(subredditName); }); } else if (holder instanceof SubscribedThingViewHolder) { - SubscribedSubredditData subreddit = favoriteSubscribedSubreddits.isEmpty() ? subscribedSubreddits.get(position - (CURRENT_MENU_ITEMS + SubscribedSubredditData subreddit = favoriteSubscribedSubreddits.isEmpty() || hideFavoriteSubredditsSection ? subscribedSubreddits.get(position - (CURRENT_MENU_ITEMS - (collapseAccountSection ? ACCOUNT_SECTION_ITEMS : 0) - (collapsePostSection ? POST_SECTION_ITEMS : 0) - (collapsePreferencesSection ? PREFERENCES_SECTION_ITEMS : 0)) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 986e5376..70f5f6eb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -553,6 +553,8 @@ <string name="settings_collapse_preferences_section_title">Collapse Preferences Section</string> <string name="settings_collapse_favorite_subreddits_section_title">Collapse Favorite Subreddits Section</string> <string name="settings_collapse_subscribed_subreddits_section_title">Collapse Subscribed Subreddits Section</string> + <string name="settings_hide_favorite_subreddits_sections_title">Hide Favorite Subreddits Section</string> + <string name="settings_hide_subscribed_subreddits_sections_title">Hide Subscribed Subreddits Section</string> <string name="no_link_available">Cannot get the link</string> diff --git a/app/src/main/res/xml/navigation_drawer_preferences.xml b/app/src/main/res/xml/navigation_drawer_preferences.xml index 4fa0d064..12873fa3 100644 --- a/app/src/main/res/xml/navigation_drawer_preferences.xml +++ b/app/src/main/res/xml/navigation_drawer_preferences.xml @@ -31,4 +31,14 @@ app:key="collapse_subscribed_subreddits_section" app:title="@string/settings_collapse_subscribed_subreddits_section_title" /> + <SwitchPreference + app:defaultValue="false" + app:key="hide_favorite_subreddits_sections" + app:title="@string/settings_hide_favorite_subreddits_sections_title" /> + + <SwitchPreference + app:defaultValue="false" + app:key="hide_subscribed_subreddits_sections" + app:title="@string/settings_hide_subscribed_subreddits_sections_title" /> + </PreferenceScreen>
\ No newline at end of file |