aboutsummaryrefslogtreecommitdiff
path: root/res/menu
diff options
context:
space:
mode:
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/abstract_top_menu.xml (renamed from res/menu/chat.xml)38
-rw-r--r--res/menu/drawer_menu.xml8
-rw-r--r--res/menu/empty.xml2
-rw-r--r--res/menu/main.xml19
-rw-r--r--res/menu/nowplaying.xml15
-rw-r--r--res/menu/nowplaying_downloading.xml13
-rw-r--r--res/menu/nowplaying_offline.xml11
-rw-r--r--res/menu/search.xml13
-rw-r--r--res/menu/select_album.xml6
-rw-r--r--res/menu/select_album_list.xml2
-rw-r--r--res/menu/select_artist.xml14
-rw-r--r--res/menu/select_bookmark_context.xml24
-rw-r--r--res/menu/select_genres.xml12
-rw-r--r--res/menu/select_playlist.xml25
-rw-r--r--res/menu/select_podcast_episode.xml3
-rw-r--r--res/menu/select_podcast_episode_offline.xml3
-rw-r--r--res/menu/select_podcasts.xml18
-rw-r--r--res/menu/select_podcasts_context_offline.xml7
-rw-r--r--res/menu/select_song.xml26
-rw-r--r--res/menu/select_song_offline.xml18
20 files changed, 107 insertions, 170 deletions
diff --git a/res/menu/chat.xml b/res/menu/abstract_top_menu.xml
index 685aba18..46419d0f 100644
--- a/res/menu/chat.xml
+++ b/res/menu/abstract_top_menu.xml
@@ -1,19 +1,19 @@
-<?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_refresh"
- android:icon="@drawable/action_refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
-
- <item
- android:id="@+id/menu_settings"
- android:icon="@drawable/action_settings"
- android:title="@string/menu.settings"/>
-
- <item
- android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
- android:title="@string/menu.exit"/>
-</menu> \ No newline at end of file
+<?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_refresh"
+ android:icon="?attr/refresh"
+ android:title="@string/menu.refresh"
+ compat:showAsAction="always|withText"/>
+
+ <item
+ android:id="@+id/menu_search"
+ android:icon="?attr/search"
+ android:title="@string/menu.search"
+ compat:showAsAction="always|withText"/>
+
+ <item
+ android:id="@+id/menu_exit"
+ android:title="@string/menu.exit"/>
+</menu>
diff --git a/res/menu/drawer_menu.xml b/res/menu/drawer_menu.xml
new file mode 100644
index 00000000..c2969938
--- /dev/null
+++ b/res/menu/drawer_menu.xml
@@ -0,0 +1,8 @@
+<?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_exit"
+ android:title="@string/menu.exit"/>
+</menu>
diff --git a/res/menu/empty.xml b/res/menu/empty.xml
index 979eefe4..9bb43bf7 100644
--- a/res/menu/empty.xml
+++ b/res/menu/empty.xml
@@ -3,7 +3,7 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
</menu>
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 1390b68b..5e504242 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -3,24 +3,18 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_search"
- android:icon="@drawable/action_search"
+ android:icon="?attr/search"
android:title="@string/menu.search"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
compat:showAsAction="always|withText"/>
-
- <item
- android:id="@+id/menu_help"
- android:icon="@drawable/action_help"
- android:title="@string/menu.help"/>
<item
android:id="@+id/menu_about"
- android:icon="@drawable/action_help"
android:title="@string/menu.about"/>
<item
@@ -31,14 +25,7 @@
android:id="@+id/menu_changelog"
android:title="@string/changelog_full_title"/>
- <item
- android:id="@+id/menu_settings"
- android:icon="@drawable/action_settings"
- android:title="@string/menu.settings"/>
-
- <item
+ <item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
-
</menu>
diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index ae411240..3c9c5ba6 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -3,27 +3,25 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/download.menu_shuffle"
compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_remove_all"
- android:icon="@drawable/action_remove_all"
+ android:icon="?attr/remove"
android:title="@string/download.menu_remove_all"
compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_save_playlist"
- android:icon="@drawable/action_save"
+ android:icon="?attr/save"
android:title="@string/download.menu_save"
compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_screen_on_off"
- android:icon="@drawable/action_screen_on_off"
- android:title="@string/download.menu_screen_on"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/download.menu_screen_on"/>
<item
android:id="@+id/menu_toggle_timer"
@@ -32,9 +30,8 @@
<item
android:id="@+id/menu_toggle_now_playing"
android:title="@string/download.show_downloading"/>
-
- <item
+
+ <item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/nowplaying_downloading.xml b/res/menu/nowplaying_downloading.xml
index fbdb78f4..50ab00f3 100644
--- a/res/menu/nowplaying_downloading.xml
+++ b/res/menu/nowplaying_downloading.xml
@@ -3,19 +3,9 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_remove_all"
- android:icon="@drawable/action_remove_all"
+ android:icon="?attr/remove"
android:title="@string/download.menu_remove_all"
compat:showAsAction="always|withText"/>
-
- <item
- android:id="@+id/menu_screen_on_off"
- android:icon="@drawable/action_screen_on_off"
- android:title="@string/download.menu_screen_on"
- compat:showAsAction="ifRoom|withText"/>
-
- <item
- android:id="@+id/menu_toggle_timer"
- android:title="@string/download.start_timer"/>
<item
android:id="@+id/menu_toggle_now_playing"
@@ -23,6 +13,5 @@
<item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/nowplaying_offline.xml b/res/menu/nowplaying_offline.xml
index 3800c013..41d1d5d1 100644
--- a/res/menu/nowplaying_offline.xml
+++ b/res/menu/nowplaying_offline.xml
@@ -4,28 +4,25 @@
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/download.menu_shuffle"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_remove_all"
- android:icon="@drawable/action_remove_all"
+ android:icon="?attr/remove"
android:title="@string/download.menu_remove_all"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_screen_on_off"
- android:icon="@drawable/action_screen_on_off"
- android:title="@string/download.menu_screen_on"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/download.menu_screen_on"/>
<item
android:id="@+id/menu_toggle_timer"
android:title="@string/download.start_timer"/>
- <item
+ <item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/search.xml b/res/menu/search.xml
index fa361566..cab9c4f6 100644
--- a/res/menu/search.xml
+++ b/res/menu/search.xml
@@ -3,23 +3,12 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_search"
- android:icon="@drawable/action_search"
+ android:icon="?attr/search"
android:title="@string/menu.search"
compat:showAsAction="ifRoom|withText"/>
<item
- android:id="@+id/menu_help"
- android:icon="@drawable/ic_menu_help"
- android:title="@string/menu.help"/>
-
- <item
- android:id="@+id/menu_settings"
- android:icon="@drawable/ic_menu_settings"
- android:title="@string/menu.settings"/>
-
- <item
android:id="@+id/menu_exit"
- android:icon="@drawable/ic_menu_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml
index 329c479c..469561f1 100644
--- a/res/menu/select_album.xml
+++ b/res/menu/select_album.xml
@@ -3,19 +3,19 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_play_now"
- android:icon="@drawable/action_play_all"
+ android:icon="?media_button_start"
android:title="@string/menu.play"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
compat:showAsAction="ifRoom|withText"/>
</menu>
diff --git a/res/menu/select_album_list.xml b/res/menu/select_album_list.xml
index 635a36bf..60b636e3 100644
--- a/res/menu/select_album_list.xml
+++ b/res/menu/select_album_list.xml
@@ -3,7 +3,7 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
</menu>
diff --git a/res/menu/select_artist.xml b/res/menu/select_artist.xml
index 3c694cd2..d1e1f4e3 100644
--- a/res/menu/select_artist.xml
+++ b/res/menu/select_artist.xml
@@ -3,29 +3,23 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_search"
- android:icon="@drawable/action_search"
+ android:icon="?attr/search"
android:title="@string/menu.search"
compat:showAsAction="ifRoom|withText"/>
- <item
- android:id="@+id/menu_settings"
- android:icon="@drawable/action_settings"
- android:title="@string/menu.settings"/>
-
- <item
+ <item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/select_bookmark_context.xml b/res/menu/select_bookmark_context.xml
new file mode 100644
index 00000000..af11c86f
--- /dev/null
+++ b/res/menu/select_bookmark_context.xml
@@ -0,0 +1,24 @@
+<?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/bookmark_menu_info"
+ android:title="@string/common.info"/>
+
+ <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/common.delete"/>
+
+ <item
+ android:id="@+id/bookmark_menu_delete"
+ android:title="@string/bookmark.delete"/>
+</menu>
diff --git a/res/menu/select_genres.xml b/res/menu/select_genres.xml
index 7ce7f1a0..837b3534 100644
--- a/res/menu/select_genres.xml
+++ b/res/menu/select_genres.xml
@@ -3,17 +3,7 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
-
- <item
- android:id="@+id/menu_settings"
- android:icon="@drawable/action_settings"
- android:title="@string/menu.settings"/>
-
- <item
- android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
- android:title="@string/menu.exit"/>
</menu> \ No newline at end of file
diff --git a/res/menu/select_playlist.xml b/res/menu/select_playlist.xml
deleted file mode 100644
index 4c4cc302..00000000
--- a/res/menu/select_playlist.xml
+++ /dev/null
@@ -1,25 +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/menu_refresh"
- android:icon="@drawable/action_refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
-
- <item
- android:id="@+id/menu_search"
- android:icon="@drawable/action_search"
- android:title="@string/menu.search"
- compat:showAsAction="always|withText"/>
-
- <item
- android:id="@+id/menu_settings"
- android:icon="@drawable/action_settings"
- android:title="@string/menu.settings"/>
-
- <item
- android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
- android:title="@string/menu.exit"/>
-</menu>
diff --git a/res/menu/select_podcast_episode.xml b/res/menu/select_podcast_episode.xml
index 7e79d0f7..8472325a 100644
--- a/res/menu/select_podcast_episode.xml
+++ b/res/menu/select_podcast_episode.xml
@@ -3,7 +3,7 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
@@ -13,6 +13,5 @@
<item
android:id="@+id/menu_delete"
- android:icon="@drawable/action_remove_all"
android:title="@string/common.delete"/>
</menu>
diff --git a/res/menu/select_podcast_episode_offline.xml b/res/menu/select_podcast_episode_offline.xml
index cb6d1a3b..4d464c1f 100644
--- a/res/menu/select_podcast_episode_offline.xml
+++ b/res/menu/select_podcast_episode_offline.xml
@@ -3,12 +3,11 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_delete"
- android:icon="@drawable/action_remove_all"
android:title="@string/common.delete"/>
</menu>
diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml
index 6c1ffa07..212feb04 100644
--- a/res/menu/select_podcasts.xml
+++ b/res/menu/select_podcasts.xml
@@ -3,27 +3,25 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
+ <item
+ android:id="@+id/menu_search"
+ android:icon="?attr/search"
+ android:title="@string/menu.search"
+ compat:showAsAction="always|withText"/>
+
<item
android:id="@+id/menu_add_podcast"
- android:icon="@drawable/action_exit"
android:title="@string/menu.add_podcast"/>
<item
android:id="@+id/menu_check"
- android:icon="@drawable/action_refresh"
android:title="@string/menu.check_podcasts"/>
- <item
- android:id="@+id/menu_settings"
- android:icon="@drawable/action_settings"
- android:title="@string/menu.settings"/>
-
- <item
+ <item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu> \ No newline at end of file
diff --git a/res/menu/select_podcasts_context_offline.xml b/res/menu/select_podcasts_context_offline.xml
new file mode 100644
index 00000000..cbc76224
--- /dev/null
+++ b/res/menu/select_podcasts_context_offline.xml
@@ -0,0 +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/podcast_channel_info"
+ android:title="@string/common.info"/>
+</menu> \ No newline at end of file
diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index 658e3ffe..d60dedac 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -3,45 +3,37 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_play_now"
- android:icon="@drawable/action_play_all"
+ android:icon="?attr/media_button_start"
android:title="@string/menu.play"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_select"
- android:icon="@drawable/action_select"
- android:title="@string/menu.select"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/menu.select"/>
<item
android:id="@+id/menu_download"
- android:icon="@drawable/action_save"
- android:title="@string/common.download"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/common.download"/>
<item
android:id="@+id/menu_cache"
- android:icon="@drawable/action_save"
- android:title="@string/common.pin"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/common.pin"/>
<item
android:id="@+id/menu_delete"
- android:icon="@drawable/action_remove_all"
- android:title="@string/common.delete"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/common.delete"/>
<item
android:id="@+id/menu_add_playlist"
@@ -53,7 +45,5 @@
<item
android:id="@+id/menu_play_last"
- android:icon="@drawable/action_play_all"
- android:title="@string/menu.play_last"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/menu.play_last"/>
</menu>
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index 7588d9ad..88e9758d 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -3,37 +3,31 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_play_now"
- android:icon="@drawable/action_play_all"
+ android:icon="?attr/media_button_start"
android:title="@string/menu.play"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_select"
- android:icon="@drawable/action_select"
- android:title="@string/menu.select"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/menu.select"/>
<item
android:id="@+id/menu_delete"
- android:icon="@drawable/action_remove_all"
- android:title="@string/common.delete"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/common.delete"/>
<item
android:id="@+id/menu_play_last"
- android:icon="@drawable/action_play_all"
- android:title="@string/menu.play_last"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/menu.play_last"/>
</menu>
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 18:06:13 +0000