diff options
Diffstat (limited to 'app/src/main/res/menu')
26 files changed, 161 insertions, 261 deletions
diff --git a/app/src/main/res/menu/abstract_top_menu.xml b/app/src/main/res/menu/abstract_top_menu.xml index 22499ae9..7c8d414d 100644 --- a/app/src/main/res/menu/abstract_top_menu.xml +++ b/app/src/main/res/menu/abstract_top_menu.xml @@ -2,7 +2,7 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:compat="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/menu_search" + android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" compat:showAsAction="always|withText"/> diff --git a/app/src/main/res/menu/drawer_navigation.xml b/app/src/main/res/menu/drawer_navigation.xml new file mode 100644 index 00000000..88ecd920 --- /dev/null +++ b/app/src/main/res/menu/drawer_navigation.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <group android:checkableBehavior="single"> + <item + android:id="@+id/drawer_home" + android:icon="?attr/drawerHome" + android:title="@string/button_bar.home"/> + <item + android:id="@+id/drawer_library" + android:icon="?attr/drawerLibrary" + android:title="@string/button_bar.browse"/> + <item + android:id="@+id/drawer_playlists" + android:icon="?attr/drawerPlaylists" + android:title="@string/button_bar.playlists"/> + <item + android:id="@+id/drawer_podcasts" + android:icon="?attr/drawerPodcasts" + android:title="@string/button_bar.podcasts"/> + <item + android:id="@+id/drawer_bookmarks" + android:icon="?attr/drawerBookmarks" + android:title="@string/button_bar.bookmarks"/> + <item + android:id="@+id/drawer_shares" + android:icon="?attr/drawerShares" + android:title="@string/button_bar.shares"/> + <item + android:id="@+id/drawer_chat" + android:icon="?attr/drawerChat" + android:title="@string/button_bar.chat"/> + <item + android:id="@+id/drawer_admin" + android:icon="?attr/drawerAdmin" + android:title="@string/button_bar.admin"/> + <item + android:id="@+id/drawer_downloading" + android:icon="?attr/drawerDownloading" + android:title="@string/button_bar.downloading" + android:visible="false"/> + </group> + + <group + android:id="@+id/drawer_bottom" + android:checkableBehavior="single"> + + <item + android:id="@+id/drawer_settings" + android:title="@string/menu.settings"/> + </group> +</menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index 549c5fb6..0970c8ce 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -2,13 +2,13 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:compat="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/menu_search" + android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" compat:showAsAction="always|withText"/> <item - android:id="@+id/menu_shuffle" + android:id="@+id/menu_global_shuffle" android:icon="?attr/shuffle" android:title="@string/menu.shuffle" compat:showAsAction="always|withText"/> diff --git a/app/src/main/res/menu/multiselect_media.xml b/app/src/main/res/menu/multiselect_media.xml new file mode 100644 index 00000000..75865a14 --- /dev/null +++ b/app/src/main/res/menu/multiselect_media.xml @@ -0,0 +1,47 @@ +<?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/menu_play_now" + android:icon="?attr/actionbar_start" + android:title="@string/menu.play" + compat:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_shuffle" + android:icon="?attr/shuffle" + android:title="@string/menu.shuffle" + compat:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_download" + android:title="@string/common.download"/> + + <item + android:id="@+id/menu_cache" + android:title="@string/common.pin"/> + + <item + android:id="@+id/menu_delete" + android:title="@string/menu.delete_cache"/> + + <item + android:id="@+id/menu_add_playlist" + android:title="@string/menu.add_playlist"/> + + <item + android:id="@+id/menu_remove_playlist" + android:title="@string/menu.remove_playlist"/> + + <group android:id="@+id/hide_play_next"> + <item + android:id="@+id/menu_play_next" + android:title="@string/common.play_next"/> + </group> + + <group android:id="@+id/hide_play_last"> + <item + android:id="@+id/menu_play_last" + android:title="@string/menu.play_last"/> + </group> +</menu> diff --git a/app/src/main/res/menu/multiselect_media_offline.xml b/app/src/main/res/menu/multiselect_media_offline.xml new file mode 100644 index 00000000..5587c106 --- /dev/null +++ b/app/src/main/res/menu/multiselect_media_offline.xml @@ -0,0 +1,31 @@ +<?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/menu_play_now" + android:icon="?attr/actionbar_start" + android:title="@string/menu.play" + compat:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_shuffle" + android:icon="?attr/shuffle" + android:title="@string/menu.shuffle" + compat:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_delete" + android:title="@string/menu.delete_cache"/> + + <group android:id="@+id/hide_play_next"> + <item + android:id="@+id/menu_play_next" + android:title="@string/common.play_next"/> + </group> + + <group android:id="@+id/hide_play_last"> + <item + android:id="@+id/menu_play_last" + android:title="@string/menu.play_last"/> + </group> +</menu> diff --git a/app/src/main/res/menu/nowplaying_context.xml b/app/src/main/res/menu/nowplaying_context.xml index c9347353..845a98c8 100644 --- a/app/src/main/res/menu/nowplaying_context.xml +++ b/app/src/main/res/menu/nowplaying_context.xml @@ -19,10 +19,6 @@ android:title="@string/download.menu_lyrics"/> <item - android:id="@+id/menu_remove" - android:title="@string/download.menu_remove"/> - - <item android:id="@+id/menu_delete" android:title="@string/menu.delete_cache"/> diff --git a/app/src/main/res/menu/nowplaying_context_offline.xml b/app/src/main/res/menu/nowplaying_context_offline.xml index 24b23a8d..9ce63d79 100644 --- a/app/src/main/res/menu/nowplaying_context_offline.xml +++ b/app/src/main/res/menu/nowplaying_context_offline.xml @@ -15,10 +15,6 @@ android:title="@string/download.menu_show_album"/> <item - android:id="@+id/menu_remove" - android:title="@string/download.menu_remove"/> - - <item android:id="@+id/menu_delete" android:title="@string/menu.delete_cache"/> diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml index cab9c4f6..e9377d68 100644 --- a/app/src/main/res/menu/search.xml +++ b/app/src/main/res/menu/search.xml @@ -2,7 +2,7 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:compat="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/menu_search" + android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" compat:showAsAction="ifRoom|withText"/> diff --git a/app/src/main/res/menu/select_album.xml b/app/src/main/res/menu/select_album.xml index 3d2228e8..c94a4a3f 100644 --- a/app/src/main/res/menu/select_album.xml +++ b/app/src/main/res/menu/select_album.xml @@ -3,7 +3,7 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_play_now" - android:icon="?media_button_start" + android:icon="?actionbar_start" android:title="@string/menu.play" compat:showAsAction="always|withText"/> 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_album_list.xml b/app/src/main/res/menu/select_album_list.xml index a9196d1c..17148a51 100644 --- a/app/src/main/res/menu/select_album_list.xml +++ b/app/src/main/res/menu/select_album_list.xml @@ -3,7 +3,7 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_play_now" - android:icon="?media_button_start" + android:icon="?actionbar_start" android:title="@string/menu.play" compat:showAsAction="always|withText"/> diff --git a/app/src/main/res/menu/select_artist.xml b/app/src/main/res/menu/select_artist.xml index 603f0a3b..66ba37ba 100644 --- a/app/src/main/res/menu/select_artist.xml +++ b/app/src/main/res/menu/select_artist.xml @@ -2,13 +2,13 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:compat="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/menu_shuffle" + android:id="@+id/menu_global_shuffle" android:icon="?attr/shuffle" android:title="@string/menu.shuffle" compat:showAsAction="always|withText"/> <item - android:id="@+id/menu_search" + android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" compat:showAsAction="ifRoom|withText"/> 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> diff --git a/app/src/main/res/menu/select_podcasts.xml b/app/src/main/res/menu/select_podcasts.xml index f30429ce..41ad62fa 100644 --- a/app/src/main/res/menu/select_podcasts.xml +++ b/app/src/main/res/menu/select_podcasts.xml @@ -2,7 +2,7 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:compat="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/menu_search" + android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" compat:showAsAction="always|withText"/> diff --git a/app/src/main/res/menu/select_song.xml b/app/src/main/res/menu/select_song.xml index fc4494cb..5718866a 100644 --- a/app/src/main/res/menu/select_song.xml +++ b/app/src/main/res/menu/select_song.xml @@ -3,7 +3,7 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_play_now" - android:icon="?attr/media_button_start" + android:icon="?attr/actionbar_start" android:title="@string/menu.play" compat:showAsAction="always|withText"/> @@ -32,14 +32,6 @@ <item android:id="@+id/menu_delete" android:title="@string/menu.delete_cache"/> - - <item - android:id="@+id/menu_add_playlist" - android:title="@string/menu.add_playlist"/> - - <item - android:id="@+id/menu_remove_playlist" - android:title="@string/menu.remove_playlist"/> <group android:id="@+id/hide_play_next"> <item diff --git a/app/src/main/res/menu/select_song_context.xml b/app/src/main/res/menu/select_song_context.xml index d8fc211c..eae8a8bc 100644 --- a/app/src/main/res/menu/select_song_context.xml +++ b/app/src/main/res/menu/select_song_context.xml @@ -6,37 +6,6 @@ android:id="@+id/song_menu_info" android:title="@string/common.info" /> - - <item - android:id="@+id/song_menu_play_now" - android:title="@string/common.play_now" - /> - - <group android:id="@+id/hide_play_next"> - <item - android:id="@+id/song_menu_play_next" - android:title="@string/common.play_next"/> - </group> - - <group android:id="@+id/hide_play_last"> - <item - android:id="@+id/song_menu_play_last" - android:title="@string/common.play_last"/> - </group> - - <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"/> <group android:id="@+id/server_1.8"> <item diff --git a/app/src/main/res/menu/select_song_context_offline.xml b/app/src/main/res/menu/select_song_context_offline.xml index 49445876..77903fb0 100644 --- a/app/src/main/res/menu/select_song_context_offline.xml +++ b/app/src/main/res/menu/select_song_context_offline.xml @@ -6,27 +6,6 @@ android:id="@+id/song_menu_info" android:title="@string/common.info" /> - - <item - android:id="@+id/song_menu_play_now" - android:title="@string/common.play_now" - /> - - <group android:id="@+id/hide_play_next"> - <item - android:id="@+id/song_menu_play_next" - android:title="@string/common.play_next"/> - </group> - - <group android:id="@+id/hide_play_last"> - <item - android:id="@+id/song_menu_play_last" - android:title="@string/common.play_last"/> - </group> - - <item - android:id="@+id/song_menu_delete" - android:title="@string/menu.delete_cache"/> <item android:id="@+id/song_menu_star" diff --git a/app/src/main/res/menu/select_song_offline.xml b/app/src/main/res/menu/select_song_offline.xml index c45405fb..7a4a5407 100644 --- a/app/src/main/res/menu/select_song_offline.xml +++ b/app/src/main/res/menu/select_song_offline.xml @@ -3,7 +3,7 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_play_now" - android:icon="?attr/media_button_start" + android:icon="?attr/actionbar_start" android:title="@string/menu.play" compat:showAsAction="always|withText"/> diff --git a/app/src/main/res/menu/similar_artists.xml b/app/src/main/res/menu/similar_artists.xml index 771555b6..f6c30fb2 100644 --- a/app/src/main/res/menu/similar_artists.xml +++ b/app/src/main/res/menu/similar_artists.xml @@ -4,7 +4,7 @@ <item android:id="@+id/menu_play_now" - android:icon="?media_button_start" + android:icon="?actionbar_start" android:title="@string/menu.play" compat:showAsAction="always|withText"/> |