diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2018-05-05 18:21:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-05 18:21:14 +0200 |
| commit | e04e53782915ce8b89e8e8aa649429fc660888df (patch) | |
| tree | 1cba7c555226aadee527e61953649ba7136dc298 /app | |
| parent | dacd7787bc9b6224a07e063b9ede8c9d472f29ee (diff) | |
| parent | 1628360c4b4aa0d3c5d3a119b9bd51908f490249 (diff) | |
| download | AntennaPod-e04e53782915ce8b89e8e8aa649429fc660888df.zip | |
Merge pull request #2674 from ByteHamster/delete-while-playing
Prevent deletion of currently playing item
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java | 2 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java index c62c30c90..c4f476634 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java @@ -100,8 +100,10 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter { FeedItem.State state = item.getState(); if (state == FeedItem.State.PLAYING) { holder.butSecondary.setEnabled(false); + holder.butSecondary.setAlpha(0.5f); } else { holder.butSecondary.setEnabled(true); + holder.butSecondary.setAlpha(1.0f); } holder.butSecondary.setFocusable(false); holder.butSecondary.setTag(item); 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); |