baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Fixed scrolling not working when rotating device

Browse source
This commit is contained in:
litetex 2022-02-17 20:58:53 +01:00
parent 9c2cdd2513
commit 2acaefdb2a
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
View file

@ -310,10 +310,24 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
onItemSelected(selectedItem); onItemSelected(selectedItem);
} }
}); });
// Ensure that there is always a scroll listener (e.g. when rotating the device)
useNormalItemListScrollListener();
} }
/** /**
* Remove all listeners and add the initial scroll listener to the {@link #itemsList}. * Removes all listeners and adds the normal scroll listener to the {@link #itemsList}.
*/
protected void useNormalItemListScrollListener() {
if (DEBUG) {
Log.d(TAG, "useNormalItemListScrollListener called");
}
itemsList.clearOnScrollListeners();
itemsList.addOnScrollListener(new DefaultItemListOnScrolledDownListener());
}
/**
* Removes all listeners and adds the initial scroll listener to the {@link #itemsList}.
* <br/> * <br/>
* Which tries to load more items when not enough are in the view (not scrollable) * Which tries to load more items when not enough are in the view (not scrollable)
* and more are available. * and more are available.
@ -329,9 +343,9 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
* <li>no more items can be loaded</li> * <li>no more items can be loaded</li>
* </ul> * </ul>
*/ */
protected void setItemsListInitialScrollListener() { protected void useInitialItemListLoadScrollListener() {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "setItemsListInitialScrollListener called"); Log.d(TAG, "useInitialItemListLoadScrollListener called");
} }
itemsList.clearOnScrollListeners(); itemsList.clearOnScrollListeners();
itemsList.addOnScrollListener(new DefaultItemListOnScrolledDownListener() { itemsList.addOnScrollListener(new DefaultItemListOnScrolledDownListener() {
@ -342,7 +356,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
if (dy != 0) { if (dy != 0) {
log("Vertical scroll occurred"); log("Vertical scroll occurred");
useNormalScrollListener(); useNormalItemListScrollListener();
return; return;
} }
if (isLoading.get()) { if (isLoading.get()) {
@ -352,14 +366,14 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
if (!hasMoreItems()) { if (!hasMoreItems()) {
log("No more items to load"); log("No more items to load");
useNormalScrollListener(); useNormalItemListScrollListener();
return; return;
} }
if (itemsList.canScrollVertically(1) if (itemsList.canScrollVertically(1)
|| itemsList.canScrollVertically(-1)) { || itemsList.canScrollVertically(-1)) {
log("View is scrollable"); log("View is scrollable");
useNormalScrollListener(); useNormalItemListScrollListener();
return; return;
} }
@ -367,14 +381,9 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
loadMoreItems(); loadMoreItems();
} }
private void useNormalScrollListener() {
itemsList.removeOnScrollListener(this);
itemsList.addOnScrollListener(new DefaultItemListOnScrolledDownListener());
}
private void log(final String msg) { private void log(final String msg) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "itemListInitScrollListener - " + msg); Log.d(TAG, "initItemListLoadScrollListener - " + msg);
} }
} }
}); });
@ -476,7 +485,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
@Override @Override
protected void startLoading(final boolean forceLoad) { protected void startLoading(final boolean forceLoad) {
setItemsListInitialScrollListener(); useInitialItemListLoadScrollListener();
super.startLoading(forceLoad); super.startLoading(forceLoad);
} }