From eccf2722cdf85d7f7e9629e4ff12f288caa9ad23 Mon Sep 17 00:00:00 2001 From: Campello Manuel <9112949+CampelloManuel@users.noreply.github.com> Date: Sat, 27 Jan 2024 16:44:04 +0100 Subject: [PATCH] don't show animations when moving between lists if they are disabled --- .../fragments/TaskListViewPagerFragment.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/nononsenseapps/notepad/fragments/TaskListViewPagerFragment.java b/app/src/main/java/com/nononsenseapps/notepad/fragments/TaskListViewPagerFragment.java index 6c638058..7ae54400 100644 --- a/app/src/main/java/com/nononsenseapps/notepad/fragments/TaskListViewPagerFragment.java +++ b/app/src/main/java/com/nononsenseapps/notepad/fragments/TaskListViewPagerFragment.java @@ -46,13 +46,14 @@ import androidx.viewpager.widget.ViewPager; import com.nononsenseapps.helpers.NnnLogger; -import com.nononsenseapps.notepad.activities.main.ActivityMain; -import com.nononsenseapps.notepad.interfaces.ListOpener; -import com.nononsenseapps.notepad.activities.ActivitySearchDeleted; +import com.nononsenseapps.helpers.PreferencesHelper; import com.nononsenseapps.notepad.R; +import com.nononsenseapps.notepad.activities.ActivitySearchDeleted; +import com.nononsenseapps.notepad.activities.main.ActivityMain; import com.nononsenseapps.notepad.database.TaskList; import com.nononsenseapps.notepad.databinding.FragmentTasklistViewpagerBinding; import com.nononsenseapps.notepad.fragments.DialogEditList.EditListDialogListener; +import com.nononsenseapps.notepad.interfaces.ListOpener; import com.nononsenseapps.notepad.interfaces.MenuStateController; import com.nononsenseapps.ui.ViewsHelper; @@ -81,6 +82,12 @@ public class TaskListViewPagerFragment extends Fragment implements private long mListIdToSelect = -1; + /** + * If transitions between note lists should be animated, with smooth scrolling + * The value is regularly updated by {@link TaskListViewPagerFragment#onResume()} + */ + private boolean mShouldAnimate = true; + /** * for {@link R.layout#fragment_tasklist_viewpager} */ @@ -126,6 +133,12 @@ public SectionsPagerAdapter getSectionsPagerAdapter() { return mSectionsPagerAdapter; } + @Override + public void onResume() { + super.onResume(); + mShouldAnimate = PreferencesHelper.areAnimationsEnabled(this.getContext()); + } + @Override public void onCreate(Bundle savedState) { super.onCreate(savedState); @@ -168,13 +181,12 @@ public void onLoadFinished(@NonNull Loader arg0, Cursor c) { mTaskListsAdapter.swapCursor(c); final int pos; if (mListIdToSelect != -1) { - pos = mSectionsPagerAdapter - .getItemPosition(mListIdToSelect); + pos = mSectionsPagerAdapter.getItemPosition(mListIdToSelect); } else { pos = -1; } if (pos >= 0) { - pager.setCurrentItem(pos); + pager.setCurrentItem(pos, mShouldAnimate); mListIdToSelect = -1; } } @@ -290,7 +302,7 @@ public void openList(final long id) { pos = mSectionsPagerAdapter.getItemPosition(id); if (pos > -1) { - pager.setCurrentItem(pos, true); + pager.setCurrentItem(pos, mShouldAnimate); mListIdToSelect = -1; } } @@ -370,9 +382,9 @@ public void destroy() { wrappedAdapter.unregisterDataSetObserver(subObserver); } if (prefListener != null) { - PreferenceManager.getDefaultSharedPreferences(getActivity()) - .unregisterOnSharedPreferenceChangeListener( - prefListener); + PreferenceManager + .getDefaultSharedPreferences(getActivity()) + .unregisterOnSharedPreferenceChangeListener(prefListener); } }