Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show feed search results as soon as they are available (#7100) 

without waiting for episode search results
This commit is contained in:
ByteHamster 2024-04-15 19:24:06 +02:00 committed by GitHub
parent e9b3cc34fe
commit 2043e71299
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
app/src/main/java/de/danoeh/antennapod/ui/screen/SearchFragment.java
View File

@ -6,7 +6,6 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.util.Log; import android.util.Log;
import android.util.Pair;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -75,7 +74,8 @@ public class SearchFragment extends Fragment implements EpisodeItemListAdapter.O
private EpisodeItemListAdapter adapter; private EpisodeItemListAdapter adapter;
private HorizontalFeedListAdapter adapterFeeds; private HorizontalFeedListAdapter adapterFeeds;
private Disposable disposable; private Disposable disposableFeeds;
private Disposable disposableEpisodes;
private ProgressBar progressBar; private ProgressBar progressBar;
private EmptyViewHandler emptyViewHandler; private EmptyViewHandler emptyViewHandler;
private EpisodeItemListRecyclerView recyclerView; private EpisodeItemListRecyclerView recyclerView;
@ -127,8 +127,11 @@ public class SearchFragment extends Fragment implements EpisodeItemListAdapter.O
@Override @Override
public void onStop() { public void onStop() {
super.onStop(); super.onStop();
if (disposable != null) { if (disposableFeeds != null) {
disposable.dispose(); disposableFeeds.dispose();
}
if (disposableEpisodes != null) {
disposableEpisodes.dispose();
} }
} }
@ -373,44 +376,45 @@ public class SearchFragment extends Fragment implements EpisodeItemListAdapter.O
} }
private void search() { private void search() {
if (disposable != null) { if (disposableFeeds != null) {
disposable.dispose(); disposableFeeds.dispose();
}
if (disposableEpisodes != null) {
disposableEpisodes.dispose();
} }
adapterFeeds.setEndButton(R.string.search_online, this::searchOnline); adapterFeeds.setEndButton(R.string.search_online, this::searchOnline);
chip.setVisibility((getArguments().getLong(ARG_FEED, 0) == 0) ? View.GONE : View.VISIBLE); long feed = getArguments().getLong(ARG_FEED, 0);
disposable = Observable.fromCallable(this::performSearch) chip.setVisibility((feed == 0) ? View.GONE : View.VISIBLE);
String query = searchView.getQuery().toString();
if (query.isEmpty()) {
emptyViewHandler.setMessage(R.string.type_to_search);
return;
}
if (feed != 0) {
// Search within a feed
adapterFeeds.updateData(Collections.emptyList());
} else {
disposableFeeds = Observable.fromCallable(() -> DBReader.searchFeeds(query))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(results -> {
progressBar.setVisibility(View.GONE);
adapterFeeds.updateData(results);
emptyViewHandler.setMessage(getString(R.string.no_results_for_query, query));
}, error -> Log.e(TAG, Log.getStackTraceString(error)));
}
disposableEpisodes = Observable.fromCallable(() -> DBReader.searchFeedItems(feed, query))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(results -> { .subscribe(results -> {
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
this.results = results.first; this.results = results;
adapter.updateItems(results.first); adapter.updateItems(results);
if (getArguments().getLong(ARG_FEED, 0) == 0) { emptyViewHandler.setMessage(getString(R.string.no_results_for_query, searchView.getQuery()));
adapterFeeds.updateData(results.second);
} else {
adapterFeeds.updateData(Collections.emptyList());
}
if (searchView.getQuery().toString().isEmpty()) {
emptyViewHandler.setMessage(R.string.type_to_search);
} else {
emptyViewHandler.setMessage(getString(R.string.no_results_for_query, searchView.getQuery()));
}
}, error -> Log.e(TAG, Log.getStackTraceString(error))); }, error -> Log.e(TAG, Log.getStackTraceString(error)));
} }
@NonNull
private Pair<List<FeedItem>, List<Feed>> performSearch() {
String query = searchView.getQuery().toString();
if (query.isEmpty()) {
return new Pair<>(Collections.emptyList(), Collections.emptyList());
}
long feed = getArguments().getLong(ARG_FEED);
List<FeedItem> items = DBReader.searchFeedItems(feed, query);
List<Feed> feeds = DBReader.searchFeeds(query);
return new Pair<>(items, feeds);
}
private void showInputMethod(View view) { private void showInputMethod(View view) {
InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE); InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
if (imm != null) { if (imm != null) {