From 9bf6cabfbc8a1923e65e367e3b32ff7036819edd Mon Sep 17 00:00:00 2001 From: birdbird <6892457-tzugen@users.noreply.gitlab.com> Date: Tue, 12 Jul 2022 13:00:03 +0000 Subject: [PATCH] Refactor use of attrs to tint images --- .idea/misc.xml | 4 - ultrasonic/lint-baseline.xml | 108 +++++++++- .../ultrasonic/activity/NavigationActivity.kt | 4 +- .../ultrasonic/adapters/AlbumRowBinder.kt | 17 +- .../ultrasonic/adapters/ServerRowAdapter.kt | 6 +- .../ultrasonic/adapters/TrackViewHolder.kt | 36 ++-- .../org/moire/ultrasonic/adapters/Utils.kt | 16 +- .../kotlin/org/moire/ultrasonic/app/UApp.kt | 5 +- .../ultrasonic/fragment/AlbumListFragment.kt | 3 +- .../ultrasonic/fragment/NowPlayingFragment.kt | 13 +- .../ultrasonic/fragment/PlayerFragment.kt | 43 ++-- .../ultrasonic/fragment/SearchFragment.kt | 3 +- .../fragment/TrackCollectionFragment.kt | 3 +- .../playback/MediaNotificationProvider.kt | 4 +- .../provider/UltrasonicAppWidgetProvider.kt | 4 +- .../res/drawable-hdpi/list_focused_holo.9.png | Bin 183 -> 0 bytes .../drawable-hdpi/list_longpressed_holo.9.png | Bin 140 -> 0 bytes .../list_pressed_holo_dark.9.png | Bin 139 -> 0 bytes .../list_pressed_holo_light.9.png | Bin 139 -> 0 bytes .../list_selector_disabled_holo_dark.9.png | Bin 166 -> 0 bytes .../list_selector_disabled_holo_light.9.png | Bin 161 -> 0 bytes ...k_custom_dark.xml => btn_check_custom.xml} | 6 +- .../res/drawable/btn_check_custom_light.xml | 28 --- ...n_check_off_dark.xml => btn_check_off.xml} | 3 +- .../main/res/drawable/btn_check_off_light.xml | 9 - ...btn_check_on_dark.xml => btn_check_on.xml} | 3 +- .../main/res/drawable/btn_check_on_light.xml | 9 - ...e_error_dark.xml => ic_baseline_error.xml} | 3 +- .../res/drawable/ic_baseline_error_light.xml | 9 - ...lder_dark.xml => ic_create_new_folder.xml} | 3 +- .../drawable/ic_create_new_folder_light.xml | 9 - ..._drag_queue_dark.xml => ic_drag_queue.xml} | 3 +- .../main/res/drawable/ic_drag_queue_light.xml | 9 - .../{ic_folder_dark.xml => ic_folder.xml} | 3 +- .../src/main/res/drawable/ic_folder_light.xml | 9 - ..._menu_about_dark.xml => ic_menu_about.xml} | 3 +- .../main/res/drawable/ic_menu_about_light.xml | 9 - ...backward_dark.xml => ic_menu_backward.xml} | 3 +- .../res/drawable/ic_menu_backward_light.xml | 9 - ...bookmark_dark.xml => ic_menu_bookmark.xml} | 3 +- .../res/drawable/ic_menu_bookmark_light.xml | 9 - ...enu_browse_dark.xml => ic_menu_browse.xml} | 3 +- .../res/drawable/ic_menu_browse_light.xml | 9 - ...ic_menu_chat_dark.xml => ic_menu_chat.xml} | 3 +- .../main/res/drawable/ic_menu_chat_light.xml | 9 - ...at_send_dark.xml => ic_menu_chat_send.xml} | 3 +- .../res/drawable/ic_menu_chat_send_light.xml | 9 - ..._menu_close_dark.xml => ic_menu_close.xml} | 3 +- .../main/res/drawable/ic_menu_close_light.xml | 9 - ...download_dark.xml => ic_menu_download.xml} | 3 +- .../res/drawable/ic_menu_download_light.xml | 9 - ...ic_menu_exit_dark.xml => ic_menu_exit.xml} | 3 +- .../main/res/drawable/ic_menu_exit_light.xml | 9 - ...u_forward_dark.xml => ic_menu_forward.xml} | 3 +- .../res/drawable/ic_menu_forward_light.xml | 9 - ...ic_menu_help_dark.xml => ic_menu_help.xml} | 3 +- .../main/res/drawable/ic_menu_help_light.xml | 9 - ...ic_menu_home_dark.xml => ic_menu_home.xml} | 3 +- .../main/res/drawable/ic_menu_home_light.xml | 9 - .../{ic_menu_pin_dark.xml => ic_menu_pin.xml} | 3 +- .../main/res/drawable/ic_menu_pin_light.xml | 9 - ...aylists_dark.xml => ic_menu_playlists.xml} | 3 +- .../res/drawable/ic_menu_playlists_light.xml | 9 - ...podcasts_dark.xml => ic_menu_podcasts.xml} | 3 +- .../res/drawable/ic_menu_podcasts_light.xml | 12 -- ...u_refresh_dark.xml => ic_menu_refresh.xml} | 3 +- .../res/drawable/ic_menu_refresh_light.xml | 9 - ...ve_all_dark.xml => ic_menu_remove_all.xml} | 3 +- .../res/drawable/ic_menu_remove_all_light.xml | 9 - ...ic_menu_save_dark.xml => ic_menu_save.xml} | 3 +- .../main/res/drawable/ic_menu_save_light.xml | 9 - ...off_dark.xml => ic_menu_screen_on_off.xml} | 3 +- .../drawable/ic_menu_screen_on_off_light.xml | 9 - ..._holo_dark.xml => ic_menu_search_holo.xml} | 3 +- .../drawable/ic_menu_search_holo_light.xml | 9 - ...ct_all_dark.xml => ic_menu_select_all.xml} | 3 +- .../res/drawable/ic_menu_select_all_light.xml | 9 - ...der_dark.xml => ic_menu_select_folder.xml} | 3 +- .../drawable/ic_menu_select_folder_light.xml | 9 - ...ver_dark.xml => ic_menu_select_server.xml} | 3 +- .../drawable/ic_menu_select_server_light.xml | 9 - ...enu_server_dark.xml => ic_menu_server.xml} | 3 +- .../res/drawable/ic_menu_server_light.xml | 9 - ...settings_dark.xml => ic_menu_settings.xml} | 3 +- .../res/drawable/ic_menu_settings_light.xml | 9 - ..._menu_share_dark.xml => ic_menu_share.xml} | 3 +- .../main/res/drawable/ic_menu_share_light.xml | 9 - ..._menu_unpin_dark.xml => ic_menu_unpin.xml} | 3 +- .../main/res/drawable/ic_menu_unpin_light.xml | 9 - ...ic_more_vert_dark.xml => ic_more_vert.xml} | 3 +- .../main/res/drawable/ic_more_vert_light.xml | 9 - ..._sd_storage_dark.xml => ic_sd_storage.xml} | 3 +- .../main/res/drawable/ic_sd_storage_light.xml | 9 - ...ic_star_full_dark.xml => ic_star_full.xml} | 5 +- .../main/res/drawable/ic_star_full_light.xml | 9 - ...tar_hollow_dark.xml => ic_star_hollow.xml} | 5 +- .../res/drawable/ic_star_hollow_light.xml | 9 - ...start_normal_dark.xml => ic_stat_play.xml} | 3 +- .../main/res/drawable/ic_stat_play_light.xml | 9 - ...ory_up_dark.xml => ic_subdirectory_up.xml} | 3 +- .../res/drawable/ic_subdirectory_up_light.xml | 9 - ...lector_background_transition_holo_dark.xml | 20 -- ...ector_background_transition_holo_light.xml | 20 -- .../res/drawable/list_selector_holo_dark.xml | 28 --- .../list_selector_holo_dark_selected.xml | 28 --- .../res/drawable/list_selector_holo_light.xml | 29 --- .../list_selector_holo_light_selected.xml | 29 --- ...mal_dark.xml => media_backward_normal.xml} | 3 +- .../drawable/media_backward_normal_light.xml | 9 - ...rmal_dark.xml => media_forward_normal.xml} | 3 +- .../drawable/media_forward_normal_light.xml | 9 - ...normal_dark.xml => media_pause_normal.xml} | 3 +- .../res/drawable/media_pause_normal_light.xml | 9 - ...peat_all_dark.xml => media_repeat_all.xml} | 3 +- .../res/drawable/media_repeat_all_light.xml | 9 - ...peat_off_dark.xml => media_repeat_off.xml} | 3 +- .../res/drawable/media_repeat_off_light.xml | 9 - ...peat_one_dark.xml => media_repeat_one.xml} | 3 +- .../res/drawable/media_repeat_one_light.xml | 9 - ...rmal_dark.xml => media_shuffle_normal.xml} | 3 +- .../drawable/media_shuffle_normal_light.xml | 9 - ...t_play_dark.xml => media_start_normal.xml} | 3 +- .../res/drawable/media_start_normal_light.xml | 9 - ..._normal_dark.xml => media_stop_normal.xml} | 3 +- .../res/drawable/media_stop_normal_light.xml | 9 - ..._dark.xml => media_toggle_list_normal.xml} | 0 .../media_toggle_list_normal_light.xml | 9 - ...ownload_dark.xml => stat_sys_download.xml} | 16 +- ..._dark.xml => stat_sys_download_anim_0.xml} | 3 +- .../stat_sys_download_anim_0_light.xml | 9 - ..._dark.xml => stat_sys_download_anim_1.xml} | 3 +- .../stat_sys_download_anim_1_light.xml | 12 -- ..._dark.xml => stat_sys_download_anim_2.xml} | 3 +- .../stat_sys_download_anim_2_light.xml | 12 -- ..._dark.xml => stat_sys_download_anim_3.xml} | 3 +- .../stat_sys_download_anim_3_light.xml | 12 -- ..._dark.xml => stat_sys_download_anim_4.xml} | 3 +- .../stat_sys_download_anim_4_light.xml | 12 -- ..._dark.xml => stat_sys_download_anim_5.xml} | 3 +- .../stat_sys_download_anim_5_light.xml | 12 -- ..._dark.xml => stat_sys_download_anim_6.xml} | 3 +- .../stat_sys_download_anim_6_light.xml | 12 -- ..._dark.xml => stat_sys_download_anim_7.xml} | 3 +- .../stat_sys_download_anim_7_light.xml | 12 -- .../res/drawable/stat_sys_download_light.xml | 32 --- .../main/res/layout-land/current_playing.xml | 10 +- .../src/main/res/layout/album_buttons.xml | 14 +- .../src/main/res/layout/appwidget4x1.xml | 6 +- .../src/main/res/layout/appwidget4x2.xml | 6 +- .../src/main/res/layout/appwidget4x3.xml | 6 +- .../src/main/res/layout/appwidget4x4.xml | 6 +- ultrasonic/src/main/res/layout/chat.xml | 2 +- .../src/main/res/layout/current_playing.xml | 10 +- .../main/res/layout/list_header_folder.xml | 2 +- .../src/main/res/layout/list_item_album.xml | 3 +- .../src/main/res/layout/list_item_track.xml | 190 +++++++++++++++--- .../res/layout/list_item_track_details.xml | 93 --------- .../src/main/res/layout/media_buttons.xml | 14 +- .../src/main/res/layout/navigation_header.xml | 2 +- .../src/main/res/layout/now_playing.xml | 2 +- ultrasonic/src/main/res/layout/server_row.xml | 5 +- ultrasonic/src/main/res/menu/chat.xml | 2 +- ultrasonic/src/main/res/menu/navigation.xml | 26 +-- ultrasonic/src/main/res/menu/nowplaying.xml | 17 +- ultrasonic/src/main/res/menu/search.xml | 2 +- ultrasonic/src/main/res/menu/select_album.xml | 4 +- ultrasonic/src/main/res/values/styles.xml | 56 ------ ultrasonic/src/main/res/values/themes.xml | 156 -------------- 168 files changed, 507 insertions(+), 1341 deletions(-) delete mode 100644 .idea/misc.xml delete mode 100644 ultrasonic/src/main/res/drawable-hdpi/list_focused_holo.9.png delete mode 100644 ultrasonic/src/main/res/drawable-hdpi/list_longpressed_holo.9.png delete mode 100644 ultrasonic/src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png delete mode 100644 ultrasonic/src/main/res/drawable-hdpi/list_pressed_holo_light.9.png delete mode 100644 ultrasonic/src/main/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png delete mode 100644 ultrasonic/src/main/res/drawable-hdpi/list_selector_disabled_holo_light.9.png rename ultrasonic/src/main/res/drawable/{btn_check_custom_dark.xml => btn_check_custom.xml} (82%) delete mode 100644 ultrasonic/src/main/res/drawable/btn_check_custom_light.xml rename ultrasonic/src/main/res/drawable/{btn_check_off_dark.xml => btn_check_off.xml} (81%) delete mode 100644 ultrasonic/src/main/res/drawable/btn_check_off_light.xml rename ultrasonic/src/main/res/drawable/{btn_check_on_dark.xml => btn_check_on.xml} (83%) delete mode 100644 ultrasonic/src/main/res/drawable/btn_check_on_light.xml rename ultrasonic/src/main/res/drawable/{ic_baseline_error_dark.xml => ic_baseline_error.xml} (81%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_baseline_error_light.xml rename ultrasonic/src/main/res/drawable/{ic_create_new_folder_dark.xml => ic_create_new_folder.xml} (83%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_create_new_folder_light.xml rename ultrasonic/src/main/res/drawable/{ic_drag_queue_dark.xml => ic_drag_queue.xml} (77%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_drag_queue_light.xml rename ultrasonic/src/main/res/drawable/{ic_folder_dark.xml => ic_folder.xml} (81%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_folder_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_about_dark.xml => ic_menu_about.xml} (80%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_about_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_backward_dark.xml => ic_menu_backward.xml} (78%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_backward_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_bookmark_dark.xml => ic_menu_bookmark.xml} (82%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_bookmark_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_browse_dark.xml => ic_menu_browse.xml} (86%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_browse_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_chat_dark.xml => ic_menu_chat.xml} (82%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_chat_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_chat_send_dark.xml => ic_menu_chat_send.xml} (77%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_chat_send_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_close_dark.xml => ic_menu_close.xml} (80%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_close_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_download_dark.xml => ic_menu_download.xml} (82%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_download_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_exit_dark.xml => ic_menu_exit.xml} (84%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_exit_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_forward_dark.xml => ic_menu_forward.xml} (78%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_forward_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_help_dark.xml => ic_menu_help.xml} (87%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_help_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_home_dark.xml => ic_menu_home.xml} (82%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_home_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_pin_dark.xml => ic_menu_pin.xml} (78%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_pin_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_playlists_dark.xml => ic_menu_playlists.xml} (78%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_playlists_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_podcasts_dark.xml => ic_menu_podcasts.xml} (86%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_podcasts_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_refresh_dark.xml => ic_menu_refresh.xml} (85%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_refresh_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_remove_all_dark.xml => ic_menu_remove_all.xml} (80%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_remove_all_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_save_dark.xml => ic_menu_save.xml} (83%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_save_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_screen_on_off_dark.xml => ic_menu_screen_on_off.xml} (82%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_screen_on_off_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_search_holo_dark.xml => ic_menu_search_holo.xml} (86%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_search_holo_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_select_all_dark.xml => ic_menu_select_all.xml} (88%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_select_all_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_select_folder_dark.xml => ic_menu_select_folder.xml} (82%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_select_folder_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_select_server_dark.xml => ic_menu_select_server.xml} (84%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_select_server_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_server_dark.xml => ic_menu_server.xml} (86%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_server_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_settings_dark.xml => ic_menu_settings.xml} (93%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_settings_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_share_dark.xml => ic_menu_share.xml} (89%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_share_light.xml rename ultrasonic/src/main/res/drawable/{ic_menu_unpin_dark.xml => ic_menu_unpin.xml} (80%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_unpin_light.xml rename ultrasonic/src/main/res/drawable/{ic_more_vert_dark.xml => ic_more_vert.xml} (84%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_more_vert_light.xml rename ultrasonic/src/main/res/drawable/{ic_sd_storage_dark.xml => ic_sd_storage.xml} (82%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_sd_storage_light.xml rename ultrasonic/src/main/res/drawable/{ic_star_full_dark.xml => ic_star_full.xml} (72%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_star_full_light.xml rename ultrasonic/src/main/res/drawable/{ic_star_hollow_dark.xml => ic_star_hollow.xml} (78%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_star_hollow_light.xml rename ultrasonic/src/main/res/drawable/{media_start_normal_dark.xml => ic_stat_play.xml} (75%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_stat_play_light.xml rename ultrasonic/src/main/res/drawable/{ic_subdirectory_up_dark.xml => ic_subdirectory_up.xml} (79%) delete mode 100644 ultrasonic/src/main/res/drawable/ic_subdirectory_up_light.xml delete mode 100644 ultrasonic/src/main/res/drawable/list_selector_background_transition_holo_dark.xml delete mode 100644 ultrasonic/src/main/res/drawable/list_selector_background_transition_holo_light.xml delete mode 100644 ultrasonic/src/main/res/drawable/list_selector_holo_dark.xml delete mode 100644 ultrasonic/src/main/res/drawable/list_selector_holo_dark_selected.xml delete mode 100644 ultrasonic/src/main/res/drawable/list_selector_holo_light.xml delete mode 100644 ultrasonic/src/main/res/drawable/list_selector_holo_light_selected.xml rename ultrasonic/src/main/res/drawable/{media_backward_normal_dark.xml => media_backward_normal.xml} (77%) delete mode 100644 ultrasonic/src/main/res/drawable/media_backward_normal_light.xml rename ultrasonic/src/main/res/drawable/{media_forward_normal_dark.xml => media_forward_normal.xml} (77%) delete mode 100644 ultrasonic/src/main/res/drawable/media_forward_normal_light.xml rename ultrasonic/src/main/res/drawable/{media_pause_normal_dark.xml => media_pause_normal.xml} (77%) delete mode 100644 ultrasonic/src/main/res/drawable/media_pause_normal_light.xml rename ultrasonic/src/main/res/drawable/{media_repeat_all_dark.xml => media_repeat_all.xml} (79%) delete mode 100644 ultrasonic/src/main/res/drawable/media_repeat_all_light.xml rename ultrasonic/src/main/res/drawable/{media_repeat_off_dark.xml => media_repeat_off.xml} (80%) delete mode 100644 ultrasonic/src/main/res/drawable/media_repeat_off_light.xml rename ultrasonic/src/main/res/drawable/{media_repeat_one_dark.xml => media_repeat_one.xml} (81%) delete mode 100644 ultrasonic/src/main/res/drawable/media_repeat_one_light.xml rename ultrasonic/src/main/res/drawable/{media_shuffle_normal_dark.xml => media_shuffle_normal.xml} (84%) delete mode 100644 ultrasonic/src/main/res/drawable/media_shuffle_normal_light.xml rename ultrasonic/src/main/res/drawable/{ic_stat_play_dark.xml => media_start_normal.xml} (75%) delete mode 100644 ultrasonic/src/main/res/drawable/media_start_normal_light.xml rename ultrasonic/src/main/res/drawable/{media_stop_normal_dark.xml => media_stop_normal.xml} (75%) delete mode 100644 ultrasonic/src/main/res/drawable/media_stop_normal_light.xml rename ultrasonic/src/main/res/drawable/{media_toggle_list_normal_dark.xml => media_toggle_list_normal.xml} (100%) delete mode 100644 ultrasonic/src/main/res/drawable/media_toggle_list_normal_light.xml rename ultrasonic/src/main/res/drawable/{stat_sys_download_dark.xml => stat_sys_download.xml} (53%) rename ultrasonic/src/main/res/drawable/{stat_sys_download_anim_0_dark.xml => stat_sys_download_anim_0.xml} (77%) delete mode 100644 ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_light.xml rename ultrasonic/src/main/res/drawable/{stat_sys_download_anim_1_dark.xml => stat_sys_download_anim_1.xml} (81%) delete mode 100644 ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_light.xml rename ultrasonic/src/main/res/drawable/{stat_sys_download_anim_2_dark.xml => stat_sys_download_anim_2.xml} (81%) delete mode 100644 ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_light.xml rename ultrasonic/src/main/res/drawable/{stat_sys_download_anim_3_dark.xml => stat_sys_download_anim_3.xml} (81%) delete mode 100644 ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_light.xml rename ultrasonic/src/main/res/drawable/{stat_sys_download_anim_4_dark.xml => stat_sys_download_anim_4.xml} (81%) delete mode 100644 ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_light.xml rename ultrasonic/src/main/res/drawable/{stat_sys_download_anim_5_dark.xml => stat_sys_download_anim_5.xml} (81%) delete mode 100644 ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_light.xml rename ultrasonic/src/main/res/drawable/{stat_sys_download_anim_6_dark.xml => stat_sys_download_anim_6.xml} (81%) delete mode 100644 ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_light.xml rename ultrasonic/src/main/res/drawable/{stat_sys_download_anim_7_dark.xml => stat_sys_download_anim_7.xml} (80%) delete mode 100644 ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_light.xml delete mode 100644 ultrasonic/src/main/res/drawable/stat_sys_download_light.xml delete mode 100644 ultrasonic/src/main/res/layout/list_item_track_details.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 59f6372b..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ultrasonic/lint-baseline.xml b/ultrasonic/lint-baseline.xml index dbf21cde..032bf5a6 100644 --- a/ultrasonic/lint-baseline.xml +++ b/ultrasonic/lint-baseline.xml @@ -158,6 +158,39 @@ column="1"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - Unit, val onContextMenuClick: (MenuItem, Album) -> Boolean, - private val imageLoader: ImageLoader, - context: Context + private val imageLoader: ImageLoader ) : ItemViewBinder(), KoinComponent { - private val starDrawable: Drawable = - Util.getDrawableFromAttribute(context, R.attr.star_full) - private val starHollowDrawable: Drawable = - Util.getDrawableFromAttribute(context, R.attr.star_hollow) + private val starDrawable: Int = R.drawable.ic_star_full + private val starHollowDrawable: Int = R.drawable.ic_star_hollow // Set our layout files val layout = R.layout.list_item_album - val contextMenuLayout = R.menu.context_menu_artist override fun onBindViewHolder(holder: ViewHolder, item: Album) { holder.album.text = item.title @@ -60,7 +53,7 @@ class AlbumRowBinder( true } holder.coverArtId = item.coverArt - holder.star.setImageDrawable(if (item.starred) starDrawable else starHollowDrawable) + holder.star.setImageResource(if (item.starred) starDrawable else starHollowDrawable) holder.star.setOnClickListener { onStarClick(item, holder.star) } imageLoader.loadImage( @@ -88,7 +81,7 @@ class AlbumRowBinder( */ private fun onStarClick(entry: Album, star: ImageView) { entry.starred = !entry.starred - star.setImageDrawable(if (entry.starred) starDrawable else starHollowDrawable) + star.setImageResource(if (entry.starred) starDrawable else starHollowDrawable) val musicService = getMusicService() Thread { val useId3 = shouldUseId3Tags diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ServerRowAdapter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ServerRowAdapter.kt index 1ec4fbe7..dcb57e1d 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ServerRowAdapter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ServerRowAdapter.kt @@ -19,7 +19,6 @@ import org.moire.ultrasonic.data.ActiveServerProvider import org.moire.ultrasonic.data.ServerSetting import org.moire.ultrasonic.model.ServerSettingsModel import org.moire.ultrasonic.util.ServerColor -import org.moire.ultrasonic.util.Util /** * Row Adapter to be used in the Server List @@ -108,14 +107,13 @@ internal class ServerRowAdapter( // Configure icons for the row if (setting?.id == ActiveServerProvider.OFFLINE_DB_ID) { serverMenu?.visibility = View.INVISIBLE - icon = Util.getDrawableFromAttribute(context, R.attr.screen_on_off) + icon = ContextCompat.getDrawable(context, R.drawable.ic_menu_screen_on_off) background = ContextCompat.getDrawable(context, R.drawable.circle) } else { - icon = ContextCompat.getDrawable(context, R.drawable.ic_menu_server_dark) + icon = ContextCompat.getDrawable(context, R.drawable.ic_menu_server) background = ContextCompat.getDrawable(context, R.drawable.circle) } - // Set colors icon?.setTint(ServerColor.getForegroundColor(context, setting?.color)) background?.setTint(ServerColor.getBackgroundColor(context, setting?.color)) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt index b0f921ea..95f47112 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt @@ -30,7 +30,7 @@ import timber.log.Timber class TrackViewHolder(val view: View) : RecyclerView.ViewHolder(view), Checkable, KoinComponent { var check: CheckedTextView = view.findViewById(R.id.song_check) - private var rating: LinearLayout = view.findViewById(R.id.song_rating) + private var rating: LinearLayout = view.findViewById(R.id.song_five_star) private var fiveStar1: ImageView = view.findViewById(R.id.song_five_star_1) private var fiveStar2: ImageView = view.findViewById(R.id.song_five_star_2) private var fiveStar3: ImageView = view.findViewById(R.id.song_five_star_3) @@ -134,7 +134,7 @@ class TrackViewHolder(val view: View) : RecyclerView.ViewHolder(view), Checkable private fun setupStarButtons(song: Track, useFiveStarRating: Boolean) { if (useFiveStarRating) { // Hide single star - star.isVisible = false + star.visibility = View.INVISIBLE val rating = if (song.userRating == null) 0 else song.userRating!! setFiveStars(rating) } else { @@ -147,10 +147,10 @@ class TrackViewHolder(val view: View) : RecyclerView.ViewHolder(view), Checkable val id = song.id if (!isStarred) { - star.setImageDrawable(imageHelper.starDrawable) + star.setImageResource(R.drawable.ic_star_full) song.starred = true } else { - star.setImageDrawable(imageHelper.starHollowDrawable) + star.setImageResource(R.drawable.ic_star_hollow) song.starred = false } @@ -173,32 +173,28 @@ class TrackViewHolder(val view: View) : RecyclerView.ViewHolder(view), Checkable @Suppress("MagicNumber") private fun setFiveStars(rating: Int) { - fiveStar1.setImageDrawable( - if (rating > 0) imageHelper.starDrawable else imageHelper.starHollowDrawable + fiveStar1.setImageResource( + if (rating > 0) R.drawable.ic_star_full else R.drawable.ic_star_hollow ) - fiveStar2.setImageDrawable( - if (rating > 1) imageHelper.starDrawable else imageHelper.starHollowDrawable + fiveStar2.setImageResource( + if (rating > 1) R.drawable.ic_star_full else R.drawable.ic_star_hollow ) - fiveStar3.setImageDrawable( - if (rating > 2) imageHelper.starDrawable else imageHelper.starHollowDrawable + fiveStar3.setImageResource( + if (rating > 2) R.drawable.ic_star_full else R.drawable.ic_star_hollow ) - fiveStar4.setImageDrawable( - if (rating > 3) imageHelper.starDrawable else imageHelper.starHollowDrawable + fiveStar4.setImageResource( + if (rating > 3) R.drawable.ic_star_full else R.drawable.ic_star_hollow ) - fiveStar5.setImageDrawable( - if (rating > 4) imageHelper.starDrawable else imageHelper.starHollowDrawable + fiveStar5.setImageResource( + if (rating > 4) R.drawable.ic_star_full else R.drawable.ic_star_hollow ) } private fun setSingleStar(starred: Boolean) { if (starred) { - if (star.drawable !== imageHelper.starDrawable) { - star.setImageDrawable(imageHelper.starDrawable) - } + star.setImageResource(R.drawable.ic_star_full) } else { - if (star.drawable !== imageHelper.starHollowDrawable) { - star.setImageDrawable(imageHelper.starHollowDrawable) - } + star.setImageResource(R.drawable.ic_star_hollow) } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/Utils.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/Utils.kt index 991ae445..2b779638 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/Utils.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/Utils.kt @@ -5,11 +5,11 @@ import android.graphics.drawable.Drawable import android.view.MenuInflater import android.view.View import android.widget.PopupMenu +import androidx.core.content.ContextCompat import org.moire.ultrasonic.R import org.moire.ultrasonic.data.ActiveServerProvider import org.moire.ultrasonic.domain.Identifiable import org.moire.ultrasonic.util.Settings -import org.moire.ultrasonic.util.Util object Utils { @JvmStatic @@ -37,8 +37,6 @@ object Utils { class ImageHelper(context: Context) { lateinit var errorImage: Drawable - lateinit var starHollowDrawable: Drawable - lateinit var starDrawable: Drawable lateinit var pinImage: Drawable lateinit var downloadedImage: Drawable lateinit var downloadingImage: Drawable @@ -61,13 +59,11 @@ object Utils { } private fun getDrawables(context: Context) { - starHollowDrawable = Util.getDrawableFromAttribute(context, R.attr.star_hollow) - starDrawable = Util.getDrawableFromAttribute(context, R.attr.star_full) - pinImage = Util.getDrawableFromAttribute(context, R.attr.pin) - downloadedImage = Util.getDrawableFromAttribute(context, R.attr.downloaded) - errorImage = Util.getDrawableFromAttribute(context, R.attr.error) - downloadingImage = Util.getDrawableFromAttribute(context, R.attr.downloading) - playingImage = Util.getDrawableFromAttribute(context, R.attr.media_play_small) + pinImage = ContextCompat.getDrawable(context, R.drawable.ic_menu_pin)!! + downloadedImage = ContextCompat.getDrawable(context, R.drawable.ic_menu_download)!! + errorImage = ContextCompat.getDrawable(context, R.drawable.ic_baseline_error)!! + downloadingImage = ContextCompat.getDrawable(context, R.drawable.stat_sys_download)!! + playingImage = ContextCompat.getDrawable(context, R.drawable.ic_stat_play)!! } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt index b7d37d96..e95164c7 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt @@ -1,6 +1,7 @@ package org.moire.ultrasonic.app import android.content.Context +import android.os.StrictMode import androidx.multidex.MultiDexApplication import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -31,8 +32,8 @@ class UApp : MultiDexApplication() { init { instance = this -// if (BuildConfig.DEBUG) -// StrictMode.enableDefaults() + if (BuildConfig.DEBUG) + StrictMode.enableDefaults() } var initiated = false diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumListFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumListFragment.kt index b7de646d..2557aea4 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumListFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumListFragment.kt @@ -75,8 +75,7 @@ class AlbumListFragment : EntryListFragment() { AlbumRowBinder( { entry -> onItemClick(entry) }, { menuItem, entry -> onContextMenuItemSelected(menuItem, entry) }, - imageLoaderProvider.getImageLoader(), - context = requireContext() + imageLoaderProvider.getImageLoader() ) ) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/NowPlayingFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/NowPlayingFragment.kt index b34d30ee..7c045041 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/NowPlayingFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/NowPlayingFragment.kt @@ -28,7 +28,6 @@ import org.moire.ultrasonic.subsonic.ImageLoaderProvider import org.moire.ultrasonic.util.Constants import org.moire.ultrasonic.util.Settings import org.moire.ultrasonic.util.Util.applyTheme -import org.moire.ultrasonic.util.Util.getDrawableFromAttribute import org.moire.ultrasonic.util.Util.getNotificationImageSize import timber.log.Timber @@ -85,17 +84,9 @@ class NowPlayingFragment : Fragment() { private fun update() { try { if (mediaPlayerController.isPlaying) { - playButton!!.setImageDrawable( - getDrawableFromAttribute( - requireContext(), R.attr.media_pause - ) - ) + playButton!!.setImageResource(R.drawable.media_pause_normal) } else { - playButton!!.setImageDrawable( - getDrawableFromAttribute( - requireContext(), R.attr.media_play - ) - ) + playButton!!.setImageResource(R.drawable.media_start_normal) } val file = mediaPlayerController.currentPlayingLegacy diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt index dcb5acd0..9c9e9c00 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt @@ -10,7 +10,6 @@ package org.moire.ultrasonic.fragment import android.annotation.SuppressLint import android.app.AlertDialog import android.graphics.Point -import android.graphics.drawable.Drawable import android.os.Bundle import android.os.Handler import android.os.Looper @@ -156,9 +155,9 @@ class PlayerFragment : private lateinit var playButton: View private lateinit var shuffleButton: View private lateinit var repeatButton: ImageView - private lateinit var hollowStar: Drawable - private lateinit var fullStar: Drawable private lateinit var progressBar: SeekBar + private val hollowStar = R.drawable.ic_star_hollow + private val fullStar = R.drawable.ic_star_full internal val viewAdapter: BaseAdapter by lazy { BaseAdapter() @@ -231,8 +230,6 @@ class PlayerFragment : val ratingLinearLayout = view.findViewById(R.id.song_rating) if (!useFiveStarRating) ratingLinearLayout.isVisible = false - hollowStar = Util.getDrawableFromAttribute(view.context, R.attr.star_hollow) - fullStar = Util.getDrawableFromAttribute(view.context, R.attr.star_full) fiveStar1ImageView.setOnClickListener { setSongRating(1) } fiveStar2ImageView.setOnClickListener { setSongRating(2) } @@ -441,27 +438,15 @@ class PlayerFragment : private fun updateRepeatButtonState(repeatMode: Int) { when (repeatMode) { 0 -> { - repeatButton.setImageDrawable( - Util.getDrawableFromAttribute( - requireContext(), R.attr.media_repeat_off - ) - ) + repeatButton.setImageResource(R.drawable.media_repeat_off) repeatButton.alpha = ALPHA_DEACTIVATED } 1 -> { - repeatButton.setImageDrawable( - Util.getDrawableFromAttribute( - requireContext(), R.attr.media_repeat_single - ) - ) + repeatButton.setImageResource(R.drawable.media_repeat_one) repeatButton.alpha = ALPHA_ACTIVATED } 2 -> { - repeatButton.setImageDrawable( - Util.getDrawableFromAttribute( - requireContext(), R.attr.media_repeat_all - ) - ) + repeatButton.setImageResource(R.drawable.media_repeat_all) repeatButton.alpha = ALPHA_ACTIVATED } else -> { @@ -583,10 +568,10 @@ class PlayerFragment : if (useFiveStarRating) starMenuItem.isVisible = false if (currentSong != null) { - starMenuItem.icon = if (currentSong!!.starred) fullStar else hollowStar + starMenuItem.setIcon(if (currentSong!!.starred) fullStar else hollowStar) shareSongMenuItem.isVisible = true } else { - starMenuItem.icon = hollowStar + starMenuItem.setIcon(hollowStar) shareSongMenuItem.isVisible = false } @@ -761,10 +746,10 @@ class PlayerFragment : object : FutureCallback { override fun onSuccess(result: SessionResult?) { if (isStarred) { - starMenuItem.icon = hollowStar + starMenuItem.setIcon(hollowStar) currentSong!!.starred = false } else { - starMenuItem.icon = fullStar + starMenuItem.setIcon(fullStar) currentSong!!.starred = true } } @@ -1227,11 +1212,11 @@ class PlayerFragment : rating = currentSong!!.userRating!! } - fiveStar1ImageView.setImageDrawable(if (rating > 0) fullStar else hollowStar) - fiveStar2ImageView.setImageDrawable(if (rating > 1) fullStar else hollowStar) - fiveStar3ImageView.setImageDrawable(if (rating > 2) fullStar else hollowStar) - fiveStar4ImageView.setImageDrawable(if (rating > 3) fullStar else hollowStar) - fiveStar5ImageView.setImageDrawable(if (rating > 4) fullStar else hollowStar) + fiveStar1ImageView.setImageResource(if (rating > 0) fullStar else hollowStar) + fiveStar2ImageView.setImageResource(if (rating > 1) fullStar else hollowStar) + fiveStar3ImageView.setImageResource(if (rating > 2) fullStar else hollowStar) + fiveStar4ImageView.setImageResource(if (rating > 3) fullStar else hollowStar) + fiveStar5ImageView.setImageResource(if (rating > 4) fullStar else hollowStar) } private fun setSongRating(rating: Int) { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SearchFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SearchFragment.kt index 6df86761..61495272 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SearchFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SearchFragment.kt @@ -102,8 +102,7 @@ class SearchFragment : MultiListFragment(), KoinComponent { AlbumRowBinder( onItemClick = ::onItemClick, onContextMenuClick = ::onContextMenuItemSelected, - imageLoader = imageLoaderProvider.getImageLoader(), - context = requireContext() + imageLoader = imageLoaderProvider.getImageLoader() ) ) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt index 54587ee5..5e60df19 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt @@ -137,8 +137,7 @@ open class TrackCollectionFragment : MultiListFragment() { AlbumRowBinder( { entry -> onItemClick(entry) }, { menuItem, entry -> onContextMenuItemSelected(menuItem, entry) }, - imageLoaderProvider.getImageLoader(), - context = requireContext() + imageLoaderProvider.getImageLoader() ) ) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/MediaNotificationProvider.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/MediaNotificationProvider.kt index 51beaeff..be7873a9 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/MediaNotificationProvider.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/MediaNotificationProvider.kt @@ -57,8 +57,8 @@ class MediaNotificationProvider(context: Context) : CommandButton.Builder() .setDisplayName("Love") .setIconResId( - if (rating.isHeart) R.drawable.ic_star_full_dark - else R.drawable.ic_star_hollow_dark + if (rating.isHeart) R.drawable.ic_star_full + else R.drawable.ic_star_hollow ) .setSessionCommand( SessionCommand( diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.kt index e74fbbae..ffd579cc 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.kt @@ -133,9 +133,9 @@ open class UltrasonicAppWidgetProvider : AppWidgetProvider() { // Set correct drawable for pause state if (playing) { - views.setImageViewResource(R.id.control_play, R.drawable.media_pause_normal_dark) + views.setImageViewResource(R.id.control_play, R.drawable.media_pause_normal) } else { - views.setImageViewResource(R.id.control_play, R.drawable.media_start_normal_dark) + views.setImageViewResource(R.id.control_play, R.drawable.media_start_normal) } // Set the cover art diff --git a/ultrasonic/src/main/res/drawable-hdpi/list_focused_holo.9.png b/ultrasonic/src/main/res/drawable-hdpi/list_focused_holo.9.png deleted file mode 100644 index 942cf1a6212f15e486fce70d33cf93e8a9ecd64f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~%*9TgAsieWw;%dH0CG7CJR*x3 z7`Qt@n9=;?>9s&Xp#Yx{S0MfW|9|7HPaz1%Wqi_g4M?$;1o;IsF!=h-jAaP)1PW+- zx;Tb#L?;U*B=GVkB%~x1GBSqGDe36mJc)BgSx}JULd8cdU%K0x926K9Fo;#w{faUL PYGd$p^>bP0l+XkKm2fm! diff --git a/ultrasonic/src/main/res/drawable-hdpi/list_longpressed_holo.9.png b/ultrasonic/src/main/res/drawable-hdpi/list_longpressed_holo.9.png deleted file mode 100644 index 16183cafe9b796677d76189fbc06efe3fe626069..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wLn2VPZ!4!jq}L~Gb-B{xqtMx1v18*KVzKkaj4*MThFoo$_|e|^t*dB f{q+}Od&S5g+MXz~tz81Bk%7U})z4*}Q$iB}j?*Tu diff --git a/ultrasonic/src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png b/ultrasonic/src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png deleted file mode 100644 index 6fd19b2d97652c3a46ddb1c7daaac8b02070c114..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wLn2#PZ!4!jq}L{_kK-b zz$e5NNdN!;A4tN%Ke;LQfgIM7AirP+hMM|@Tk{L&00lHXT^vI!PA3Z_G&C?6oIG*h xQ4`CYQ1_pUYj%Bdb~~Ir#lGd|qJ<|E1Q?DlFj*0PKR+B~q^GN&%Q~loCID=3FhT$T diff --git a/ultrasonic/src/main/res/drawable-hdpi/list_selector_disabled_holo_light.9.png b/ultrasonic/src/main/res/drawable-hdpi/list_selector_disabled_holo_light.9.png deleted file mode 100644 index be177c46692d8e6a8e8fb68b0f6967f0fe3d4957..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^azGr$!VDy}M6D+PDb50q$YKTt?oJS9G(UNIEl`j@ zz$e5NNdN!;A4oz#Q}(4WAd96W$S)XZj{K`zAsc{v4Nn)x5R22v0tpQa>;@-K9LVY6 u332 + android:drawable="@drawable/btn_check_on" /> + android:drawable="@drawable/btn_check_off" /> + android:drawable="@drawable/btn_check_off" /> diff --git a/ultrasonic/src/main/res/drawable/btn_check_custom_light.xml b/ultrasonic/src/main/res/drawable/btn_check_custom_light.xml deleted file mode 100644 index 4aeaa0e3..00000000 --- a/ultrasonic/src/main/res/drawable/btn_check_custom_light.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - diff --git a/ultrasonic/src/main/res/drawable/btn_check_off_dark.xml b/ultrasonic/src/main/res/drawable/btn_check_off.xml similarity index 81% rename from ultrasonic/src/main/res/drawable/btn_check_off_dark.xml rename to ultrasonic/src/main/res/drawable/btn_check_off.xml index cf9d5b4c..606393b0 100644 --- a/ultrasonic/src/main/res/drawable/btn_check_off_dark.xml +++ b/ultrasonic/src/main/res/drawable/btn_check_off.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/btn_check_off_light.xml b/ultrasonic/src/main/res/drawable/btn_check_off_light.xml deleted file mode 100644 index 0dfed94a..00000000 --- a/ultrasonic/src/main/res/drawable/btn_check_off_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/btn_check_on_dark.xml b/ultrasonic/src/main/res/drawable/btn_check_on.xml similarity index 83% rename from ultrasonic/src/main/res/drawable/btn_check_on_dark.xml rename to ultrasonic/src/main/res/drawable/btn_check_on.xml index e7a34f0d..40d4a4ec 100644 --- a/ultrasonic/src/main/res/drawable/btn_check_on_dark.xml +++ b/ultrasonic/src/main/res/drawable/btn_check_on.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/btn_check_on_light.xml b/ultrasonic/src/main/res/drawable/btn_check_on_light.xml deleted file mode 100644 index ab6bc6fe..00000000 --- a/ultrasonic/src/main/res/drawable/btn_check_on_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_baseline_error_dark.xml b/ultrasonic/src/main/res/drawable/ic_baseline_error.xml similarity index 81% rename from ultrasonic/src/main/res/drawable/ic_baseline_error_dark.xml rename to ultrasonic/src/main/res/drawable/ic_baseline_error.xml index 4c9185e3..b915a341 100644 --- a/ultrasonic/src/main/res/drawable/ic_baseline_error_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_baseline_error.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_baseline_error_light.xml b/ultrasonic/src/main/res/drawable/ic_baseline_error_light.xml deleted file mode 100644 index 2f22d456..00000000 --- a/ultrasonic/src/main/res/drawable/ic_baseline_error_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_create_new_folder_dark.xml b/ultrasonic/src/main/res/drawable/ic_create_new_folder.xml similarity index 83% rename from ultrasonic/src/main/res/drawable/ic_create_new_folder_dark.xml rename to ultrasonic/src/main/res/drawable/ic_create_new_folder.xml index f5fa668f..fc38ba91 100644 --- a/ultrasonic/src/main/res/drawable/ic_create_new_folder_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_create_new_folder.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_create_new_folder_light.xml b/ultrasonic/src/main/res/drawable/ic_create_new_folder_light.xml deleted file mode 100644 index 0562247b..00000000 --- a/ultrasonic/src/main/res/drawable/ic_create_new_folder_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_drag_queue_dark.xml b/ultrasonic/src/main/res/drawable/ic_drag_queue.xml similarity index 77% rename from ultrasonic/src/main/res/drawable/ic_drag_queue_dark.xml rename to ultrasonic/src/main/res/drawable/ic_drag_queue.xml index 90190820..9ccb33b0 100644 --- a/ultrasonic/src/main/res/drawable/ic_drag_queue_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_drag_queue.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_drag_queue_light.xml b/ultrasonic/src/main/res/drawable/ic_drag_queue_light.xml deleted file mode 100644 index edbe4a08..00000000 --- a/ultrasonic/src/main/res/drawable/ic_drag_queue_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_folder_dark.xml b/ultrasonic/src/main/res/drawable/ic_folder.xml similarity index 81% rename from ultrasonic/src/main/res/drawable/ic_folder_dark.xml rename to ultrasonic/src/main/res/drawable/ic_folder.xml index be14acb4..a601f5fc 100644 --- a/ultrasonic/src/main/res/drawable/ic_folder_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_folder.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_folder_light.xml b/ultrasonic/src/main/res/drawable/ic_folder_light.xml deleted file mode 100644 index 43499268..00000000 --- a/ultrasonic/src/main/res/drawable/ic_folder_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/ultrasonic/src/main/res/drawable/ic_menu_about_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_about.xml similarity index 80% rename from ultrasonic/src/main/res/drawable/ic_menu_about_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_about.xml index 8c3b438e..439ae2e8 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_about_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_about.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_about_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_about_light.xml deleted file mode 100644 index 81c73ad6..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_about_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_backward_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_backward.xml similarity index 78% rename from ultrasonic/src/main/res/drawable/ic_menu_backward_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_backward.xml index f2b3e3bf..04a5e7fa 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_backward_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_backward.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_backward_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_backward_light.xml deleted file mode 100644 index 2cba694d..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_backward_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_bookmark_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_bookmark.xml similarity index 82% rename from ultrasonic/src/main/res/drawable/ic_menu_bookmark_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_bookmark.xml index 88437b3a..572ab108 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_bookmark_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_bookmark.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_bookmark_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_bookmark_light.xml deleted file mode 100644 index fc2435c3..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_bookmark_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_browse_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_browse.xml similarity index 86% rename from ultrasonic/src/main/res/drawable/ic_menu_browse_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_browse.xml index 671a59ea..28bc803e 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_browse_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_browse.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_browse_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_browse_light.xml deleted file mode 100644 index bc62da11..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_browse_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_chat_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_chat.xml similarity index 82% rename from ultrasonic/src/main/res/drawable/ic_menu_chat_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_chat.xml index fd02ccb9..5cdd0aa5 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_chat_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_chat.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_chat_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_chat_light.xml deleted file mode 100644 index e318a8e2..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_chat_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_chat_send_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_chat_send.xml similarity index 77% rename from ultrasonic/src/main/res/drawable/ic_menu_chat_send_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_chat_send.xml index cde32795..3d96e2cc 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_chat_send_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_chat_send.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_chat_send_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_chat_send_light.xml deleted file mode 100644 index a38079dd..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_chat_send_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_close_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_close.xml similarity index 80% rename from ultrasonic/src/main/res/drawable/ic_menu_close_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_close.xml index 36e8c25e..39ad81c4 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_close_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_close.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_close_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_close_light.xml deleted file mode 100644 index eafd163c..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_close_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_download_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_download.xml similarity index 82% rename from ultrasonic/src/main/res/drawable/ic_menu_download_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_download.xml index 1ba9033f..8614ef2b 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_download_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_download.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_download_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_download_light.xml deleted file mode 100644 index c34ad570..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_download_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_exit_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_exit.xml similarity index 84% rename from ultrasonic/src/main/res/drawable/ic_menu_exit_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_exit.xml index 9627fae5..d85519b9 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_exit_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_exit.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_exit_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_exit_light.xml deleted file mode 100644 index ed50df9e..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_exit_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_forward_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_forward.xml similarity index 78% rename from ultrasonic/src/main/res/drawable/ic_menu_forward_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_forward.xml index b8249deb..bfa8055f 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_forward_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_forward.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_forward_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_forward_light.xml deleted file mode 100644 index da7f4101..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_forward_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_help_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_help.xml similarity index 87% rename from ultrasonic/src/main/res/drawable/ic_menu_help_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_help.xml index d06fdcd1..c63537e8 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_help_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_help.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_help_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_help_light.xml deleted file mode 100644 index a7daa90e..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_help_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_home_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_home.xml similarity index 82% rename from ultrasonic/src/main/res/drawable/ic_menu_home_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_home.xml index 59cf225a..b01fabad 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_home_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_home.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_home_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_home_light.xml deleted file mode 100644 index 6c64722e..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_home_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_pin_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_pin.xml similarity index 78% rename from ultrasonic/src/main/res/drawable/ic_menu_pin_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_pin.xml index 468fa2be..9c629346 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_pin_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_pin.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_pin_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_pin_light.xml deleted file mode 100644 index e78f6442..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_pin_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/ultrasonic/src/main/res/drawable/ic_menu_playlists_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_playlists.xml similarity index 78% rename from ultrasonic/src/main/res/drawable/ic_menu_playlists_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_playlists.xml index b7d80429..7ad9fb00 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_playlists_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_playlists.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_playlists_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_playlists_light.xml deleted file mode 100644 index 3e7cedf9..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_playlists_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_podcasts_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_podcasts.xml similarity index 86% rename from ultrasonic/src/main/res/drawable/ic_menu_podcasts_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_podcasts.xml index 4d4907a2..b1181478 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_podcasts_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_podcasts.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_podcasts_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_podcasts_light.xml deleted file mode 100644 index a2f129e0..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_podcasts_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_refresh_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_refresh.xml similarity index 85% rename from ultrasonic/src/main/res/drawable/ic_menu_refresh_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_refresh.xml index 0db4ec04..1aff2e9b 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_refresh_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_refresh.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_refresh_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_refresh_light.xml deleted file mode 100644 index 8f948116..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_refresh_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_remove_all_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_remove_all.xml similarity index 80% rename from ultrasonic/src/main/res/drawable/ic_menu_remove_all_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_remove_all.xml index 6b1f0f1b..c5a82114 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_remove_all_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_remove_all.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_remove_all_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_remove_all_light.xml deleted file mode 100644 index 7e530b50..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_remove_all_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_save_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_save.xml similarity index 83% rename from ultrasonic/src/main/res/drawable/ic_menu_save_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_save.xml index c4f8b1a7..c45fb86c 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_save_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_save.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_save_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_save_light.xml deleted file mode 100644 index 6f2fd6be..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_save_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_screen_on_off_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_screen_on_off.xml similarity index 82% rename from ultrasonic/src/main/res/drawable/ic_menu_screen_on_off_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_screen_on_off.xml index 297d2c02..1af344e3 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_screen_on_off_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_screen_on_off.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_screen_on_off_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_screen_on_off_light.xml deleted file mode 100644 index 528e1326..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_screen_on_off_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_search_holo_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_search_holo.xml similarity index 86% rename from ultrasonic/src/main/res/drawable/ic_menu_search_holo_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_search_holo.xml index bcad2f8a..5e8e2920 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_search_holo_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_search_holo.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_search_holo_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_search_holo_light.xml deleted file mode 100644 index c8d7c016..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_search_holo_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_select_all_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_select_all.xml similarity index 88% rename from ultrasonic/src/main/res/drawable/ic_menu_select_all_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_select_all.xml index a58cc529..09650216 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_select_all_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_select_all.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_select_all_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_select_all_light.xml deleted file mode 100644 index aa03c6aa..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_select_all_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_select_folder_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_select_folder.xml similarity index 82% rename from ultrasonic/src/main/res/drawable/ic_menu_select_folder_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_select_folder.xml index 0942a3cd..f6b406c3 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_select_folder_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_select_folder.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_select_folder_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_select_folder_light.xml deleted file mode 100644 index d8b876d4..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_select_folder_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_select_server_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_select_server.xml similarity index 84% rename from ultrasonic/src/main/res/drawable/ic_menu_select_server_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_select_server.xml index 7eabdfcc..71f3a481 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_select_server_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_select_server.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_select_server_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_select_server_light.xml deleted file mode 100644 index 661adceb..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_select_server_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_server_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_server.xml similarity index 86% rename from ultrasonic/src/main/res/drawable/ic_menu_server_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_server.xml index 7d2c5684..46fb2d19 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_server_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_server.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_server_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_server_light.xml deleted file mode 100644 index f0f97357..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_server_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_settings_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_settings.xml similarity index 93% rename from ultrasonic/src/main/res/drawable/ic_menu_settings_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_settings.xml index fb8cfb69..b511b4d0 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_settings_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_settings.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_settings_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_settings_light.xml deleted file mode 100644 index 04ef1787..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_settings_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_share_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_share.xml similarity index 89% rename from ultrasonic/src/main/res/drawable/ic_menu_share_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_share.xml index 265f3b89..432f7a38 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_share_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_share.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_share_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_share_light.xml deleted file mode 100644 index 4abfedfc..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_share_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_unpin_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_unpin.xml similarity index 80% rename from ultrasonic/src/main/res/drawable/ic_menu_unpin_dark.xml rename to ultrasonic/src/main/res/drawable/ic_menu_unpin.xml index 30c2dc00..c311052d 100644 --- a/ultrasonic/src/main/res/drawable/ic_menu_unpin_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_menu_unpin.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_menu_unpin_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_unpin_light.xml deleted file mode 100644 index 60062857..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_unpin_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/ultrasonic/src/main/res/drawable/ic_more_vert_dark.xml b/ultrasonic/src/main/res/drawable/ic_more_vert.xml similarity index 84% rename from ultrasonic/src/main/res/drawable/ic_more_vert_dark.xml rename to ultrasonic/src/main/res/drawable/ic_more_vert.xml index 34b02991..23ef291c 100644 --- a/ultrasonic/src/main/res/drawable/ic_more_vert_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_more_vert.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_more_vert_light.xml b/ultrasonic/src/main/res/drawable/ic_more_vert_light.xml deleted file mode 100644 index 6f19fe26..00000000 --- a/ultrasonic/src/main/res/drawable/ic_more_vert_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_sd_storage_dark.xml b/ultrasonic/src/main/res/drawable/ic_sd_storage.xml similarity index 82% rename from ultrasonic/src/main/res/drawable/ic_sd_storage_dark.xml rename to ultrasonic/src/main/res/drawable/ic_sd_storage.xml index 65dea756..20d7315e 100644 --- a/ultrasonic/src/main/res/drawable/ic_sd_storage_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_sd_storage.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_sd_storage_light.xml b/ultrasonic/src/main/res/drawable/ic_sd_storage_light.xml deleted file mode 100644 index 773c285e..00000000 --- a/ultrasonic/src/main/res/drawable/ic_sd_storage_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_star_full_dark.xml b/ultrasonic/src/main/res/drawable/ic_star_full.xml similarity index 72% rename from ultrasonic/src/main/res/drawable/ic_star_full_dark.xml rename to ultrasonic/src/main/res/drawable/ic_star_full.xml index 0a28f169..30ea2f2a 100644 --- a/ultrasonic/src/main/res/drawable/ic_star_full_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_star_full.xml @@ -2,8 +2,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_star_full_light.xml b/ultrasonic/src/main/res/drawable/ic_star_full_light.xml deleted file mode 100644 index fcb189f9..00000000 --- a/ultrasonic/src/main/res/drawable/ic_star_full_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_star_hollow_dark.xml b/ultrasonic/src/main/res/drawable/ic_star_hollow.xml similarity index 78% rename from ultrasonic/src/main/res/drawable/ic_star_hollow_dark.xml rename to ultrasonic/src/main/res/drawable/ic_star_hollow.xml index 8f1cd2d7..05ae0af0 100644 --- a/ultrasonic/src/main/res/drawable/ic_star_hollow_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_star_hollow.xml @@ -2,8 +2,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_star_hollow_light.xml b/ultrasonic/src/main/res/drawable/ic_star_hollow_light.xml deleted file mode 100644 index 3c03ae8b..00000000 --- a/ultrasonic/src/main/res/drawable/ic_star_hollow_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/media_start_normal_dark.xml b/ultrasonic/src/main/res/drawable/ic_stat_play.xml similarity index 75% rename from ultrasonic/src/main/res/drawable/media_start_normal_dark.xml rename to ultrasonic/src/main/res/drawable/ic_stat_play.xml index d8b1f6e6..04b5b2bd 100644 --- a/ultrasonic/src/main/res/drawable/media_start_normal_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_stat_play.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_stat_play_light.xml b/ultrasonic/src/main/res/drawable/ic_stat_play_light.xml deleted file mode 100644 index c96165c0..00000000 --- a/ultrasonic/src/main/res/drawable/ic_stat_play_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_subdirectory_up_dark.xml b/ultrasonic/src/main/res/drawable/ic_subdirectory_up.xml similarity index 79% rename from ultrasonic/src/main/res/drawable/ic_subdirectory_up_dark.xml rename to ultrasonic/src/main/res/drawable/ic_subdirectory_up.xml index 531e2f12..b91962e3 100644 --- a/ultrasonic/src/main/res/drawable/ic_subdirectory_up_dark.xml +++ b/ultrasonic/src/main/res/drawable/ic_subdirectory_up.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/ic_subdirectory_up_light.xml b/ultrasonic/src/main/res/drawable/ic_subdirectory_up_light.xml deleted file mode 100644 index 0e5d5473..00000000 --- a/ultrasonic/src/main/res/drawable/ic_subdirectory_up_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/list_selector_background_transition_holo_dark.xml b/ultrasonic/src/main/res/drawable/list_selector_background_transition_holo_dark.xml deleted file mode 100644 index a2257298..00000000 --- a/ultrasonic/src/main/res/drawable/list_selector_background_transition_holo_dark.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/ultrasonic/src/main/res/drawable/list_selector_background_transition_holo_light.xml b/ultrasonic/src/main/res/drawable/list_selector_background_transition_holo_light.xml deleted file mode 100644 index 0ac8398d..00000000 --- a/ultrasonic/src/main/res/drawable/list_selector_background_transition_holo_light.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/ultrasonic/src/main/res/drawable/list_selector_holo_dark.xml b/ultrasonic/src/main/res/drawable/list_selector_holo_dark.xml deleted file mode 100644 index 9a6cb89e..00000000 --- a/ultrasonic/src/main/res/drawable/list_selector_holo_dark.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - diff --git a/ultrasonic/src/main/res/drawable/list_selector_holo_dark_selected.xml b/ultrasonic/src/main/res/drawable/list_selector_holo_dark_selected.xml deleted file mode 100644 index 778ac9de..00000000 --- a/ultrasonic/src/main/res/drawable/list_selector_holo_dark_selected.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - diff --git a/ultrasonic/src/main/res/drawable/list_selector_holo_light.xml b/ultrasonic/src/main/res/drawable/list_selector_holo_light.xml deleted file mode 100644 index 844259e9..00000000 --- a/ultrasonic/src/main/res/drawable/list_selector_holo_light.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/ultrasonic/src/main/res/drawable/list_selector_holo_light_selected.xml b/ultrasonic/src/main/res/drawable/list_selector_holo_light_selected.xml deleted file mode 100644 index 9436f1b0..00000000 --- a/ultrasonic/src/main/res/drawable/list_selector_holo_light_selected.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/ultrasonic/src/main/res/drawable/media_backward_normal_dark.xml b/ultrasonic/src/main/res/drawable/media_backward_normal.xml similarity index 77% rename from ultrasonic/src/main/res/drawable/media_backward_normal_dark.xml rename to ultrasonic/src/main/res/drawable/media_backward_normal.xml index 830f8eb8..6a966bbf 100644 --- a/ultrasonic/src/main/res/drawable/media_backward_normal_dark.xml +++ b/ultrasonic/src/main/res/drawable/media_backward_normal.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/media_backward_normal_light.xml b/ultrasonic/src/main/res/drawable/media_backward_normal_light.xml deleted file mode 100644 index 25e4e5fa..00000000 --- a/ultrasonic/src/main/res/drawable/media_backward_normal_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/media_forward_normal_dark.xml b/ultrasonic/src/main/res/drawable/media_forward_normal.xml similarity index 77% rename from ultrasonic/src/main/res/drawable/media_forward_normal_dark.xml rename to ultrasonic/src/main/res/drawable/media_forward_normal.xml index 54a7c471..26e74365 100644 --- a/ultrasonic/src/main/res/drawable/media_forward_normal_dark.xml +++ b/ultrasonic/src/main/res/drawable/media_forward_normal.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/media_forward_normal_light.xml b/ultrasonic/src/main/res/drawable/media_forward_normal_light.xml deleted file mode 100644 index 2d49eb37..00000000 --- a/ultrasonic/src/main/res/drawable/media_forward_normal_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/media_pause_normal_dark.xml b/ultrasonic/src/main/res/drawable/media_pause_normal.xml similarity index 77% rename from ultrasonic/src/main/res/drawable/media_pause_normal_dark.xml rename to ultrasonic/src/main/res/drawable/media_pause_normal.xml index 7320f7a8..028180a1 100644 --- a/ultrasonic/src/main/res/drawable/media_pause_normal_dark.xml +++ b/ultrasonic/src/main/res/drawable/media_pause_normal.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/media_pause_normal_light.xml b/ultrasonic/src/main/res/drawable/media_pause_normal_light.xml deleted file mode 100644 index 650f14d0..00000000 --- a/ultrasonic/src/main/res/drawable/media_pause_normal_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/media_repeat_all_dark.xml b/ultrasonic/src/main/res/drawable/media_repeat_all.xml similarity index 79% rename from ultrasonic/src/main/res/drawable/media_repeat_all_dark.xml rename to ultrasonic/src/main/res/drawable/media_repeat_all.xml index 9cfdde59..51d4b2dc 100644 --- a/ultrasonic/src/main/res/drawable/media_repeat_all_dark.xml +++ b/ultrasonic/src/main/res/drawable/media_repeat_all.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/media_repeat_all_light.xml b/ultrasonic/src/main/res/drawable/media_repeat_all_light.xml deleted file mode 100644 index 899c876b..00000000 --- a/ultrasonic/src/main/res/drawable/media_repeat_all_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/media_repeat_off_dark.xml b/ultrasonic/src/main/res/drawable/media_repeat_off.xml similarity index 80% rename from ultrasonic/src/main/res/drawable/media_repeat_off_dark.xml rename to ultrasonic/src/main/res/drawable/media_repeat_off.xml index 4679259b..2e430c75 100644 --- a/ultrasonic/src/main/res/drawable/media_repeat_off_dark.xml +++ b/ultrasonic/src/main/res/drawable/media_repeat_off.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/media_repeat_off_light.xml b/ultrasonic/src/main/res/drawable/media_repeat_off_light.xml deleted file mode 100644 index f60d33d0..00000000 --- a/ultrasonic/src/main/res/drawable/media_repeat_off_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/media_repeat_one_dark.xml b/ultrasonic/src/main/res/drawable/media_repeat_one.xml similarity index 81% rename from ultrasonic/src/main/res/drawable/media_repeat_one_dark.xml rename to ultrasonic/src/main/res/drawable/media_repeat_one.xml index d72f32bb..2f6c7a30 100644 --- a/ultrasonic/src/main/res/drawable/media_repeat_one_dark.xml +++ b/ultrasonic/src/main/res/drawable/media_repeat_one.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/media_repeat_one_light.xml b/ultrasonic/src/main/res/drawable/media_repeat_one_light.xml deleted file mode 100644 index 1a8ef762..00000000 --- a/ultrasonic/src/main/res/drawable/media_repeat_one_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/media_shuffle_normal_dark.xml b/ultrasonic/src/main/res/drawable/media_shuffle_normal.xml similarity index 84% rename from ultrasonic/src/main/res/drawable/media_shuffle_normal_dark.xml rename to ultrasonic/src/main/res/drawable/media_shuffle_normal.xml index 81ab758e..6cdc7750 100644 --- a/ultrasonic/src/main/res/drawable/media_shuffle_normal_dark.xml +++ b/ultrasonic/src/main/res/drawable/media_shuffle_normal.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/media_shuffle_normal_light.xml b/ultrasonic/src/main/res/drawable/media_shuffle_normal_light.xml deleted file mode 100644 index 37bd166e..00000000 --- a/ultrasonic/src/main/res/drawable/media_shuffle_normal_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_stat_play_dark.xml b/ultrasonic/src/main/res/drawable/media_start_normal.xml similarity index 75% rename from ultrasonic/src/main/res/drawable/ic_stat_play_dark.xml rename to ultrasonic/src/main/res/drawable/media_start_normal.xml index d8b1f6e6..04b5b2bd 100644 --- a/ultrasonic/src/main/res/drawable/ic_stat_play_dark.xml +++ b/ultrasonic/src/main/res/drawable/media_start_normal.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/media_start_normal_light.xml b/ultrasonic/src/main/res/drawable/media_start_normal_light.xml deleted file mode 100644 index c96165c0..00000000 --- a/ultrasonic/src/main/res/drawable/media_start_normal_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/media_stop_normal_dark.xml b/ultrasonic/src/main/res/drawable/media_stop_normal.xml similarity index 75% rename from ultrasonic/src/main/res/drawable/media_stop_normal_dark.xml rename to ultrasonic/src/main/res/drawable/media_stop_normal.xml index 74c8f4cc..3d1d7e82 100644 --- a/ultrasonic/src/main/res/drawable/media_stop_normal_dark.xml +++ b/ultrasonic/src/main/res/drawable/media_stop_normal.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/media_stop_normal_light.xml b/ultrasonic/src/main/res/drawable/media_stop_normal_light.xml deleted file mode 100644 index 8cecc4ef..00000000 --- a/ultrasonic/src/main/res/drawable/media_stop_normal_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/media_toggle_list_normal_dark.xml b/ultrasonic/src/main/res/drawable/media_toggle_list_normal.xml similarity index 100% rename from ultrasonic/src/main/res/drawable/media_toggle_list_normal_dark.xml rename to ultrasonic/src/main/res/drawable/media_toggle_list_normal.xml diff --git a/ultrasonic/src/main/res/drawable/media_toggle_list_normal_light.xml b/ultrasonic/src/main/res/drawable/media_toggle_list_normal_light.xml deleted file mode 100644 index 11ccbfb0..00000000 --- a/ultrasonic/src/main/res/drawable/media_toggle_list_normal_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download.xml similarity index 53% rename from ultrasonic/src/main/res/drawable/stat_sys_download_dark.xml rename to ultrasonic/src/main/res/drawable/stat_sys_download.xml index 8c747871..ba5754e5 100644 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_dark.xml +++ b/ultrasonic/src/main/res/drawable/stat_sys_download.xml @@ -20,13 +20,13 @@ - - - - - - - - + + + + + + + + diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0.xml similarity index 77% rename from ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_dark.xml rename to ultrasonic/src/main/res/drawable/stat_sys_download_anim_0.xml index 6c598235..f69c56a3 100644 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_dark.xml +++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_light.xml deleted file mode 100644 index b9d158fe..00000000 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_0_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1.xml similarity index 81% rename from ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_dark.xml rename to ultrasonic/src/main/res/drawable/stat_sys_download_anim_1.xml index 803d2b73..7cab81e6 100644 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_dark.xml +++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_light.xml deleted file mode 100644 index 3020a3ba..00000000 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_1_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2.xml similarity index 81% rename from ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_dark.xml rename to ultrasonic/src/main/res/drawable/stat_sys_download_anim_2.xml index cdba81f2..ab4a8083 100644 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_dark.xml +++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_light.xml deleted file mode 100644 index 171d7381..00000000 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_2_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3.xml similarity index 81% rename from ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_dark.xml rename to ultrasonic/src/main/res/drawable/stat_sys_download_anim_3.xml index 57a409aa..427aa87f 100644 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_dark.xml +++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_light.xml deleted file mode 100644 index 780b394e..00000000 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_3_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4.xml similarity index 81% rename from ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_dark.xml rename to ultrasonic/src/main/res/drawable/stat_sys_download_anim_4.xml index bdbb8691..d4fc28fb 100644 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_dark.xml +++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_light.xml deleted file mode 100644 index 4a443e3c..00000000 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_4_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5.xml similarity index 81% rename from ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_dark.xml rename to ultrasonic/src/main/res/drawable/stat_sys_download_anim_5.xml index 544b9002..809d1586 100644 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_dark.xml +++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_light.xml deleted file mode 100644 index eec7de09..00000000 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_5_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6.xml similarity index 81% rename from ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_dark.xml rename to ultrasonic/src/main/res/drawable/stat_sys_download_anim_6.xml index bf00227f..97b14528 100644 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_dark.xml +++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_light.xml deleted file mode 100644 index c8c43d00..00000000 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_6_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_dark.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7.xml similarity index 80% rename from ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_dark.xml rename to ultrasonic/src/main/res/drawable/stat_sys_download_anim_7.xml index 1bd9bb35..b4becdde 100644 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_dark.xml +++ b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_light.xml deleted file mode 100644 index 53f7e5bc..00000000 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_anim_7_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/ultrasonic/src/main/res/drawable/stat_sys_download_light.xml b/ultrasonic/src/main/res/drawable/stat_sys_download_light.xml deleted file mode 100644 index 894be778..00000000 --- a/ultrasonic/src/main/res/drawable/stat_sys_download_light.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - diff --git a/ultrasonic/src/main/res/layout-land/current_playing.xml b/ultrasonic/src/main/res/layout-land/current_playing.xml index 98290701..9b55dcbf 100644 --- a/ultrasonic/src/main/res/layout-land/current_playing.xml +++ b/ultrasonic/src/main/res/layout-land/current_playing.xml @@ -56,7 +56,7 @@ a:importantForAccessibility="no" a:padding="10dip" a:scaleType="fitCenter" - a:src="?attr/star_hollow" /> + a:src="@drawable/ic_star_hollow" /> + a:src="@drawable/ic_star_hollow" /> + a:src="@drawable/ic_star_hollow" /> + a:src="@drawable/ic_star_hollow" /> + a:src="@drawable/ic_star_hollow" /> diff --git a/ultrasonic/src/main/res/layout/album_buttons.xml b/ultrasonic/src/main/res/layout/album_buttons.xml index 73acfcd0..7bb77c24 100644 --- a/ultrasonic/src/main/res/layout/album_buttons.xml +++ b/ultrasonic/src/main/res/layout/album_buttons.xml @@ -12,7 +12,7 @@ android:layout_height="32dp" android:scaleType="fitCenter" android:layout_weight="1" - android:src="?attr/select_all" + android:src="@drawable/ic_menu_select_all" android:visibility="gone" android:contentDescription="@string/common.select_all" /> @@ -22,7 +22,7 @@ android:layout_height="32dp" android:scaleType="fitCenter" android:layout_weight="1" - android:src="?attr/media_play" + android:src="@drawable/media_start_normal" android:visibility="gone" android:contentDescription="@string/common.play_now" /> @@ -52,7 +52,7 @@ android:layout_height="32dp" android:scaleType="fitCenter" android:layout_weight="1" - android:src="?attr/pin" + android:src="@drawable/ic_menu_pin" android:visibility="gone" android:contentDescription="@string/common.pin" /> @@ -62,7 +62,7 @@ android:layout_height="32dp" android:scaleType="fitCenter" android:layout_weight="1" - android:src="?attr/unpin" + android:src="@drawable/ic_menu_unpin" android:visibility="gone" android:contentDescription="@string/common.unpin" /> @@ -72,7 +72,7 @@ android:layout_height="32dp" android:scaleType="fitCenter" android:layout_weight="1" - android:src="?attr/download" + android:src="@drawable/ic_menu_download" android:visibility="gone" android:contentDescription="@string/common.download" /> @@ -82,7 +82,7 @@ android:layout_height="32dp" android:scaleType="fitCenter" android:layout_weight="1" - android:src="?attr/stop" + android:src="@drawable/media_stop_normal" android:visibility="gone" android:contentDescription="@string/common.delete" /> @@ -92,7 +92,7 @@ android:layout_height="32dp" android:scaleType="fitCenter" android:layout_weight="1" - android:src="?attr/forward" + android:src="@drawable/media_forward_normal" android:visibility="gone" android:contentDescription="@string/search.more" /> diff --git a/ultrasonic/src/main/res/layout/appwidget4x1.xml b/ultrasonic/src/main/res/layout/appwidget4x1.xml index d46d1858..e4d6c655 100644 --- a/ultrasonic/src/main/res/layout/appwidget4x1.xml +++ b/ultrasonic/src/main/res/layout/appwidget4x1.xml @@ -80,7 +80,7 @@ a:layout_weight="1" a:background="@color/transparent" a:scaleType="fitCenter" - a:src="@drawable/media_backward_normal_dark" /> + a:src="@drawable/media_backward_normal" /> + a:src="@drawable/media_start_normal" /> + a:src="@drawable/media_forward_normal" /> diff --git a/ultrasonic/src/main/res/layout/appwidget4x2.xml b/ultrasonic/src/main/res/layout/appwidget4x2.xml index 51c4bcbf..617d2b56 100644 --- a/ultrasonic/src/main/res/layout/appwidget4x2.xml +++ b/ultrasonic/src/main/res/layout/appwidget4x2.xml @@ -101,7 +101,7 @@ a:layout_weight="1" a:background="@color/transparent" a:scaleType="fitCenter" - a:src="@drawable/media_backward_normal_dark" /> + a:src="@drawable/media_backward_normal" /> + a:src="@drawable/media_start_normal" /> + a:src="@drawable/media_forward_normal" /> diff --git a/ultrasonic/src/main/res/layout/appwidget4x3.xml b/ultrasonic/src/main/res/layout/appwidget4x3.xml index ff103795..f04e9439 100644 --- a/ultrasonic/src/main/res/layout/appwidget4x3.xml +++ b/ultrasonic/src/main/res/layout/appwidget4x3.xml @@ -86,7 +86,7 @@ a:layout_weight="1" a:background="@color/transparent" a:scaleType="fitCenter" - a:src="@drawable/media_backward_normal_dark" /> + a:src="@drawable/media_backward_normal" /> + a:src="@drawable/media_start_normal" /> + a:src="@drawable/media_forward_normal" /> diff --git a/ultrasonic/src/main/res/layout/appwidget4x4.xml b/ultrasonic/src/main/res/layout/appwidget4x4.xml index a7975b1d..c35b4cf2 100644 --- a/ultrasonic/src/main/res/layout/appwidget4x4.xml +++ b/ultrasonic/src/main/res/layout/appwidget4x4.xml @@ -87,7 +87,7 @@ a:layout_weight="1" a:background="@color/transparent" a:scaleType="fitCenter" - a:src="@drawable/media_backward_normal_dark" /> + a:src="@drawable/media_backward_normal" /> + a:src="@drawable/media_start_normal" /> + a:src="@drawable/media_forward_normal" /> diff --git a/ultrasonic/src/main/res/layout/chat.xml b/ultrasonic/src/main/res/layout/chat.xml index 5980b1e5..816c5bdf 100644 --- a/ultrasonic/src/main/res/layout/chat.xml +++ b/ultrasonic/src/main/res/layout/chat.xml @@ -40,6 +40,6 @@ a:layout_width="55dip" a:layout_height="40dip" a:background="@color/transparent" - a:src="?attr/chat_send" /> + a:src="@drawable/ic_menu_chat_send" /> diff --git a/ultrasonic/src/main/res/layout/current_playing.xml b/ultrasonic/src/main/res/layout/current_playing.xml index b4a7d754..967832c9 100644 --- a/ultrasonic/src/main/res/layout/current_playing.xml +++ b/ultrasonic/src/main/res/layout/current_playing.xml @@ -51,7 +51,7 @@ a:focusable="false" a:gravity="center_vertical" a:scaleType="fitCenter" - a:src="?attr/star_hollow" + a:src="@drawable/ic_star_hollow" a:importantForAccessibility="no" /> diff --git a/ultrasonic/src/main/res/layout/list_header_folder.xml b/ultrasonic/src/main/res/layout/list_header_folder.xml index 61ae580f..5c6b161d 100644 --- a/ultrasonic/src/main/res/layout/list_header_folder.xml +++ b/ultrasonic/src/main/res/layout/list_header_folder.xml @@ -17,7 +17,7 @@ a:layout_height="wrap_content" a:layout_gravity="center_vertical" a:importantForAccessibility="no" - a:src="?attr/select_folder" /> + a:src="@drawable/ic_menu_select_folder" /> diff --git a/ultrasonic/src/main/res/layout/list_item_track.xml b/ultrasonic/src/main/res/layout/list_item_track.xml index 16322ac7..0085a332 100644 --- a/ultrasonic/src/main/res/layout/list_item_track.xml +++ b/ultrasonic/src/main/res/layout/list_item_track.xml @@ -1,40 +1,175 @@ - + a:minHeight="?android:attr/listPreferredItemHeight"> + a:src="@drawable/ic_drag_vertical" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/song_check" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - - - + + + + + + + + + + + + + + + + + + + + + + + + + a:visibility="visible" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/star_barrier" + app:layout_constraintTop_toTopOf="parent"> + a:src="@drawable/ic_star_hollow" /> + a:src="@drawable/ic_star_hollow" /> + a:src="@drawable/ic_star_hollow" /> + a:src="@drawable/ic_star_hollow" /> + a:src="@drawable/ic_star_hollow" /> - - - \ No newline at end of file + \ No newline at end of file diff --git a/ultrasonic/src/main/res/layout/list_item_track_details.xml b/ultrasonic/src/main/res/layout/list_item_track_details.xml deleted file mode 100644 index 569a64f7..00000000 --- a/ultrasonic/src/main/res/layout/list_item_track_details.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ultrasonic/src/main/res/layout/media_buttons.xml b/ultrasonic/src/main/res/layout/media_buttons.xml index 88332cb1..0c4243b7 100644 --- a/ultrasonic/src/main/res/layout/media_buttons.xml +++ b/ultrasonic/src/main/res/layout/media_buttons.xml @@ -16,7 +16,7 @@ a:adjustViewBounds="true" a:focusable="true" a:scaleType="fitCenter" - a:src="?attr/media_shuffle" + a:src="@drawable/media_shuffle_normal" a:contentDescription="@string/buttons.shuffle" /> @@ -51,7 +51,7 @@ a:adjustViewBounds="true" a:focusable="true" a:scaleType="fitCenter" - a:src="?attr/media_pause" + a:src="@drawable/media_pause_normal" a:contentDescription="@string/buttons.pause" /> @@ -75,7 +75,7 @@ a:adjustViewBounds="true" a:focusable="true" a:scaleType="fitCenter" - a:src="?attr/media_next" + a:src="@drawable/media_forward_normal" a:contentDescription="@string/buttons.next"/> \ No newline at end of file diff --git a/ultrasonic/src/main/res/layout/navigation_header.xml b/ultrasonic/src/main/res/layout/navigation_header.xml index 69d88aa9..9c15b788 100644 --- a/ultrasonic/src/main/res/layout/navigation_header.xml +++ b/ultrasonic/src/main/res/layout/navigation_header.xml @@ -35,7 +35,7 @@ a:textColor="?attr/colorOnPrimary" a:textSize="17sp" a:textStyle="bold" - app:icon="@drawable/ic_menu_select_server_dark" + app:icon="@drawable/ic_menu_select_server" app:iconPadding="12dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/ultrasonic/src/main/res/layout/now_playing.xml b/ultrasonic/src/main/res/layout/now_playing.xml index b19cca81..165ada0d 100644 --- a/ultrasonic/src/main/res/layout/now_playing.xml +++ b/ultrasonic/src/main/res/layout/now_playing.xml @@ -63,7 +63,7 @@ android:layout_weight="0.0" android:focusable="false" android:scaleType="fitCenter" - android:src="?attr/media_pause" + android:src="@drawable/media_pause_normal" android:contentDescription="@string/buttons.play"/> diff --git a/ultrasonic/src/main/res/layout/server_row.xml b/ultrasonic/src/main/res/layout/server_row.xml index abed03ca..c9dfc4e4 100644 --- a/ultrasonic/src/main/res/layout/server_row.xml +++ b/ultrasonic/src/main/res/layout/server_row.xml @@ -21,7 +21,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:src="@drawable/ic_menu_server_dark" + tools:src="@drawable/ic_menu_server" a:importantForAccessibility="no" /> \ No newline at end of file diff --git a/ultrasonic/src/main/res/menu/navigation.xml b/ultrasonic/src/main/res/menu/navigation.xml index 956f94ed..91c18d56 100644 --- a/ultrasonic/src/main/res/menu/navigation.xml +++ b/ultrasonic/src/main/res/menu/navigation.xml @@ -8,52 +8,52 @@ @@ -61,17 +61,17 @@ diff --git a/ultrasonic/src/main/res/menu/nowplaying.xml b/ultrasonic/src/main/res/menu/nowplaying.xml index 83530690..65920d6a 100644 --- a/ultrasonic/src/main/res/menu/nowplaying.xml +++ b/ultrasonic/src/main/res/menu/nowplaying.xml @@ -6,42 +6,43 @@ + \ No newline at end of file diff --git a/ultrasonic/src/main/res/menu/select_album.xml b/ultrasonic/src/main/res/menu/select_album.xml index 8246d460..5383a5d0 100644 --- a/ultrasonic/src/main/res/menu/select_album.xml +++ b/ultrasonic/src/main/res/menu/select_album.xml @@ -8,11 +8,11 @@ a:id="@+id/menu_item_share" app:showAsAction="ifRoom|withText" a:title="@string/menu.share" - a:icon="?attr/share"/> + a:icon="@drawable/ic_menu_share"/> diff --git a/ultrasonic/src/main/res/values/styles.xml b/ultrasonic/src/main/res/values/styles.xml index d9cfaa1d..d9ca96f9 100644 --- a/ultrasonic/src/main/res/values/styles.xml +++ b/ultrasonic/src/main/res/values/styles.xml @@ -35,66 +35,10 @@ ?attr/color_selected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ultrasonic/src/main/res/values/themes.xml b/ultrasonic/src/main/res/values/themes.xml index 126c3df0..b2940931 100644 --- a/ultrasonic/src/main/res/values/themes.xml +++ b/ultrasonic/src/main/res/values/themes.xml @@ -8,58 +8,6 @@ @color/selected_menu_dark @color/selected_menu_background_black @color/navigation_header_dark - @drawable/ic_star_hollow_dark - @drawable/ic_star_full_dark - @drawable/ic_menu_about_dark - @drawable/ic_menu_select_all_dark - @drawable/ic_menu_browse_dark - @drawable/ic_menu_exit_dark - @drawable/ic_menu_backward_dark - @drawable/ic_menu_forward_dark - @drawable/ic_menu_close_dark - @drawable/ic_menu_help_dark - @drawable/ic_menu_home_dark - @drawable/ic_menu_pin_dark - @drawable/ic_menu_unpin_dark - @drawable/ic_menu_playlists_dark - @drawable/ic_menu_remove_all_dark - @drawable/ic_menu_save_dark - @drawable/ic_menu_screen_on_off_dark - @drawable/ic_menu_search_holo_dark - @drawable/ic_menu_server_dark - @drawable/ic_menu_select_server_dark - @drawable/ic_menu_select_folder_dark - @drawable/ic_menu_settings_dark - @drawable/ic_menu_share_dark - @drawable/ic_menu_download_dark - @drawable/stat_sys_download_anim_0_dark - @drawable/ic_baseline_error_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_dark - @drawable/media_repeat_off_dark - @drawable/media_repeat_one_dark - @drawable/media_shuffle_normal_dark - @drawable/media_start_normal_dark - @drawable/ic_menu_podcasts_dark - @drawable/ic_menu_refresh_dark - @drawable/ic_stat_play_dark - @drawable/media_stop_normal_dark - @drawable/media_toggle_list_normal_dark - @drawable/ic_menu_chat_dark - @drawable/ic_menu_chat_send_dark - @drawable/ic_menu_bookmark_dark - @drawable/btn_check_custom_dark - @drawable/ic_create_new_folder_dark - @drawable/ic_folder_dark - @drawable/ic_subdirectory_up_dark - @drawable/ic_sd_storage_dark - @drawable/ic_drag_queue_dark - @drawable/ic_more_vert_dark - @drawable/list_selector_holo_dark - @drawable/list_selector_holo_dark_selected @color/selected_menu_background_light @@ -72,58 +20,6 @@ @color/selected_menu_dark @color/selected_menu_background_dark @color/navigation_header_dark - @drawable/ic_star_hollow_dark - @drawable/ic_star_full_dark - @drawable/ic_menu_about_dark - @drawable/ic_menu_select_all_dark - @drawable/ic_menu_browse_dark - @drawable/ic_menu_exit_dark - @drawable/ic_menu_backward_dark - @drawable/ic_menu_forward_dark - @drawable/ic_menu_close_dark - @drawable/ic_menu_help_dark - @drawable/ic_menu_home_dark - @drawable/ic_menu_pin_dark - @drawable/ic_menu_unpin_dark - @drawable/ic_menu_playlists_dark - @drawable/ic_menu_remove_all_dark - @drawable/ic_menu_save_dark - @drawable/ic_menu_screen_on_off_dark - @drawable/ic_menu_search_holo_dark - @drawable/ic_menu_server_dark - @drawable/ic_menu_select_server_dark - @drawable/ic_menu_select_folder_dark - @drawable/ic_menu_settings_dark - @drawable/ic_menu_share_dark - @drawable/ic_menu_download_dark - @drawable/stat_sys_download_anim_0_dark - @drawable/ic_baseline_error_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_dark - @drawable/media_repeat_off_dark - @drawable/media_repeat_one_dark - @drawable/media_shuffle_normal_dark - @drawable/media_start_normal_dark - @drawable/ic_menu_podcasts_dark - @drawable/ic_menu_refresh_dark - @drawable/ic_stat_play_dark - @drawable/media_stop_normal_dark - @drawable/media_toggle_list_normal_dark - @drawable/ic_menu_chat_dark - @drawable/ic_menu_chat_send_dark - @drawable/ic_menu_bookmark_dark - @drawable/btn_check_custom_dark - @drawable/ic_create_new_folder_dark - @drawable/ic_folder_dark - @drawable/ic_subdirectory_up_dark - @drawable/ic_sd_storage_dark - @drawable/ic_drag_queue_dark - @drawable/ic_more_vert_dark - @drawable/list_selector_holo_dark - @drawable/list_selector_holo_dark_selected @color/selected_menu_background_light @@ -135,58 +31,6 @@ @color/selected_menu_light @color/selected_menu_background_light @color/navigation_header_light - @drawable/ic_star_hollow_light - @drawable/ic_star_full_light - @drawable/ic_menu_about_light - @drawable/ic_menu_select_all_light - @drawable/ic_menu_browse_light - @drawable/ic_menu_exit_light - @drawable/ic_menu_backward_light - @drawable/ic_menu_forward_light - @drawable/ic_menu_close_light - @drawable/ic_menu_help_light - @drawable/ic_menu_home_light - @drawable/ic_menu_pin_light - @drawable/ic_menu_unpin_light - @drawable/ic_menu_playlists_light - @drawable/ic_menu_remove_all_light - @drawable/ic_menu_save_light - @drawable/ic_menu_screen_on_off_light - @drawable/ic_menu_search_holo_light - @drawable/ic_menu_server_light - @drawable/ic_menu_select_server_light - @drawable/ic_menu_select_folder_light - @drawable/ic_menu_settings_light - @drawable/ic_menu_share_light - @drawable/ic_menu_download_light - @drawable/stat_sys_download_anim_0_light - @drawable/ic_baseline_error_light - @drawable/stat_sys_download_light - @drawable/media_backward_normal_light - @drawable/media_forward_normal_light - @drawable/media_pause_normal_light - @drawable/media_repeat_all_light - @drawable/media_repeat_off_light - @drawable/media_repeat_one_light - @drawable/media_shuffle_normal_light - @drawable/media_start_normal_light - @drawable/ic_menu_podcasts_light - @drawable/ic_menu_refresh_light - @drawable/ic_stat_play_light - @drawable/media_stop_normal_light - @drawable/media_toggle_list_normal_light - @drawable/ic_menu_chat_light - @drawable/ic_menu_chat_send_light - @drawable/ic_menu_bookmark_light - @drawable/btn_check_custom_light - @drawable/ic_create_new_folder_light - @drawable/ic_folder_light - @drawable/ic_subdirectory_up_light - @drawable/ic_sd_storage_light - @drawable/ic_drag_queue_light - @drawable/ic_more_vert_light - @drawable/list_selector_holo_light - @drawable/list_selector_holo_light_selected @color/selected_menu_background_dark \ No newline at end of file