From c2b6066c7ec68a9f1d7e72a24d5bfb22c5461e3c Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Fri, 26 Feb 2021 22:15:39 +0800 Subject: [PATCH] New option: Show avatar on the right in the navigation drawer. --- .../activities/MainActivity.java | 26 +++++++++++++++++- .../NavigationDrawerRecyclerViewAdapter.java | 16 +++++++++++ ...rOnTheRightInTheNavigationDrawerEvent.java | 9 ++++++ .../settings/InterfacePreferenceFragment.java | 9 ++++++ .../utils/SharedPreferencesUtils.java | 1 + .../res/drawable/subreddit_default_icon.png | Bin 0 -> 16621 bytes ..._icon.jpg => subreddit_default_icon_2.jpg} | Bin app/src/main/res/values/strings.xml | 1 + .../main/res/xml/interface_preferences.xml | 5 ++++ 9 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeShowAvatarOnTheRightInTheNavigationDrawerEvent.java create mode 100644 app/src/main/res/drawable/subreddit_default_icon.png rename app/src/main/res/drawable/{subreddit_default_icon.jpg => subreddit_default_icon_2.jpg} (100%) diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/MainActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/MainActivity.java index 83b8a2c9..18955498 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/MainActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/MainActivity.java @@ -95,6 +95,7 @@ import ml.docilealligator.infinityforreddit.events.ChangeDisableSwipingBetweenTa import ml.docilealligator.infinityforreddit.events.ChangeLockBottomAppBarEvent; import ml.docilealligator.infinityforreddit.events.ChangeNSFWEvent; import ml.docilealligator.infinityforreddit.events.ChangeRequireAuthToAccountSectionEvent; +import ml.docilealligator.infinityforreddit.events.ChangeShowAvatarOnTheRightInTheNavigationDrawerEvent; import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent; import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent; import ml.docilealligator.infinityforreddit.fragments.PostFragment; @@ -1162,7 +1163,30 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb @Subscribe public void onChangeRequireAuthToAccountSectionEvent(ChangeRequireAuthToAccountSectionEvent changeRequireAuthToAccountSectionEvent) { - adapter.setRequireAuthToAccountSection(changeRequireAuthToAccountSectionEvent.requireAuthToAccountSection); + if (adapter != null) { + adapter.setRequireAuthToAccountSection(changeRequireAuthToAccountSectionEvent.requireAuthToAccountSection); + } + } + + @Subscribe + public void onChangeShowAvatarOnTheRightInTheNavigationDrawerEvent(ChangeShowAvatarOnTheRightInTheNavigationDrawerEvent event) { + if (adapter != null) { + adapter.setShowAvatarOnTheRightInTheNavigationDrawer(event.showAvatarOnTheRightInTheNavigationDrawer); + int previousPosition = -1; + if (navDrawerRecyclerView.getLayoutManager() != null) { + previousPosition = ((LinearLayoutManager) navDrawerRecyclerView.getLayoutManager()).findFirstVisibleItemPosition(); + } + + RecyclerView.LayoutManager layoutManager = navDrawerRecyclerView.getLayoutManager(); + navDrawerRecyclerView.setAdapter(null); + navDrawerRecyclerView.setLayoutManager(null); + navDrawerRecyclerView.setAdapter(adapter); + navDrawerRecyclerView.setLayoutManager(layoutManager); + + if (previousPosition > 0) { + navDrawerRecyclerView.scrollToPosition(previousPosition); + } + } } @Override 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 744e6ad8..d6de3458 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/NavigationDrawerRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/NavigationDrawerRecyclerViewAdapter.java @@ -7,6 +7,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; @@ -64,6 +65,7 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter= Build.VERSION_CODES.O) { @@ -36,6 +38,13 @@ public class InterfacePreferenceFragment extends PreferenceFragmentCompat { }); } + if (showAvatarOnTheRightInTheNavigationDrawer != null) { + showAvatarOnTheRightInTheNavigationDrawer.setOnPreferenceChangeListener((preference, newValue) -> { + EventBus.getDefault().post(new ChangeShowAvatarOnTheRightInTheNavigationDrawerEvent((Boolean) newValue)); + return true; + }); + } + if (voteButtonsOnTheRightSwitch != null) { voteButtonsOnTheRightSwitch.setOnPreferenceChangeListener((preference, newValue) -> { EventBus.getDefault().post(new ChangeVoteButtonsPositionEvent((Boolean) newValue)); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java index aa2d7c3f..be8489a9 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java @@ -38,6 +38,7 @@ public class SharedPreferencesUtils { public static final String DISABLE_IMMERSIVE_INTERFACE_IN_LANDSCAPE_MODE = "disable_immersive_interface_in_landscape_mode"; public static final String BOTTOM_APP_BAR_KEY = "bottom_app_bar"; public static final String VOTE_BUTTONS_ON_THE_RIGHT_KEY = "vote_buttons_on_the_right"; + public static final String SHOW_AVATAR_ON_THE_RIGHT_IN_THE_NAVIGATION_DRAWER = "show_avatar_on_the_right_in_the_navigation_drawer"; public static final String SORT_TYPE_SHARED_PREFERENCES_FILE = "ml.docilealligator.infinityforreddit.sort_type"; public static final String SORT_TYPE_BEST_POST = "sort_type_best_post"; diff --git a/app/src/main/res/drawable/subreddit_default_icon.png b/app/src/main/res/drawable/subreddit_default_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..072c8e24f334e0d99f8fc190f16af5fab5d81777 GIT binary patch literal 16621 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 J^3O(r{{y?!fPer1 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/subreddit_default_icon.jpg b/app/src/main/res/drawable/subreddit_default_icon_2.jpg similarity index 100% rename from app/src/main/res/drawable/subreddit_default_icon.jpg rename to app/src/main/res/drawable/subreddit_default_icon_2.jpg diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5278ec55..81cc184b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -540,6 +540,7 @@ Hide Subreddit and User Prefix Hide the Number of Votes Hide the Number of Comments + Show Avatar on the Left in the Navigation Drawer Cannot get the link diff --git a/app/src/main/res/xml/interface_preferences.xml b/app/src/main/res/xml/interface_preferences.xml index d6f8dc68..e40f5b25 100644 --- a/app/src/main/res/xml/interface_preferences.xml +++ b/app/src/main/res/xml/interface_preferences.xml @@ -29,6 +29,11 @@ app:title="@string/settings_enable_bottom_app_bar_title" app:summary="@string/settings_enable_bottom_app_bar_summary" /> + +