Reorganise context menu

This commit is contained in:
Adrian Ulrich committed 2018-10-26 22:17:30 +02:00
1 parent 4ac874d4de
commit 20962e37d0
2 files changed
+31 -17

No files matched your search

@@ -44,6 +44,7 @@ import android.view.ContextMenu;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.SubMenu;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
@@ -603,6 +604,7 @@ public class LibraryActivity
}
}
private static final int CTX_MENU_NOOP = -1;
private static final int CTX_MENU_PLAY = 0;
private static final int CTX_MENU_ENQUEUE = 1;
private static final int CTX_MENU_EXPAND = 2;
@@ -624,45 +626,53 @@ public class LibraryActivity
* @param menu The menu to create.
* @param rowData Data for the adapter row.
*/
public void onCreateContextMenu(ContextMenu menu, Intent rowData)
{
public void onCreateContextMenu(ContextMenu menu, Intent rowData) {
// Add to -> Playlist is always available.
SubMenu subAddTo = menu.addSubMenu(0, CTX_MENU_NOOP, 10, R.string.add_to);
subAddTo.add(0, CTX_MENU_ADD_TO_PLAYLIST, 0, R.string.playlist).setIntent(rowData);
if (rowData.getLongExtra(LibraryAdapter.DATA_ID, LibraryAdapter.INVALID_ID) == LibraryAdapter.HEADER_ID) {
menu.setHeaderTitle(getString(R.string.all_songs));
menu.add(0, CTX_MENU_PLAY_ALL, 0, R.string.play_all).setIntent(rowData);
menu.add(0, CTX_MENU_ENQUEUE_ALL, 0, R.string.enqueue_all).setIntent(rowData);
menu.addSubMenu(0, CTX_MENU_ADD_TO_PLAYLIST, 0, R.string.add_to_playlist).getItem().setIntent(rowData);
} else {
int type = rowData.getIntExtra(LibraryAdapter.DATA_TYPE, MediaUtils.TYPE_INVALID);
menu.setHeaderTitle(rowData.getStringExtra(LibraryAdapter.DATA_TITLE));
subAddTo.add(0, CTX_MENU_ADD_TO_HOMESCREEN, 0, R.string.homescreen).setIntent(rowData);
if (FileUtils.canDispatchIntent(rowData))
menu.add(0, CTX_MENU_OPEN_EXTERNAL, 0, R.string.open).setIntent(rowData);
menu.add(0, CTX_MENU_PLAY, 0, R.string.play).setIntent(rowData);
if (type <= MediaUtils.TYPE_SONG) {
menu.add(0, CTX_MENU_PLAY_ALL, 0, R.string.play_all).setIntent(rowData);
}
menu.add(0, CTX_MENU_ENQUEUE_AS_NEXT, 0, R.string.enqueue_as_next).setIntent(rowData);
menu.add(0, CTX_MENU_ENQUEUE, 0, R.string.enqueue).setIntent(rowData);
if (type == MediaUtils.TYPE_PLAYLIST) {
menu.add(0, CTX_MENU_RENAME_PLAYLIST, 0, R.string.rename).setIntent(rowData);
} else if (rowData.getBooleanExtra(LibraryAdapter.DATA_EXPANDABLE, false)) {
menu.add(0, CTX_MENU_EXPAND, 0, R.string.expand).setIntent(rowData);
}
if (type == MediaUtils.TYPE_SONG) {
menu.add(0, CTX_MENU_SHOW_DETAILS, 0, R.string.details).setIntent(rowData);
if (type == MediaUtils.TYPE_SONG || type == MediaUtils.TYPE_ALBUM) {
SubMenu subMoreFrom = menu.addSubMenu(0, CTX_MENU_NOOP, 0, R.string.more_from_current);
subMoreFrom.add(0, CTX_MENU_MORE_FROM_ARTIST, 0, R.string.artist).setIntent(rowData);
if (type == MediaUtils.TYPE_SONG) {
subMoreFrom.add(0, CTX_MENU_MORE_FROM_ALBUM, 0, R.string.album).setIntent(rowData);
subMoreFrom.add(0, CTX_MENU_SHOW_DETAILS, 0, R.string.details).setIntent(rowData);
if (PluginUtils.checkPlugins(this)) {
// not part of submenu: just last item in normal menu.
menu.add(0, CTX_MENU_PLUGINS, 99, R.string.plugins).setIntent(rowData);
}
}
}
if (type >= MediaUtils.TYPE_ARTIST && type <= MediaUtils.TYPE_COMPOSER && type != MediaUtils.TYPE_SONG)
menu.add(0, CTX_MENU_ADD_TO_HOMESCREEN, 0, R.string.add_to_homescreen).setIntent(rowData);
if (type == MediaUtils.TYPE_ALBUM || type == MediaUtils.TYPE_SONG)
menu.add(0, CTX_MENU_MORE_FROM_ARTIST, 0, R.string.more_from_artist).setIntent(rowData);
if (type == MediaUtils.TYPE_SONG) {
menu.add(0, CTX_MENU_MORE_FROM_ALBUM, 0, R.string.more_from_album).setIntent(rowData);
if (PluginUtils.checkPlugins(this))
menu.add(0, CTX_MENU_PLUGINS, 1, R.string.plugins).setIntent(rowData); // last in order
}
menu.addSubMenu(0, CTX_MENU_ADD_TO_PLAYLIST, 0, R.string.add_to_playlist).getItem().setIntent(rowData);
menu.add(0, CTX_MENU_DELETE, 0, R.string.delete).setIntent(rowData);
menu.add(0, CTX_MENU_DELETE, 90, R.string.delete).setIntent(rowData);
}
}
@@ -685,6 +695,8 @@ public class LibraryActivity
final Intent intent = item.getIntent();
switch (item.getItemId()) {
case CTX_MENU_NOOP:
break;
case CTX_MENU_EXPAND:
expand(intent);
if (mDefaultAction == ACTION_LAST_USED && mLastAction != ACTION_EXPAND) {