From 56db791e7d6c36d3f11a92422526f6ec8d516db2 Mon Sep 17 00:00:00 2001 From: daniel oeh Date: Mon, 25 Feb 2013 18:15:02 +0100 Subject: FeedImageLoader now works independently from FeedImages --- src/de/danoeh/antennapod/fragment/CoverFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/de/danoeh/antennapod/fragment/CoverFragment.java') diff --git a/src/de/danoeh/antennapod/fragment/CoverFragment.java b/src/de/danoeh/antennapod/fragment/CoverFragment.java index f1fde24d8..0ef19f818 100644 --- a/src/de/danoeh/antennapod/fragment/CoverFragment.java +++ b/src/de/danoeh/antennapod/fragment/CoverFragment.java @@ -12,7 +12,7 @@ import com.actionbarsherlock.app.SherlockFragment; import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.AudioplayerActivity.AudioplayerContentFragment; -import de.danoeh.antennapod.asynctask.FeedImageLoader; +import de.danoeh.antennapod.asynctask.ImageLoader; import de.danoeh.antennapod.feed.Feed; import de.danoeh.antennapod.feed.FeedItem; import de.danoeh.antennapod.feed.FeedManager; @@ -79,7 +79,7 @@ public class CoverFragment extends SherlockFragment implements @Override public void run() { - FeedImageLoader.getInstance().loadCoverBitmap( + ImageLoader.getInstance().loadCoverBitmap( media.getItem().getFeed().getImage(), imgvCover); } }); -- cgit v1.2.3 From a6b6022626b26acd970588ca0bfd0c1c3d641825 Mon Sep 17 00:00:00 2001 From: daniel oeh Date: Wed, 27 Feb 2013 11:47:12 +0100 Subject: PlaybackService now works with the 'Playable' interface --- .../danoeh/antennapod/fragment/CoverFragment.java | 35 +++++++--------------- 1 file changed, 10 insertions(+), 25 deletions(-) (limited to 'src/de/danoeh/antennapod/fragment/CoverFragment.java') diff --git a/src/de/danoeh/antennapod/fragment/CoverFragment.java b/src/de/danoeh/antennapod/fragment/CoverFragment.java index 0ef19f818..29a160960 100644 --- a/src/de/danoeh/antennapod/fragment/CoverFragment.java +++ b/src/de/danoeh/antennapod/fragment/CoverFragment.java @@ -13,30 +13,25 @@ import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.AudioplayerActivity.AudioplayerContentFragment; import de.danoeh.antennapod.asynctask.ImageLoader; -import de.danoeh.antennapod.feed.Feed; -import de.danoeh.antennapod.feed.FeedItem; -import de.danoeh.antennapod.feed.FeedManager; -import de.danoeh.antennapod.feed.FeedMedia; +import de.danoeh.antennapod.util.Playable; /** Displays the cover and the title of a FeedItem. */ public class CoverFragment extends SherlockFragment implements AudioplayerContentFragment { private static final String TAG = "CoverFragment"; - private static final String ARG_FEED_ID = "arg.feedId"; - private static final String ARG_FEEDITEM_ID = "arg.feedItem"; + private static final String ARG_PLAYABLE = "arg.playable"; - private FeedMedia media; + private Playable media; private ImageView imgvCover; private boolean viewCreated = false; - public static CoverFragment newInstance(FeedItem item) { + public static CoverFragment newInstance(Playable item) { CoverFragment f = new CoverFragment(); if (item != null) { Bundle args = new Bundle(); - args.putLong(ARG_FEED_ID, item.getFeed().getId()); - args.putLong(ARG_FEEDITEM_ID, item.getId()); + args.putParcelable(ARG_PLAYABLE, item); f.setArguments(args); } return f; @@ -46,21 +41,11 @@ public class CoverFragment extends SherlockFragment implements public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setRetainInstance(true); - FeedManager manager = FeedManager.getInstance(); - FeedItem item = null; Bundle args = getArguments(); if (args != null) { - long feedId = args.getLong(ARG_FEED_ID, -1); - long itemId = args.getLong(ARG_FEEDITEM_ID, -1); - if (feedId != -1 && itemId != -1) { - Feed feed = manager.getFeed(feedId); - item = manager.getFeedItem(itemId, feed); - if (item != null) { - media = item.getMedia(); - } - } else { - Log.e(TAG, TAG + " was called with invalid arguments"); - } + media = args.getParcelable(ARG_PLAYABLE); + } else { + Log.e(TAG, TAG + " was called with invalid arguments"); } } @@ -80,7 +65,7 @@ public class CoverFragment extends SherlockFragment implements @Override public void run() { ImageLoader.getInstance().loadCoverBitmap( - media.getItem().getFeed().getImage(), imgvCover); + media.getImageFileUrl(), imgvCover); } }); } else { @@ -103,7 +88,7 @@ public class CoverFragment extends SherlockFragment implements } @Override - public void onDataSetChanged(FeedMedia media) { + public void onDataSetChanged(Playable media) { this.media = media; if (viewCreated) { loadMediaInfo(); -- cgit v1.2.3 From cc741d66434f72d22c2952785daff28369d0ef9b Mon Sep 17 00:00:00 2001 From: daniel oeh Date: Wed, 27 Feb 2013 11:53:17 +0100 Subject: Created de.danoeh.antennapod.util.playback package --- src/de/danoeh/antennapod/fragment/CoverFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/de/danoeh/antennapod/fragment/CoverFragment.java') diff --git a/src/de/danoeh/antennapod/fragment/CoverFragment.java b/src/de/danoeh/antennapod/fragment/CoverFragment.java index 29a160960..c477ea2b8 100644 --- a/src/de/danoeh/antennapod/fragment/CoverFragment.java +++ b/src/de/danoeh/antennapod/fragment/CoverFragment.java @@ -13,7 +13,7 @@ import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.AudioplayerActivity.AudioplayerContentFragment; import de.danoeh.antennapod.asynctask.ImageLoader; -import de.danoeh.antennapod.util.Playable; +import de.danoeh.antennapod.util.playback.Playable; /** Displays the cover and the title of a FeedItem. */ public class CoverFragment extends SherlockFragment implements -- cgit v1.2.3