rename similar menu xml files

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);
     }
 

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);
     }

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);
     }
 

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);
     }
 

app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java

@@ -35,7 +35,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
     protected int itemLayoutRes;
 
     public PlaylistAdapter(AppCompatActivity activity, List<Playlist> 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;

app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java

@@ -42,7 +42,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
     protected boolean usePalette;
 
     public AlbumAdapter(@NonNull AppCompatActivity activity, List<Album> 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;

app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java

@@ -41,7 +41,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
     protected boolean usePalette;
 
     public ArtistAdapter(@NonNull AppCompatActivity activity, List<Artist> 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;

app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java

@@ -149,7 +149,7 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> 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);
             }
         }
     }

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

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<Song> 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

app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java

@@ -48,7 +48,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
     }
 
     public SongAdapter(AppCompatActivity activity, List<Song> 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;

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

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