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

Use a single search fragment for all searchers

This commit is contained in:
ByteHamster 2020-04-09 12:33:31 +02:00
parent b146a1163c
commit ac13b7aa7b
14 changed files with 124 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/de/danoeh/antennapod/discovery/CombinedSearcher.java
View File

@ -1,8 +1,7 @@
package de.danoeh.antennapod.discovery;
import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
import android.util.Pair;
import io.reactivex.Single;
import io.reactivex.SingleOnSubscribe;
import io.reactivex.android.schedulers.AndroidSchedulers;
@ -19,7 +18,7 @@ import java.util.concurrent.CountDownLatch;
public class CombinedSearcher implements PodcastSearcher {
private static final String TAG = "CombinedSearcher";
public CombinedSearcher(Context context) {
public CombinedSearcher() {
}
public Single<List<PodcastSearchResult>> search(String query) {
@ -31,7 +30,7 @@ public class CombinedSearcher implements PodcastSearcher {
PodcastSearcherRegistry.SearcherInfo searchProviderInfo
= PodcastSearcherRegistry.getSearchProviders().get(i);
PodcastSearcher searcher = searchProviderInfo.searcher;
if (searchProviderInfo.weight <= 0.00001f) {
if (searchProviderInfo.weight <= 0.00001f || searcher.getClass() == CombinedSearcher.class) {
latch.countDown();
continue;
}
@ -102,4 +101,18 @@ public class CombinedSearcher implements PodcastSearcher {
public boolean urlNeedsLookup(String url) {
return PodcastSearcherRegistry.urlNeedsLookup(url);
}
@Override
public String getName() {
ArrayList<String> names = new ArrayList<>();
for (int i = 0; i < PodcastSearcherRegistry.getSearchProviders().size(); i++) {
PodcastSearcherRegistry.SearcherInfo searchProviderInfo
= PodcastSearcherRegistry.getSearchProviders().get(i);
PodcastSearcher searcher = searchProviderInfo.searcher;
if (searchProviderInfo.weight > 0.00001f && searcher.getClass() != CombinedSearcher.class) {
names.add(searcher.getName());
}
}
return TextUtils.join(", ", names);
}
}

5
app/src/main/java/de/danoeh/antennapod/discovery/FyydPodcastSearcher.java
View File

@ -45,4 +45,9 @@ public class FyydPodcastSearcher implements PodcastSearcher {
public boolean urlNeedsLookup(String url) {
return false;
}
@Override
public String getName() {
return "Fyyd";
}
}

5
app/src/main/java/de/danoeh/antennapod/discovery/GpodnetPodcastSearcher.java
View File

@ -43,4 +43,9 @@ public class GpodnetPodcastSearcher implements PodcastSearcher {
public boolean urlNeedsLookup(String url) {
return false;
}
@Override
public String getName() {
return "Gpodder.net";
}
}

5
app/src/main/java/de/danoeh/antennapod/discovery/ItunesPodcastSearcher.java
View File

@ -96,4 +96,9 @@ public class ItunesPodcastSearcher implements PodcastSearcher {
public boolean urlNeedsLookup(String url) {
return url.contains("itunes.apple.com");
}
@Override
public String getName() {
return "iTunes";
}
}

2
app/src/main/java/de/danoeh/antennapod/discovery/PodcastSearcher.java
View File

@ -11,4 +11,6 @@ public interface PodcastSearcher {
Single<String> lookupUrl(String resultUrl);
boolean urlNeedsLookup(String resultUrl);
String getName();
}

13
app/src/main/java/de/danoeh/antennapod/discovery/PodcastSearcherRegistry.java
View File

@ -15,8 +15,9 @@ public class PodcastSearcherRegistry {
public static List<SearcherInfo> getSearchProviders() {
if (searchProviders == null) {
searchProviders = new ArrayList<>();
searchProviders.add(new SearcherInfo(new FyydPodcastSearcher(), 1.f));
searchProviders.add(new SearcherInfo(new CombinedSearcher(), 1.f));
searchProviders.add(new SearcherInfo(new ItunesPodcastSearcher(), 1.f));
searchProviders.add(new SearcherInfo(new FyydPodcastSearcher(), 1.f));
searchProviders.add(new SearcherInfo(new GpodnetPodcastSearcher(), 0.0f));
}
return searchProviders;
@ -24,7 +25,8 @@ public class PodcastSearcherRegistry {
public static Single<String> lookupUrl(String url) {
for (PodcastSearcherRegistry.SearcherInfo searchProviderInfo : getSearchProviders()) {
if (searchProviderInfo.searcher.urlNeedsLookup(url)) {
if (searchProviderInfo.searcher.getClass() != CombinedSearcher.class
&& searchProviderInfo.searcher.urlNeedsLookup(url)) {
return searchProviderInfo.searcher.lookupUrl(url);
}
}
@ -33,7 +35,8 @@ public class PodcastSearcherRegistry {
public static boolean urlNeedsLookup(String url) {
for (PodcastSearcherRegistry.SearcherInfo searchProviderInfo : getSearchProviders()) {
if (searchProviderInfo.searcher.urlNeedsLookup(url)) {
if (searchProviderInfo.searcher.getClass() != CombinedSearcher.class
&& searchProviderInfo.searcher.urlNeedsLookup(url)) {
return true;
}
}
@ -41,8 +44,8 @@ public class PodcastSearcherRegistry {
}
public static class SearcherInfo {
final PodcastSearcher searcher;
final float weight;
public final PodcastSearcher searcher;
public final float weight;
public SearcherInfo(PodcastSearcher searcher, float weight) {
this.searcher = searcher;

14
app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
View File

@ -19,6 +19,9 @@ import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
import de.danoeh.antennapod.activity.OpmlImportActivity;
import de.danoeh.antennapod.discovery.CombinedSearcher;
import de.danoeh.antennapod.discovery.FyydPodcastSearcher;
import de.danoeh.antennapod.discovery.ItunesPodcastSearcher;
import de.danoeh.antennapod.fragment.gpodnet.GpodnetMainFragment;
/**
@ -40,9 +43,9 @@ public class AddFeedFragment extends Fragment {
((AppCompatActivity) getActivity()).setSupportActionBar(root.findViewById(R.id.toolbar));
root.findViewById(R.id.btn_search_itunes).setOnClickListener(v
-> activity.loadChildFragment(new ItunesSearchFragment()));
-> activity.loadChildFragment(OnlineSearchFragment.newInstance(ItunesPodcastSearcher.class)));
root.findViewById(R.id.btn_search_fyyd).setOnClickListener(v
-> activity.loadChildFragment(new FyydSearchFragment()));
-> activity.loadChildFragment(OnlineSearchFragment.newInstance(FyydPodcastSearcher.class)));
root.findViewById(R.id.btn_search_gpodder).setOnClickListener(v
-> activity.loadChildFragment(new GpodnetMainFragment()));
@ -99,12 +102,7 @@ public class AddFeedFragment extends Fragment {
addUrl(query);
return;
}
Bundle bundle = new Bundle();
bundle.putString(CombinedSearchFragment.ARGUMENT_QUERY, query);
CombinedSearchFragment fragment = new CombinedSearchFragment();
fragment.setArguments(bundle);
activity.loadChildFragment(fragment);
activity.loadChildFragment(OnlineSearchFragment.newInstance(CombinedSearcher.class, query));
}
@Override

173
app/src/main/java/de/danoeh/antennapod/fragment/CombinedSearchFragment.java
View File

@ -1,173 +0,0 @@
package de.danoeh.antennapod.fragment;
import android.content.Intent;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.core.view.MenuItemCompat;
import androidx.appcompat.widget.SearchView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.GridView;
import android.widget.ProgressBar;
import android.widget.TextView;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
import de.danoeh.antennapod.adapter.itunes.ItunesAdapter;
import de.danoeh.antennapod.discovery.CombinedSearcher;
import de.danoeh.antennapod.discovery.PodcastSearchResult;
import de.danoeh.antennapod.menuhandler.MenuItemUtils;
import io.reactivex.disposables.Disposable;
import java.util.ArrayList;
import java.util.List;
public class CombinedSearchFragment extends Fragment {
private static final String TAG = "CombinedSearchFragment";
public static final String ARGUMENT_QUERY = "query";
/**
* Adapter responsible with the search results
*/
private ItunesAdapter adapter;
private GridView gridView;
private ProgressBar progressBar;
private TextView txtvError;
private Button butRetry;
private TextView txtvEmpty;
/**
* List of podcasts retreived from the search
*/
private List<PodcastSearchResult> searchResults = new ArrayList<>();
private Disposable disposable;
/**
* Constructor
*/
public CombinedSearchFragment() {
// Required empty public constructor
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View root = inflater.inflate(R.layout.fragment_itunes_search, container, false);
((AppCompatActivity) getActivity()).setSupportActionBar(root.findViewById(R.id.toolbar));
gridView = root.findViewById(R.id.gridView);
adapter = new ItunesAdapter(getActivity(), new ArrayList<>());
gridView.setAdapter(adapter);
//Show information about the podcast when the list item is clicked
gridView.setOnItemClickListener((parent, view1, position, id) -> {
PodcastSearchResult podcast = searchResults.get(position);
Intent intent = new Intent(getActivity(), OnlineFeedViewActivity.class);
intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, podcast.feedUrl);
startActivity(intent);
});
progressBar = root.findViewById(R.id.progressBar);
txtvError = root.findViewById(R.id.txtvError);
butRetry = root.findViewById(R.id.butRetry);
txtvEmpty = root.findViewById(android.R.id.empty);
return root;
}
@Override
public void onDestroy() {
super.onDestroy();
if (disposable != null) {
disposable.dispose();
}
adapter = null;
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.itunes_search, menu);
MenuItem searchItem = menu.findItem(R.id.action_search);
final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
sv.setQueryHint(getString(R.string.search_label));
sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String s) {
sv.clearFocus();
search(s);
return true;
}
@Override
public boolean onQueryTextChange(String s) {
return false;
}
});
MenuItemCompat.setOnActionExpandListener(searchItem, new MenuItemCompat.OnActionExpandListener() {
@Override
public boolean onMenuItemActionExpand(MenuItem item) {
return true;
}
@Override
public boolean onMenuItemActionCollapse(MenuItem item) {
getActivity().getSupportFragmentManager().popBackStack();
return true;
}
});
MenuItemCompat.expandActionView(searchItem);
if (getArguments() != null && getArguments().getString(ARGUMENT_QUERY, null) != null) {
sv.setQuery(getArguments().getString(ARGUMENT_QUERY, null), true);
}
}
private void search(String query) {
if (disposable != null) {
disposable.dispose();
}
showOnlyProgressBar();
CombinedSearcher searcher = new CombinedSearcher(getContext());
disposable = searcher.search(query).subscribe(result -> {
searchResults = result;
progressBar.setVisibility(View.GONE);
adapter.clear();
adapter.addAll(searchResults);
adapter.notifyDataSetInvalidated();
gridView.setVisibility(!searchResults.isEmpty() ? View.VISIBLE : View.GONE);
txtvEmpty.setVisibility(searchResults.isEmpty() ? View.VISIBLE : View.GONE);
}, error -> {
Log.e(TAG, Log.getStackTraceString(error));
progressBar.setVisibility(View.GONE);
txtvError.setText(error.toString());
txtvError.setVisibility(View.VISIBLE);
butRetry.setOnClickListener(v -> search(query));
butRetry.setVisibility(View.VISIBLE);
});
}
private void showOnlyProgressBar() {
gridView.setVisibility(View.GONE);
txtvError.setVisibility(View.GONE);
butRetry.setVisibility(View.GONE);
txtvEmpty.setVisibility(View.GONE);
progressBar.setVisibility(View.VISIBLE);
}
}

123
app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java → app/src/main/java/de/danoeh/antennapod/fragment/DiscoveryFragment.java
View File

@ -2,45 +2,36 @@ package de.danoeh.antennapod.fragment;
import android.content.Intent;
import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.core.view.MenuItemCompat;
import androidx.appcompat.widget.SearchView;
import androidx.annotation.NonNull;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.GridView;
import android.widget.ProgressBar;
import android.widget.TextView;
import de.danoeh.antennapod.discovery.ItunesPodcastSearcher;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
import de.danoeh.antennapod.adapter.itunes.ItunesAdapter;
import de.danoeh.antennapod.discovery.ItunesTopListLoader;
import de.danoeh.antennapod.discovery.PodcastSearchResult;
import io.reactivex.disposables.Disposable;
import java.util.ArrayList;
import java.util.List;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
import de.danoeh.antennapod.adapter.itunes.ItunesAdapter;
import de.danoeh.antennapod.menuhandler.MenuItemUtils;
import io.reactivex.disposables.Disposable;
//Searches iTunes store for given string and displays results in a list
public class ItunesSearchFragment extends Fragment {
/**
* Searches iTunes store for top podcasts and displays results in a list.
*/
public class DiscoveryFragment extends Fragment {
private static final String TAG = "ItunesSearchFragment";
/**
* Adapter responsible with the search results
* Adapter responsible with the search results.
*/
private ItunesAdapter adapter;
private GridView gridView;
@ -50,7 +41,7 @@ public class ItunesSearchFragment extends Fragment {
private TextView txtvEmpty;
/**
* List of podcasts retreived from the search
* List of podcasts retreived from the search.
*/
private List<PodcastSearchResult> searchResults;
private List<PodcastSearchResult> topList;
@ -76,10 +67,7 @@ public class ItunesSearchFragment extends Fragment {
}
}
/**
* Constructor
*/
public ItunesSearchFragment() {
public DiscoveryFragment() {
// Required empty public constructor
}
@ -128,43 +116,6 @@ public class ItunesSearchFragment extends Fragment {
adapter = null;
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.itunes_search, menu);
MenuItem searchItem = menu.findItem(R.id.action_search);
final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
sv.setQueryHint(getString(R.string.search_itunes_label));
sv.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String s) {
sv.clearFocus();
search(s);
return true;
}
@Override
public boolean onQueryTextChange(String s) {
return false;
}
});
MenuItemCompat.setOnActionExpandListener(searchItem, new MenuItemCompat.OnActionExpandListener() {
@Override
public boolean onMenuItemActionExpand(MenuItem item) {
return true;
}
@Override
public boolean onMenuItemActionCollapse(MenuItem item) {
if (searchResults != null) {
searchResults = null;
updateData(topList);
}
return true;
}
});
}
private void loadToplist() {
if (disposable != null) {
disposable.dispose();
@ -176,43 +127,17 @@ public class ItunesSearchFragment extends Fragment {
progressBar.setVisibility(View.VISIBLE);
ItunesTopListLoader loader = new ItunesTopListLoader(getContext());
disposable = loader.loadToplist(25)
.subscribe(podcasts -> {
progressBar.setVisibility(View.GONE);
topList = podcasts;
updateData(topList);
}, error -> {
Log.e(TAG, Log.getStackTraceString(error));
progressBar.setVisibility(View.GONE);
txtvError.setText(error.toString());
txtvError.setVisibility(View.VISIBLE);
butRetry.setOnClickListener(v -> loadToplist());
butRetry.setVisibility(View.VISIBLE);
});
}
private void search(String query) {
if (disposable != null) {
disposable.dispose();
}
gridView.setVisibility(View.GONE);
txtvError.setVisibility(View.GONE);
butRetry.setVisibility(View.GONE);
txtvEmpty.setVisibility(View.GONE);
progressBar.setVisibility(View.VISIBLE);
ItunesPodcastSearcher searcher = new ItunesPodcastSearcher();
disposable = searcher.search(query).subscribe(podcasts -> {
disposable = loader.loadToplist(25).subscribe(podcasts -> {
progressBar.setVisibility(View.GONE);
updateData(podcasts);
topList = podcasts;
updateData(topList);
}, error -> {
Log.e(TAG, Log.getStackTraceString(error));
progressBar.setVisibility(View.GONE);
txtvError.setText(error.toString());
txtvError.setVisibility(View.VISIBLE);
butRetry.setOnClickListener(v -> search(query));
butRetry.setVisibility(View.VISIBLE);
});
Log.e(TAG, Log.getStackTraceString(error));
progressBar.setVisibility(View.GONE);
txtvError.setText(error.toString());
txtvError.setVisibility(View.VISIBLE);
butRetry.setOnClickListener(v -> loadToplist());
butRetry.setVisibility(View.VISIBLE);
});
}
}

72
app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java → app/src/main/java/de/danoeh/antennapod/fragment/OnlineSearchFragment.java
View File

@ -20,22 +20,25 @@ import android.widget.TextView;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
import de.danoeh.antennapod.adapter.itunes.ItunesAdapter;
import de.danoeh.antennapod.discovery.FyydPodcastSearcher;
import de.danoeh.antennapod.discovery.PodcastSearchResult;
import de.danoeh.antennapod.menuhandler.MenuItemUtils;
import de.danoeh.antennapod.discovery.PodcastSearcher;
import de.danoeh.antennapod.discovery.PodcastSearcherRegistry;
import io.reactivex.disposables.Disposable;
import java.util.ArrayList;
import java.util.List;
public class FyydSearchFragment extends Fragment {
public class OnlineSearchFragment extends Fragment {
private static final String TAG = "FyydSearchFragment";
private static final String ARG_SEARCHER = "searcher";
private static final String ARG_QUERY = "query";
/**
* Adapter responsible with the search results
*/
private ItunesAdapter adapter;
private PodcastSearcher searchProvider;
private GridView gridView;
private ProgressBar progressBar;
private TextView txtvError;
@ -48,10 +51,23 @@ public class FyydSearchFragment extends Fragment {
private List<PodcastSearchResult> searchResults;
private Disposable disposable;
public static OnlineSearchFragment newInstance(Class<? extends PodcastSearcher> searchProvider) {
return newInstance(searchProvider, null);
}
public static OnlineSearchFragment newInstance(Class<? extends PodcastSearcher> searchProvider, String query) {
OnlineSearchFragment fragment = new OnlineSearchFragment();
Bundle arguments = new Bundle();
arguments.putString(ARG_SEARCHER, searchProvider.getName());
arguments.putString(ARG_QUERY, query);
fragment.setArguments(arguments);
return fragment;
}
/**
* Constructor
*/
public FyydSearchFragment() {
public OnlineSearchFragment() {
// Required empty public constructor
}
@ -59,11 +75,20 @@ public class FyydSearchFragment extends Fragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
for (PodcastSearcherRegistry.SearcherInfo info : PodcastSearcherRegistry.getSearchProviders()) {
if (info.searcher.getClass().getName().equals(getArguments().getString(ARG_SEARCHER))) {
searchProvider = info.searcher;
break;
}
}
if (searchProvider == null) {
throw new IllegalArgumentException("Podcast searcher not found");
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
// Inflate the layout for this fragment
View root = inflater.inflate(R.layout.fragment_itunes_search, container, false);
((AppCompatActivity) getActivity()).setSupportActionBar(root.findViewById(R.id.toolbar));
@ -83,6 +108,7 @@ public class FyydSearchFragment extends Fragment {
butRetry = root.findViewById(R.id.butRetry);
txtvEmpty = root.findViewById(android.R.id.empty);
txtvEmpty.setText(getString(R.string.search_powered_by, searchProvider.getName()));
return root;
}
@ -98,10 +124,10 @@ public class FyydSearchFragment extends Fragment {
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.itunes_search, menu);
inflater.inflate(R.menu.online_search, menu);
MenuItem searchItem = menu.findItem(R.id.action_search);
final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
sv.setQueryHint(getString(R.string.search_fyyd_label));
sv.setQueryHint(getString(R.string.search_podcast_hint));
sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String s) {
@ -115,7 +141,7 @@ public class FyydSearchFragment extends Fragment {
return false;
}
});
MenuItemCompat.setOnActionExpandListener(searchItem, new MenuItemCompat.OnActionExpandListener() {
searchItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
@Override
public boolean onMenuItemActionExpand(MenuItem item) {
return true;
@ -127,7 +153,12 @@ public class FyydSearchFragment extends Fragment {
return true;
}
});
MenuItemCompat.expandActionView(searchItem);
searchItem.expandActionView();
if (getArguments().getString(ARG_QUERY, null) != null) {
sv.setQuery(getArguments().getString(ARG_QUERY, null), true);
}
}
private void search(String query) {
@ -135,26 +166,23 @@ public class FyydSearchFragment extends Fragment {
disposable.dispose();
}
showOnlyProgressBar();
FyydPodcastSearcher searcher = new FyydPodcastSearcher();
disposable = searcher.search(query).subscribe(result -> {
disposable = searchProvider.search(query).subscribe(result -> {
searchResults = result;
progressBar.setVisibility(View.GONE);
adapter.clear();
adapter.addAll(searchResults);
adapter.notifyDataSetInvalidated();
gridView.setVisibility(!searchResults.isEmpty() ? View.VISIBLE : View.GONE);
txtvEmpty.setVisibility(searchResults.isEmpty() ? View.VISIBLE : View.GONE);
txtvEmpty.setText(getString(R.string.no_results_for_query, query));
}, error -> {
Log.e(TAG, Log.getStackTraceString(error));
progressBar.setVisibility(View.GONE);
txtvError.setText(error.toString());
txtvError.setVisibility(View.VISIBLE);
butRetry.setOnClickListener(v -> search(query));
butRetry.setVisibility(View.VISIBLE);
});
Log.e(TAG, Log.getStackTraceString(error));
progressBar.setVisibility(View.GONE);
txtvError.setText(error.toString());
txtvError.setVisibility(View.VISIBLE);
butRetry.setOnClickListener(v -> search(query));
butRetry.setVisibility(View.VISIBLE);
});
}
private void showOnlyProgressBar() {

3
app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java
View File

@ -3,7 +3,6 @@ package de.danoeh.antennapod.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.util.DisplayMetrics;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater;
@ -41,7 +40,7 @@ public class QuickFeedDiscoveryFragment extends Fragment implements AdapterView.
View root = inflater.inflate(R.layout.quick_feed_discovery, container, false);
View discoverMore = root.findViewById(R.id.discover_more);
discoverMore.setOnClickListener(v ->
((MainActivity) getActivity()).loadChildFragment(new ItunesSearchFragment()));
((MainActivity) getActivity()).loadChildFragment(new DiscoveryFragment()));
discoverGridLayout = root.findViewById(R.id.discover_grid);
progressBar = root.findViewById(R.id.discover_progress_bar);

1
app/src/main/res/layout/fragment_itunes_search.xml
View File

@ -36,7 +36,6 @@
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:gravity="center"
android:visibility="gone"
android:text="@string/search_status_no_results" />
<ProgressBar

0
app/src/main/res/menu/itunes_search.xml → app/src/main/res/menu/online_search.xml
View File

1
core/src/main/res/values/strings.xml
View File

@ -699,6 +699,7 @@
<string name="browse_gpoddernet_label">Browse gpodder.net</string>
<string name="discover">Discover</string>
<string name="discover_more">more »</string>
<string name="search_powered_by">Search powered by %1$s</string>
<string name="filter">Filter</string>