summaryrefslogtreecommitdiff
path: root/src/de/danoeh/antennapod
diff options
context:
space:
mode:
authordaniel oeh <daniel.oeh@gmail.com>2012-11-16 19:36:21 +0100
committerdaniel oeh <daniel.oeh@gmail.com>2012-11-16 19:36:21 +0100
commit385b11eae209c37cff64375b7fd6669e71918e5a (patch)
tree11d89370ffaca311b4b3d224a93ad628c24baf01 /src/de/danoeh/antennapod
parenta7831abf77a75b15681c3a4364d04950394dddab (diff)
downloadAntennaPod-385b11eae209c37cff64375b7fd6669e71918e5a.zip
Added 'Playing' state
Diffstat (limited to 'src/de/danoeh/antennapod')
-rw-r--r--src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java14
-rw-r--r--src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java9
2 files changed, 18 insertions, 5 deletions
diff --git a/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index 5a1da7ef5..e7d2c322c 100644
--- a/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -93,13 +93,21 @@ public class FeedItemlistAdapter extends ArrayAdapter<FeedItem> {
holder.feedtitle.setText(item.getFeed().getTitle());
}
- if (item.isInProgress()) {
+ if (item.isPlaying()) {
holder.title.setTypeface(Typeface.DEFAULT_BOLD);
- holder.statusLabel.setBackgroundColor(convertView.getResources().getColor(R.color.status_progress));
+ holder.statusLabel.setBackgroundColor(convertView
+ .getResources().getColor(R.color.status_playing));
+ holder.statusLabel.setVisibility(View.VISIBLE);
+
+ } else if (item.isInProgress()) {
+ holder.title.setTypeface(Typeface.DEFAULT_BOLD);
+ holder.statusLabel.setBackgroundColor(convertView
+ .getResources().getColor(R.color.status_progress));
holder.statusLabel.setVisibility(View.VISIBLE);
} else if (!item.isRead()) {
holder.title.setTypeface(Typeface.DEFAULT_BOLD);
- holder.statusLabel.setBackgroundColor(convertView.getResources().getColor(R.color.status_unread));
+ holder.statusLabel.setBackgroundColor(convertView
+ .getResources().getColor(R.color.status_unread));
holder.statusLabel.setVisibility(View.VISIBLE);
} else {
holder.title.setTypeface(Typeface.DEFAULT);
diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
index d6bc79ade..2c345fe0a 100644
--- a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
+++ b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
@@ -50,8 +50,13 @@ public class FeedItemMenuHandler {
selectedItem.getLink() != null);
menu.findItem(R.id.mark_unread_item).setVisible(
- selectedItem.isRead() || selectedItem.isInProgress());
- menu.findItem(R.id.mark_read_item).setVisible(!selectedItem.isRead() || selectedItem.isInProgress());
+ !selectedItem.isPlaying()
+ && (selectedItem.isRead() || selectedItem
+ .isInProgress()));
+ menu.findItem(R.id.mark_read_item).setVisible(
+ !selectedItem.isPlaying()
+ && (!selectedItem.isRead() || selectedItem
+ .isInProgress()));
if (selectedItem.getLink() != null) {
menu.findItem(R.id.visit_website_item).setVisible(true);