diff options
Diffstat (limited to 'app/src')
13 files changed, 32 insertions, 97 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/AutoDownloadTest.java b/app/src/androidTest/java/de/test/antennapod/storage/AutoDownloadTest.java index 23c129cb1..7723d4941 100644 --- a/app/src/androidTest/java/de/test/antennapod/storage/AutoDownloadTest.java +++ b/app/src/androidTest/java/de/test/antennapod/storage/AutoDownloadTest.java @@ -99,8 +99,6 @@ public class AutoDownloadTest { FeedMedia media = item.getMedia(); new PlaybackServiceStarter(context, media) .callEvenIfRunning(true) - .startWhenPrepared(true) - .shouldStream(true) .start(); Awaitility.await("episode is playing") .atMost(2000, MILLISECONDS) 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 5ddb6407c..f790a5784 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java @@ -80,8 +80,6 @@ public class FeedItemlistDescriptionAdapter extends ArrayAdapter<FeedItem> { } new PlaybackServiceStarter(getContext(), playable) - .shouldStream(true) - .startWhenPrepared(true) .callEvenIfRunning(true) .start(); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java index 974b12bab..983ae3df9 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java @@ -41,8 +41,6 @@ public class PlayActionButton extends ItemActionButton { } new PlaybackServiceStarter(context, media) .callEvenIfRunning(true) - .startWhenPrepared(true) - .shouldStream(false) .start(); if (media.getMediaType() == MediaType.VIDEO) { diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java index ab2122b12..ce251f5a6 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java @@ -37,8 +37,6 @@ public class PlayLocalActionButton extends ItemActionButton { new PlaybackServiceStarter(context, media) .callEvenIfRunning(true) - .startWhenPrepared(true) - .shouldStream(true) .start(); if (media.getMediaType() == MediaType.VIDEO) { diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java index 94c446f50..2f5cb5430 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java @@ -47,8 +47,6 @@ public class StreamActionButton extends ItemActionButton { } new PlaybackServiceStarter(context, media) .callEvenIfRunning(true) - .startWhenPrepared(true) - .shouldStream(true) .start(); if (media.getMediaType() == MediaType.VIDEO) { diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java index 5cc1f99c6..841c121e9 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java @@ -10,24 +10,14 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import android.widget.Button; import android.widget.CheckBox; -import android.widget.TextView; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.event.playback.SpeedChangedEvent; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.util.playback.PlaybackController; -import de.danoeh.antennapod.view.PlaybackSpeedSeekBar; -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - import java.util.List; -import java.util.Locale; public class PlaybackControlsDialog extends DialogFragment { private PlaybackController controller; private AlertDialog dialog; - private PlaybackSpeedSeekBar speedSeekBar; - private TextView txtvPlaybackSpeed; public static PlaybackControlsDialog newInstance() { Bundle arguments = new Bundle(); @@ -48,12 +38,10 @@ public class PlaybackControlsDialog extends DialogFragment { public void loadMediaInfo() { setupUi(); setupAudioTracks(); - updateSpeed(new SpeedChangedEvent(getCurrentPlaybackSpeedMultiplier())); } }; controller.init(); setupUi(); - EventBus.getDefault().register(this); } @Override @@ -61,7 +49,6 @@ public class PlaybackControlsDialog extends DialogFragment { super.onStop(); controller.release(); controller = null; - EventBus.getDefault().unregister(this); } @NonNull @@ -75,15 +62,6 @@ public class PlaybackControlsDialog extends DialogFragment { } private void setupUi() { - txtvPlaybackSpeed = dialog.findViewById(R.id.txtvPlaybackSpeed); - speedSeekBar = dialog.findViewById(R.id.speed_seek_bar); - speedSeekBar.setProgressChangedListener(speed -> { - if (controller != null) { - controller.setPlaybackSpeed(speed); - } - }); - updateSpeed(new SpeedChangedEvent(controller.getCurrentPlaybackSpeedMultiplier())); - final CheckBox stereoToMono = dialog.findViewById(R.id.stereo_to_mono); stereoToMono.setChecked(UserPreferences.stereoToMono()); if (controller != null && !controller.canDownmix()) { @@ -111,12 +89,6 @@ public class PlaybackControlsDialog extends DialogFragment { }); } - @Subscribe(threadMode = ThreadMode.MAIN) - public void updateSpeed(SpeedChangedEvent event) { - txtvPlaybackSpeed.setText(String.format(Locale.getDefault(), "%.2fx", event.getNewSpeed())); - speedSeekBar.updateSpeed(event.getNewSpeed()); - } - private void setupAudioTracks() { List<String> audioTracks = controller.getAudioTracks(); int selectedAudioTrack = controller.getSelectedAudioTrack(); diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java index ad2ed3499..2c3c44b1d 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java @@ -148,32 +148,24 @@ public class ProxyDialog { } private void setProxyConfig() { - String type = (String) spType.getSelectedItem(); - ProxyConfig proxy; - if (Proxy.Type.valueOf(type) == Proxy.Type.DIRECT) { - proxy = ProxyConfig.direct(); - } else { - String host = etHost.getText().toString(); - String port = etPort.getText().toString(); - String username = etUsername.getText().toString(); - if (TextUtils.isEmpty(username)) { - username = null; - } - String password = etPassword.getText().toString(); - if (TextUtils.isEmpty(password)) { - password = null; - } - int portValue = 0; - if (!TextUtils.isEmpty(port)) { - portValue = Integer.parseInt(port); - } - if (Proxy.Type.valueOf(type) == Proxy.Type.SOCKS) { - proxy = ProxyConfig.socks(host, portValue, username, password); - } else { - proxy = ProxyConfig.http(host, portValue, username, password); - } + final String type = (String) spType.getSelectedItem(); + final Proxy.Type typeEnum = Proxy.Type.valueOf(type); + final String host = etHost.getText().toString(); + final String port = etPort.getText().toString(); + + String username = etUsername.getText().toString(); + if (TextUtils.isEmpty(username)) { + username = null; + } + String password = etPassword.getText().toString(); + if (TextUtils.isEmpty(password)) { + password = null; + } + int portValue = 0; + if (!TextUtils.isEmpty(port)) { + portValue = Integer.parseInt(port); } - UserPreferences.setProxyConfig(proxy); + UserPreferences.setProxyConfig(new ProxyConfig(typeEnum, host, portValue, username, password)); } private final TextWatcher requireTestOnChange = new TextWatcher() { diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/StreamingConfirmationDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/StreamingConfirmationDialog.java index 22f62d410..a38463c4a 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/StreamingConfirmationDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/StreamingConfirmationDialog.java @@ -32,8 +32,6 @@ public class StreamingConfirmationDialog { private void stream() { new PlaybackServiceStarter(context, playable) .callEvenIfRunning(true) - .startWhenPrepared(true) - .shouldStream(true) .shouldStreamThisTime(true) .start(); } 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 8bfcfd1ed..f76b902cd 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java @@ -119,13 +119,12 @@ public class QuickFeedDiscoveryFragment extends Fragment implements AdapterView. String countryCode = prefs.getString(ItunesTopListLoader.PREF_KEY_COUNTRY_CODE, Locale.getDefault().getCountry()); if (countryCode.equals(ItunesTopListLoader.DISCOVER_HIDE_FAKE_COUNTRY_CODE)) { - errorTextView.setText(String.format(getResources().getString(R.string.discover_is_hidden), - getResources().getString(R.string.discover_hide))); + errorTextView.setText(R.string.discover_is_hidden); errorView.setVisibility(View.VISIBLE); progressBar.setVisibility(View.GONE); - discoverGridLayout.setVisibility(View.INVISIBLE); - errorRetry.setVisibility(View.INVISIBLE); - poweredByTextView.setVisibility(View.INVISIBLE); + discoverGridLayout.setVisibility(View.GONE); + errorRetry.setVisibility(View.GONE); + poweredByTextView.setVisibility(View.GONE); return; } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java index a29fd0425..42b6580a2 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java @@ -57,6 +57,7 @@ import de.danoeh.antennapod.dialog.RemoveFeedDialog; import de.danoeh.antennapod.dialog.RenameItemDialog; import de.danoeh.antennapod.dialog.SubscriptionsFilterDialog; import de.danoeh.antennapod.fragment.actions.FeedMultiSelectActionHandler; +import de.danoeh.antennapod.fragment.preferences.StatisticsFragment; import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.view.EmptyViewHandler; import io.reactivex.Observable; @@ -229,6 +230,9 @@ public class SubscriptionFragment extends Fragment } else if (itemId == R.id.action_search) { ((MainActivity) getActivity()).loadChildFragment(SearchFragment.newInstance()); return true; + } else if (itemId == R.id.action_statistics) { + ((MainActivity) getActivity()).loadChildFragment(new StatisticsFragment()); + return true; } return false; } diff --git a/app/src/main/res/layout/audio_controls.xml b/app/src/main/res/layout/audio_controls.xml index 0bfa4f521..dc48006bb 100644 --- a/app/src/main/res/layout/audio_controls.xml +++ b/app/src/main/res/layout/audio_controls.xml @@ -19,31 +19,6 @@ android:visibility="gone" android:layout_marginBottom="8dp" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <TextView - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/playback_speed" - style="@style/AntennaPod.TextView.ListItemPrimaryTitle" /> - - <TextView - android:id="@+id/txtvPlaybackSpeed" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="1.00x" /> - - </LinearLayout> - - <de.danoeh.antennapod.view.PlaybackSpeedSeekBar - android:id="@+id/speed_seek_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/menu/subscriptions.xml b/app/src/main/res/menu/subscriptions.xml index 9276db562..fa63bf583 100644 --- a/app/src/main/res/menu/subscriptions.xml +++ b/app/src/main/res/menu/subscriptions.xml @@ -7,6 +7,11 @@ custom:showAsAction="always" android:title="@string/search_label"/> <item + android:id="@+id/action_statistics" + android:icon="@drawable/chart_box_outline" + android:title="@string/statistics_label" + custom:showAsAction="always" /> + <item android:id="@+id/refresh_item" android:title="@string/refresh_label" android:menuCategory="container" diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 7c5012899..91ba649d2 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -45,9 +45,9 @@ android:icon="@drawable/ic_notifications"/> <Preference + android:icon="@drawable/chart_box_outline" android:key="statistics" - android:title="@string/statistics_label" - android:icon="@drawable/ic_statistics" /> + android:title="@string/statistics_label" /> <PreferenceCategory android:key="project" |