Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MenuItems in ItemviewActivity were not displayed correctly. fixes #273

Browse Source
This commit is contained in:
daniel oeh 2013-09-12 13:49:50 +02:00
parent 455b6c7172
commit 2e8f102248
2 changed files with 85 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
res/menu/feeditem.xml
View File

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@id/skip_episode_item" android:title="@string/skip_episode_label" android:showAsAction="collapseActionView"></item><item
<item
android:id="@+id/download_item"
android:icon="?attr/av_download"
android:showAsAction="ifRoom"
android:showAsAction="ifRoom|collapseActionView"
android:title="@string/download_label">
</item>
<item
android:id="@+id/stream_item"
android:icon="?attr/action_stream"
android:showAsAction="ifRoom"
android:showAsAction="ifRoom|collapseActionView"
android:title="@string/stream_label">
</item>
<item
android:id="@+id/play_item"
android:icon="?attr/av_play"
android:showAsAction="ifRoom"
android:showAsAction="ifRoom|collapseActionView"
android:title="@string/play_label">
</item>
<item
@ -25,10 +25,15 @@
android:showAsAction="collapseActionView"
android:title="@string/remove_label">
</item>
<item
android:id="@id/skip_episode_item"
android:title="@string/skip_episode_label"
android:showAsAction="collapseActionView">
</item>
<item
android:id="@+id/cancel_download_item"
android:icon="?attr/navigation_cancel"
android:showAsAction="ifRoom"
android:showAsAction="ifRoom|collapseActionView"
android:title="@string/cancel_download_label">
</item>
<item

10
src/de/danoeh/antennapod/activity/ItemviewActivity.java
View File

@ -5,6 +5,7 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.app.ActionBarActivity;
import android.text.format.DateUtils;
import android.util.Log;
@ -30,7 +31,9 @@ import de.danoeh.antennapod.util.menuhandler.FeedItemMenuHandler;
import java.text.DateFormat;
/** Displays a single FeedItem and provides various actions */
/**
* Displays a single FeedItem and provides various actions
*/
public class ItemviewActivity extends ActionBarActivity {
private static final String TAG = "ItemviewActivity";
@ -125,6 +128,11 @@ public class ItemviewActivity extends ActionBarActivity {
if (item != null) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.feeditem, menu);
// MenuItem visibility has to be set programmatically here; TODO remove this workaround
MenuItemCompat.setShowAsAction(menu.findItem(R.id.download_item), MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
MenuItemCompat.setShowAsAction(menu.findItem(R.id.stream_item), MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
MenuItemCompat.setShowAsAction(menu.findItem(R.id.play_item), MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
MenuItemCompat.setShowAsAction(menu.findItem(R.id.cancel_download_item), MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
return true;
} else {
return false;