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

Show pause button for currently streamed episode

This commit is contained in:
ByteHamster 2020-02-28 14:04:08 +01:00
parent 37528452ca
commit 7adfbcf003
3 changed files with 51 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java
View File

@ -41,7 +41,9 @@ public abstract class ItemActionButton {
} }
final boolean isDownloadingMedia = DownloadRequester.getInstance().isDownloadingFile(media); final boolean isDownloadingMedia = DownloadRequester.getInstance().isDownloadingFile(media);
if (media.isDownloaded()) { if (media.isCurrentlyPlaying()) {
return new PauseActionButton(item);
} else if (media.isDownloaded()) {
return new PlayActionButton(item); return new PlayActionButton(item);
} else if (isDownloadingMedia) { } else if (isDownloadingMedia) {
return new CancelDownloadActionButton(item); return new CancelDownloadActionButton(item);

42
app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java Normal file
View File

@ -0,0 +1,42 @@
package de.danoeh.antennapod.adapter.actionbutton;
import android.content.Context;
import androidx.annotation.AttrRes;
import androidx.annotation.StringRes;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.feed.FeedItem;
import de.danoeh.antennapod.core.feed.FeedMedia;
import de.danoeh.antennapod.core.util.IntentUtils;
import static de.danoeh.antennapod.core.service.playback.PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE;
class PauseActionButton extends ItemActionButton {
PauseActionButton(FeedItem item) {
super(item);
}
@Override
@StringRes
public int getLabel() {
return R.string.pause_label;
}
@Override
@AttrRes
public int getDrawable() {
return R.attr.av_pause;
}
@Override
public void onClick(Context context) {
FeedMedia media = item.getMedia();
if (media == null) {
return;
}
if (media.isCurrentlyPlaying()) {
IntentUtils.sendLocalBroadcast(context, ACTION_PAUSE_PLAY_CURRENT_EPISODE);
}
}
}

34
app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java
View File

@ -3,16 +3,11 @@ package de.danoeh.antennapod.adapter.actionbutton;
import android.content.Context; import android.content.Context;
import androidx.annotation.AttrRes; import androidx.annotation.AttrRes;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import de.danoeh.antennapod.R; import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedItem;
import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.feed.FeedMedia;
import de.danoeh.antennapod.core.storage.DBTasks;
import de.danoeh.antennapod.core.util.IntentUtils;
import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter; import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
import static de.danoeh.antennapod.core.service.playback.PlaybackService.ACTION_PAUSE_PLAY_CURRENT_EPISODE;
class PlayActionButton extends ItemActionButton { class PlayActionButton extends ItemActionButton {
PlayActionButton(FeedItem item) { PlayActionButton(FeedItem item) {
@ -28,12 +23,7 @@ class PlayActionButton extends ItemActionButton {
@Override @Override
@AttrRes @AttrRes
public int getDrawable() { public int getDrawable() {
FeedMedia media = item.getMedia(); return R.attr.av_play;
if (media != null && media.isCurrentlyPlaying()) {
return R.attr.av_pause;
} else {
return R.attr.av_play;
}
} }
@Override @Override
@ -43,22 +33,10 @@ class PlayActionButton extends ItemActionButton {
return; return;
} }
if (media.isPlaying()) { new PlaybackServiceStarter(context, media)
togglePlayPause(context, media); .callEvenIfRunning(true)
} else { .startWhenPrepared(true)
DBTasks.playMedia(context, media, false, true, false); .shouldStream(false)
} .start();
}
private void togglePlayPause(Context context, FeedMedia media) {
if (media.isCurrentlyPlaying()) {
IntentUtils.sendLocalBroadcast(context, ACTION_PAUSE_PLAY_CURRENT_EPISODE);
} else {
new PlaybackServiceStarter(context, media)
.callEvenIfRunning(true)
.startWhenPrepared(true)
.shouldStream(false)
.start();
}
} }
} }