diff options
| -rw-r--r-- | res/layout/feedlist_item.xml | 3 | ||||
| -rw-r--r-- | src/de/podfetcher/activity/PodfetcherActivity.java | 26 | ||||
| -rw-r--r-- | src/de/podfetcher/adapter/FeedlistAdapter.java | 16 | ||||
| -rw-r--r-- | src/de/podfetcher/feed/Feed.java | 11 |
4 files changed, 36 insertions, 20 deletions
diff --git a/res/layout/feedlist_item.xml b/res/layout/feedlist_item.xml index c69815405..b448b75f9 100644 --- a/res/layout/feedlist_item.xml +++ b/res/layout/feedlist_item.xml @@ -26,7 +26,8 @@ <TextView android:id="@+id/txtvNewEpisodes" android:layout_width="fill_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + /> <TextView android:id="@+id/txtvLastUpdate" diff --git a/src/de/podfetcher/activity/PodfetcherActivity.java b/src/de/podfetcher/activity/PodfetcherActivity.java index 655cfc9cf..ee8eee79d 100644 --- a/src/de/podfetcher/activity/PodfetcherActivity.java +++ b/src/de/podfetcher/activity/PodfetcherActivity.java @@ -1,28 +1,16 @@ package de.podfetcher.activity; -import javax.xml.parsers.ParserConfigurationException; +import android.app.Activity; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentTransaction; -import org.xml.sax.SAXException; +import com.actionbarsherlock.app.ActionBar; +import com.actionbarsherlock.app.ActionBar.Tab; +import com.actionbarsherlock.app.SherlockFragmentActivity; import de.podfetcher.R; -import de.podfetcher.feed.*; -import de.podfetcher.storage.DownloadRequester; import de.podfetcher.fragment.FeedlistFragment; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ListView; -import android.widget.ArrayAdapter; -import android.os.Bundle; -import android.content.Intent; -import android.app.Activity; -import com.actionbarsherlock.app.SherlockFragmentActivity; -import com.actionbarsherlock.app.SherlockListFragment; -import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.app.ActionBar.Tab; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; diff --git a/src/de/podfetcher/adapter/FeedlistAdapter.java b/src/de/podfetcher/adapter/FeedlistAdapter.java index 39c935e8f..e10c7bff0 100644 --- a/src/de/podfetcher/adapter/FeedlistAdapter.java +++ b/src/de/podfetcher/adapter/FeedlistAdapter.java @@ -17,6 +17,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import android.graphics.BitmapFactory; +import android.graphics.Color; public class FeedlistAdapter extends ArrayAdapter<Feed> { @@ -39,6 +40,7 @@ public class FeedlistAdapter extends ArrayAdapter<Feed> { convertView = inflater.inflate(R.layout.feedlist_item, null); holder.title = (TextView) convertView .findViewById(R.id.txtvFeedname); + holder.newEpisodes = (TextView) convertView.findViewById(R.id.txtvNewEpisodes); holder.image = (ImageView) convertView .findViewById(R.id.imgvFeedimage); holder.lastUpdate = (TextView) convertView @@ -52,6 +54,19 @@ public class FeedlistAdapter extends ArrayAdapter<Feed> { holder.lastUpdate.setText(DateUtils.formatSameDayTime(feed .getLastUpdate().getTime(), System.currentTimeMillis(), DateFormat.SHORT, DateFormat.SHORT)); + + int newItems = feed.getNumOfNewItems(); + if (newItems > 0) { + holder.newEpisodes.setTextColor(Color.parseColor("red")); + if (newItems == 1) { + holder.newEpisodes.setText(newItems + " new Episode"); + } else { + holder.newEpisodes.setText(newItems + " new Episodes"); + } + } else { + holder.newEpisodes.setTextColor(Color.parseColor("gray")); + holder.newEpisodes.setText("No new episodes"); + } if (feed.getImage() != null) { holder.image.setImageBitmap(feed.getImage().getImageBitmap()); // TODO // select @@ -69,6 +84,7 @@ public class FeedlistAdapter extends ArrayAdapter<Feed> { static class Holder { TextView title; TextView lastUpdate; + TextView newEpisodes; ImageView image; } diff --git a/src/de/podfetcher/feed/Feed.java b/src/de/podfetcher/feed/Feed.java index b411b3ecb..bcec1e55b 100644 --- a/src/de/podfetcher/feed/Feed.java +++ b/src/de/podfetcher/feed/Feed.java @@ -30,6 +30,17 @@ public class Feed extends FeedFile { this(lastUpdate); this.download_url = url; } + + /** Returns the number of FeedItems where 'read' is false. */ + public int getNumOfNewItems() { + int count = 0; + for (FeedItem item : items) { + if (!item.isRead()) { + count++; + } + } + return count; + } public String getTitle() { return title; |