From 3e98ab61ea50b320989c26f6548303fd91447073 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 22 Apr 2018 22:21:46 +0200 Subject: Start PlaybackService lazily to allow using ForegroundService --- app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java') diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java index 2d11e9f71..7078eeb63 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java @@ -34,6 +34,7 @@ import com.bumptech.glide.Glide; import com.joanzapata.iconify.Iconify; import com.joanzapata.iconify.widget.IconButton; +import de.danoeh.antennapod.core.service.playback.PlaybackService; import de.danoeh.antennapod.core.util.NetworkUtils; import org.apache.commons.lang3.ArrayUtils; @@ -243,6 +244,9 @@ public class ItemFragment extends Fragment implements OnSwipeGesture { if (item.hasMedia()) { FeedMedia media = item.getMedia(); if (!media.isDownloaded()) { + if (!PlaybackService.isRunning) { + PlaybackService.startService(getActivity(), media, true, false); + } DBTasks.playMedia(getActivity(), media, true, true, true); ((MainActivity) getActivity()).dismissChildFragment(); } else { -- cgit v1.2.3 From f66e19845c123160ba6174c2dec337070a6d9b22 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Fri, 4 May 2018 14:36:32 +0200 Subject: Review changes --- app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java') diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java index 7078eeb63..5088d71a6 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java @@ -244,9 +244,7 @@ public class ItemFragment extends Fragment implements OnSwipeGesture { if (item.hasMedia()) { FeedMedia media = item.getMedia(); if (!media.isDownloaded()) { - if (!PlaybackService.isRunning) { - PlaybackService.startService(getActivity(), media, true, false); - } + PlaybackService.startIfNotRunning(getActivity(), media, true, false); DBTasks.playMedia(getActivity(), media, true, true, true); ((MainActivity) getActivity()).dismissChildFragment(); } else { -- cgit v1.2.3 From 1628360c4b4aa0d3c5d3a119b9bd51908f490249 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sat, 5 May 2018 11:27:16 +0200 Subject: Prevent deletion of currently playing item Was already prevented in the download list but not on the details fragment. Added alpha to make disabled state clear. Closes #2285 --- .../main/java/de/danoeh/antennapod/fragment/ItemFragment.java | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java') diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java index 2d11e9f71..2aa97977e 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java @@ -432,6 +432,16 @@ public class ItemFragment extends Fragment implements OnSwipeGesture { butAction1Text = R.string.download_label; } } + + FeedItem.State state = item.getState(); + if (butAction2Text == R.string.delete_label && state == FeedItem.State.PLAYING) { + butAction2.setEnabled(false); + butAction2.setAlpha(0.5f); + } else { + butAction2.setEnabled(true); + butAction2.setAlpha(1.0f); + } + if(butAction1Icon != null && butAction1Text != 0) { butAction1.setText(butAction1Icon +"\u0020\u0020" + getActivity().getString(butAction1Text)); Iconify.addIcons(butAction1); -- cgit v1.2.3 From f6082f58088d79a8b46556fc68c7bbbf30008c82 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 6 May 2018 19:44:07 +0200 Subject: Using builder to call PlaybackService --- app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java | 1 - 1 file changed, 1 deletion(-) (limited to 'app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java') diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java index 5088d71a6..63727a1f4 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java @@ -244,7 +244,6 @@ public class ItemFragment extends Fragment implements OnSwipeGesture { if (item.hasMedia()) { FeedMedia media = item.getMedia(); if (!media.isDownloaded()) { - PlaybackService.startIfNotRunning(getActivity(), media, true, false); DBTasks.playMedia(getActivity(), media, true, true, true); ((MainActivity) getActivity()).dismissChildFragment(); } else { -- cgit v1.2.3