Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix various issues in the search suggestions list #8972

Merged
merged 3 commits into from
Sep 19, 2022
Merged

Fix various issues in the search suggestions list #8972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbf5549
Fix wrong icons being set on suggestion items
Stypox Sep 14, 2022
1f57c87
Disable suggestion list animations: not meaningful
Stypox Sep 14, 2022
28b34f3
Fix scroll issues in suggestion list
Stypox Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,8 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
super.initViews(rootView, savedInstanceState);

searchBinding.suggestionsList.setAdapter(suggestionListAdapter);
// animations are just strange and useless, since the suggestions keep changing too much
searchBinding.suggestionsList.setItemAnimator(null);
new ItemTouchHelper(new ItemTouchHelper.Callback() {
@Override
public int getMovementFlags(@NonNull final RecyclerView recyclerView,
Expand Down Expand Up @@ -944,8 +946,8 @@ public void handleSuggestions(@NonNull final List<SuggestionItem> suggestions) {
if (DEBUG) {
Log.d(TAG, "handleSuggestions() called with: suggestions = [" + suggestions + "]");
}
searchBinding.suggestionsList.smoothScrollToPosition(0);
suggestionListAdapter.submitList(suggestions);
suggestionListAdapter.submitList(suggestions,
() -> searchBinding.suggestionsList.scrollToPosition(0));

if (suggestionsPanelVisible && isErrorPanelVisible()) {
hideLoading();
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,14 @@ private static class SuggestionItemCallback extends DiffUtil.ItemCallback<Sugges
@Override
public boolean areItemsTheSame(@NonNull final SuggestionItem oldItem,
@NonNull final SuggestionItem newItem) {
return oldItem.query.equals(newItem.query);
return oldItem.fromHistory == newItem.fromHistory
&& oldItem.query.equals(newItem.query);
}

@Override
public boolean areContentsTheSame(@NonNull final SuggestionItem oldItem,
@NonNull final SuggestionItem newItem) {
return oldItem.equals(newItem);
return true; // items' contents never change; the list of items themselves does
}
}
}