diff options
Diffstat (limited to 'app')
32 files changed, 412 insertions, 568 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java index fd4e31074..a0d1c17d5 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java @@ -57,6 +57,7 @@ import de.danoeh.antennapod.core.util.URLChecker; import de.danoeh.antennapod.core.util.syndication.FeedDiscoverer; import de.danoeh.antennapod.core.util.syndication.HtmlToPlainText; import de.danoeh.antennapod.dialog.AuthenticationDialog; +import de.danoeh.antennapod.discovery.PodcastSearcherRegistry; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; @@ -84,7 +85,6 @@ public class OnlineFeedViewActivity extends AppCompatActivity { public static final String ARG_FEEDURL = "arg.feedurl"; // Optional argument: specify a title for the actionbar. - public static final String ARG_TITLE = "title"; private static final int RESULT_ERROR = 2; private static final String TAG = "OnlineFeedViewActivity"; private volatile List<Feed> feeds; @@ -127,11 +127,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity { if (feedUrl == null) { Log.e(TAG, "feedUrl is null."); - new AlertDialog.Builder(OnlineFeedViewActivity.this) - .setNeutralButton(android.R.string.ok, (dialog, which) -> finish()) - .setTitle(R.string.error_label) - .setMessage(R.string.null_value_podcast_error) - .show(); + showNoPodcastFoundError(); } else { Log.d(TAG, "Activity was started with url " + feedUrl); setLoadingLayout(); @@ -140,13 +136,26 @@ public class OnlineFeedViewActivity extends AppCompatActivity { feedUrl = feedUrl.replaceFirst("((www.)?(subscribeonandroid.com/))", ""); } if (savedInstanceState == null) { - startFeedDownload(feedUrl, null, null); + lookupUrlAndDownload(feedUrl, null, null); } else { - startFeedDownload(feedUrl, savedInstanceState.getString("username"), savedInstanceState.getString("password")); + lookupUrlAndDownload(feedUrl, savedInstanceState.getString("username"), + savedInstanceState.getString("password")); } } } + private void showNoPodcastFoundError() { + new AlertDialog.Builder(OnlineFeedViewActivity.this) + .setNeutralButton(android.R.string.ok, (dialog, which) -> finish()) + .setTitle(R.string.error_label) + .setMessage(R.string.null_value_podcast_error) + .setOnDismissListener(dialog1 -> { + setResult(RESULT_ERROR); + finish(); + }) + .show(); + } + /** * Displays a progress indicator. */ @@ -198,10 +207,9 @@ public class OnlineFeedViewActivity extends AppCompatActivity { } } - private void resetIntent(String url, String title) { + private void resetIntent(String url) { Intent intent = new Intent(); intent.putExtra(ARG_FEEDURL, url); - intent.putExtra(ARG_TITLE, title); setIntent(intent); } @@ -226,6 +234,17 @@ public class OnlineFeedViewActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + private void lookupUrlAndDownload(String url, String username, String password) { + download = PodcastSearcherRegistry.lookupUrl(url) + .subscribeOn(Schedulers.io()) + .observeOn(Schedulers.io()) + .subscribe(lookedUpUrl -> startFeedDownload(lookedUpUrl, username, password), + error -> { + showNoPodcastFoundError(); + Log.e(TAG, Log.getStackTraceString(error)); + }); + } + private void startFeedDownload(String url, String username, String password) { Log.d(TAG, "Starting feed download"); url = URLChecker.prepareURL(url); @@ -580,7 +599,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity { if (urls.size() == 1) { // Skip dialog and display the item directly - resetIntent(urls.get(0), titles.get(0)); + resetIntent(urls.get(0)); startFeedDownload(urls.get(0), null, null); return true; } @@ -589,7 +608,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity { DialogInterface.OnClickListener onClickListener = (dialog, which) -> { String selectedUrl = urls.get(which); dialog.dismiss(); - resetIntent(selectedUrl, titles.get(which)); + resetIntent(selectedUrl); FeedPreferences prefs = feed.getPreferences(); if(prefs != null) { startFeedDownload(selectedUrl, prefs.getUsername(), prefs.getPassword()); diff --git a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java index b31ab4d3d..d85235cf9 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java @@ -5,6 +5,7 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; +import android.widget.Toast; import androidx.annotation.Nullable; import androidx.core.graphics.drawable.DrawableCompat; import androidx.appcompat.app.AppCompatActivity; @@ -14,10 +15,11 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.storage.PodDBAdapter; import io.reactivex.Completable; import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; /** - * Shows the AntennaPod logo while waiting for the main activity to start + * Shows the AntennaPod logo while waiting for the main activity to start. */ public class SplashActivity extends AppCompatActivity { @Override @@ -40,13 +42,17 @@ public class SplashActivity extends AppCompatActivity { PodDBAdapter.getInstance().close(); subscriber.onComplete(); }) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(() -> { - Intent intent = new Intent(SplashActivity.this, MainActivity.class); - startActivity(intent); - overridePendingTransition(0, 0); - finish(); - }); + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(() -> { + Intent intent = new Intent(SplashActivity.this, MainActivity.class); + startActivity(intent); + overridePendingTransition(0, 0); + finish(); + }, error -> { + error.printStackTrace(); + Toast.makeText(this, error.getLocalizedMessage(), Toast.LENGTH_LONG).show(); + finish(); + }); } } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DataFolderAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DataFolderAdapter.java index e3ca5b5a5..64560df56 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DataFolderAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DataFolderAdapter.java @@ -2,23 +2,24 @@ package de.danoeh.antennapod.adapter; import android.app.Dialog; import android.content.Context; -import android.widget.ProgressBar; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; +import android.text.format.Formatter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ProgressBar; import android.widget.RadioButton; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; + import java.io.File; import java.util.ArrayList; import java.util.List; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.preferences.UserPreferences; -import de.danoeh.antennapod.core.util.Converter; import de.danoeh.antennapod.core.util.StorageUtils; import de.danoeh.antennapod.dialog.ChooseDataFolderDialog; @@ -48,8 +49,9 @@ public class DataFolderAdapter extends RecyclerView.Adapter<DataFolderAdapter.Vi @Override public void onBindViewHolder(@NonNull ViewHolder holder, int position) { StoragePath storagePath = entries.get(position); - String freeSpace = Converter.byteToString(storagePath.getAvailableSpace()); - String totalSpace = Converter.byteToString(storagePath.getTotalSpace()); + Context context = holder.root.getContext(); + String freeSpace = Formatter.formatShortFileSize(context, storagePath.getAvailableSpace()); + String totalSpace = Formatter.formatShortFileSize(context, storagePath.getTotalSpace()); holder.path.setText(storagePath.getShortPath()); holder.size.setText(String.format(freeSpaceString, freeSpace, totalSpace)); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadStatisticsListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadStatisticsListAdapter.java index c49d2f39d..721b720d1 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadStatisticsListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadStatisticsListAdapter.java @@ -1,14 +1,14 @@ package de.danoeh.antennapod.adapter; import android.content.Context; +import android.text.format.Formatter; + +import java.util.List; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.storage.StatisticsItem; -import de.danoeh.antennapod.core.util.Converter; import de.danoeh.antennapod.view.PieChartView; -import java.util.List; - /** * Adapter for the download statistics list. */ @@ -25,7 +25,7 @@ public class DownloadStatisticsListAdapter extends StatisticsListAdapter { @Override String getHeaderValue() { - return Converter.byteToString((long) pieChartData.getSum()); + return Formatter.formatShortFileSize(context, (long) pieChartData.getSum()); } @Override @@ -40,7 +40,7 @@ public class DownloadStatisticsListAdapter extends StatisticsListAdapter { @Override void onBindFeedViewHolder(StatisticsHolder holder, StatisticsItem item) { - holder.value.setText(Converter.byteToString(item.totalDownloadSize)); + holder.value.setText(Formatter.formatShortFileSize(context, item.totalDownloadSize)); } } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java index 3aaeec902..540cd054c 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java @@ -1,6 +1,7 @@ package de.danoeh.antennapod.adapter; import android.content.Context; +import android.text.format.Formatter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,7 +15,6 @@ import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.service.download.DownloadRequest; import de.danoeh.antennapod.core.service.download.DownloadStatus; import de.danoeh.antennapod.core.service.download.Downloader; -import de.danoeh.antennapod.core.util.Converter; import de.danoeh.antennapod.core.util.ThemeUtils; import de.danoeh.antennapod.view.CircularProgressBar; @@ -79,9 +79,9 @@ public class DownloadlistAdapter extends BaseAdapter { if (request.getSoFar() <= 0) { status += context.getString(R.string.download_pending); } else { - status += Converter.byteToString(request.getSoFar()); + status += Formatter.formatShortFileSize(context, request.getSoFar()); if (request.getSize() != DownloadStatus.SIZE_UNKNOWN) { - status += " / " + Converter.byteToString(request.getSize()); + status += " / " + Formatter.formatShortFileSize(context, request.getSize()); holder.secondaryActionProgress.setPercentage( 0.01f * Math.max(1, request.getProgressPercent()), request); } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java index 849bb3b64..9158d587b 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java @@ -8,6 +8,9 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.TextView; import de.danoeh.antennapod.R; +import de.danoeh.antennapod.core.feed.MediaType; +import de.danoeh.antennapod.core.preferences.PlaybackPreferences; +import de.danoeh.antennapod.core.util.IntentUtils; import de.danoeh.antennapod.core.util.NetworkUtils; import de.danoeh.antennapod.core.util.playback.RemoteMedia; import de.danoeh.antennapod.core.feed.FeedItem; @@ -67,16 +70,28 @@ public class FeedItemlistDescriptionAdapter extends ArrayAdapter<FeedItem> { return; } Playable playable = new RemoteMedia(item); + if (PlaybackPreferences.getCurrentlyPlayingMediaType() == RemoteMedia.PLAYABLE_TYPE_REMOTE_MEDIA) { + PlaybackPreferences.writeNoMediaPlaying(); + IntentUtils.sendLocalBroadcast(getContext(), PlaybackService.ACTION_SHUTDOWN_PLAYBACK_SERVICE); + holder.preview.setText(R.string.preview_episode); + return; + } + if (!NetworkUtils.isStreamingAllowed()) { new StreamingConfirmationDialog(getContext(), playable).show(); return; } + new PlaybackServiceStarter(getContext(), playable) .shouldStream(true) .startWhenPrepared(true) .callEvenIfRunning(true) .start(); - getContext().startActivity(PlaybackService.getPlayerActivityIntent(getContext(), playable)); + holder.preview.setText(R.string.stop_playback); + + if (playable.getMediaType() == MediaType.VIDEO) { + getContext().startActivity(PlaybackService.getPlayerActivityIntent(getContext(), playable)); + } }); convertView.setOnClickListener(v -> { if (holder.description.getTag() == Boolean.TRUE) { @@ -85,8 +100,14 @@ public class FeedItemlistDescriptionAdapter extends ArrayAdapter<FeedItem> { holder.description.setTag(Boolean.FALSE); } else { holder.description.setMaxLines(2000); - holder.preview.setVisibility(View.VISIBLE); holder.description.setTag(Boolean.TRUE); + + holder.preview.setVisibility(item.getMedia() != null ? View.VISIBLE : View.GONE); + if (PlaybackPreferences.getCurrentlyPlayingMediaType() == RemoteMedia.PLAYABLE_TYPE_REMOTE_MEDIA) { + holder.preview.setText(R.string.stop_playback); + } else { + holder.preview.setText(R.string.preview_episode); + } } }); return convertView; diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java index 6a16949cc..f491a8b29 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java @@ -317,7 +317,7 @@ public class NavListAdapter extends BaseAdapter LayoutInflater inflater = (LayoutInflater) context .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - convertView = inflater.inflate(R.layout.nav_feedlistitem, parent, false); + convertView = inflater.inflate(R.layout.nav_listitem, parent, false); holder.image = convertView.findViewById(R.id.imgvCover); holder.title = convertView.findViewById(R.id.txtvTitle); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java index f799a880e..970d2e535 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java @@ -1,6 +1,9 @@ package de.danoeh.antennapod.adapter; import android.content.Context; + +import androidx.core.text.TextUtilsCompat; +import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; @@ -87,6 +90,13 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI holder.feedTitle.setText(feed.getTitle()); holder.imageView.setContentDescription(feed.getTitle()); holder.feedTitle.setVisibility(View.VISIBLE); + + // Fix TriangleLabelView corner for RTL + if (TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) + == ViewCompat.LAYOUT_DIRECTION_RTL) { + holder.count.setCorner(TriangleLabelView.Corner.TOP_LEFT); + } + int count = itemAccess.getFeedCounter(feed.getId()); if(count > 0) { holder.count.setPrimaryText(String.format(Locale.getDefault(), "%d", diff --git a/app/src/main/java/de/danoeh/antennapod/discovery/CombinedSearcher.java b/app/src/main/java/de/danoeh/antennapod/discovery/CombinedSearcher.java index e34d8539c..6c2a87c12 100644 --- a/app/src/main/java/de/danoeh/antennapod/discovery/CombinedSearcher.java +++ b/app/src/main/java/de/danoeh/antennapod/discovery/CombinedSearcher.java @@ -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,25 +18,22 @@ import java.util.concurrent.CountDownLatch; public class CombinedSearcher implements PodcastSearcher { private static final String TAG = "CombinedSearcher"; - private final List<Pair<PodcastSearcher, Float>> searchProviders = new ArrayList<>(); - - public CombinedSearcher(Context context) { - addProvider(new FyydPodcastSearcher(), 1.f); - addProvider(new ItunesPodcastSearcher(context), 1.f); - //addProvider(new GpodnetPodcastSearcher(), 0.6f); - } - - private void addProvider(PodcastSearcher provider, float priority) { - searchProviders.add(new Pair<>(provider, priority)); + public CombinedSearcher() { } public Single<List<PodcastSearchResult>> search(String query) { ArrayList<Disposable> disposables = new ArrayList<>(); - List<List<PodcastSearchResult>> singleResults = new ArrayList<>(Collections.nCopies(searchProviders.size(), null)); - CountDownLatch latch = new CountDownLatch(searchProviders.size()); - for (int i = 0; i < searchProviders.size(); i++) { - Pair<PodcastSearcher, Float> searchProviderInfo = searchProviders.get(i); - PodcastSearcher searcher = searchProviderInfo.first; + List<List<PodcastSearchResult>> singleResults = new ArrayList<>( + Collections.nCopies(PodcastSearcherRegistry.getSearchProviders().size(), null)); + CountDownLatch latch = new CountDownLatch(PodcastSearcherRegistry.getSearchProviders().size()); + 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) { + latch.countDown(); + continue; + } final int index = i; disposables.add(searcher.search(query).subscribe(e -> { singleResults.set(index, e); @@ -56,7 +52,9 @@ public class CombinedSearcher implements PodcastSearcher { }) .doOnDispose(() -> { for (Disposable disposable : disposables) { - disposable.dispose(); + if (disposable != null) { + disposable.dispose(); + } } }) .subscribeOn(Schedulers.io()) @@ -67,7 +65,7 @@ public class CombinedSearcher implements PodcastSearcher { HashMap<String, Float> resultRanking = new HashMap<>(); HashMap<String, PodcastSearchResult> urlToResult = new HashMap<>(); for (int i = 0; i < singleResults.size(); i++) { - float providerPriority = searchProviders.get(i).second; + float providerPriority = PodcastSearcherRegistry.getSearchProviders().get(i).weight; List<PodcastSearchResult> providerResults = singleResults.get(i); if (providerResults == null) { continue; @@ -93,4 +91,28 @@ public class CombinedSearcher implements PodcastSearcher { } return results; } + + @Override + public Single<String> lookupUrl(String url) { + return PodcastSearcherRegistry.lookupUrl(url); + } + + @Override + 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); + } } diff --git a/app/src/main/java/de/danoeh/antennapod/discovery/FyydPodcastSearcher.java b/app/src/main/java/de/danoeh/antennapod/discovery/FyydPodcastSearcher.java index 529a9e3d5..5a93e6530 100644 --- a/app/src/main/java/de/danoeh/antennapod/discovery/FyydPodcastSearcher.java +++ b/app/src/main/java/de/danoeh/antennapod/discovery/FyydPodcastSearcher.java @@ -35,4 +35,19 @@ public class FyydPodcastSearcher implements PodcastSearcher { .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } + + @Override + public Single<String> lookupUrl(String url) { + return Single.just(url); + } + + @Override + public boolean urlNeedsLookup(String url) { + return false; + } + + @Override + public String getName() { + return "Fyyd"; + } } diff --git a/app/src/main/java/de/danoeh/antennapod/discovery/GpodnetPodcastSearcher.java b/app/src/main/java/de/danoeh/antennapod/discovery/GpodnetPodcastSearcher.java index 4fbac19ff..53237579f 100644 --- a/app/src/main/java/de/danoeh/antennapod/discovery/GpodnetPodcastSearcher.java +++ b/app/src/main/java/de/danoeh/antennapod/discovery/GpodnetPodcastSearcher.java @@ -33,4 +33,19 @@ public class GpodnetPodcastSearcher implements PodcastSearcher { .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } + + @Override + public Single<String> lookupUrl(String url) { + return Single.just(url); + } + + @Override + public boolean urlNeedsLookup(String url) { + return false; + } + + @Override + public String getName() { + return "Gpodder.net"; + } } diff --git a/app/src/main/java/de/danoeh/antennapod/discovery/ItunesPodcastSearcher.java b/app/src/main/java/de/danoeh/antennapod/discovery/ItunesPodcastSearcher.java index 620b30177..796ec556f 100644 --- a/app/src/main/java/de/danoeh/antennapod/discovery/ItunesPodcastSearcher.java +++ b/app/src/main/java/de/danoeh/antennapod/discovery/ItunesPodcastSearcher.java @@ -2,7 +2,6 @@ package de.danoeh.antennapod.discovery; import android.content.Context; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.ClientConfig; import de.danoeh.antennapod.core.service.download.AntennapodHttpClient; import io.reactivex.Single; import io.reactivex.SingleOnSubscribe; @@ -23,12 +22,11 @@ import java.util.List; public class ItunesPodcastSearcher implements PodcastSearcher { private static final String ITUNES_API_URL = "https://itunes.apple.com/search?media=podcast&term=%s"; - private final Context context; - public ItunesPodcastSearcher(Context context) { - this.context = context; + public ItunesPodcastSearcher() { } + @Override public Single<List<PodcastSearchResult>> search(String query) { return Single.create((SingleOnSubscribe<List<PodcastSearchResult>>) subscriber -> { String encodedQuery; @@ -56,11 +54,12 @@ public class ItunesPodcastSearcher implements PodcastSearcher { for (int i = 0; i < j.length(); i++) { JSONObject podcastJson = j.getJSONObject(i); PodcastSearchResult podcast = PodcastSearchResult.fromItunes(podcastJson); - podcasts.add(podcast); + if (podcast.feedUrl != null) { + podcasts.add(podcast); + } } } else { - String prefix = context.getString(R.string.error_msg_prefix); - subscriber.onError(new IOException(prefix + response)); + subscriber.onError(new IOException(response.toString())); } } catch (IOException | JSONException e) { subscriber.onError(e); @@ -70,4 +69,36 @@ public class ItunesPodcastSearcher implements PodcastSearcher { .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } + + @Override + public Single<String> lookupUrl(String url) { + return Single.create(emitter -> { + OkHttpClient client = AntennapodHttpClient.getHttpClient(); + Request.Builder httpReq = new Request.Builder().url(url); + try { + Response response = client.newCall(httpReq.build()).execute(); + if (response.isSuccessful()) { + String resultString = response.body().string(); + JSONObject result = new JSONObject(resultString); + JSONObject results = result.getJSONArray("results").getJSONObject(0); + String feedUrl = results.getString("feedUrl"); + emitter.onSuccess(feedUrl); + } else { + emitter.onError(new IOException(response.toString())); + } + } catch (IOException | JSONException e) { + emitter.onError(e); + } + }); + } + + @Override + public boolean urlNeedsLookup(String url) { + return url.contains("itunes.apple.com"); + } + + @Override + public String getName() { + return "iTunes"; + } } diff --git a/app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java b/app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java index 226b18204..e93a89ef0 100644 --- a/app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java +++ b/app/src/main/java/de/danoeh/antennapod/discovery/ItunesTopListLoader.java @@ -4,7 +4,6 @@ import android.content.Context; import android.util.Log; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.ClientConfig; import de.danoeh.antennapod.core.service.download.AntennapodHttpClient; import io.reactivex.Single; import io.reactivex.SingleOnSubscribe; @@ -49,35 +48,6 @@ public class ItunesTopListLoader { .observeOn(AndroidSchedulers.mainThread()); } - public Single<String> getFeedUrl(PodcastSearchResult podcast) { - if (!podcast.feedUrl.contains("itunes.apple.com")) { - return Single.just(podcast.feedUrl) - .observeOn(AndroidSchedulers.mainThread()); - } - return Single.create((SingleOnSubscribe<String>) emitter -> { - OkHttpClient client = AntennapodHttpClient.getHttpClient(); - Request.Builder httpReq = new Request.Builder() - .url(podcast.feedUrl); - try { - Response response = client.newCall(httpReq.build()).execute(); - if (response.isSuccessful()) { - String resultString = response.body().string(); - JSONObject result = new JSONObject(resultString); - JSONObject results = result.getJSONArray("results").getJSONObject(0); - String feedUrl = results.getString("feedUrl"); - emitter.onSuccess(feedUrl); - } else { - String prefix = context.getString(R.string.error_msg_prefix); - emitter.onError(new IOException(prefix + response)); - } - } catch (IOException | JSONException e) { - emitter.onError(e); - } - }) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - private String getTopListFeed(OkHttpClient client, String country, int limit) throws IOException { String url = "https://itunes.apple.com/%s/rss/toppodcasts/limit=" + limit + "/explicit=true/json"; Log.d(TAG, "Feed URL " + String.format(url, country)); diff --git a/app/src/main/java/de/danoeh/antennapod/discovery/PodcastSearcher.java b/app/src/main/java/de/danoeh/antennapod/discovery/PodcastSearcher.java index b19d7d695..eeebd2ebf 100644 --- a/app/src/main/java/de/danoeh/antennapod/discovery/PodcastSearcher.java +++ b/app/src/main/java/de/danoeh/antennapod/discovery/PodcastSearcher.java @@ -7,4 +7,10 @@ import java.util.List; public interface PodcastSearcher { Single<List<PodcastSearchResult>> search(String query); + + Single<String> lookupUrl(String resultUrl); + + boolean urlNeedsLookup(String resultUrl); + + String getName(); } diff --git a/app/src/main/java/de/danoeh/antennapod/discovery/PodcastSearcherRegistry.java b/app/src/main/java/de/danoeh/antennapod/discovery/PodcastSearcherRegistry.java new file mode 100644 index 000000000..3f738424b --- /dev/null +++ b/app/src/main/java/de/danoeh/antennapod/discovery/PodcastSearcherRegistry.java @@ -0,0 +1,55 @@ +package de.danoeh.antennapod.discovery; + + +import io.reactivex.Single; + +import java.util.ArrayList; +import java.util.List; + +public class PodcastSearcherRegistry { + private static List<SearcherInfo> searchProviders; + + private PodcastSearcherRegistry() { + } + + public static List<SearcherInfo> getSearchProviders() { + if (searchProviders == null) { + searchProviders = new ArrayList<>(); + 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; + } + + public static Single<String> lookupUrl(String url) { + for (PodcastSearcherRegistry.SearcherInfo searchProviderInfo : getSearchProviders()) { + if (searchProviderInfo.searcher.getClass() != CombinedSearcher.class + && searchProviderInfo.searcher.urlNeedsLookup(url)) { + return searchProviderInfo.searcher.lookupUrl(url); + } + } + return Single.just(url); + } + + public static boolean urlNeedsLookup(String url) { + for (PodcastSearcherRegistry.SearcherInfo searchProviderInfo : getSearchProviders()) { + if (searchProviderInfo.searcher.getClass() != CombinedSearcher.class + && searchProviderInfo.searcher.urlNeedsLookup(url)) { + return true; + } + } + return false; + } + + public static class SearcherInfo { + public final PodcastSearcher searcher; + public final float weight; + + public SearcherInfo(PodcastSearcher searcher, float weight) { + this.searcher = searcher; + this.weight = weight; + } + } +} diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java index 2d2244a85..046a39355 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java @@ -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())); @@ -89,7 +92,6 @@ public class AddFeedFragment extends Fragment { private void addUrl(String url) { Intent intent = new Intent(getActivity(), OnlineFeedViewActivity.class); intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, url); - intent.putExtra(OnlineFeedViewActivity.ARG_TITLE, getString(R.string.add_feed_label)); startActivity(intent); } @@ -100,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 diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CombinedSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DiscoveryFragment.java index 256438c2b..89d3c7af9 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/CombinedSearchFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/DiscoveryFragment.java @@ -2,39 +2,36 @@ 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 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.CombinedSearcher; +import de.danoeh.antennapod.discovery.ItunesTopListLoader; 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 { +/** + * Searches iTunes store for top podcasts and displays results in a list. + */ +public class DiscoveryFragment extends Fragment { - private static final String TAG = "CombinedSearchFragment"; - public static final String ARGUMENT_QUERY = "query"; + private static final String TAG = "ItunesSearchFragment"; /** - * Adapter responsible with the search results + * Adapter responsible with the search results. */ private ItunesAdapter adapter; private GridView gridView; @@ -44,15 +41,33 @@ public class CombinedSearchFragment extends Fragment { private TextView txtvEmpty; /** - * List of podcasts retreived from the search + * List of podcasts retreived from the search. */ - private List<PodcastSearchResult> searchResults = new ArrayList<>(); + private List<PodcastSearchResult> searchResults; + private List<PodcastSearchResult> topList; private Disposable disposable; /** - * Constructor + * Replace adapter data with provided search results from SearchTask. + * @param result List of Podcast objects containing search results */ - public CombinedSearchFragment() { + private void updateData(List<PodcastSearchResult> result) { + this.searchResults = result; + adapter.clear(); + if (result != null && result.size() > 0) { + gridView.setVisibility(View.VISIBLE); + txtvEmpty.setVisibility(View.GONE); + for (PodcastSearchResult p : result) { + adapter.add(p); + } + adapter.notifyDataSetInvalidated(); + } else { + gridView.setVisibility(View.GONE); + txtvEmpty.setVisibility(View.VISIBLE); + } + } + + public DiscoveryFragment() { // Required empty public constructor } @@ -63,7 +78,7 @@ public class CombinedSearchFragment extends Fragment { } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment View root = inflater.inflate(R.layout.fragment_itunes_search, container, false); @@ -75,9 +90,11 @@ public class CombinedSearchFragment extends Fragment { //Show information about the podcast when the list item is clicked gridView.setOnItemClickListener((parent, view1, position, id) -> { PodcastSearchResult podcast = searchResults.get(position); + if (podcast.feedUrl == null) { + return; + } Intent intent = new Intent(getActivity(), OnlineFeedViewActivity.class); intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, podcast.feedUrl); - intent.putExtra(OnlineFeedViewActivity.ARG_TITLE, podcast.title); startActivity(intent); }); progressBar = root.findViewById(R.id.progressBar); @@ -85,6 +102,8 @@ public class CombinedSearchFragment extends Fragment { butRetry = root.findViewById(R.id.butRetry); txtvEmpty = root.findViewById(android.R.id.empty); + loadToplist(); + return root; } @@ -97,78 +116,28 @@ public class CombinedSearchFragment 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_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) { + private void loadToplist() { 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); - 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 -> { + 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 -> search(query)); + butRetry.setOnClickListener(v -> loadToplist()); 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); - } } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java deleted file mode 100644 index 0e3caf2fe..000000000 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java +++ /dev/null @@ -1,236 +0,0 @@ -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 de.danoeh.antennapod.discovery.ItunesTopListLoader; -import de.danoeh.antennapod.discovery.PodcastSearchResult; - -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 { - - private static final String TAG = "ItunesSearchFragment"; - - - /** - * 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; - private List<PodcastSearchResult> topList; - private Disposable disposable; - - /** - * Replace adapter data with provided search results from SearchTask. - * @param result List of Podcast objects containing search results - */ - private void updateData(List<PodcastSearchResult> result) { - this.searchResults = result; - adapter.clear(); - if (result != null && result.size() > 0) { - gridView.setVisibility(View.VISIBLE); - txtvEmpty.setVisibility(View.GONE); - for (PodcastSearchResult p : result) { - adapter.add(p); - } - adapter.notifyDataSetInvalidated(); - } else { - gridView.setVisibility(View.GONE); - txtvEmpty.setVisibility(View.VISIBLE); - } - } - - /** - * Constructor - */ - public ItunesSearchFragment() { - // Required empty public constructor - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setHasOptionsMenu(true); - } - - @Override - public View onCreateView(@NonNull 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); - if (podcast.feedUrl == null) { - return; - } - gridView.setVisibility(View.GONE); - progressBar.setVisibility(View.VISIBLE); - ItunesTopListLoader loader = new ItunesTopListLoader(getContext()); - disposable = loader.getFeedUrl(podcast) - .subscribe(feedUrl -> { - progressBar.setVisibility(View.GONE); - gridView.setVisibility(View.VISIBLE); - Intent intent = new Intent(getActivity(), OnlineFeedViewActivity.class); - intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, feedUrl); - intent.putExtra(OnlineFeedViewActivity.ARG_TITLE, "iTunes"); - startActivity(intent); - }, error -> { - Log.e(TAG, Log.getStackTraceString(error)); - progressBar.setVisibility(View.GONE); - gridView.setVisibility(View.VISIBLE); - String prefix = getString(R.string.error_msg_prefix); - new AlertDialog.Builder(getActivity()) - .setMessage(prefix + " " + error.getMessage()) - .setPositiveButton(android.R.string.ok, null) - .show(); - }); - }); - 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); - - loadToplist(); - - 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_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(); - } - gridView.setVisibility(View.GONE); - txtvError.setVisibility(View.GONE); - butRetry.setVisibility(View.GONE); - txtvEmpty.setVisibility(View.GONE); - 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(getContext()); - disposable = searcher.search(query).subscribe(podcasts -> { - progressBar.setVisibility(View.GONE); - updateData(podcasts); - }, 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); - }); - } - -} diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/OnlineSearchFragment.java index 547bd6b24..d9c31f993 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/OnlineSearchFragment.java @@ -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)); @@ -76,7 +101,6 @@ public class FyydSearchFragment extends Fragment { PodcastSearchResult podcast = searchResults.get(position); Intent intent = new Intent(getActivity(), OnlineFeedViewActivity.class); intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, podcast.feedUrl); - intent.putExtra(OnlineFeedViewActivity.ARG_TITLE, podcast.title); startActivity(intent); }); progressBar = root.findViewById(R.id.progressBar); @@ -84,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; } @@ -99,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) { @@ -116,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; @@ -128,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) { @@ -136,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() { diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java index d8d0f41c5..d6bcdd79c 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java @@ -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); @@ -106,23 +105,8 @@ public class QuickFeedDiscoveryFragment extends Fragment implements AdapterView. if (podcast.feedUrl == null) { return; } - view.setAlpha(0.5f); - ItunesTopListLoader loader = new ItunesTopListLoader(getContext()); - disposable = loader.getFeedUrl(podcast) - .subscribe(feedUrl -> { - view.setAlpha(1f); - Intent intent = new Intent(getActivity(), OnlineFeedViewActivity.class); - intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, feedUrl); - intent.putExtra(OnlineFeedViewActivity.ARG_TITLE, getString(R.string.add_feed_label)); - startActivity(intent); - }, error -> { - Log.e(TAG, Log.getStackTraceString(error)); - view.setAlpha(1f); - String prefix = getString(R.string.error_msg_prefix); - new AlertDialog.Builder(getActivity()) - .setMessage(prefix + " " + error.getMessage()) - .setPositiveButton(android.R.string.ok, null) - .show(); - }); + Intent intent = new Intent(getActivity(), OnlineFeedViewActivity.class); + intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, podcast.feedUrl); + startActivity(intent); } } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java index 87378ae6c..e1c85a2d3 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java @@ -104,7 +104,6 @@ public abstract class PodcastListFragment extends Fragment { Log.d(TAG, "Selected podcast: " + selection.toString()); Intent intent = new Intent(getActivity(), OnlineFeedViewActivity.class); intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, selection.getUrl()); - intent.putExtra(OnlineFeedViewActivity.ARG_TITLE, getString(R.string.gpodnet_main_label)); startActivity(intent); } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java index ff5326bfb..fcc37f644 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java @@ -148,7 +148,7 @@ public class NetworkPreferencesFragment extends PreferenceFragmentCompat { timePickerDialog.show(); }); builder.setNeutralButton(R.string.pref_autoUpdateIntervallOrTime_Disable, (dialog, which) -> { - UserPreferences.disableAutoUpdate(); + UserPreferences.disableAutoUpdate(context); setUpdateIntervalText(); }); builder.show(); diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java index e791efe98..dbfa2f4ca 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java @@ -24,7 +24,7 @@ public class PreferenceUpgrader { int newVersion = BuildConfig.VERSION_CODE; if (oldVersion != newVersion) { - AutoUpdateManager.restartUpdateAlarm(); + AutoUpdateManager.restartUpdateAlarm(context); upgrade(oldVersion); upgraderPrefs.edit().putInt(PREF_CONFIGURED_VERSION, newVersion).apply(); diff --git a/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java b/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java index 506f0f695..7b80c3850 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java +++ b/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java @@ -2,6 +2,7 @@ package de.danoeh.antennapod.view.viewholder; import android.os.Build; import android.text.Layout; +import android.text.format.Formatter; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -9,9 +10,12 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; + import androidx.cardview.widget.CardView; import androidx.recyclerview.widget.RecyclerView; + import com.joanzapata.iconify.Iconify; + import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.adapter.CoverLoader; @@ -153,14 +157,14 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder { } if (media.getSize() > 0) { - size.setText(Converter.byteToString(media.getSize())); + size.setText(Formatter.formatShortFileSize(activity, media.getSize())); } else if (NetworkUtils.isEpisodeHeadDownloadAllowed() && !media.checkedOnSizeButUnknown()) { size.setText("{fa-spinner}"); Iconify.addIcons(size); NetworkUtils.getFeedMediaSizeObservable(media).subscribe( sizeValue -> { if (sizeValue > 0) { - size.setText(Converter.byteToString(sizeValue)); + size.setText(Formatter.formatShortFileSize(activity, sizeValue)); } else { size.setText(""); } diff --git a/app/src/main/res/layout/directory_chooser.xml b/app/src/main/res/layout/directory_chooser.xml index 5b9269607..fbe5a3d19 100644 --- a/app/src/main/res/layout/directory_chooser.xml +++ b/app/src/main/res/layout/directory_chooser.xml @@ -109,7 +109,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_below="@id/butNavUp" - android:background="@color/holo_blue_light" /> + android:background="?android:attr/dividerHorizontal" /> </RelativeLayout> <ListView diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml index e68232663..62ce30788 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/app/src/main/res/layout/feeditemlist_item.xml @@ -9,8 +9,10 @@ android:orientation="horizontal" android:gravity="center_vertical" android:baselineAligned="false" + android:paddingStart="12dp" android:paddingLeft="12dp" - android:paddingStart="12dp"> + android:paddingEnd="0dp" + android:paddingRight="0dp"> <LinearLayout android:layout_width="wrap_content" @@ -23,6 +25,8 @@ android:contentDescription="@string/drag_handle_content_description" android:scaleType="fitCenter" android:src="?attr/dragview_background" + android:paddingStart="0dp" + android:paddingLeft="0dp" android:paddingEnd="4dp" android:paddingRight="4dp" tools:src="@drawable/ic_drag_darktheme" diff --git a/app/src/main/res/layout/fragment_itunes_search.xml b/app/src/main/res/layout/fragment_itunes_search.xml index 0de57f62b..228bfb803 100644 --- a/app/src/main/res/layout/fragment_itunes_search.xml +++ b/app/src/main/res/layout/fragment_itunes_search.xml @@ -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 diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml deleted file mode 100644 index 52833b3cd..000000000 --- a/app/src/main/res/layout/nav_feedlistitem.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="@dimen/listitem_iconwithtext_height" - android:paddingLeft="@dimen/listitem_icon_leftpadding" - android:paddingStart="@dimen/listitem_icon_leftpadding" - android:paddingRight="@dimen/listitem_icon_rightpadding" - android:paddingEnd="@dimen/listitem_icon_rightpadding" - tools:background="@android:color/darker_gray" - android:foreground="?attr/selectableItemBackground"> - - <ImageView - android:id="@+id/imgvCover" - android:contentDescription="@string/cover_label" - android:layout_width="@dimen/thumbnail_length_navlist" - android:layout_height="@dimen/thumbnail_length_navlist" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_centerVertical="true" - android:adjustViewBounds="true" - android:cropToPadding="true" - android:scaleType="centerCrop" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp" - tools:src="@drawable/ic_antenna" - tools:background="@android:color/holo_green_dark"/> - - <TextView - android:id="@+id/txtvCount" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/list_vertical_padding" - android:layout_marginStart="@dimen/list_vertical_padding" - android:lines="1" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_navdrawer" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:layout_centerVertical="true" - tools:text="23" - tools:background="@android:color/holo_green_dark"/> - - <com.joanzapata.iconify.widget.IconTextView - android:id="@+id/itxtvFailure" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/txtvCount" - android:layout_toStartOf="@id/txtvCount" - android:layout_marginLeft="@dimen/list_vertical_padding" - android:layout_marginStart="@dimen/list_vertical_padding" - android:layout_alignWithParentIfMissing="true" - android:lines="1" - android:text="{fa-exclamation-circle}" - android:textColor="@color/download_failed_red" - android:textSize="@dimen/text_size_navdrawer" - android:layout_centerVertical="true" - tools:text="!" - tools:background="@android:color/holo_green_dark"/> - - <TextView - android:id="@+id/txtvTitle" - android:lines="1" - android:ellipsize="end" - android:singleLine="true" - android:layout_centerVertical="true" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_navdrawer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding" - android:layout_marginStart="@dimen/listitem_iconwithtext_textleftpadding" - android:layout_toRightOf="@id/imgvCover" - android:layout_toEndOf="@id/imgvCover" - android:layout_toLeftOf="@id/itxtvFailure" - android:layout_toStartOf="@id/itxtvFailure" - android:layout_alignWithParentIfMissing="true" - tools:text="Navigation feed item title" - tools:background="@android:color/holo_green_dark"/> - -</RelativeLayout> diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml index 87f07793c..f03ebc09f 100644 --- a/app/src/main/res/layout/nav_listitem.xml +++ b/app/src/main/res/layout/nav_listitem.xml @@ -18,7 +18,6 @@ android:adjustViewBounds="true" android:cropToPadding="true" android:scaleType="centerInside" - android:padding="4dp" android:layout_marginLeft="@dimen/listitem_icon_leftpadding" android:layout_marginStart="@dimen/listitem_icon_leftpadding" android:layout_marginTop="4dp" @@ -44,13 +43,31 @@ android:layout_toEndOf="@id/imgvCover" tools:text="Navigation item title" /> + <com.joanzapata.iconify.widget.IconTextView + android:id="@+id/itxtvFailure" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/txtvCount" + android:layout_toStartOf="@id/txtvCount" + android:layout_marginLeft="@dimen/list_vertical_padding" + android:layout_marginStart="@dimen/list_vertical_padding" + android:layout_alignWithParentIfMissing="true" + android:lines="1" + android:text="{fa-exclamation-circle}" + android:textColor="@color/download_failed_red" + android:textSize="@dimen/text_size_navdrawer" + android:layout_centerVertical="true" + android:visibility="gone" + tools:text="!" + tools:background="@android:color/holo_green_dark"/> + <TextView android:id="@+id/txtvCount" android:layout_width="wrap_content" android:layout_height="wrap_content" android:lines="1" android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_navdrawer" + android:textSize="14sp" android:layout_marginLeft="12dp" android:layout_marginStart="12dp" android:layout_marginRight="@dimen/listitem_icon_rightpadding" diff --git a/app/src/main/res/layout/subscription_item.xml b/app/src/main/res/layout/subscription_item.xml index 177608a54..43c3d99fa 100644 --- a/app/src/main/res/layout/subscription_item.xml +++ b/app/src/main/res/layout/subscription_item.xml @@ -37,7 +37,7 @@ android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:layout_alignParentTop="true" - app:backgroundColor="@color/antennapod_blue" + app:backgroundColor="?attr/colorAccent" app:corner="rightTop" app:primaryText="Test" app:primaryTextColor="@color/white" diff --git a/app/src/main/res/layout/vertical_list_divider.xml b/app/src/main/res/layout/vertical_list_divider.xml deleted file mode 100644 index 61739cbcd..000000000 --- a/app/src/main/res/layout/vertical_list_divider.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<View xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="1dp" - android:layout_height="match_parent" - android:layout_marginBottom="16dp" - android:layout_marginTop="16dp" - android:background="?android:attr/listDivider" - tools:background="@android:color/holo_red_dark" /> diff --git a/app/src/main/res/menu/itunes_search.xml b/app/src/main/res/menu/online_search.xml index 93d93157a..93d93157a 100644 --- a/app/src/main/res/menu/itunes_search.xml +++ b/app/src/main/res/menu/online_search.xml |