diff --git a/local.properties b/local.properties index 39c61052..e9d3f6e0 100644 --- a/local.properties +++ b/local.properties @@ -7,5 +7,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Sat Nov 30 23:46:41 MST 2013 +#Fri Dec 20 10:17:44 MST 2013 sdk.dir=C\:/Program Files (x86)/Android/android-studio/sdk diff --git a/res/drawable-hdpi-v14/menu_arrow_bottom.png b/res/drawable-hdpi-v14/menu_arrow_bottom.png deleted file mode 100644 index 47e9c904..00000000 Binary files a/res/drawable-hdpi-v14/menu_arrow_bottom.png and /dev/null differ diff --git a/res/drawable-hdpi-v14/menu_arrow_right.png b/res/drawable-hdpi-v14/menu_arrow_right.png deleted file mode 100644 index 4ae9df9b..00000000 Binary files a/res/drawable-hdpi-v14/menu_arrow_right.png and /dev/null differ diff --git a/res/drawable-hdpi-v14/menu_arrow_top.png b/res/drawable-hdpi-v14/menu_arrow_top.png deleted file mode 100644 index ab4ed80e..00000000 Binary files a/res/drawable-hdpi-v14/menu_arrow_top.png and /dev/null differ diff --git a/res/drawable-hdpi/action_bar_bg.9.png b/res/drawable-hdpi/action_bar_bg.9.png deleted file mode 100644 index df1cabf2..00000000 Binary files a/res/drawable-hdpi/action_bar_bg.9.png and /dev/null differ diff --git a/res/drawable-hdpi/album_art_background.png b/res/drawable-hdpi/album_art_background.png deleted file mode 100644 index a25f4a31..00000000 Binary files a/res/drawable-hdpi/album_art_background.png and /dev/null differ diff --git a/res/drawable-hdpi/appwidget_bg.9.png b/res/drawable-hdpi/appwidget_bg.9.png deleted file mode 100644 index 23a2e36d..00000000 Binary files a/res/drawable-hdpi/appwidget_bg.9.png and /dev/null differ diff --git a/res/drawable-hdpi/bg_separator.9.png b/res/drawable-hdpi/bg_separator.9.png deleted file mode 100644 index 4dc1b348..00000000 Binary files a/res/drawable-hdpi/bg_separator.9.png and /dev/null differ diff --git a/res/drawable-hdpi/btn_check_buttonless_off.png b/res/drawable-hdpi/btn_check_buttonless_off.png deleted file mode 100644 index d705b420..00000000 Binary files a/res/drawable-hdpi/btn_check_buttonless_off.png and /dev/null differ diff --git a/res/drawable-hdpi/btn_check_buttonless_on.png b/res/drawable-hdpi/btn_check_buttonless_on.png deleted file mode 100644 index 1ba1ec8f..00000000 Binary files a/res/drawable-hdpi/btn_check_buttonless_on.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_appwidget_music_next.png b/res/drawable-hdpi/ic_appwidget_music_next.png deleted file mode 100644 index 582e10a2..00000000 Binary files a/res/drawable-hdpi/ic_appwidget_music_next.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_appwidget_music_pause.png b/res/drawable-hdpi/ic_appwidget_music_pause.png deleted file mode 100644 index a55a40d8..00000000 Binary files a/res/drawable-hdpi/ic_appwidget_music_pause.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_appwidget_music_play.png b/res/drawable-hdpi/ic_appwidget_music_play.png deleted file mode 100644 index 55bfec37..00000000 Binary files a/res/drawable-hdpi/ic_appwidget_music_play.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_appwidget_music_previous.png b/res/drawable-hdpi/ic_appwidget_music_previous.png deleted file mode 100644 index e5499a33..00000000 Binary files a/res/drawable-hdpi/ic_appwidget_music_previous.png and /dev/null differ diff --git a/res/drawable-hdpi/main_header_icon.png b/res/drawable-hdpi/main_header_icon.png deleted file mode 100644 index 6722bece..00000000 Binary files a/res/drawable-hdpi/main_header_icon.png and /dev/null differ diff --git a/res/drawable-hdpi/media_backward_normal.png b/res/drawable-hdpi/media_backward_normal.png deleted file mode 100644 index e5499a33..00000000 Binary files a/res/drawable-hdpi/media_backward_normal.png and /dev/null differ diff --git a/res/drawable-hdpi/media_forward_normal.png b/res/drawable-hdpi/media_forward_normal.png deleted file mode 100644 index 582e10a2..00000000 Binary files a/res/drawable-hdpi/media_forward_normal.png and /dev/null differ diff --git a/res/drawable-hdpi/media_pause_normal.png b/res/drawable-hdpi/media_pause_normal.png deleted file mode 100644 index a55a40d8..00000000 Binary files a/res/drawable-hdpi/media_pause_normal.png and /dev/null differ diff --git a/res/drawable-hdpi/media_repeat_off.png b/res/drawable-hdpi/media_repeat_off.png deleted file mode 100644 index 32745d11..00000000 Binary files a/res/drawable-hdpi/media_repeat_off.png and /dev/null differ diff --git a/res/drawable-hdpi/media_repeat_single.png b/res/drawable-hdpi/media_repeat_single.png deleted file mode 100644 index c27464be..00000000 Binary files a/res/drawable-hdpi/media_repeat_single.png and /dev/null differ diff --git a/res/drawable-hdpi/media_shuffle_normal.png b/res/drawable-hdpi/media_shuffle_normal.png deleted file mode 100644 index 3f20af53..00000000 Binary files a/res/drawable-hdpi/media_shuffle_normal.png and /dev/null differ diff --git a/res/drawable-hdpi/media_start_normal.png b/res/drawable-hdpi/media_start_normal.png deleted file mode 100644 index 55bfec37..00000000 Binary files a/res/drawable-hdpi/media_start_normal.png and /dev/null differ diff --git a/res/drawable-hdpi/media_stop_normal.png b/res/drawable-hdpi/media_stop_normal.png deleted file mode 100644 index a79381aa..00000000 Binary files a/res/drawable-hdpi/media_stop_normal.png and /dev/null differ diff --git a/res/drawable-hdpi/media_toggle_list_normal.png b/res/drawable-hdpi/media_toggle_list_normal.png deleted file mode 100644 index fa205483..00000000 Binary files a/res/drawable-hdpi/media_toggle_list_normal.png and /dev/null differ diff --git a/res/drawable-hdpi/menu_arrow_bottom.png b/res/drawable-hdpi/menu_arrow_bottom.png deleted file mode 100644 index 4cbe8cbe..00000000 Binary files a/res/drawable-hdpi/menu_arrow_bottom.png and /dev/null differ diff --git a/res/drawable-hdpi/menu_arrow_right.png b/res/drawable-hdpi/menu_arrow_right.png deleted file mode 100644 index 2fb6a937..00000000 Binary files a/res/drawable-hdpi/menu_arrow_right.png and /dev/null differ diff --git a/res/drawable-hdpi/menu_arrow_top.png b/res/drawable-hdpi/menu_arrow_top.png deleted file mode 100644 index 41f6c6a8..00000000 Binary files a/res/drawable-hdpi/menu_arrow_top.png and /dev/null differ diff --git a/res/drawable-hdpi/title_bar_shadow.9.png b/res/drawable-hdpi/title_bar_shadow.9.png deleted file mode 100644 index 4dc1b348..00000000 Binary files a/res/drawable-hdpi/title_bar_shadow.9.png and /dev/null differ diff --git a/res/drawable-mdpi-v14/menu_arrow_bottom.png b/res/drawable-mdpi-v14/menu_arrow_bottom.png deleted file mode 100644 index af8e7b90..00000000 Binary files a/res/drawable-mdpi-v14/menu_arrow_bottom.png and /dev/null differ diff --git a/res/drawable-mdpi-v14/menu_arrow_right.png b/res/drawable-mdpi-v14/menu_arrow_right.png deleted file mode 100644 index 21deedfc..00000000 Binary files a/res/drawable-mdpi-v14/menu_arrow_right.png and /dev/null differ diff --git a/res/drawable-mdpi-v14/menu_arrow_top.png b/res/drawable-mdpi-v14/menu_arrow_top.png deleted file mode 100644 index 1f5d61a2..00000000 Binary files a/res/drawable-mdpi-v14/menu_arrow_top.png and /dev/null differ diff --git a/res/drawable-mdpi/menu_arrow_bottom.png b/res/drawable-mdpi/menu_arrow_bottom.png deleted file mode 100644 index 3dce461a..00000000 Binary files a/res/drawable-mdpi/menu_arrow_bottom.png and /dev/null differ diff --git a/res/drawable-mdpi/menu_arrow_right.png b/res/drawable-mdpi/menu_arrow_right.png deleted file mode 100644 index 3222d034..00000000 Binary files a/res/drawable-mdpi/menu_arrow_right.png and /dev/null differ diff --git a/res/drawable-mdpi/menu_arrow_top.png b/res/drawable-mdpi/menu_arrow_top.png deleted file mode 100644 index cde43fd2..00000000 Binary files a/res/drawable-mdpi/menu_arrow_top.png and /dev/null differ diff --git a/res/drawable-nodpi/preview_two.png b/res/drawable-nodpi/preview_two.png deleted file mode 100644 index 5b9599ab..00000000 Binary files a/res/drawable-nodpi/preview_two.png and /dev/null differ diff --git a/res/drawable-xhdpi-v14/appwidget_dark_bg.9.png b/res/drawable-xhdpi-v14/appwidget_dark_bg.9.png deleted file mode 100644 index 7ccb762b..00000000 Binary files a/res/drawable-xhdpi-v14/appwidget_dark_bg.9.png and /dev/null differ diff --git a/res/drawable-xhdpi-v14/menu_arrow_bottom.png b/res/drawable-xhdpi-v14/menu_arrow_bottom.png deleted file mode 100644 index aba9001f..00000000 Binary files a/res/drawable-xhdpi-v14/menu_arrow_bottom.png and /dev/null differ diff --git a/res/drawable-xhdpi-v14/menu_arrow_right.png b/res/drawable-xhdpi-v14/menu_arrow_right.png deleted file mode 100644 index 85591b81..00000000 Binary files a/res/drawable-xhdpi-v14/menu_arrow_right.png and /dev/null differ diff --git a/res/drawable-xhdpi-v14/menu_arrow_top.png b/res/drawable-xhdpi-v14/menu_arrow_top.png deleted file mode 100644 index b81c7474..00000000 Binary files a/res/drawable-xhdpi-v14/menu_arrow_top.png and /dev/null differ diff --git a/res/drawable-xhdpi/action_bar_bg.9.png b/res/drawable-xhdpi/action_bar_bg.9.png deleted file mode 100644 index df1cabf2..00000000 Binary files a/res/drawable-xhdpi/action_bar_bg.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_about_dark.png b/res/drawable-xhdpi/ic_menu_about_dark.png deleted file mode 100644 index 4ee903f0..00000000 Binary files a/res/drawable-xhdpi/ic_menu_about_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_about_light.png b/res/drawable-xhdpi/ic_menu_about_light.png deleted file mode 100644 index 2641f142..00000000 Binary files a/res/drawable-xhdpi/ic_menu_about_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_about_selected.png b/res/drawable-xhdpi/ic_menu_about_selected.png deleted file mode 100644 index 38359d30..00000000 Binary files a/res/drawable-xhdpi/ic_menu_about_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_add_to_queue_dark.png b/res/drawable-xhdpi/ic_menu_add_to_queue_dark.png deleted file mode 100644 index 05f9ab06..00000000 Binary files a/res/drawable-xhdpi/ic_menu_add_to_queue_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_add_to_queue_light.png b/res/drawable-xhdpi/ic_menu_add_to_queue_light.png deleted file mode 100644 index 32e5c356..00000000 Binary files a/res/drawable-xhdpi/ic_menu_add_to_queue_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_backward_dark.png b/res/drawable-xhdpi/ic_menu_backward_dark.png deleted file mode 100644 index 3bdda98c..00000000 Binary files a/res/drawable-xhdpi/ic_menu_backward_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_backward_light.png b/res/drawable-xhdpi/ic_menu_backward_light.png deleted file mode 100644 index f420e43f..00000000 Binary files a/res/drawable-xhdpi/ic_menu_backward_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_bookmark_dark.png b/res/drawable-xhdpi/ic_menu_bookmark_dark.png deleted file mode 100644 index 8fdcd1a2..00000000 Binary files a/res/drawable-xhdpi/ic_menu_bookmark_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_bookmark_light.png b/res/drawable-xhdpi/ic_menu_bookmark_light.png deleted file mode 100644 index c1ec9727..00000000 Binary files a/res/drawable-xhdpi/ic_menu_bookmark_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_bookmark_selected.png b/res/drawable-xhdpi/ic_menu_bookmark_selected.png deleted file mode 100644 index c6dd9828..00000000 Binary files a/res/drawable-xhdpi/ic_menu_bookmark_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_browse_dark.png b/res/drawable-xhdpi/ic_menu_browse_dark.png deleted file mode 100644 index 78500a93..00000000 Binary files a/res/drawable-xhdpi/ic_menu_browse_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_browse_light.png b/res/drawable-xhdpi/ic_menu_browse_light.png deleted file mode 100644 index d1324014..00000000 Binary files a/res/drawable-xhdpi/ic_menu_browse_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_browse_selected.png b/res/drawable-xhdpi/ic_menu_browse_selected.png deleted file mode 100644 index f8e9c8d9..00000000 Binary files a/res/drawable-xhdpi/ic_menu_browse_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_chat_dark.png b/res/drawable-xhdpi/ic_menu_chat_dark.png deleted file mode 100644 index be04b06e..00000000 Binary files a/res/drawable-xhdpi/ic_menu_chat_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_chat_light.png b/res/drawable-xhdpi/ic_menu_chat_light.png deleted file mode 100644 index 3f58695c..00000000 Binary files a/res/drawable-xhdpi/ic_menu_chat_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_chat_selected.png b/res/drawable-xhdpi/ic_menu_chat_selected.png deleted file mode 100644 index 7ca19134..00000000 Binary files a/res/drawable-xhdpi/ic_menu_chat_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_chat_send_dark.png b/res/drawable-xhdpi/ic_menu_chat_send_dark.png deleted file mode 100644 index bd37dc59..00000000 Binary files a/res/drawable-xhdpi/ic_menu_chat_send_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_chat_send_light.png b/res/drawable-xhdpi/ic_menu_chat_send_light.png deleted file mode 100644 index 0c870d2c..00000000 Binary files a/res/drawable-xhdpi/ic_menu_chat_send_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_exit_dark.png b/res/drawable-xhdpi/ic_menu_exit_dark.png deleted file mode 100644 index 3cc316ae..00000000 Binary files a/res/drawable-xhdpi/ic_menu_exit_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_exit_light.png b/res/drawable-xhdpi/ic_menu_exit_light.png deleted file mode 100644 index ca7d159f..00000000 Binary files a/res/drawable-xhdpi/ic_menu_exit_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_exit_selected.png b/res/drawable-xhdpi/ic_menu_exit_selected.png deleted file mode 100644 index a9945f49..00000000 Binary files a/res/drawable-xhdpi/ic_menu_exit_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_forward_dark.png b/res/drawable-xhdpi/ic_menu_forward_dark.png deleted file mode 100644 index 37c4101d..00000000 Binary files a/res/drawable-xhdpi/ic_menu_forward_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_forward_light.png b/res/drawable-xhdpi/ic_menu_forward_light.png deleted file mode 100644 index 1f60fc63..00000000 Binary files a/res/drawable-xhdpi/ic_menu_forward_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_help_dark.png b/res/drawable-xhdpi/ic_menu_help_dark.png deleted file mode 100644 index 24370486..00000000 Binary files a/res/drawable-xhdpi/ic_menu_help_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_help_light.png b/res/drawable-xhdpi/ic_menu_help_light.png deleted file mode 100644 index 0e67d7c1..00000000 Binary files a/res/drawable-xhdpi/ic_menu_help_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_home_dark.png b/res/drawable-xhdpi/ic_menu_home_dark.png deleted file mode 100644 index 8b02461e..00000000 Binary files a/res/drawable-xhdpi/ic_menu_home_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_home_light.png b/res/drawable-xhdpi/ic_menu_home_light.png deleted file mode 100644 index 9ffecdb6..00000000 Binary files a/res/drawable-xhdpi/ic_menu_home_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_home_selected.png b/res/drawable-xhdpi/ic_menu_home_selected.png deleted file mode 100644 index 39aee629..00000000 Binary files a/res/drawable-xhdpi/ic_menu_home_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_playlists_dark.png b/res/drawable-xhdpi/ic_menu_playlists_dark.png deleted file mode 100644 index 95708234..00000000 Binary files a/res/drawable-xhdpi/ic_menu_playlists_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_playlists_light.png b/res/drawable-xhdpi/ic_menu_playlists_light.png deleted file mode 100644 index a0a156a9..00000000 Binary files a/res/drawable-xhdpi/ic_menu_playlists_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_playlists_selected.png b/res/drawable-xhdpi/ic_menu_playlists_selected.png deleted file mode 100644 index 34640068..00000000 Binary files a/res/drawable-xhdpi/ic_menu_playlists_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_remove_all_dark.png b/res/drawable-xhdpi/ic_menu_remove_all_dark.png deleted file mode 100644 index 412b3335..00000000 Binary files a/res/drawable-xhdpi/ic_menu_remove_all_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_remove_all_light.png b/res/drawable-xhdpi/ic_menu_remove_all_light.png deleted file mode 100644 index 98c73da1..00000000 Binary files a/res/drawable-xhdpi/ic_menu_remove_all_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_save_dark.png b/res/drawable-xhdpi/ic_menu_save_dark.png deleted file mode 100644 index 27206025..00000000 Binary files a/res/drawable-xhdpi/ic_menu_save_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_save_light.png b/res/drawable-xhdpi/ic_menu_save_light.png deleted file mode 100644 index 9460b391..00000000 Binary files a/res/drawable-xhdpi/ic_menu_save_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_screen_on_off_dark.png b/res/drawable-xhdpi/ic_menu_screen_on_off_dark.png deleted file mode 100644 index 2e46eb06..00000000 Binary files a/res/drawable-xhdpi/ic_menu_screen_on_off_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_screen_on_off_light.png b/res/drawable-xhdpi/ic_menu_screen_on_off_light.png deleted file mode 100644 index c0f0f43e..00000000 Binary files a/res/drawable-xhdpi/ic_menu_screen_on_off_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_search_dark.png b/res/drawable-xhdpi/ic_menu_search_dark.png deleted file mode 100644 index 3549f84d..00000000 Binary files a/res/drawable-xhdpi/ic_menu_search_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_search_light.png b/res/drawable-xhdpi/ic_menu_search_light.png deleted file mode 100644 index 804420ae..00000000 Binary files a/res/drawable-xhdpi/ic_menu_search_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_search_selected.png b/res/drawable-xhdpi/ic_menu_search_selected.png deleted file mode 100644 index 00f4787c..00000000 Binary files a/res/drawable-xhdpi/ic_menu_search_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_select_all_dark.png b/res/drawable-xhdpi/ic_menu_select_all_dark.png deleted file mode 100644 index 52d1155d..00000000 Binary files a/res/drawable-xhdpi/ic_menu_select_all_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_select_all_light.png b/res/drawable-xhdpi/ic_menu_select_all_light.png deleted file mode 100644 index fbe5845a..00000000 Binary files a/res/drawable-xhdpi/ic_menu_select_all_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_select_folder_dark.png b/res/drawable-xhdpi/ic_menu_select_folder_dark.png deleted file mode 100644 index a1d5d73e..00000000 Binary files a/res/drawable-xhdpi/ic_menu_select_folder_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_select_folder_light.png b/res/drawable-xhdpi/ic_menu_select_folder_light.png deleted file mode 100644 index 53c013b0..00000000 Binary files a/res/drawable-xhdpi/ic_menu_select_folder_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_settings_dark.png b/res/drawable-xhdpi/ic_menu_settings_dark.png deleted file mode 100644 index b8ebb3e3..00000000 Binary files a/res/drawable-xhdpi/ic_menu_settings_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_settings_light.png b/res/drawable-xhdpi/ic_menu_settings_light.png deleted file mode 100644 index 04b65dc3..00000000 Binary files a/res/drawable-xhdpi/ic_menu_settings_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_settings_selected.png b/res/drawable-xhdpi/ic_menu_settings_selected.png deleted file mode 100644 index 2b96d497..00000000 Binary files a/res/drawable-xhdpi/ic_menu_settings_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_share_dark.png b/res/drawable-xhdpi/ic_menu_share_dark.png deleted file mode 100644 index 15549b04..00000000 Binary files a/res/drawable-xhdpi/ic_menu_share_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_share_light.png b/res/drawable-xhdpi/ic_menu_share_light.png deleted file mode 100644 index cdafd8ab..00000000 Binary files a/res/drawable-xhdpi/ic_menu_share_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_unpin_dark.png b/res/drawable-xhdpi/ic_menu_unpin_dark.png deleted file mode 100644 index 6b197c30..00000000 Binary files a/res/drawable-xhdpi/ic_menu_unpin_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_unpin_light.png b/res/drawable-xhdpi/ic_menu_unpin_light.png deleted file mode 100644 index 4cdbe873..00000000 Binary files a/res/drawable-xhdpi/ic_menu_unpin_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_star_full_dark.png b/res/drawable-xhdpi/ic_star_full_dark.png deleted file mode 100644 index e9e4cab3..00000000 Binary files a/res/drawable-xhdpi/ic_star_full_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_star_full_light.png b/res/drawable-xhdpi/ic_star_full_light.png deleted file mode 100644 index da44dd82..00000000 Binary files a/res/drawable-xhdpi/ic_star_full_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_star_hollow_dark.png b/res/drawable-xhdpi/ic_star_hollow_dark.png deleted file mode 100644 index 3c618a12..00000000 Binary files a/res/drawable-xhdpi/ic_star_hollow_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_star_hollow_light.png b/res/drawable-xhdpi/ic_star_hollow_light.png deleted file mode 100644 index 7ff6c8d0..00000000 Binary files a/res/drawable-xhdpi/ic_star_hollow_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_stat_downloaded_dark.png b/res/drawable-xhdpi/ic_stat_downloaded_dark.png deleted file mode 100644 index bc0ced50..00000000 Binary files a/res/drawable-xhdpi/ic_stat_downloaded_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_stat_downloaded_light.png b/res/drawable-xhdpi/ic_stat_downloaded_light.png deleted file mode 100644 index dfe81e06..00000000 Binary files a/res/drawable-xhdpi/ic_stat_downloaded_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/main_header_icon.png b/res/drawable-xhdpi/main_header_icon.png deleted file mode 100644 index 35dd21fb..00000000 Binary files a/res/drawable-xhdpi/main_header_icon.png and /dev/null differ diff --git a/res/drawable-xhdpi/md__category_background.9.png b/res/drawable-xhdpi/md__category_background.9.png deleted file mode 100644 index 942d72e6..00000000 Binary files a/res/drawable-xhdpi/md__category_background.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_backward_normal_dark.png b/res/drawable-xhdpi/media_backward_normal_dark.png deleted file mode 100644 index 304a331f..00000000 Binary files a/res/drawable-xhdpi/media_backward_normal_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_backward_normal_light.png b/res/drawable-xhdpi/media_backward_normal_light.png deleted file mode 100644 index 5ba84410..00000000 Binary files a/res/drawable-xhdpi/media_backward_normal_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_forward_normal_dark.png b/res/drawable-xhdpi/media_forward_normal_dark.png deleted file mode 100644 index 1a735c0b..00000000 Binary files a/res/drawable-xhdpi/media_forward_normal_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_forward_normal_light.png b/res/drawable-xhdpi/media_forward_normal_light.png deleted file mode 100644 index 61b8d595..00000000 Binary files a/res/drawable-xhdpi/media_forward_normal_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_pause_normal_dark.png b/res/drawable-xhdpi/media_pause_normal_dark.png deleted file mode 100644 index ef7807c4..00000000 Binary files a/res/drawable-xhdpi/media_pause_normal_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_pause_normal_light.png b/res/drawable-xhdpi/media_pause_normal_light.png deleted file mode 100644 index 97d6f91a..00000000 Binary files a/res/drawable-xhdpi/media_pause_normal_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_play_next_dark.png b/res/drawable-xhdpi/media_play_next_dark.png deleted file mode 100644 index 6d2bfb68..00000000 Binary files a/res/drawable-xhdpi/media_play_next_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_play_next_light.png b/res/drawable-xhdpi/media_play_next_light.png deleted file mode 100644 index 9ffd6b9a..00000000 Binary files a/res/drawable-xhdpi/media_play_next_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_play_now_dark.png b/res/drawable-xhdpi/media_play_now_dark.png deleted file mode 100644 index e53d5eb1..00000000 Binary files a/res/drawable-xhdpi/media_play_now_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_play_now_light.png b/res/drawable-xhdpi/media_play_now_light.png deleted file mode 100644 index d527454c..00000000 Binary files a/res/drawable-xhdpi/media_play_now_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_repeat_off_dark.png b/res/drawable-xhdpi/media_repeat_off_dark.png deleted file mode 100644 index 9ec52039..00000000 Binary files a/res/drawable-xhdpi/media_repeat_off_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_repeat_off_light.png b/res/drawable-xhdpi/media_repeat_off_light.png deleted file mode 100644 index 468415ae..00000000 Binary files a/res/drawable-xhdpi/media_repeat_off_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_shuffle_normal_dark.png b/res/drawable-xhdpi/media_shuffle_normal_dark.png deleted file mode 100644 index 6cc43e6e..00000000 Binary files a/res/drawable-xhdpi/media_shuffle_normal_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_shuffle_normal_light.png b/res/drawable-xhdpi/media_shuffle_normal_light.png deleted file mode 100644 index eee9d97b..00000000 Binary files a/res/drawable-xhdpi/media_shuffle_normal_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_start_normal_dark.png b/res/drawable-xhdpi/media_start_normal_dark.png deleted file mode 100644 index d6a28669..00000000 Binary files a/res/drawable-xhdpi/media_start_normal_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_start_normal_light.png b/res/drawable-xhdpi/media_start_normal_light.png deleted file mode 100644 index 2d67d31e..00000000 Binary files a/res/drawable-xhdpi/media_start_normal_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_start_normal_selected.png b/res/drawable-xhdpi/media_start_normal_selected.png deleted file mode 100644 index 8a70b380..00000000 Binary files a/res/drawable-xhdpi/media_start_normal_selected.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_start_pressed.png b/res/drawable-xhdpi/media_start_pressed.png deleted file mode 100644 index b5397054..00000000 Binary files a/res/drawable-xhdpi/media_start_pressed.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_stop_normal_dark.png b/res/drawable-xhdpi/media_stop_normal_dark.png deleted file mode 100644 index 94bf7743..00000000 Binary files a/res/drawable-xhdpi/media_stop_normal_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_stop_normal_light.png b/res/drawable-xhdpi/media_stop_normal_light.png deleted file mode 100644 index 9a23e3d4..00000000 Binary files a/res/drawable-xhdpi/media_stop_normal_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_toggle_list_normal_dark.png b/res/drawable-xhdpi/media_toggle_list_normal_dark.png deleted file mode 100644 index f3f447f0..00000000 Binary files a/res/drawable-xhdpi/media_toggle_list_normal_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/media_toggle_list_normal_light.png b/res/drawable-xhdpi/media_toggle_list_normal_light.png deleted file mode 100644 index 1c573cc4..00000000 Binary files a/res/drawable-xhdpi/media_toggle_list_normal_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/menu_arrow_bottom.png b/res/drawable-xhdpi/menu_arrow_bottom.png deleted file mode 100644 index 77a088fd..00000000 Binary files a/res/drawable-xhdpi/menu_arrow_bottom.png and /dev/null differ diff --git a/res/drawable-xhdpi/menu_arrow_right.png b/res/drawable-xhdpi/menu_arrow_right.png deleted file mode 100644 index 17b5250d..00000000 Binary files a/res/drawable-xhdpi/menu_arrow_right.png and /dev/null differ diff --git a/res/drawable-xhdpi/menu_arrow_top.png b/res/drawable-xhdpi/menu_arrow_top.png deleted file mode 100644 index 2c2f7490..00000000 Binary files a/res/drawable-xhdpi/menu_arrow_top.png and /dev/null differ diff --git a/res/drawable-xxhdpi/btn_check_off_focused_holo_dark.png b/res/drawable-xxhdpi/btn_check_off_focused_holo_dark.png new file mode 100644 index 00000000..b0353feb Binary files /dev/null and b/res/drawable-xxhdpi/btn_check_off_focused_holo_dark.png differ diff --git a/res/drawable-xxhdpi/btn_check_off_focused_holo_light.png b/res/drawable-xxhdpi/btn_check_off_focused_holo_light.png new file mode 100644 index 00000000..889a67c0 Binary files /dev/null and b/res/drawable-xxhdpi/btn_check_off_focused_holo_light.png differ diff --git a/res/drawable-xxhdpi/btn_check_off_holo_dark.png b/res/drawable-xxhdpi/btn_check_off_holo_dark.png new file mode 100644 index 00000000..ecfc08c7 Binary files /dev/null and b/res/drawable-xxhdpi/btn_check_off_holo_dark.png differ diff --git a/res/drawable-xxhdpi/btn_check_off_holo_light.png b/res/drawable-xxhdpi/btn_check_off_holo_light.png new file mode 100644 index 00000000..b067b58f Binary files /dev/null and b/res/drawable-xxhdpi/btn_check_off_holo_light.png differ diff --git a/res/drawable-xxhdpi/btn_check_on_focused_holo_dark.png b/res/drawable-xxhdpi/btn_check_on_focused_holo_dark.png new file mode 100644 index 00000000..e0d942a9 Binary files /dev/null and b/res/drawable-xxhdpi/btn_check_on_focused_holo_dark.png differ diff --git a/res/drawable-xxhdpi/btn_check_on_focused_holo_light.png b/res/drawable-xxhdpi/btn_check_on_focused_holo_light.png new file mode 100644 index 00000000..83f8dfd7 Binary files /dev/null and b/res/drawable-xxhdpi/btn_check_on_focused_holo_light.png differ diff --git a/res/drawable-xxhdpi/btn_check_on_holo_dark.png b/res/drawable-xxhdpi/btn_check_on_holo_dark.png new file mode 100644 index 00000000..1aafc836 Binary files /dev/null and b/res/drawable-xxhdpi/btn_check_on_holo_dark.png differ diff --git a/res/drawable-xxhdpi/btn_check_on_holo_light.png b/res/drawable-xxhdpi/btn_check_on_holo_light.png new file mode 100644 index 00000000..11598dd2 Binary files /dev/null and b/res/drawable-xxhdpi/btn_check_on_holo_light.png differ diff --git a/res/drawable-xxhdpi/ic_action_volume_on_dark.png b/res/drawable-xxhdpi/ic_action_volume_on_dark.png new file mode 100644 index 00000000..87f2bc84 Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_volume_on_dark.png differ diff --git a/res/drawable-xxhdpi/ic_action_volume_on_light.png b/res/drawable-xxhdpi/ic_action_volume_on_light.png new file mode 100644 index 00000000..cd668575 Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_volume_on_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_about_dark.png b/res/drawable-xxhdpi/ic_menu_about_dark.png new file mode 100644 index 00000000..a7bdf347 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_about_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_about_light.png b/res/drawable-xxhdpi/ic_menu_about_light.png new file mode 100644 index 00000000..0fe809b9 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_about_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_add_to_queue_dark.png b/res/drawable-xxhdpi/ic_menu_add_to_queue_dark.png new file mode 100644 index 00000000..c30aade6 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_add_to_queue_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_add_to_queue_light.png b/res/drawable-xxhdpi/ic_menu_add_to_queue_light.png new file mode 100644 index 00000000..7e3b25e1 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_add_to_queue_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_backward_dark.png b/res/drawable-xxhdpi/ic_menu_backward_dark.png new file mode 100644 index 00000000..5b41aa4d Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_backward_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_backward_light.png b/res/drawable-xxhdpi/ic_menu_backward_light.png new file mode 100644 index 00000000..46184bd0 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_backward_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_bookmark_dark.png b/res/drawable-xxhdpi/ic_menu_bookmark_dark.png new file mode 100644 index 00000000..e4e2fb8c Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_bookmark_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_bookmark_light.png b/res/drawable-xxhdpi/ic_menu_bookmark_light.png new file mode 100644 index 00000000..cfd237f1 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_bookmark_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_browse_dark.png b/res/drawable-xxhdpi/ic_menu_browse_dark.png new file mode 100644 index 00000000..71a5214b Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_browse_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_browse_light.png b/res/drawable-xxhdpi/ic_menu_browse_light.png new file mode 100644 index 00000000..c41ca8c8 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_browse_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_chat_dark.png b/res/drawable-xxhdpi/ic_menu_chat_dark.png new file mode 100644 index 00000000..e88c4699 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_chat_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_chat_light.png b/res/drawable-xxhdpi/ic_menu_chat_light.png new file mode 100644 index 00000000..04000fd0 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_chat_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_chat_send_dark.png b/res/drawable-xxhdpi/ic_menu_chat_send_dark.png new file mode 100644 index 00000000..793f2cb2 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_chat_send_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_chat_send_light.png b/res/drawable-xxhdpi/ic_menu_chat_send_light.png new file mode 100644 index 00000000..373dde23 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_chat_send_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_exit_dark.png b/res/drawable-xxhdpi/ic_menu_exit_dark.png new file mode 100644 index 00000000..5dc21435 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_exit_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_exit_light.png b/res/drawable-xxhdpi/ic_menu_exit_light.png new file mode 100644 index 00000000..331c545b Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_exit_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_forward_dark.png b/res/drawable-xxhdpi/ic_menu_forward_dark.png new file mode 100644 index 00000000..ae8ffaf1 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_forward_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_forward_light.png b/res/drawable-xxhdpi/ic_menu_forward_light.png new file mode 100644 index 00000000..fe1d67cf Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_forward_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_help_dark.png b/res/drawable-xxhdpi/ic_menu_help_dark.png new file mode 100644 index 00000000..7b3662c2 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_help_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_help_light.png b/res/drawable-xxhdpi/ic_menu_help_light.png new file mode 100644 index 00000000..c5a34319 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_help_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_home_dark.png b/res/drawable-xxhdpi/ic_menu_home_dark.png new file mode 100644 index 00000000..d25b2541 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_home_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_home_light.png b/res/drawable-xxhdpi/ic_menu_home_light.png new file mode 100644 index 00000000..66431785 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_home_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_playlists_dark.png b/res/drawable-xxhdpi/ic_menu_playlists_dark.png new file mode 100644 index 00000000..46004164 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_playlists_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_playlists_light.png b/res/drawable-xxhdpi/ic_menu_playlists_light.png new file mode 100644 index 00000000..b00a85f6 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_playlists_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_remove_all_dark.png b/res/drawable-xxhdpi/ic_menu_remove_all_dark.png new file mode 100644 index 00000000..cb1260a4 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_remove_all_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_remove_all_light.png b/res/drawable-xxhdpi/ic_menu_remove_all_light.png new file mode 100644 index 00000000..b522daff Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_remove_all_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_save_dark.png b/res/drawable-xxhdpi/ic_menu_save_dark.png new file mode 100644 index 00000000..ccf8c82c Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_save_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_save_light.png b/res/drawable-xxhdpi/ic_menu_save_light.png new file mode 100644 index 00000000..74435004 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_save_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_screen_on_off_dark.png b/res/drawable-xxhdpi/ic_menu_screen_on_off_dark.png new file mode 100644 index 00000000..463d3aee Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_screen_on_off_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_screen_on_off_light.png b/res/drawable-xxhdpi/ic_menu_screen_on_off_light.png new file mode 100644 index 00000000..33cf3546 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_screen_on_off_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_search_holo_dark.png b/res/drawable-xxhdpi/ic_menu_search_holo_dark.png new file mode 100644 index 00000000..4ba4314c Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_search_holo_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_search_holo_light.png b/res/drawable-xxhdpi/ic_menu_search_holo_light.png new file mode 100644 index 00000000..c69d5263 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_search_holo_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_select_all_dark.png b/res/drawable-xxhdpi/ic_menu_select_all_dark.png new file mode 100644 index 00000000..9825a89a Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_select_all_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_select_all_light.png b/res/drawable-xxhdpi/ic_menu_select_all_light.png new file mode 100644 index 00000000..aa5937ea Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_select_all_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_select_folder_dark.png b/res/drawable-xxhdpi/ic_menu_select_folder_dark.png new file mode 100644 index 00000000..51070821 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_select_folder_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_select_folder_light.png b/res/drawable-xxhdpi/ic_menu_select_folder_light.png new file mode 100644 index 00000000..22003198 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_select_folder_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_settings_dark.png b/res/drawable-xxhdpi/ic_menu_settings_dark.png new file mode 100644 index 00000000..fe5fec47 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_settings_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_settings_light.png b/res/drawable-xxhdpi/ic_menu_settings_light.png new file mode 100644 index 00000000..530227e2 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_settings_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_share_dark.png b/res/drawable-xxhdpi/ic_menu_share_dark.png new file mode 100644 index 00000000..22ed428f Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_share_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_share_light.png b/res/drawable-xxhdpi/ic_menu_share_light.png new file mode 100644 index 00000000..3e441000 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_share_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_unpin_dark.png b/res/drawable-xxhdpi/ic_menu_unpin_dark.png new file mode 100644 index 00000000..ac9dbf06 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_unpin_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_unpin_light.png b/res/drawable-xxhdpi/ic_menu_unpin_light.png new file mode 100644 index 00000000..ebe32838 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_unpin_light.png differ diff --git a/res/drawable-xxhdpi/ic_star_full_dark.png b/res/drawable-xxhdpi/ic_star_full_dark.png new file mode 100644 index 00000000..953dee08 Binary files /dev/null and b/res/drawable-xxhdpi/ic_star_full_dark.png differ diff --git a/res/drawable-xxhdpi/ic_star_full_light.png b/res/drawable-xxhdpi/ic_star_full_light.png new file mode 100644 index 00000000..4b6c12c6 Binary files /dev/null and b/res/drawable-xxhdpi/ic_star_full_light.png differ diff --git a/res/drawable-xxhdpi/ic_star_hollow_dark.png b/res/drawable-xxhdpi/ic_star_hollow_dark.png new file mode 100644 index 00000000..436b0ca1 Binary files /dev/null and b/res/drawable-xxhdpi/ic_star_hollow_dark.png differ diff --git a/res/drawable-xxhdpi/ic_star_hollow_light.png b/res/drawable-xxhdpi/ic_star_hollow_light.png new file mode 100644 index 00000000..4e62bde7 Binary files /dev/null and b/res/drawable-xxhdpi/ic_star_hollow_light.png differ diff --git a/res/drawable-xxhdpi/main_header_icon.png b/res/drawable-xxhdpi/main_header_icon.png deleted file mode 100644 index 352111ad..00000000 Binary files a/res/drawable-xxhdpi/main_header_icon.png and /dev/null differ diff --git a/res/drawable-xxhdpi/media_backward_normal_dark.png b/res/drawable-xxhdpi/media_backward_normal_dark.png new file mode 100644 index 00000000..99d6a79f Binary files /dev/null and b/res/drawable-xxhdpi/media_backward_normal_dark.png differ diff --git a/res/drawable-xxhdpi/media_backward_normal_light.png b/res/drawable-xxhdpi/media_backward_normal_light.png new file mode 100644 index 00000000..3e0997ad Binary files /dev/null and b/res/drawable-xxhdpi/media_backward_normal_light.png differ diff --git a/res/drawable-xxhdpi/media_forward_normal_dark.png b/res/drawable-xxhdpi/media_forward_normal_dark.png new file mode 100644 index 00000000..3c937727 Binary files /dev/null and b/res/drawable-xxhdpi/media_forward_normal_dark.png differ diff --git a/res/drawable-xxhdpi/media_forward_normal_light.png b/res/drawable-xxhdpi/media_forward_normal_light.png new file mode 100644 index 00000000..7e31df8b Binary files /dev/null and b/res/drawable-xxhdpi/media_forward_normal_light.png differ diff --git a/res/drawable-xxhdpi/media_pause_normal_dark.png b/res/drawable-xxhdpi/media_pause_normal_dark.png new file mode 100644 index 00000000..293f7127 Binary files /dev/null and b/res/drawable-xxhdpi/media_pause_normal_dark.png differ diff --git a/res/drawable-xxhdpi/media_pause_normal_light.png b/res/drawable-xxhdpi/media_pause_normal_light.png new file mode 100644 index 00000000..c3b376a1 Binary files /dev/null and b/res/drawable-xxhdpi/media_pause_normal_light.png differ diff --git a/res/drawable-xxhdpi/media_repeat_off_dark.png b/res/drawable-xxhdpi/media_repeat_off_dark.png new file mode 100644 index 00000000..c46ffa91 Binary files /dev/null and b/res/drawable-xxhdpi/media_repeat_off_dark.png differ diff --git a/res/drawable-xxhdpi/media_repeat_off_light.png b/res/drawable-xxhdpi/media_repeat_off_light.png new file mode 100644 index 00000000..b94d29fb Binary files /dev/null and b/res/drawable-xxhdpi/media_repeat_off_light.png differ diff --git a/res/drawable-xxhdpi/media_repeat_single_dark.png b/res/drawable-xxhdpi/media_repeat_single_dark.png new file mode 100644 index 00000000..499bfe11 Binary files /dev/null and b/res/drawable-xxhdpi/media_repeat_single_dark.png differ diff --git a/res/drawable-xxhdpi/media_repeat_single_light.png b/res/drawable-xxhdpi/media_repeat_single_light.png new file mode 100644 index 00000000..d9561b3b Binary files /dev/null and b/res/drawable-xxhdpi/media_repeat_single_light.png differ diff --git a/res/drawable-xxhdpi/media_shuffle_normal_dark.png b/res/drawable-xxhdpi/media_shuffle_normal_dark.png new file mode 100644 index 00000000..a2e1785c Binary files /dev/null and b/res/drawable-xxhdpi/media_shuffle_normal_dark.png differ diff --git a/res/drawable-xxhdpi/media_shuffle_normal_light.png b/res/drawable-xxhdpi/media_shuffle_normal_light.png new file mode 100644 index 00000000..61b73f12 Binary files /dev/null and b/res/drawable-xxhdpi/media_shuffle_normal_light.png differ diff --git a/res/drawable-xxhdpi/media_start_normal_dark.png b/res/drawable-xxhdpi/media_start_normal_dark.png new file mode 100644 index 00000000..97ff9b07 Binary files /dev/null and b/res/drawable-xxhdpi/media_start_normal_dark.png differ diff --git a/res/drawable-xxhdpi/media_start_normal_light.png b/res/drawable-xxhdpi/media_start_normal_light.png new file mode 100644 index 00000000..df599471 Binary files /dev/null and b/res/drawable-xxhdpi/media_start_normal_light.png differ diff --git a/res/drawable-xxhdpi/media_stop_normal_dark.png b/res/drawable-xxhdpi/media_stop_normal_dark.png new file mode 100644 index 00000000..c86dbb15 Binary files /dev/null and b/res/drawable-xxhdpi/media_stop_normal_dark.png differ diff --git a/res/drawable-xxhdpi/media_stop_normal_light.png b/res/drawable-xxhdpi/media_stop_normal_light.png new file mode 100644 index 00000000..f42d5252 Binary files /dev/null and b/res/drawable-xxhdpi/media_stop_normal_light.png differ diff --git a/res/drawable-xxhdpi/media_toggle_list_normal_dark.png b/res/drawable-xxhdpi/media_toggle_list_normal_dark.png new file mode 100644 index 00000000..121d6ce1 Binary files /dev/null and b/res/drawable-xxhdpi/media_toggle_list_normal_dark.png differ diff --git a/res/drawable-xxhdpi/media_toggle_list_normal_light.png b/res/drawable-xxhdpi/media_toggle_list_normal_light.png new file mode 100644 index 00000000..9e2cb958 Binary files /dev/null and b/res/drawable-xxhdpi/media_toggle_list_normal_light.png differ diff --git a/res/drawable-xxhdpi/stat_sys_download_anim0_dark.png b/res/drawable-xxhdpi/stat_sys_download_anim0_dark.png new file mode 100644 index 00000000..6bcd8313 Binary files /dev/null and b/res/drawable-xxhdpi/stat_sys_download_anim0_dark.png differ diff --git a/res/drawable-xxhdpi/stat_sys_download_anim0_light.png b/res/drawable-xxhdpi/stat_sys_download_anim0_light.png new file mode 100644 index 00000000..ef7785a4 Binary files /dev/null and b/res/drawable-xxhdpi/stat_sys_download_anim0_light.png differ diff --git a/res/drawable-xxhdpi/stat_sys_download_anim1_dark.png b/res/drawable-xxhdpi/stat_sys_download_anim1_dark.png new file mode 100644 index 00000000..1923c84f Binary files /dev/null and b/res/drawable-xxhdpi/stat_sys_download_anim1_dark.png differ diff --git a/res/drawable-xxhdpi/stat_sys_download_anim1_light.png b/res/drawable-xxhdpi/stat_sys_download_anim1_light.png new file mode 100644 index 00000000..cc08ad4f Binary files /dev/null and b/res/drawable-xxhdpi/stat_sys_download_anim1_light.png differ diff --git a/res/drawable-xxhdpi/stat_sys_download_anim2_dark.png b/res/drawable-xxhdpi/stat_sys_download_anim2_dark.png new file mode 100644 index 00000000..3a1aac56 Binary files /dev/null and b/res/drawable-xxhdpi/stat_sys_download_anim2_dark.png differ diff --git a/res/drawable-xxhdpi/stat_sys_download_anim2_light.png b/res/drawable-xxhdpi/stat_sys_download_anim2_light.png new file mode 100644 index 00000000..d81a7810 Binary files /dev/null and b/res/drawable-xxhdpi/stat_sys_download_anim2_light.png differ diff --git a/res/drawable-xxhdpi/stat_sys_download_anim3_dark.png b/res/drawable-xxhdpi/stat_sys_download_anim3_dark.png new file mode 100644 index 00000000..92fde1cb Binary files /dev/null and b/res/drawable-xxhdpi/stat_sys_download_anim3_dark.png differ diff --git a/res/drawable-xxhdpi/stat_sys_download_anim3_light.png b/res/drawable-xxhdpi/stat_sys_download_anim3_light.png new file mode 100644 index 00000000..c22ceb94 Binary files /dev/null and b/res/drawable-xxhdpi/stat_sys_download_anim3_light.png differ diff --git a/res/drawable-xxhdpi/stat_sys_download_anim4_dark.png b/res/drawable-xxhdpi/stat_sys_download_anim4_dark.png new file mode 100644 index 00000000..904c8169 Binary files /dev/null and b/res/drawable-xxhdpi/stat_sys_download_anim4_dark.png differ diff --git a/res/drawable-xxhdpi/stat_sys_download_anim4_light.png b/res/drawable-xxhdpi/stat_sys_download_anim4_light.png new file mode 100644 index 00000000..7f512721 Binary files /dev/null and b/res/drawable-xxhdpi/stat_sys_download_anim4_light.png differ diff --git a/res/drawable-xxhdpi/stat_sys_download_anim5_dark.png b/res/drawable-xxhdpi/stat_sys_download_anim5_dark.png new file mode 100644 index 00000000..c1513fe7 Binary files /dev/null and b/res/drawable-xxhdpi/stat_sys_download_anim5_dark.png differ diff --git a/res/drawable-xxhdpi/stat_sys_download_anim5_light.png b/res/drawable-xxhdpi/stat_sys_download_anim5_light.png new file mode 100644 index 00000000..b0514360 Binary files /dev/null and b/res/drawable-xxhdpi/stat_sys_download_anim5_light.png differ diff --git a/res/drawable/btn_check_custom_dark.xml b/res/drawable/btn_check_custom_dark.xml new file mode 100644 index 00000000..677e7f9b --- /dev/null +++ b/res/drawable/btn_check_custom_dark.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + diff --git a/res/drawable/btn_check_custom.xml b/res/drawable/btn_check_custom_light.xml similarity index 66% rename from res/drawable/btn_check_custom.xml rename to res/drawable/btn_check_custom_light.xml index f363a2d2..f6f622fa 100644 --- a/res/drawable/btn_check_custom.xml +++ b/res/drawable/btn_check_custom_light.xml @@ -17,12 +17,18 @@ + android:drawable="@drawable/btn_check_on_holo_light" /> + android:drawable="@drawable/btn_check_off_holo_light" /> + + + + + android:drawable="@drawable/btn_check_off_holo_light" /> diff --git a/res/drawable/stat_sys_download_dark.xml b/res/drawable/stat_sys_download_dark.xml new file mode 100644 index 00000000..64fba75d --- /dev/null +++ b/res/drawable/stat_sys_download_dark.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + diff --git a/res/drawable/stat_sys_download_light.xml b/res/drawable/stat_sys_download_light.xml new file mode 100644 index 00000000..4a938c37 --- /dev/null +++ b/res/drawable/stat_sys_download_light.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + diff --git a/res/layout/share_details.xml b/res/layout/share_details.xml new file mode 100644 index 00000000..ffd906a8 --- /dev/null +++ b/res/layout/share_details.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + diff --git a/res/layout/song_details.xml b/res/layout/song_details.xml index e9e223d0..d1f9afb9 100644 --- a/res/layout/song_details.xml +++ b/res/layout/song_details.xml @@ -33,12 +33,12 @@ a:textAppearance="?android:attr/textAppearanceMedium" /> + a:id="@+id/song_status" + a:layout_width="wrap_content" + a:layout_height="wrap_content" + a:layout_gravity="right|center_vertical" + a:drawablePadding="1dip" + a:paddingRight="6dip" /> diff --git a/res/layout/video_list_item.xml b/res/layout/video_list_item.xml index 662394f1..60f8e332 100644 --- a/res/layout/video_list_item.xml +++ b/res/layout/video_list_item.xml @@ -9,7 +9,6 @@ a:id="@+id/song_check" a:layout_width="wrap_content" a:layout_height="fill_parent" - a:checkMark="@drawable/btn_check_custom" a:gravity="center_vertical" a:paddingLeft="1dip" a:visibility="gone" /> diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml index 4b0f6629..38e1b3b2 100644 --- a/res/menu/nowplaying.xml +++ b/res/menu/nowplaying.xml @@ -2,20 +2,25 @@ + \ No newline at end of file diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml index de25c260..0b53bdac 100644 --- a/res/menu/select_album.xml +++ b/res/menu/select_album.xml @@ -1,6 +1,12 @@ + + + \ No newline at end of file diff --git a/res/menu/select_song_context.xml b/res/menu/select_song_context.xml index 3e8e9fd1..3a534b25 100644 --- a/res/menu/select_song_context.xml +++ b/res/menu/select_song_context.xml @@ -19,5 +19,8 @@ + \ No newline at end of file diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml new file mode 100644 index 00000000..d4931d56 --- /dev/null +++ b/res/values-fr/arrays.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 277fcabe..8ec4ed19 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -358,6 +358,20 @@ Touchez pour sélectionner un titre Carte SD non disponible Aucune carte SD + Default Share Description + Sharing + Always ask for description and expiration when creating a share + Always Ask For Details + Default Expiration Date + Do not show dialog again + Set Share Options + Description + None + One Day + One Week + One Month + One Year + No Expiration Aucun titre diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml index 8534cc9c..54f4e790 100644 --- a/res/values-hu/arrays.xml +++ b/res/values-hu/arrays.xml @@ -214,5 +214,7 @@ Alapértelmezett Flash + + diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index c31bf482..f766ffc1 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -358,6 +358,20 @@ Érintse meg a zene kiválasztásához Az SD kártya nem elérhető! Nincs SD kártya! + Default Share Description + Sharing + Always ask for description and expiration when creating a share + Always Ask For Details + Default Expiration Date + Do not show dialog again + Set Share Options + Description + None + One Day + One Week + One Month + One Year + No Expiration Nincsenek dalok diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 23464fc0..18ce1b09 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -238,7 +238,20 @@ 4500 5000 - + + @string/settings.share_none + @string/settings.share_one_day + @string/settings.share_one_week + @string/settings.share_one_month + @string/settings.share_one_year + + + -1 + 86400000 + 604800000 + 2592000000 + 31536000000 + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index b8cbc619..76372b22 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -358,6 +358,20 @@ Touch to select music SD card unavailable No SD card + Default Share Description + Sharing + Always ask for description and expiration when creating a share + Always Ask For Details + Default Expiration Date + Do not show dialog again + Set Share Options + Description + None + One Day + One Week + One Month + One Year + No Expiration No songs diff --git a/res/values/styles.xml b/res/values/styles.xml index 84b55ab6..3466d4a5 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -85,6 +85,9 @@ - + + + + diff --git a/res/values/themes.xml b/res/values/themes.xml index 3ad75327..c8e5a79e 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -20,18 +20,18 @@ @drawable/ic_menu_remove_all_dark @drawable/ic_menu_save_dark @drawable/ic_menu_screen_on_off_dark - @drawable/ic_menu_search_dark + @drawable/ic_menu_search_holo_dark @drawable/ic_menu_select_folder_dark @drawable/ic_menu_settings_dark @drawable/ic_menu_share_dark - @drawable/ic_stat_downloaded_dark - @drawable/ic_stat_downloading_dark + @drawable/stat_sys_download_anim0_dark + @drawable/stat_sys_download_dark @drawable/media_backward_normal_dark @drawable/media_forward_normal_dark @drawable/media_pause_normal_dark @drawable/media_repeat_all @drawable/media_repeat_off_dark - @drawable/media_repeat_single + @drawable/media_repeat_single_dark @drawable/media_shuffle_normal_dark @drawable/media_start_normal_dark @drawable/media_play_next @@ -41,6 +41,7 @@ @drawable/ic_menu_chat_dark @drawable/ic_menu_chat_send_dark @drawable/ic_menu_bookmark_dark + @drawable/btn_check_custom_dark \ No newline at end of file diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 4f82c9f5..00d1b803 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -13,7 +13,6 @@ a:entryValues="@array/themeValues" a:key="theme" a:title="@string/settings.theme_title" /> - - + + + + + - - - - entries = new ArrayList(1); + entries.add(entry); + createShare(entries); + } default: return false; } diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java index d1f61d0d..f09a7a51 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java @@ -307,6 +307,13 @@ public class SearchActivity extends SubsonicTabActivity getDownloadService().unpin(songs); } break; + case R.id.menu_item_share: + if (entry != null) + { + songs = new ArrayList(1); + songs.add(entry); + createShare(songs); + } default: return super.onContextItemSelected(menuItem); } diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java index d24657bd..1b558b23 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java @@ -72,7 +72,9 @@ public class SelectAlbumActivity extends SubsonicTabActivity private ImageView deleteButton; private ImageView moreButton; private boolean playAllButtonVisible; + private boolean shareButtonVisible; private MenuItem playAllButton; + private MenuItem shareButton; private boolean showHeader = true; private Random random = new Random(); @@ -287,6 +289,13 @@ public class SelectAlbumActivity extends SubsonicTabActivity playAllButton.setVisible(playAllButtonVisible); } + shareButton = menu.findItem(R.id.menu_item_share); + + if (shareButton != null) + { + shareButton.setVisible(shareButtonVisible); + } + return true; } @@ -388,6 +397,8 @@ public class SelectAlbumActivity extends SubsonicTabActivity { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.select_album_context, menu); + + shareButton = menu.findItem(R.id.menu_item_share); } } @@ -408,29 +419,36 @@ public class SelectAlbumActivity extends SubsonicTabActivity return true; } + String entryId = entry.getId(); + switch (menuItem.getItemId()) { case R.id.album_menu_play_now: - downloadRecursively(entry.getId(), false, false, true, false, false, false, false, false); + downloadRecursively(entryId, false, false, true, false, false, false, false, false); break; case R.id.album_menu_play_next: - downloadRecursively(entry.getId(), false, false, false, false, false, true, false, false); + downloadRecursively(entryId, false, false, false, false, false, true, false, false); break; case R.id.album_menu_play_last: - downloadRecursively(entry.getId(), false, true, false, false, false, false, false, false); + downloadRecursively(entryId, false, true, false, false, false, false, false, false); break; case R.id.album_menu_pin: - downloadRecursively(entry.getId(), true, true, false, false, false, false, false, false); + downloadRecursively(entryId, true, true, false, false, false, false, false, false); break; case R.id.album_menu_unpin: - downloadRecursively(entry.getId(), false, false, false, false, false, false, true, false); + downloadRecursively(entryId, false, false, false, false, false, false, true, false); break; case R.id.album_menu_download: - downloadRecursively(entry.getId(), false, false, false, false, true, false, false, false); + downloadRecursively(entryId, false, false, false, false, true, false, false, false); break; case R.id.select_album_play_all: playAll(); break; + case R.id.menu_item_share: + List entries = new ArrayList(1); + entries.add(entry); + createShare(entries); + return true; default: return super.onContextItemSelected(menuItem); } @@ -453,6 +471,9 @@ public class SelectAlbumActivity extends SubsonicTabActivity case R.id.select_album_play_all: playAll(); return true; + case R.id.menu_item_share: + createShare(getSelectedSongs(albumListView)); + return true; } return false; @@ -868,7 +889,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity } } - final int listSize = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, 0); + final int listSize = getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, 0); if (songCount > 0) { @@ -943,6 +964,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity boolean isAlbumList = getIntent().hasExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE); playAllButtonVisible = !(isAlbumList || entries.isEmpty()) && !allVideos; + shareButtonVisible = songCount > 0; emptyView.setVisibility(entries.isEmpty() ? View.VISIBLE : View.GONE); @@ -951,6 +973,11 @@ public class SelectAlbumActivity extends SubsonicTabActivity playAllButton.setVisible(playAllButtonVisible); } + if (shareButton != null) + { + shareButton.setVisible(shareButtonVisible); + } + albumListView.setAdapter(new EntryAdapter(SelectAlbumActivity.this, getImageLoader(), entries, true)); licenseValid = result.getSecond(); diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java index 1b6e89b5..5f5f3309 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java @@ -88,6 +88,9 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer private CheckBoxPreference sendBluetoothNotifications; private CheckBoxPreference sendBluetoothAlbumArt; private ListPreference viewRefresh; + private CheckBoxPreference sharingAlwaysAskForDetails; + private EditTextPreference sharingDefaultDescription; + private ListPreference sharingDefaultExpiration; private int maxServerCount = 10; private int minServerCount = 0; @@ -176,6 +179,9 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer sendBluetoothAlbumArt = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_SEND_BLUETOOTH_ALBUM_ART); sendBluetoothNotifications = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_SEND_BLUETOOTH_NOTIFICATIONS); viewRefresh = (ListPreference) findPreference(Constants.PREFERENCES_KEY_VIEW_REFRESH); + sharingAlwaysAskForDetails = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_ASK_FOR_SHARE_DETAILS); + sharingDefaultDescription = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_DEFAULT_SHARE_DESCRIPTION); + sharingDefaultExpiration = (ListPreference) findPreference(Constants.PREFERENCES_KEY_DEFAULT_SHARE_EXPIRATION); findPreference(Constants.PREFERENCES_KEY_CLEAR_SEARCH_HISTORY).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { @@ -490,6 +496,8 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer chatRefreshInterval.setSummary(chatRefreshInterval.getEntry()); directoryCacheTime.setSummary(directoryCacheTime.getEntry()); viewRefresh.setSummary(viewRefresh.getEntry()); + sharingDefaultExpiration.setSummary(sharingDefaultExpiration.getEntry()); + sharingDefaultDescription.setSummary(sharingDefaultDescription.getText()); if (!mediaButtonsEnabled.isChecked()) { diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java index 8060b48d..0185c854 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java @@ -22,6 +22,7 @@ import android.annotation.SuppressLint; import android.app.ActionBar; import android.app.Activity; import android.app.AlertDialog; +import android.app.Dialog; import android.app.Notification; import android.app.NotificationManager; import android.content.Context; @@ -38,11 +39,17 @@ import android.os.Environment; import android.os.Handler; import android.util.Log; import android.view.KeyEvent; +import android.view.LayoutInflater; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; import android.view.View.OnTouchListener; +import android.view.ViewGroup; +import android.widget.CheckBox; +import android.widget.CompoundButton; +import android.widget.DatePicker; +import android.widget.EditText; import android.widget.ImageView; import android.widget.RemoteViews; import android.widget.TextView; @@ -51,16 +58,20 @@ import com.thejoshwa.ultrasonic.androidapp.R; import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; +import com.thejoshwa.ultrasonic.androidapp.domain.Share; import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; import com.thejoshwa.ultrasonic.androidapp.service.MusicService; import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; +import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; import com.thejoshwa.ultrasonic.androidapp.util.Constants; import com.thejoshwa.ultrasonic.androidapp.util.EntryByDiscAndTrackComparator; import com.thejoshwa.ultrasonic.androidapp.util.ImageLoader; import com.thejoshwa.ultrasonic.androidapp.util.ModalBackgroundTask; +import com.thejoshwa.ultrasonic.androidapp.util.ShareDetails; import com.thejoshwa.ultrasonic.androidapp.util.SilentBackgroundTask; +import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; import com.thejoshwa.ultrasonic.androidapp.util.Util; import com.thejoshwa.ultrasonic.androidapp.util.VideoPlayerType; @@ -69,6 +80,8 @@ import net.simonvt.menudrawer.Position; import java.io.File; import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Calendar; import java.util.Collection; import java.util.Collections; import java.util.LinkedList; @@ -89,6 +102,7 @@ public class SubsonicTabActivity extends Activity implements OnClickListener private static final String STATE_MENUDRAWER = "com.thejoshwa.ultrasonic.androidapp.menuDrawer"; private static final String STATE_ACTIVE_VIEW_ID = "com.thejoshwa.ultrasonic.androidapp.activeViewId"; private static final String STATE_ACTIVE_POSITION = "com.thejoshwa.ultrasonic.androidapp.activePosition"; + private static final int DIALOG_ASK_FOR_SHARE_DETAILS = 102; public MenuDrawer menuDrawer; private int activePosition = 1; @@ -101,6 +115,11 @@ public class SubsonicTabActivity extends Activity implements OnClickListener public Bitmap nowPlayingImage; boolean licenseValid; NotificationManager notificationManager; + private EditText shareDescription; + DatePicker datePicker; + CheckBox hideDialogCheckBox; + CheckBox noExpirationCheckBox; + ShareDetails shareDetails; @Override protected void onCreate(Bundle bundle) @@ -570,6 +589,163 @@ public class SubsonicTabActivity extends Activity implements OnClickListener } } + @Override + protected Dialog onCreateDialog(final int id) + { + if (id == DIALOG_ASK_FOR_SHARE_DETAILS) + { + final LayoutInflater layoutInflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE); + final View layout = layoutInflater.inflate(R.layout.share_details, (ViewGroup) findViewById(R.id.share_details)); + + if (layout != null) + { + shareDescription = (EditText) layout.findViewById(R.id.share_description); + hideDialogCheckBox = (CheckBox) layout.findViewById(R.id.hide_dialog); + noExpirationCheckBox = (CheckBox) layout.findViewById(R.id.no_expiration); + datePicker = (DatePicker) layout.findViewById(R.id.date_picker); + } + + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.share_set_share_options); + builder.setMessage(R.string.share_description); + builder.setPositiveButton(R.string.common_save, new DialogInterface.OnClickListener() + { + @Override + public void onClick(final DialogInterface dialog, final int clickId) + { + if (!noExpirationCheckBox.isChecked()) + { + Calendar cal = Calendar.getInstance(); + cal.setTime(Util.getDateFromDatePicker(datePicker)); + shareDetails.Expiration = cal; + } + + shareDetails.Description = String.valueOf(shareDescription.getText()); + + if (hideDialogCheckBox.isChecked()) + { + Util.setShouldAskForShareDetails(SubsonicTabActivity.this, false); + } + + share(); + } + }); + builder.setNegativeButton(R.string.common_cancel, new DialogInterface.OnClickListener() + { + @Override + public void onClick(final DialogInterface dialog, final int clickId) + { + shareDetails = null; + dialog.cancel(); + } + }); + builder.setView(layout); + builder.setCancelable(true); + + noExpirationCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() + { + @Override + public void onCheckedChanged(CompoundButton compoundButton, boolean b) + { + datePicker.setEnabled(!b); + } + }); + + return builder.create(); + } + else + { + return super.onCreateDialog(id); + } + } + + @Override + protected void onPrepareDialog(final int id, final Dialog dialog) + { + if (id == DIALOG_ASK_FOR_SHARE_DETAILS) + { + String defaultDescription = Util.getDefaultShareDescription(this); + Calendar cal = Util.getDefaultShareExpirationCalendar(this); + + if (cal != null) { + noExpirationCheckBox.setChecked(false); + datePicker.setEnabled(true); + datePicker.init(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), null); + } + else + { + noExpirationCheckBox.setChecked(true); + datePicker.setEnabled(false); + }; + + shareDescription.setText(defaultDescription); + } + } + + public void createShare(final List entries) + { + boolean askForDetails = Util.getShouldAskForShareDetails(this); + + shareDetails = new ShareDetails(); + shareDetails.Entries = entries; + + if (askForDetails) + { + showDialog(DIALOG_ASK_FOR_SHARE_DETAILS); + } + else + { + shareDetails.Description = Util.getDefaultShareDescription(this); + shareDetails.Expiration = Util.getDefaultShareExpirationCalendar(this); + share(); + } + } + + public void share() + { + BackgroundTask task = new TabActivityBackgroundTask(this, true) + { + @Override + protected Share doInBackground() throws Throwable + { + List ids = new ArrayList(); + + if (shareDetails.Entries.isEmpty()) + { + ids.add(getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ID)); + } + else + { + for (MusicDirectory.Entry entry : shareDetails.Entries) + { + ids.add(entry.getId()); + } + } + + MusicService musicService = MusicServiceFactory.getMusicService(SubsonicTabActivity.this); + + long timeInMillis = 0; + + if (shareDetails.Expiration != null) + timeInMillis = shareDetails.Expiration.getTimeInMillis(); + + List shares = musicService.createShare(ids, shareDetails.Description, timeInMillis, SubsonicTabActivity.this, this); + return shares.get(0); + } + + @Override + protected void done(Share result) + { + Intent intent = new Intent(Intent.ACTION_SEND); + intent.setType("text/plain"); + intent.putExtra(Intent.EXTRA_TEXT, String.format("Check out this music I shared from UltraSonic\n\n%s", result.getUrl())); + startActivity(Intent.createChooser(intent, "Share via")); + } + }; + + task.execute(); + } + public void setTextViewTextOnUiThread(final RemoteViews view, final int id, final String text) { this.runOnUiThread(new Runnable() diff --git a/src/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java b/src/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java index a878280a..3407fe3d 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java @@ -497,4 +497,10 @@ public class CachedMusicService implements MusicService return userInfo; } + + @Override + public List createShare(List ids, String description, Long expires, Context context, ProgressListener progressListener) throws Exception + { + return musicService.createShare(ids, description, expires, context, progressListener); + } } diff --git a/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java b/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java index 26bfb8c3..fb66a56a 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java @@ -127,6 +127,8 @@ public interface DownloadService boolean isJukeboxAvailable(); + boolean isSharingAvailable(); + void setJukeboxEnabled(boolean b); void adjustJukeboxVolume(boolean up); diff --git a/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java b/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java index ebc1352e..8b894710 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java @@ -1372,6 +1372,25 @@ public class DownloadServiceImpl extends Service implements DownloadService return false; } + @Override + public boolean isSharingAvailable() + { + MusicService musicService = MusicServiceFactory.getMusicService(DownloadServiceImpl.this); + + try + { + String username = Util.getUserName(DownloadServiceImpl.this, Util.getActiveServer(DownloadServiceImpl.this)); + UserInfo user = musicService.getUser(username, DownloadServiceImpl.this, null); + return user.getShareRole(); + } + catch (Exception e) + { + Log.w("Error getting user information", e); + } + + return false; + } + @Override public void setJukeboxEnabled(boolean jukeboxEnabled) { diff --git a/src/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java b/src/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java index 24495d5e..814565c8 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java @@ -141,4 +141,6 @@ public interface MusicService MusicDirectory getVideos(boolean refresh, Context context, ProgressListener progressListener) throws Exception; UserInfo getUser(String username, Context context, ProgressListener progressListener) throws Exception; + + List createShare(List ids, String description, Long expires, Context context, ProgressListener progressListener) throws Exception; } \ No newline at end of file diff --git a/src/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java b/src/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java index fc373f5f..d00838a2 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java @@ -33,6 +33,7 @@ import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; import com.thejoshwa.ultrasonic.androidapp.domain.SearchCriteria; import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; +import com.thejoshwa.ultrasonic.androidapp.domain.Share; import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; import com.thejoshwa.ultrasonic.androidapp.util.Constants; import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; @@ -749,6 +750,12 @@ public class OfflineMusicService extends RESTMusicService throw new OfflineException("Getting user info not available in offline mode"); } + @Override + public List createShare(List ids, String description, Long expires, Context context, ProgressListener progressListener) throws Exception + { + throw new OfflineException("Creating shares not available in offline mode"); + } + private static void listFilesRecursively(File parent, List children) { for (File file : FileUtil.listMediaFiles(parent)) diff --git a/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java b/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java index c31c8a41..2b0f51c7 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java @@ -1562,4 +1562,39 @@ public class RESTMusicService implements MusicService Util.close(reader); } } + + @Override + public List createShare(List ids, String description, Long expires, Context context, ProgressListener progressListener) throws Exception + { + List parameterNames = new LinkedList(); + List parameterValues = new LinkedList(); + + for (String id : ids) + { + parameterNames.add("id"); + parameterValues.add(id); + } + + if (description != null) + { + parameterNames.add("description"); + parameterValues.add(description); + } + + if (expires > 0) + { + parameterNames.add("expires"); + parameterValues.add(expires); + } + + Reader reader = getReader(context, progressListener, "createShare", null, parameterNames, parameterValues); + try + { + return new ShareParser(context).parse(reader, progressListener); + } + finally + { + Util.close(reader); + } + } } diff --git a/src/com/thejoshwa/ultrasonic/androidapp/service/parser/ShareParser.java b/src/com/thejoshwa/ultrasonic/androidapp/service/parser/ShareParser.java index 2e251baa..70458fd2 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/service/parser/ShareParser.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/service/parser/ShareParser.java @@ -29,7 +29,7 @@ public class ShareParser extends MusicDirectoryEntryParser updateProgress(progressListener, R.string.parser_reading); init(reader); - List dir = new ArrayList(); + List shares = new ArrayList(); Share share = null; int eventType; @@ -52,6 +52,7 @@ public class ShareParser extends MusicDirectoryEntryParser share.setUrl(get("url")); share.setUsername(get("username")); share.setVisitCount(getLong("visitCount")); + shares.add(share); } else if ("entry".equals(name)) { @@ -70,6 +71,6 @@ public class ShareParser extends MusicDirectoryEntryParser validate(); updateProgress(progressListener, R.string.parser_reading_done); - return dir; + return shares; } } \ No newline at end of file diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java b/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java index 37774434..4623c609 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java @@ -118,6 +118,9 @@ public final class Constants public static final String PREFERENCES_KEY_SEND_BLUETOOTH_NOTIFICATIONS = "sendBluetoothNotifications"; public static final String PREFERENCES_KEY_SEND_BLUETOOTH_ALBUM_ART = "sendBluetoothAlbumArt"; public static final String PREFERENCES_KEY_VIEW_REFRESH = "viewRefresh"; + public static final String PREFERENCES_KEY_ASK_FOR_SHARE_DETAILS = "sharingAlwaysAskForDetails"; + public static final String PREFERENCES_KEY_DEFAULT_SHARE_DESCRIPTION = "sharingDefaultDescription"; + public static final String PREFERENCES_KEY_DEFAULT_SHARE_EXPIRATION = "sharingDefaultExpiration"; // Name of the preferences file. public static final String PREFERENCES_FILE_NAME = "com.thejoshwa.ultrasonic.androidapp_preferences"; diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/ShareDetails.java b/src/com/thejoshwa/ultrasonic/androidapp/util/ShareDetails.java new file mode 100644 index 00000000..d5d53a21 --- /dev/null +++ b/src/com/thejoshwa/ultrasonic/androidapp/util/ShareDetails.java @@ -0,0 +1,16 @@ +package com.thejoshwa.ultrasonic.androidapp.util; + +import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; + +import java.util.Calendar; +import java.util.List; + +/** + * Created by Josh on 12/17/13. + */ +public class ShareDetails +{ + public String Description; + public Calendar Expiration; + public List Entries; +} diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java b/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java index 01c7c0d8..3a297289 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java @@ -45,6 +45,7 @@ import android.util.DisplayMetrics; import android.util.Log; import android.view.Gravity; import android.view.KeyEvent; +import android.widget.DatePicker; import android.widget.RemoteViews; import android.widget.Toast; @@ -53,11 +54,11 @@ import com.thejoshwa.ultrasonic.androidapp.activity.DownloadActivity; import com.thejoshwa.ultrasonic.androidapp.activity.MainActivity; import com.thejoshwa.ultrasonic.androidapp.domain.Bookmark; import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; +import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; import com.thejoshwa.ultrasonic.androidapp.domain.RepeatMode; import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; import com.thejoshwa.ultrasonic.androidapp.domain.Version; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; import com.thejoshwa.ultrasonic.androidapp.receiver.MediaButtonIntentReceiver; import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; @@ -79,7 +80,10 @@ import java.lang.reflect.Method; import java.security.MessageDigest; import java.text.DecimalFormat; import java.text.NumberFormat; +import java.util.Calendar; +import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; @@ -1568,4 +1572,56 @@ public class Util extends DownloadActivity return Integer.parseInt(preferences.getString(Constants.PREFERENCES_KEY_VIEW_REFRESH, "1000")); } + public static Date getDateFromDatePicker(DatePicker datePicker) { + int day = datePicker.getDayOfMonth(); + int month = datePicker.getMonth(); + int year = datePicker.getYear(); + + Calendar calendar = Calendar.getInstance(); + calendar.set(year, month, day); + + return calendar.getTime(); + } + + public static boolean getShouldAskForShareDetails(Context context) + { + SharedPreferences preferences = getPreferences(context); + return preferences.getBoolean(Constants.PREFERENCES_KEY_ASK_FOR_SHARE_DETAILS, true); + } + + public static String getDefaultShareDescription(Context context) + { + SharedPreferences preferences = getPreferences(context); + return preferences.getString(Constants.PREFERENCES_KEY_DEFAULT_SHARE_DESCRIPTION, ""); + } + + public static long getDefaultShareExpiration(Context context) + { + SharedPreferences preferences = getPreferences(context); + return Long.parseLong(preferences.getString(Constants.PREFERENCES_KEY_DEFAULT_SHARE_EXPIRATION, "-1")); + } + + public static Calendar getDefaultShareExpirationCalendar(Context context) + { + long expiration = getDefaultShareExpiration(context); + + if (expiration > 0) + { + Calendar cal = Calendar.getInstance(Locale.getDefault()); + cal.setTimeInMillis(System.currentTimeMillis() + expiration); + return cal; + } + else + { + return null; + } + } + + public static void setShouldAskForShareDetails(Context context, boolean shouldAskForShareDetails) + { + SharedPreferences preferences = getPreferences(context); + SharedPreferences.Editor editor = preferences.edit(); + editor.putBoolean(Constants.PREFERENCES_KEY_ASK_FOR_SHARE_DETAILS, shouldAskForShareDetails); + editor.commit(); + } } diff --git a/src/com/thejoshwa/ultrasonic/androidapp/view/SongView.java b/src/com/thejoshwa/ultrasonic/androidapp/view/SongView.java index 5d3ddaa1..d721d30c 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/view/SongView.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/view/SongView.java @@ -19,6 +19,7 @@ package com.thejoshwa.ultrasonic.androidapp.view; import android.content.Context; +import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; import android.util.Log; import android.view.LayoutInflater; @@ -334,6 +335,12 @@ public class SongView extends UpdateView implements Checkable if (this.statusTextView != null) { this.statusTextView.setCompoundDrawablesWithIntrinsicBounds(leftImage, null, rightImage, null); + + if (rightImage == downloadingImage) + { + AnimationDrawable frameAnimation = (AnimationDrawable) rightImage; + frameAnimation.setVisible(true, true); + } } }