From eee5c43bf00d76cac9e74273ed96c61974e1b088 Mon Sep 17 00:00:00 2001 From: daniel oeh Date: Fri, 22 Jun 2012 13:49:38 +0200 Subject: Moved FeedItemMenuHandler into the right package --- src/de/podfetcher/activity/ItemviewActivity.java | 2 +- .../podfetcher/fragment/FeedItemlistFragment.java | 2 +- .../syndication/util/FeedItemMenuHandler.java | 93 ---------------------- src/de/podfetcher/util/FeedItemMenuHandler.java | 93 ++++++++++++++++++++++ 4 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 src/de/podfetcher/syndication/util/FeedItemMenuHandler.java create mode 100644 src/de/podfetcher/util/FeedItemMenuHandler.java diff --git a/src/de/podfetcher/activity/ItemviewActivity.java b/src/de/podfetcher/activity/ItemviewActivity.java index d6cb41b9a..7cc16a584 100644 --- a/src/de/podfetcher/activity/ItemviewActivity.java +++ b/src/de/podfetcher/activity/ItemviewActivity.java @@ -28,7 +28,7 @@ import de.podfetcher.fragment.FeedItemlistFragment; import de.podfetcher.fragment.FeedlistFragment; import de.podfetcher.service.PlaybackService; import de.podfetcher.storage.DownloadRequester; -import de.podfetcher.syndication.util.FeedItemMenuHandler; +import de.podfetcher.util.FeedItemMenuHandler; /** Displays a single FeedItem and provides various actions */ public class ItemviewActivity extends SherlockActivity { diff --git a/src/de/podfetcher/fragment/FeedItemlistFragment.java b/src/de/podfetcher/fragment/FeedItemlistFragment.java index a1facc65b..d8be380fe 100644 --- a/src/de/podfetcher/fragment/FeedItemlistFragment.java +++ b/src/de/podfetcher/fragment/FeedItemlistFragment.java @@ -21,7 +21,7 @@ import de.podfetcher.adapter.FeedItemlistAdapter; import de.podfetcher.feed.FeedItem; import de.podfetcher.feed.FeedManager; import de.podfetcher.storage.DownloadRequester; -import de.podfetcher.syndication.util.FeedItemMenuHandler; +import de.podfetcher.util.FeedItemMenuHandler; public class FeedItemlistFragment extends SherlockListFragment { @Override diff --git a/src/de/podfetcher/syndication/util/FeedItemMenuHandler.java b/src/de/podfetcher/syndication/util/FeedItemMenuHandler.java deleted file mode 100644 index 533062f8f..000000000 --- a/src/de/podfetcher/syndication/util/FeedItemMenuHandler.java +++ /dev/null @@ -1,93 +0,0 @@ -package de.podfetcher.syndication.util; - -import android.content.Context; - -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuInflater; -import com.actionbarsherlock.view.MenuItem; - -import de.podfetcher.R; -import de.podfetcher.feed.FeedItem; -import de.podfetcher.feed.FeedManager; -import de.podfetcher.storage.DownloadRequester; - -/** Handles interactions with the FeedItemMenu. */ -public class FeedItemMenuHandler { - private FeedItemMenuHandler() { - - } - - public static boolean onPrepareMenu(Menu menu, FeedItem selectedItem) { - FeedManager manager = FeedManager.getInstance(); - - if (selectedItem.getMedia().isDownloaded()) { - menu.findItem(R.id.play_item).setVisible(true); - menu.findItem(R.id.remove_item).setVisible(true); - } else if (selectedItem.getMedia().getFile_url() == null) { - menu.findItem(R.id.download_item).setVisible(true); - menu.findItem(R.id.stream_item).setVisible(true); - } else { - menu.findItem(R.id.cancel_download_item).setVisible(true); - } - - if (selectedItem.isRead()) { - menu.findItem(R.id.mark_unread_item).setVisible(true); - } else { - menu.findItem(R.id.mark_read_item).setVisible(true); - } - - if (manager.isInQueue(selectedItem)) { - menu.findItem(R.id.remove_from_queue_item).setVisible(true); - } else { - menu.findItem(R.id.add_to_queue_item).setVisible(true); - } - return true; - } - - public static boolean onMenuItemClicked(Context context, MenuItem item, FeedItem selectedItem) { - DownloadRequester requester = DownloadRequester.getInstance(); - FeedManager manager = FeedManager.getInstance(); - switch (item.getItemId()) { - case R.id.download_item: - requester.downloadMedia(context, - selectedItem.getMedia()); - break; - case R.id.play_item: - manager.playMedia(context, - selectedItem.getMedia(), true, true, false); - break; - case R.id.remove_item: - manager.deleteFeedMedia(context, - selectedItem.getMedia()); - break; - case R.id.cancel_download_item: - requester.cancelDownload(context, selectedItem - .getMedia().getDownloadId()); - break; - case R.id.mark_read_item: - manager.markItemRead(context, selectedItem, true); - break; - case R.id.mark_unread_item: - manager.markItemRead(context, selectedItem, false); - break; - case R.id.add_to_queue_item: - manager.addQueueItem(context, selectedItem); - break; - case R.id.remove_from_queue_item: - manager.removeQueueItem(context, selectedItem); - break; - case R.id.stream_item: - manager.playMedia(context, selectedItem.getMedia(), true, true, true); - } - // Refresh menu state - - return true; - } - - public static boolean onCreateMenu(MenuInflater inflater, Menu menu) { - inflater.inflate(R.menu.feeditem, menu); - return true; - } - - -} diff --git a/src/de/podfetcher/util/FeedItemMenuHandler.java b/src/de/podfetcher/util/FeedItemMenuHandler.java new file mode 100644 index 000000000..680520077 --- /dev/null +++ b/src/de/podfetcher/util/FeedItemMenuHandler.java @@ -0,0 +1,93 @@ +package de.podfetcher.util; + +import android.content.Context; + +import com.actionbarsherlock.view.Menu; +import com.actionbarsherlock.view.MenuInflater; +import com.actionbarsherlock.view.MenuItem; + +import de.podfetcher.R; +import de.podfetcher.feed.FeedItem; +import de.podfetcher.feed.FeedManager; +import de.podfetcher.storage.DownloadRequester; + +/** Handles interactions with the FeedItemMenu. */ +public class FeedItemMenuHandler { + private FeedItemMenuHandler() { + + } + + public static boolean onPrepareMenu(Menu menu, FeedItem selectedItem) { + FeedManager manager = FeedManager.getInstance(); + + if (selectedItem.getMedia().isDownloaded()) { + menu.findItem(R.id.play_item).setVisible(true); + menu.findItem(R.id.remove_item).setVisible(true); + } else if (selectedItem.getMedia().getFile_url() == null) { + menu.findItem(R.id.download_item).setVisible(true); + menu.findItem(R.id.stream_item).setVisible(true); + } else { + menu.findItem(R.id.cancel_download_item).setVisible(true); + } + + if (selectedItem.isRead()) { + menu.findItem(R.id.mark_unread_item).setVisible(true); + } else { + menu.findItem(R.id.mark_read_item).setVisible(true); + } + + if (manager.isInQueue(selectedItem)) { + menu.findItem(R.id.remove_from_queue_item).setVisible(true); + } else { + menu.findItem(R.id.add_to_queue_item).setVisible(true); + } + return true; + } + + public static boolean onMenuItemClicked(Context context, MenuItem item, FeedItem selectedItem) { + DownloadRequester requester = DownloadRequester.getInstance(); + FeedManager manager = FeedManager.getInstance(); + switch (item.getItemId()) { + case R.id.download_item: + requester.downloadMedia(context, + selectedItem.getMedia()); + break; + case R.id.play_item: + manager.playMedia(context, + selectedItem.getMedia(), true, true, false); + break; + case R.id.remove_item: + manager.deleteFeedMedia(context, + selectedItem.getMedia()); + break; + case R.id.cancel_download_item: + requester.cancelDownload(context, selectedItem + .getMedia().getDownloadId()); + break; + case R.id.mark_read_item: + manager.markItemRead(context, selectedItem, true); + break; + case R.id.mark_unread_item: + manager.markItemRead(context, selectedItem, false); + break; + case R.id.add_to_queue_item: + manager.addQueueItem(context, selectedItem); + break; + case R.id.remove_from_queue_item: + manager.removeQueueItem(context, selectedItem); + break; + case R.id.stream_item: + manager.playMedia(context, selectedItem.getMedia(), true, true, true); + } + // Refresh menu state + + return true; + } + + public static boolean onCreateMenu(MenuInflater inflater, Menu menu) { + inflater.inflate(R.menu.feeditem, menu); + return true; + } + + +} -- cgit v1.2.3