diff options
56 files changed, 71 insertions, 89 deletions
diff --git a/res/drawable-hdpi/action_browse.png b/res/drawable-hdpi/action_browse.png Binary files differdeleted file mode 100644 index 54296909..00000000 --- a/res/drawable-hdpi/action_browse.png +++ /dev/null diff --git a/res/drawable-hdpi/action_compass.png b/res/drawable-hdpi/action_compass.png Binary files differdeleted file mode 100644 index 39760f89..00000000 --- a/res/drawable-hdpi/action_compass.png +++ /dev/null diff --git a/res/drawable-hdpi/action_exit.png b/res/drawable-hdpi/action_exit.png Binary files differdeleted file mode 100644 index 09e18dee..00000000 --- a/res/drawable-hdpi/action_exit.png +++ /dev/null diff --git a/res/drawable-hdpi/action_help.png b/res/drawable-hdpi/action_help.png Binary files differdeleted file mode 100644 index aaf8304c..00000000 --- a/res/drawable-hdpi/action_help.png +++ /dev/null diff --git a/res/drawable-hdpi/action_moreoverflow.png b/res/drawable-hdpi/action_moreoverflow.png Binary files differdeleted file mode 100644 index cb6ebdaf..00000000 --- a/res/drawable-hdpi/action_moreoverflow.png +++ /dev/null diff --git a/res/drawable-hdpi/action_offline.png b/res/drawable-hdpi/action_offline.png Binary files differdeleted file mode 100644 index a85f0931..00000000 --- a/res/drawable-hdpi/action_offline.png +++ /dev/null diff --git a/res/drawable-hdpi/action_play_all.png b/res/drawable-hdpi/action_play_all.png Binary files differdeleted file mode 100644 index 6ce5629a..00000000 --- a/res/drawable-hdpi/action_play_all.png +++ /dev/null diff --git a/res/drawable-hdpi/action_refresh.png b/res/drawable-hdpi/action_refresh.png Binary files differdeleted file mode 100644 index 9f30dc95..00000000 --- a/res/drawable-hdpi/action_refresh.png +++ /dev/null diff --git a/res/drawable-hdpi/action_remove_all.png b/res/drawable-hdpi/action_remove_all.png Binary files differdeleted file mode 100644 index 97b88837..00000000 --- a/res/drawable-hdpi/action_remove_all.png +++ /dev/null diff --git a/res/drawable-hdpi/action_save.png b/res/drawable-hdpi/action_save.png Binary files differdeleted file mode 100644 index 7bda97d6..00000000 --- a/res/drawable-hdpi/action_save.png +++ /dev/null diff --git a/res/drawable-hdpi/action_screen_on_off.png b/res/drawable-hdpi/action_screen_on_off.png Binary files differdeleted file mode 100644 index c7168563..00000000 --- a/res/drawable-hdpi/action_screen_on_off.png +++ /dev/null diff --git a/res/drawable-hdpi/action_search.png b/res/drawable-hdpi/action_search.png Binary files differdeleted file mode 100644 index 6bc3d426..00000000 --- a/res/drawable-hdpi/action_search.png +++ /dev/null diff --git a/res/drawable-hdpi/action_select.png b/res/drawable-hdpi/action_select.png Binary files differdeleted file mode 100644 index e9e83e3d..00000000 --- a/res/drawable-hdpi/action_select.png +++ /dev/null diff --git a/res/drawable-hdpi/action_settings.png b/res/drawable-hdpi/action_settings.png Binary files differdeleted file mode 100644 index 1ab7722b..00000000 --- a/res/drawable-hdpi/action_settings.png +++ /dev/null diff --git a/res/drawable-hdpi/action_share.png b/res/drawable-hdpi/action_share.png Binary files differdeleted file mode 100644 index 28376157..00000000 --- a/res/drawable-hdpi/action_share.png +++ /dev/null diff --git a/res/drawable-hdpi/action_shuffle.png b/res/drawable-hdpi/action_shuffle.png Binary files differdeleted file mode 100644 index 0613965c..00000000 --- a/res/drawable-hdpi/action_shuffle.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_chat_dark.png b/res/drawable-hdpi/ic_menu_chat_dark.png Binary files differindex be04b06e..75363fce 100644 --- a/res/drawable-hdpi/ic_menu_chat_dark.png +++ b/res/drawable-hdpi/ic_menu_chat_dark.png diff --git a/res/drawable-hdpi/ic_menu_chat_light.png b/res/drawable-hdpi/ic_menu_chat_light.png Binary files differindex 3f58695c..e28933e4 100644 --- a/res/drawable-hdpi/ic_menu_chat_light.png +++ b/res/drawable-hdpi/ic_menu_chat_light.png diff --git a/res/drawable-hdpi/ic_menu_chat_send_dark.png b/res/drawable-hdpi/ic_menu_chat_send_dark.png Binary files differindex bd37dc59..c0e9b372 100644 --- a/res/drawable-hdpi/ic_menu_chat_send_dark.png +++ b/res/drawable-hdpi/ic_menu_chat_send_dark.png diff --git a/res/drawable-hdpi/ic_menu_chat_send_light.png b/res/drawable-hdpi/ic_menu_chat_send_light.png Binary files differindex 0c870d2c..ebcfe9e8 100644 --- a/res/drawable-hdpi/ic_menu_chat_send_light.png +++ b/res/drawable-hdpi/ic_menu_chat_send_light.png diff --git a/res/drawable-hdpi/ic_menu_exit.png b/res/drawable-hdpi/ic_menu_exit.png Binary files differdeleted file mode 100644 index 847a1ed3..00000000 --- a/res/drawable-hdpi/ic_menu_exit.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_help.png b/res/drawable-hdpi/ic_menu_help.png Binary files differdeleted file mode 100644 index 9f11f434..00000000 --- a/res/drawable-hdpi/ic_menu_help.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_settings.png b/res/drawable-hdpi/ic_menu_settings.png Binary files differdeleted file mode 100644 index 48775c1e..00000000 --- a/res/drawable-hdpi/ic_menu_settings.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_shuffle.png b/res/drawable-hdpi/ic_menu_shuffle.png Binary files differdeleted file mode 100644 index 0613965c..00000000 --- a/res/drawable-hdpi/ic_menu_shuffle.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_shuffle_dark.png b/res/drawable-hdpi/ic_menu_shuffle_dark.png Binary files differnew file mode 100644 index 00000000..f77cfed2 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_shuffle_dark.png diff --git a/res/drawable-hdpi/ic_menu_shuffle_light.png b/res/drawable-hdpi/ic_menu_shuffle_light.png Binary files differnew file mode 100644 index 00000000..ded93939 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_shuffle_light.png diff --git a/res/drawable-hdpi/main_offline.png b/res/drawable-hdpi/main_offline.png Binary files differdeleted file mode 100644 index a1d27cec..00000000 --- a/res/drawable-hdpi/main_offline.png +++ /dev/null diff --git a/res/drawable-hdpi/main_offline_light.png b/res/drawable-hdpi/main_offline_light.png Binary files differindex 69bee782..cabca581 100644 --- a/res/drawable-hdpi/main_offline_light.png +++ b/res/drawable-hdpi/main_offline_light.png diff --git a/res/drawable-hdpi/volume.png b/res/drawable-hdpi/volume.png Binary files differdeleted file mode 100644 index 95134dfd..00000000 --- a/res/drawable-hdpi/volume.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_shuffle_dark.png b/res/drawable-mdpi/ic_menu_shuffle_dark.png Binary files differnew file mode 100644 index 00000000..7007fde5 --- /dev/null +++ b/res/drawable-mdpi/ic_menu_shuffle_dark.png diff --git a/res/drawable-mdpi/ic_menu_shuffle_light.png b/res/drawable-mdpi/ic_menu_shuffle_light.png Binary files differnew file mode 100644 index 00000000..4d07c3b4 --- /dev/null +++ b/res/drawable-mdpi/ic_menu_shuffle_light.png diff --git a/res/drawable-xhdpi/ic_menu_shuffle_dark.png b/res/drawable-xhdpi/ic_menu_shuffle_dark.png Binary files differnew file mode 100644 index 00000000..e3a31a84 --- /dev/null +++ b/res/drawable-xhdpi/ic_menu_shuffle_dark.png diff --git a/res/drawable-xhdpi/ic_menu_shuffle_light.png b/res/drawable-xhdpi/ic_menu_shuffle_light.png Binary files differnew file mode 100644 index 00000000..14eb942c --- /dev/null +++ b/res/drawable-xhdpi/ic_menu_shuffle_light.png diff --git a/res/drawable-xxhdpi/ic_menu_shuffle_dark.png b/res/drawable-xxhdpi/ic_menu_shuffle_dark.png Binary files differnew file mode 100644 index 00000000..b53733df --- /dev/null +++ b/res/drawable-xxhdpi/ic_menu_shuffle_dark.png diff --git a/res/drawable-xxhdpi/ic_menu_shuffle_light.png b/res/drawable-xxhdpi/ic_menu_shuffle_light.png Binary files differnew file mode 100644 index 00000000..4d5dff32 --- /dev/null +++ b/res/drawable-xxhdpi/ic_menu_shuffle_light.png diff --git a/res/layout/jukebox_volume.xml b/res/layout/jukebox_volume.xml index 4bccaec7..fd718326 100644 --- a/res/layout/jukebox_volume.xml +++ b/res/layout/jukebox_volume.xml @@ -32,7 +32,7 @@ android:paddingRight="12dip" android:layout_alignParentLeft="true" android:layout_below="@+id/jukebox_volume_title" - android:src="@drawable/volume"/> + android:src="?attr/volume"/> <SeekBar android:layout_height="wrap_content" diff --git a/res/menu/abstract_top_menu.xml b/res/menu/abstract_top_menu.xml index 98f9884e..7d91bebd 100644 --- a/res/menu/abstract_top_menu.xml +++ b/res/menu/abstract_top_menu.xml @@ -3,23 +3,21 @@ 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="@drawable/action_search"
+ android:icon="?attr/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/chat.xml b/res/menu/chat.xml index c8ea860a..5e39a5c7 100644 --- a/res/menu/chat.xml +++ b/res/menu/chat.xml @@ -3,17 +3,15 @@ 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/drawer_menu.xml b/res/menu/drawer_menu.xml index adba3c90..2b557738 100644 --- a/res/menu/drawer_menu.xml +++ b/res/menu/drawer_menu.xml @@ -4,11 +4,9 @@ <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/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 4b13b3c1..22809c47 100644 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -3,19 +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_about" - android:icon="@drawable/action_help" android:title="@string/menu.about"/> <item @@ -28,11 +27,9 @@ <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/nowplaying.xml b/res/menu/nowplaying.xml index 2fad22d2..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" @@ -35,6 +33,5 @@ <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 2c513964..50ab00f3 100644 --- a/res/menu/nowplaying_downloading.xml +++ b/res/menu/nowplaying_downloading.xml @@ -3,7 +3,7 @@ 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"/> @@ -13,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 3faa8d97..41d1d5d1 100644 --- a/res/menu/nowplaying_offline.xml +++ b/res/menu/nowplaying_offline.xml @@ -4,21 +4,19 @@ <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" @@ -26,6 +24,5 @@ <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 0f74e65c..fdadd748 100644 --- a/res/menu/search.xml +++ b/res/menu/search.xml @@ -3,18 +3,16 @@ 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_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 1346343b..5e10dc80 100644 --- a/res/menu/select_artist.xml +++ b/res/menu/select_artist.xml @@ -3,29 +3,27 @@ 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 android:id="@+id/menu_exit" - android:icon="@drawable/action_exit" android:title="@string/menu.exit"/> </menu> diff --git a/res/menu/select_genres.xml b/res/menu/select_genres.xml index ad2756d6..837b3534 100644 --- a/res/menu/select_genres.xml +++ b/res/menu/select_genres.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>
\ No newline at end of file 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 de6b83a7..d97ebe6c 100644 --- a/res/menu/select_podcasts.xml +++ b/res/menu/select_podcasts.xml @@ -3,33 +3,29 @@ 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="@drawable/action_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 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_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> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index d2b53374..e54db415 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -8,6 +8,12 @@ <attr name="media_button_start" format="reference"/> <attr name="media_button_stop" format="reference"/> <attr name="chat" format="reference"/> - <attr name="chat_send" format="reference" /> - <attr name="download_none" format="reference" /> + <attr name="chat_send" format="reference"/> + <attr name="download_none" format="reference"/> + <attr name="shuffle" format="reference"/> + <attr name="refresh" format="reference"/> + <attr name="search" format="reference"/> + <attr name="remove" format="reference"/> + <attr name="save" format="reference"/> + <attr name="volume" format="reference"/> </resources> diff --git a/res/values/themes.xml b/res/values/themes.xml index 9e10376b..1d8ddcf0 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -13,6 +13,12 @@ <item name="chat">@drawable/ic_menu_chat_light</item> <item name="chat_send">@drawable/ic_menu_chat_send_light</item> <item name="download_none">@drawable/download_none_light</item> + <item name="shuffle">@drawable/ic_menu_shuffle_light</item> + <item name="refresh">@drawable/ic_menu_refresh_light</item> + <item name="search">@drawable/ic_menu_search_light</item> + <item name="remove">@drawable/ic_menu_remove_light</item> + <item name="save">@drawable/ic_menu_save_light</item> + <item name="volume">@drawable/ic_action_volume_light</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> <item name="android:buttonStyle">@style/DSub.ButtonStyle</item> </style> @@ -20,7 +26,7 @@ <item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item> <item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item> <item name="android:textColorSecondary">@color/cyan</item> - <item name="offline_icon">@drawable/main_offline</item> + <item name="offline_icon">@drawable/main_offline_dark</item> <item name="media_button_backward">@drawable/media_backward_dark</item> <item name="media_button_forward">@drawable/media_forward_dark</item> <item name="media_button_pause">@drawable/media_pause_dark</item> @@ -30,6 +36,12 @@ <item name="chat">@drawable/ic_menu_chat_dark</item> <item name="chat_send">@drawable/ic_menu_chat_send_dark</item> <item name="download_none">@drawable/download_none_dark</item> + <item name="shuffle">@drawable/ic_menu_shuffle_dark</item> + <item name="refresh">@drawable/ic_menu_refresh_dark</item> + <item name="search">@drawable/ic_menu_search_dark</item> + <item name="remove">@drawable/ic_menu_remove_dark</item> + <item name="save">@drawable/ic_menu_save_dark</item> + <item name="volume">@drawable/ic_action_volume_dark</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> <item name="android:buttonStyle">@style/DSub.ButtonStyle</item> </style> @@ -41,16 +53,22 @@ <item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item> <item name="android:textColorSecondary">@color/cyan</item> <item name="android:windowBackground">@drawable/background</item> - <item name="offline_icon">@drawable/main_offline</item> + <item name="offline_icon">@drawable/main_offline_dark</item> <item name="media_button_backward">@drawable/media_backward_dark</item> <item name="media_button_forward">@drawable/media_forward_dark</item> <item name="media_button_pause">@drawable/media_pause_dark</item> <item name="media_button_repeat_off">@drawable/media_repeat_off</item> <item name="media_button_start">@drawable/media_start_dark</item> <item name="media_button_stop">@drawable/media_stop_dark</item> - <item name="chat">@drawable/ic_menu_chat_dark</item> + <item name="chat">@drawable/ic_menu_chat_dark</item> <item name="chat_send">@drawable/ic_menu_chat_send_dark</item> <item name="download_none">@drawable/download_none_dark</item> + <item name="shuffle">@drawable/ic_menu_shuffle_dark</item> + <item name="refresh">@drawable/ic_menu_refresh_dark</item> + <item name="search">@drawable/ic_menu_search_dark</item> + <item name="remove">@drawable/ic_menu_remove_dark</item> + <item name="save">@drawable/ic_menu_save_dark</item> + <item name="volume">@drawable/ic_action_volume_dark</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> <item name="android:buttonStyle">@style/DSub.ButtonStyle</item> </style> |
