diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java index 7241a711..453ad14a 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java @@ -171,7 +171,7 @@ public class AlbumDetailActivity extends AbsMusicContentActivity implements Pale @Override public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_album_detail, menu); + getMenuInflater().inflate(R.menu.menu_detail_album, menu); return super.onCreateOptionsMenu(menu); } diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java index 96c64d81..1422f1a4 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java @@ -196,7 +196,7 @@ public class ArtistDetailActivity extends AbsMusicContentActivity implements Pal @Override public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_artist_detail, menu); + getMenuInflater().inflate(R.menu.menu_detail_artist, menu); menu.findItem(R.id.action_colored_footers).setChecked(usePalette); return super.onCreateOptionsMenu(menu); } diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java index e89f93e9..365f81a2 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java @@ -97,7 +97,7 @@ public class GenreDetailActivity extends AbsMusicContentActivity implements CabH @Override public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_genre_detail, menu); + getMenuInflater().inflate(R.menu.menu_detail_genre, menu); return super.onCreateOptionsMenu(menu); } diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java index 4bfd645b..defb38f6 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java @@ -121,7 +121,7 @@ public class PlaylistDetailActivity extends AbsMusicContentActivity implements C @Override public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_playlist_detail, menu); + getMenuInflater().inflate(R.menu.menu_detail_playlist, menu); return super.onCreateOptionsMenu(menu); } diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java index 4a991a89..bd893390 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java @@ -35,7 +35,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter dataSet, @LayoutRes int itemLayoutRes, @Nullable CabHolder cabHolder) { - super(activity, cabHolder, R.menu.menu_playlists_selection); + super(activity, cabHolder, R.menu.menu_select_playlist); this.activity = activity; this.dataSet = dataSet; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java index a404cde7..4f9d74ed 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java @@ -42,7 +42,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) { - super(activity, cabHolder, R.menu.menu_media_selection); + super(activity, cabHolder, R.menu.menu_select_media); this.activity = activity; this.dataSet = dataSet; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java index 1923dc52..e030ecbb 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java @@ -41,7 +41,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) { - super(activity, cabHolder, R.menu.menu_media_selection); + super(activity, cabHolder, R.menu.menu_select_media); this.activity = activity; this.dataSet = dataSet; this.itemLayoutRes = itemLayoutRes; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java index 95eb56fa..281fca55 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java @@ -149,7 +149,7 @@ public class ArtistSongAdapter extends ArrayAdapter implements MaterialCab private void openCabIfNecessary() { if (cabHolder != null) { if (cab == null || !cab.isActive()) { - cab = cabHolder.openCab(R.menu.menu_media_selection, this); + cab = cabHolder.openCab(R.menu.menu_select_media, this); } } } diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlayingQueueAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlayingQueueAdapter.java index ee711307..fd22b9b5 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlayingQueueAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlayingQueueAdapter.java @@ -147,7 +147,7 @@ public class PlayingQueueAdapter extends SongAdapter implements DraggableItemAda @Override protected int getSongMenuRes() { - return R.menu.menu_item_playing_queue_song; + return R.menu.menu_item_queue_song; } @Override diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java index a9a6f76f..caaf622f 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java @@ -20,7 +20,7 @@ import java.util.List; public class PlaylistSongAdapter extends AbsOffsetSongAdapter { public PlaylistSongAdapter(AppCompatActivity activity, @NonNull List dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) { super(activity, dataSet, itemLayoutRes, usePalette, cabHolder, false); - setMultiSelectMenuRes(R.menu.menu_playlists_songs_selection); + setMultiSelectMenuRes(R.menu.menu_select_playlist_song); } @Override diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java index 056e2c09..9aa3affa 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java @@ -48,7 +48,7 @@ public class SongAdapter extends AbsMultiSelectAdapter dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder, boolean showSectionName) { - super(activity, cabHolder, R.menu.menu_media_selection); + super(activity, cabHolder, R.menu.menu_select_media); this.activity = activity; this.dataSet = dataSet; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java index 7c6dd67f..5dc7384b 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java @@ -409,7 +409,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum } public int getMenuRes() { - return R.menu.menu_item_playing_queue_song; + return R.menu.menu_item_queue_song; } @Override diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java index 6e194dda..dccacf73 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java @@ -396,7 +396,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum } public int getMenuRes() { - return R.menu.menu_item_playing_queue_song; + return R.menu.menu_item_queue_song; } @Override diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_detail_album.xml similarity index 100% rename from app/src/main/res/menu/menu_album_detail.xml rename to app/src/main/res/menu/menu_detail_album.xml diff --git a/app/src/main/res/menu/menu_artist_detail.xml b/app/src/main/res/menu/menu_detail_artist.xml similarity index 100% rename from app/src/main/res/menu/menu_artist_detail.xml rename to app/src/main/res/menu/menu_detail_artist.xml diff --git a/app/src/main/res/menu/menu_genre_detail.xml b/app/src/main/res/menu/menu_detail_genre.xml similarity index 100% rename from app/src/main/res/menu/menu_genre_detail.xml rename to app/src/main/res/menu/menu_detail_genre.xml diff --git a/app/src/main/res/menu/menu_playlist_detail.xml b/app/src/main/res/menu/menu_detail_playlist.xml similarity index 100% rename from app/src/main/res/menu/menu_playlist_detail.xml rename to app/src/main/res/menu/menu_detail_playlist.xml diff --git a/app/src/main/res/menu/menu_item_playing_queue_song.xml b/app/src/main/res/menu/menu_item_queue_song.xml similarity index 100% rename from app/src/main/res/menu/menu_item_playing_queue_song.xml rename to app/src/main/res/menu/menu_item_queue_song.xml diff --git a/app/src/main/res/menu/menu_media_selection.xml b/app/src/main/res/menu/menu_select_media.xml similarity index 100% rename from app/src/main/res/menu/menu_media_selection.xml rename to app/src/main/res/menu/menu_select_media.xml diff --git a/app/src/main/res/menu/menu_playlists_selection.xml b/app/src/main/res/menu/menu_select_playlist.xml similarity index 100% rename from app/src/main/res/menu/menu_playlists_selection.xml rename to app/src/main/res/menu/menu_select_playlist.xml diff --git a/app/src/main/res/menu/menu_playlists_songs_selection.xml b/app/src/main/res/menu/menu_select_playlist_song.xml similarity index 100% rename from app/src/main/res/menu/menu_playlists_songs_selection.xml rename to app/src/main/res/menu/menu_select_playlist_song.xml