diff options
Diffstat (limited to 'app/src/main/res/menu')
9 files changed, 20 insertions, 181 deletions
diff --git a/app/src/main/res/menu/select_album_context.xml b/app/src/main/res/menu/select_album_context.xml index 5b2529e7..388fd1f5 100644 --- a/app/src/main/res/menu/select_album_context.xml +++ b/app/src/main/res/menu/select_album_context.xml @@ -1,48 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:compat="http://schemas.android.com/apk/res-auto"> - +<menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/album_menu_info" android:title="@string/common.info"/> - <item - android:id="@+id/album_menu_play_now" - android:title="@string/common.play_now" - /> - - <item - android:id="@+id/album_menu_play_shuffled" - android:title="@string/common.play_shuffled" - /> - - <group android:id="@+id/hide_play_next"> - <item - android:id="@+id/album_menu_play_next" - android:title="@string/common.play_next"/> - </group> - - <group android:id="@+id/hide_play_last"> - <item - android:id="@+id/album_menu_play_last" - android:title="@string/common.play_last"/> - </group> - - <item - android:id="@+id/album_menu_download" - android:title="@string/common.download" - /> - - <item - android:id="@+id/album_menu_pin" - android:title="@string/common.pin" - /> - - <item - android:id="@+id/album_menu_delete" - android:title="@string/menu.delete_cache"/> - <item android:id="@+id/album_menu_show_artist" android:title="@string/menu.show_artist"/> diff --git a/app/src/main/res/menu/select_album_context_offline.xml b/app/src/main/res/menu/select_album_context_offline.xml index a1805f5b..60858d91 100644 --- a/app/src/main/res/menu/select_album_context_offline.xml +++ b/app/src/main/res/menu/select_album_context_offline.xml @@ -1,31 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:compat="http://schemas.android.com/apk/res-auto"> - <item - android:id="@+id/album_menu_play_now" - android:title="@string/common.play_now" - /> - - <item - android:id="@+id/album_menu_play_shuffled" - android:title="@string/common.play_shuffled" - /> - - <group android:id="@+id/hide_play_next"> - <item - android:id="@+id/album_menu_play_next" - android:title="@string/common.play_next"/> - </group> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> - <group android:id="@+id/hide_play_last"> - <item - android:id="@+id/album_menu_play_last" - android:title="@string/common.play_last"/> - </group> - - <item - android:id="@+id/album_menu_delete" - android:title="@string/menu.delete_cache"/> + <item + android:id="@+id/album_menu_info" + android:title="@string/common.info"/> <item android:id="@+id/album_menu_star" diff --git a/app/src/main/res/menu/select_artist_context.xml b/app/src/main/res/menu/select_artist_context.xml index debc07c6..b8bce32d 100644 --- a/app/src/main/res/menu/select_artist_context.xml +++ b/app/src/main/res/menu/select_artist_context.xml @@ -1,43 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:compat="http://schemas.android.com/apk/res-auto"> - - <item - android:id="@+id/artist_menu_play_now" - android:title="@string/common.play_now" - /> - - <item - android:id="@+id/artist_menu_play_shuffled" - android:title="@string/common.play_shuffled" - /> - - <group android:id="@+id/hide_play_next"> - <item - android:id="@+id/artist_menu_play_next" - android:title="@string/common.play_next"/> - </group> - - <group android:id="@+id/hide_play_last"> - <item - android:id="@+id/artist_menu_play_last" - android:title="@string/common.play_last"/> - </group> - - <item - android:id="@+id/artist_menu_download" - android:title="@string/common.download" - /> - - <item - android:id="@+id/artist_menu_pin" - android:title="@string/common.pin" - /> - - <item - android:id="@+id/artist_menu_delete" - android:title="@string/menu.delete_cache"/> - +<menu xmlns:android="http://schemas.android.com/apk/res/android"> <group android:id="@+id/server_1_10"> <group android:id="@+id/hide_star"> <item diff --git a/app/src/main/res/menu/select_artist_context_offline.xml b/app/src/main/res/menu/select_artist_context_offline.xml deleted file mode 100644 index 17ee97e0..00000000 --- a/app/src/main/res/menu/select_artist_context_offline.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:compat="http://schemas.android.com/apk/res-auto"> - - <item - android:id="@+id/artist_menu_play_now" - android:title="@string/common.play_now" - /> - - <item - android:id="@+id/artist_menu_play_shuffled" - android:title="@string/common.play_shuffled" - /> - - <group android:id="@+id/hide_play_next"> - <item - android:id="@+id/artist_menu_play_next" - android:title="@string/common.play_next"/> - </group> - - <group android:id="@+id/hide_play_last"> - <item - android:id="@+id/artist_menu_play_last" - android:title="@string/common.play_last"/> - </group> - - <item - android:id="@+id/artist_menu_delete" - android:title="@string/menu.delete_cache"/> -</menu> diff --git a/app/src/main/res/menu/select_bookmark_context.xml b/app/src/main/res/menu/select_bookmark_context.xml index 2b1b83fd..d52db105 100644 --- a/app/src/main/res/menu/select_bookmark_context.xml +++ b/app/src/main/res/menu/select_bookmark_context.xml @@ -15,18 +15,6 @@ android:title="@string/menu.show_artist"/> <item - android:id="@+id/song_menu_download" - android:title="@string/common.download"/> - - <item - android:id="@+id/song_menu_pin" - android:title="@string/common.pin"/> - - <item - android:id="@+id/song_menu_delete" - android:title="@string/menu.delete_cache"/> - - <item android:id="@+id/bookmark_menu_delete" android:title="@string/bookmark.delete"/> </menu> diff --git a/app/src/main/res/menu/select_playlist_context.xml b/app/src/main/res/menu/select_playlist_context.xml index 47033d9c..4941e94b 100644 --- a/app/src/main/res/menu/select_playlist_context.xml +++ b/app/src/main/res/menu/select_playlist_context.xml @@ -7,21 +7,6 @@ android:title="@string/common.info" /> - <item - android:id="@+id/playlist_menu_play_now" - android:title="@string/common.play_now" - /> - - <item - android:id="@+id/playlist_menu_play_shuffled" - android:title="@string/common.play_shuffled" - /> - - <item - android:id="@+id/playlist_menu_download" - android:title="@string/common.download" - /> - <item android:id="@+id/playlist_menu_sync" android:title="@string/menu.keep_synced"/> diff --git a/app/src/main/res/menu/select_playlist_context_offline.xml b/app/src/main/res/menu/select_playlist_context_offline.xml index d63aec17..6745d850 100644 --- a/app/src/main/res/menu/select_playlist_context_offline.xml +++ b/app/src/main/res/menu/select_playlist_context_offline.xml @@ -1,13 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:compat="http://schemas.android.com/apk/res-auto"> - <item - android:id="@+id/playlist_menu_play_now" - android:title="@string/common.play_now" +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/playlist_info" + android:title="@string/common.info" /> - - <item - android:id="@+id/playlist_menu_play_shuffled" - android:title="@string/common.play_shuffled" - /> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/select_podcast_episode_context.xml b/app/src/main/res/menu/select_podcast_episode_context.xml index bacccda3..31f2a051 100644 --- a/app/src/main/res/menu/select_podcast_episode_context.xml +++ b/app/src/main/res/menu/select_podcast_episode_context.xml @@ -7,7 +7,7 @@ android:title="@string/common.info" /> - <item + <item android:id="@+id/song_menu_play_now" android:title="@string/common.play_now" /> @@ -23,16 +23,16 @@ android:id="@+id/song_menu_play_last" android:title="@string/common.play_last"/> </group> - - <item + + <item android:id="@+id/song_menu_download" android:title="@string/common.download" /> - - <item + + <item android:id="@+id/song_menu_delete" android:title="@string/menu.delete_cache"/> - + <group android:id="@+id/server_1.9"> <item android:id="@+id/bookmark_menu_delete" diff --git a/app/src/main/res/menu/select_podcast_episode_context_offline.xml b/app/src/main/res/menu/select_podcast_episode_context_offline.xml index 587d01f7..301746f4 100644 --- a/app/src/main/res/menu/select_podcast_episode_context_offline.xml +++ b/app/src/main/res/menu/select_podcast_episode_context_offline.xml @@ -6,8 +6,8 @@ android:id="@+id/song_menu_info" android:title="@string/common.info" /> - - <item + + <item android:id="@+id/song_menu_play_now" android:title="@string/common.play_now" /> @@ -23,8 +23,8 @@ android:id="@+id/song_menu_play_last" android:title="@string/common.play_last"/> </group> - - <item + + <item android:id="@+id/song_menu_delete" android:title="@string/menu.delete_cache"/> </menu> |