From 20962e37d084bdc9cd648182b1984e06911c15d5 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Fri, 26 Oct 2018 22:17:30 +0200 Subject: [PATCH] Reorganise context menu --- .../android/vanilla/LibraryActivity.java | 44 ++++++++++++------- app/src/main/res/values/translatable.xml | 4 +- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java b/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java index 51141b88..d798d38c 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java @@ -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) { diff --git a/app/src/main/res/values/translatable.xml b/app/src/main/res/values/translatable.xml index 33208c83..e8105d20 100644 --- a/app/src/main/res/values/translatable.xml +++ b/app/src/main/res/values/translatable.xml @@ -68,7 +68,9 @@ THE SOFTWARE. Rename Save as playlist… Add to playlist… - Add to homescreen… + Add to… + Playlist + Homescreen Add to favorites Remove from favorites Favorites