From fd14c8cdce0e1ce9a0b28757dfddbaf788d0fac6 Mon Sep 17 00:00:00 2001
From: krlvm <51774833+krlvm@users.noreply.github.com>
Date: Sat, 27 Mar 2021 17:45:49 +0300
Subject: [PATCH] Fix Dark elements in Light Theme
---
app/src/debug/res/xml/main_settings.xml | 16 +-
.../java/org/schabi/newpipe/MainActivity.java | 32 ++--
.../org/schabi/newpipe/RouterActivity.java | 13 +-
.../newpipe/download/DownloadDialog.java | 3 +-
.../newpipe/fragments/MainFragment.java | 4 -
.../fragments/detail/VideoDetailFragment.java | 15 +-
.../list/playlist/PlaylistFragment.java | 9 +-
.../list/search/SuggestionListAdapter.java | 4 +-
.../history/StatisticsPlaylistFragment.java | 6 +-
.../local/subscription/FeedGroupIcon.kt | 87 +++++----
.../subscription/SubscriptionFragment.kt | 3 +-
.../subscription/dialog/FeedGroupDialog.kt | 4 +-
.../subscription/item/FeedGroupCardItem.kt | 2 +-
.../subscription/item/FeedGroupReorderItem.kt | 2 +-
.../subscription/item/FeedImportExportItem.kt | 4 +-
.../local/subscription/item/PickerIconItem.kt | 2 +-
.../newpipe/player/NotificationConstants.java | 6 +-
.../newpipe/player/NotificationUtil.java | 6 +-
.../newpipe/player/PlayQueueActivity.java | 9 +-
.../org/schabi/newpipe/player/Player.java | 20 +-
.../player/event/PlayerGestureListener.java | 14 +-
.../PeertubeInstanceListFragment.java | 6 +-
.../newpipe/settings/tabs/AddTabDialog.java | 3 +-
.../settings/tabs/ChooseTabsFragment.java | 10 +-
.../org/schabi/newpipe/settings/tabs/Tab.java | 15 +-
.../schabi/newpipe/util/KioskTranslator.java | 14 +-
.../giga/ui/fragment/MissionsFragment.java | 7 +-
.../java/us/shandian/giga/util/Utility.java | 6 +-
..._white_24dp_png.png => ic_close_white.png} | Bin
...4dp_png.png => ic_hourglass_top_white.png} | Bin
...white_24dp_png.png => ic_replay_white.png} | Bin
..._white_24dp_png.png => ic_close_white.png} | Bin
...4dp_png.png => ic_hourglass_top_white.png} | Bin
...white_24dp_png.png => ic_replay_white.png} | Bin
.../ic_add.xml} | 0
.../ic_add_circle_outline.xml} | 0
.../ic_apps.xml} | 0
.../ic_arrow_back.xml} | 0
.../ic_asterisk.xml} | 0
.../ic_attach_money.xml} | 0
.../ic_backup.xml} | 0
.../ic_bookmark.xml} | 0
.../ic_bug_report.xml} | 0
.../ic_cast.xml} | 0
.../ic_child_care.xml} | 0
.../ic_close.xml} | 0
.../ic_cloud_download.xml} | 0
.../ic_computer.xml} | 0
.../ic_crop_portrait.xml} | 0
.../ic_delete.xml} | 0
.../ic_directions_bike.xml} | 0
.../ic_directions_car.xml} | 0
.../ic_done.xml} | 0
.../ic_drag_handle.xml} | 0
.../ic_edit.xml} | 0
.../ic_expand_less.xml} | 0
.../ic_expand_more.xml} | 0
.../ic_explore.xml} | 0
.../ic_fastfood.xml} | 0
.../ic_favorite.xml} | 0
.../ic_file_download.xml} | 0
.../ic_filter_list.xml} | 0
.../ic_fitness_center.xml} | 0
.../ic_headset.xml} | 0
.../ic_help.xml} | 0
.../ic_history.xml} | 0
.../ic_home.xml} | 0
.../ic_import_export.xml} | 0
.../ic_info_outline.xml} | 0
.../ic_insert_emoticon.xml} | 0
.../ic_language.xml} | 0
.../ic_list.xml} | 0
.../ic_live_tv.xml} | 0
.../ic_megaphone.xml} | 0
.../ic_mic.xml} | 0
.../ic_more_vert.xml} | 0
.../ic_motorcycle.xml} | 0
.../ic_movie.xml} | 0
.../ic_music_note.xml} | 0
.../ic_palette.xml} | 0
.../ic_pause.xml} | 0
.../ic_people.xml} | 0
.../ic_person.xml} | 0
.../ic_pets.xml} | 0
.../ic_picture_in_picture.xml} | 0
.../ic_play_arrow.xml} | 0
.../ic_playlist_add.xml} | 0
.../ic_playlist_add_check.xml} | 0
.../ic_public.xml} | 0
.../ic_radio.xml} | 0
.../ic_refresh.xml} | 0
.../ic_restaurant.xml} | 0
.../ic_rss_feed.xml} | 0
.../ic_save.xml} | 0
.../ic_school.xml} | 0
.../ic_search.xml} | 0
.../ic_search_add.xml} | 0
.../ic_settings.xml} | 0
.../ic_settings_backup_restore.xml} | 0
.../ic_share.xml} | 0
.../ic_shopping_cart.xml} | 0
.../ic_sort.xml} | 0
.../ic_stars.xml} | 0
.../ic_telescope.xml} | 0
.../ic_thumb_down.xml} | 0
.../ic_thumb_up.xml} | 0
.../ic_trending_up.xml} | 0
.../ic_tv.xml} | 0
.../ic_videogame_asset.xml} | 0
.../ic_volume_off.xml} | 0
.../ic_volume_up.xml} | 0
.../ic_watch_later.xml} | 0
.../ic_wb_sunny.xml} | 0
.../ic_whatshot.xml} | 0
.../ic_work.xml} | 0
..._white_24dp_png.png => ic_close_white.png} | Bin
...4dp_png.png => ic_hourglass_top_white.png} | Bin
...white_24dp_png.png => ic_replay_white.png} | Bin
..._white_24dp_png.png => ic_close_white.png} | Bin
...4dp_png.png => ic_hourglass_top_white.png} | Bin
...white_24dp_png.png => ic_replay_white.png} | Bin
..._white_24dp_png.png => ic_close_white.png} | Bin
...4dp_png.png => ic_hourglass_top_white.png} | Bin
...white_24dp_png.png => ic_replay_white.png} | Bin
.../{ic_add_black_24dp.xml => ic_add.xml} | 0
...ack_24dp.xml => ic_add_circle_outline.xml} | 0
.../{ic_apps_black_24dp.xml => ic_apps.xml} | 0
..._back_black_24dp.xml => ic_arrow_back.xml} | 0
..._white_24dp.xml => ic_arrow_drop_down.xml} | 0
...up_white_24dp.xml => ic_arrow_drop_up.xml} | 0
..._track_white_24dp.xml => ic_art_track.xml} | 0
...sterisk_black_24dp.xml => ic_asterisk.xml} | 0
...ney_black_24dp.xml => ic_attach_money.xml} | 0
...ic_backup_black_24dp.xml => ic_backup.xml} | 0
...ookmark_black_24dp.xml => ic_bookmark.xml} | 0
..._white_24dp.xml => ic_brightness_high.xml} | 0
...w_white_24dp.xml => ic_brightness_low.xml} | 0
...hite_24dp.xml => ic_brightness_medium.xml} | 0
...eport_black_24dp.xml => ic_bug_report.xml} | 0
.../{ic_cast_black_24dp.xml => ic_cast.xml} | 0
..._care_black_24dp.xml => ic_child_care.xml} | 0
.../{ic_close_black_24dp.xml => ic_close.xml} | 0
...d_black_24dp.xml => ic_cloud_download.xml} | 0
..._comment_white_24dp.xml => ic_comment.xml} | 0
...omputer_black_24dp.xml => ic_computer.xml} | 0
...it_black_24dp.xml => ic_crop_portrait.xml} | 0
...ic_delete_black_24dp.xml => ic_delete.xml} | 0
...tion_white_24dp.xml => ic_description.xml} | 0
..._black_24dp.xml => ic_directions_bike.xml} | 0
...r_black_24dp.xml => ic_directions_car.xml} | 0
.../{ic_done_black_24dp.xml => ic_done.xml} | 0
...ndle_black_24dp.xml => ic_drag_handle.xml} | 0
.../{ic_edit_black_24dp.xml => ic_edit.xml} | 0
...less_black_24dp.xml => ic_expand_less.xml} | 0
...more_black_24dp.xml => ic_expand_more.xml} | 0
..._explore_black_24dp.xml => ic_explore.xml} | 0
...ard_white_24dp.xml => ic_fast_forward.xml} | 0
...wind_white_24dp.xml => ic_fast_rewind.xml} | 0
...astfood_black_24dp.xml => ic_fastfood.xml} | 0
...avorite_black_24dp.xml => ic_favorite.xml} | 0
...ad_black_24dp.xml => ic_file_download.xml} | 0
...list_black_24dp.xml => ic_filter_list.xml} | 0
...r_black_24dp.xml => ic_fitness_center.xml} | 0
...ite_24.xml => ic_format_list_numbered.xml} | 0
...creen_white_24dp.xml => ic_fullscreen.xml} | 0
..._white_24dp.xml => ic_fullscreen_exit.xml} | 0
..._headset_black_24dp.xml => ic_headset.xml} | 0
.../{ic_help_black_24dp.xml => ic_help.xml} | 0
..._history_black_24dp.xml => ic_history.xml} | 0
.../{ic_home_black_24dp.xml => ic_home.xml} | 0
...op_white_24dp.xml => ic_hourglass_top.xml} | 0
...rt_black_24dp.xml => ic_import_export.xml} | 0
...ine_black_24dp.xml => ic_info_outline.xml} | 0
..._black_24dp.xml => ic_insert_emoticon.xml} | 0
...anguage_black_24dp.xml => ic_language.xml} | 0
.../{ic_list_black_24dp.xml => ic_list.xml} | 0
..._live_tv_black_24dp.xml => ic_live_tv.xml} | 0
...aphone_black_24dp.xml => ic_megaphone.xml} | 0
.../{ic_mic_black_24dp.xml => ic_mic.xml} | 0
...e_vert_black_24dp.xml => ic_more_vert.xml} | 0
...cycle_black_24dp.xml => ic_motorcycle.xml} | 0
.../{ic_movie_black_24dp.xml => ic_movie.xml} | 0
..._note_black_24dp.xml => ic_music_note.xml} | 0
.../{ic_next_white_24dp.xml => ic_next.xml} | 0
..._palette_black_24dp.xml => ic_palette.xml} | 0
.../{ic_pause_black_24dp.xml => ic_pause.xml} | 0
...ic_people_black_24dp.xml => ic_people.xml} | 0
...ic_person_black_24dp.xml => ic_person.xml} | 0
.../{ic_pets_black_24dp.xml => ic_pets.xml} | 0
...ack_24dp.xml => ic_picture_in_picture.xml} | 0
...arrow_black_24dp.xml => ic_play_arrow.xml} | 0
...add_black_24dp.xml => ic_playlist_add.xml} | 0
...ack_24dp.xml => ic_playlist_add_check.xml} | 0
...ay_white_24dp.xml => ic_playlist_play.xml} | 0
...revious_white_24dp.xml => ic_previous.xml} | 0
...ic_public_black_24dp.xml => ic_public.xml} | 0
.../{ic_radio_black_24dp.xml => ic_radio.xml} | 0
..._refresh_black_24dp.xml => ic_refresh.xml} | 0
...ic_repeat_white_24dp.xml => ic_repeat.xml} | 0
...ic_replay_white_24dp.xml => ic_replay.xml} | 0
...urant_black_24dp.xml => ic_restaurant.xml} | 0
...ss_feed_black_24dp.xml => ic_rss_feed.xml} | 0
.../{ic_save_black_24dp.xml => ic_save.xml} | 0
...ic_school_black_24dp.xml => ic_school.xml} | 0
..._white_24dp.xml => ic_screen_rotation.xml} | 0
...ic_search_black_24dp.xml => ic_search.xml} | 0
...h_add_black_24dp.xml => ic_search_add.xml} | 0
...ettings_black_24dp.xml => ic_settings.xml} | 0
...4dp.xml => ic_settings_backup_restore.xml} | 0
.../{ic_share_black_24dp.xml => ic_share.xml} | 0
...rt_black_24dp.xml => ic_shopping_cart.xml} | 0
..._shuffle_white_24dp.xml => ic_shuffle.xml} | 0
.../{ic_sort_black_24dp.xml => ic_sort.xml} | 0
.../{ic_stars_black_24dp.xml => ic_stars.xml} | 0
...titles_white_24dp.xml => ic_subtitles.xml} | 0
...escope_black_24dp.xml => ic_telescope.xml} | 0
..._down_black_24dp.xml => ic_thumb_down.xml} | 0
...humb_up_black_24dp.xml => ic_thumb_up.xml} | 0
...g_up_black_24dp.xml => ic_trending_up.xml} | 0
.../{ic_tv_black_24dp.xml => ic_tv.xml} | 0
..._black_24dp.xml => ic_videogame_asset.xml} | 0
...down_white_24dp.xml => ic_volume_down.xml} | 0
...mute_white_24dp.xml => ic_volume_mute.xml} | 0
...e_off_black_24dp.xml => ic_volume_off.xml} | 0
...ume_up_black_24dp.xml => ic_volume_up.xml} | 0
...ater_black_24dp.xml => ic_watch_later.xml} | 0
...b_sunny_black_24dp.xml => ic_wb_sunny.xml} | 0
...hatshot_black_24dp.xml => ic_whatshot.xml} | 0
.../{ic_work_black_24dp.xml => ic_work.xml} | 0
.../res/drawable/white_edit_text_cursor.xml | 5 +
.../activity_player_queue_control.xml | 10 +-
.../fragment_video_detail.xml | 27 +--
app/src/main/res/layout-large-land/player.xml | 36 ++--
app/src/main/res/layout/activity_about.xml | 5 +-
.../layout/activity_player_queue_control.xml | 10 +-
.../res/layout/dialog_feed_group_create.xml | 4 +-
app/src/main/res/layout/dialog_playlists.xml | 2 +-
app/src/main/res/layout/drawer_header.xml | 2 +-
.../res/layout/feed_group_add_new_item.xml | 2 +-
.../main/res/layout/feed_group_card_item.xml | 2 +-
.../res/layout/feed_group_reorder_item.xml | 4 +-
.../res/layout/feed_import_export_group.xml | 2 +-
.../main/res/layout/fragment_choose_tabs.xml | 2 +-
app/src/main/res/layout/fragment_feed.xml | 2 +-
.../res/layout/fragment_instance_list.xml | 2 +-
app/src/main/res/layout/fragment_main.xml | 2 +
.../main/res/layout/fragment_video_detail.xml | 30 +--
.../main/res/layout/header_with_menu_item.xml | 2 +-
app/src/main/res/layout/item_instance.xml | 2 +-
.../res/layout/item_search_suggestion.xml | 7 +-
app/src/main/res/layout/list_choose_tabs.xml | 4 +-
.../res/layout/list_choose_tabs_dialog.xml | 2 +-
.../main/res/layout/list_comments_item.xml | 2 +-
.../res/layout/list_comments_mini_item.xml | 2 +-
.../res/layout/list_playlist_grid_item.xml | 2 +-
.../main/res/layout/list_playlist_item.xml | 2 +-
.../res/layout/list_playlist_mini_item.xml | 2 +-
.../main/res/layout/list_radio_icon_item.xml | 2 +-
.../layout/list_stream_playlist_grid_item.xml | 2 +-
.../res/layout/list_stream_playlist_item.xml | 2 +-
app/src/main/res/layout/mission_item.xml | 2 +-
.../main/res/layout/mission_item_linear.xml | 2 +-
app/src/main/res/layout/picker_icon_item.xml | 2 +-
.../res/layout/picker_subscription_item.xml | 2 +-
app/src/main/res/layout/play_queue_item.xml | 2 +-
app/src/main/res/layout/player.xml | 39 ++--
.../res/layout/player_popup_close_overlay.xml | 2 +-
app/src/main/res/layout/playlist_control.xml | 8 +-
.../layout/settings_notification_action.xml | 2 +-
.../res/layout/statistic_playlist_control.xml | 2 +-
.../main/res/layout/stream_quality_item.xml | 2 +-
.../main/res/layout/toolbar_search_layout.xml | 2 +-
app/src/main/res/menu/download_menu.xml | 8 +-
app/src/main/res/menu/error_menu.xml | 2 +-
app/src/main/res/menu/main_fragment_menu.xml | 2 +-
app/src/main/res/menu/menu_channel.xml | 4 +-
app/src/main/res/menu/menu_feed_fragment.xml | 2 +-
.../main/res/menu/menu_feed_group_dialog.xml | 2 +-
app/src/main/res/menu/menu_play_queue.xml | 4 +-
app/src/main/res/menu/menu_playlist.xml | 4 +-
app/src/main/res/menu/menu_recaptcha.xml | 2 +-
app/src/main/res/menu/menu_search.xml | 2 +-
app/src/main/res/menu/video_detail_menu.xml | 4 +-
app/src/main/res/values-night/colors.xml | 5 +
app/src/main/res/values/attrs.xml | 83 +--------
app/src/main/res/values/colors.xml | 4 +
app/src/main/res/values/styles.xml | 174 +-----------------
app/src/release/res/xml/main_settings.xml | 14 +-
288 files changed, 327 insertions(+), 560 deletions(-)
rename app/src/main/res/drawable-hdpi/{ic_close_white_24dp_png.png => ic_close_white.png} (100%)
rename app/src/main/res/drawable-hdpi/{ic_hourglass_top_white_24dp_png.png => ic_hourglass_top_white.png} (100%)
rename app/src/main/res/drawable-hdpi/{ic_replay_white_24dp_png.png => ic_replay_white.png} (100%)
rename app/src/main/res/drawable-mdpi/{ic_close_white_24dp_png.png => ic_close_white.png} (100%)
rename app/src/main/res/drawable-mdpi/{ic_hourglass_top_white_24dp_png.png => ic_hourglass_top_white.png} (100%)
rename app/src/main/res/drawable-mdpi/{ic_replay_white_24dp_png.png => ic_replay_white.png} (100%)
rename app/src/main/res/{drawable/ic_add_white_24dp.xml => drawable-night/ic_add.xml} (100%)
rename app/src/main/res/{drawable/ic_add_circle_outline_white_24dp.xml => drawable-night/ic_add_circle_outline.xml} (100%)
rename app/src/main/res/{drawable/ic_apps_white_24dp.xml => drawable-night/ic_apps.xml} (100%)
rename app/src/main/res/{drawable/ic_arrow_back_white_24dp.xml => drawable-night/ic_arrow_back.xml} (100%)
rename app/src/main/res/{drawable/ic_asterisk_white_24dp.xml => drawable-night/ic_asterisk.xml} (100%)
rename app/src/main/res/{drawable/ic_attach_money_white_24dp.xml => drawable-night/ic_attach_money.xml} (100%)
rename app/src/main/res/{drawable/ic_backup_white_24dp.xml => drawable-night/ic_backup.xml} (100%)
rename app/src/main/res/{drawable/ic_bookmark_white_24dp.xml => drawable-night/ic_bookmark.xml} (100%)
rename app/src/main/res/{drawable/ic_bug_report_white_24dp.xml => drawable-night/ic_bug_report.xml} (100%)
rename app/src/main/res/{drawable/ic_cast_white_24dp.xml => drawable-night/ic_cast.xml} (100%)
rename app/src/main/res/{drawable/ic_child_care_white_24dp.xml => drawable-night/ic_child_care.xml} (100%)
rename app/src/main/res/{drawable/ic_close_white_24dp.xml => drawable-night/ic_close.xml} (100%)
rename app/src/main/res/{drawable/ic_cloud_download_white_24dp.xml => drawable-night/ic_cloud_download.xml} (100%)
rename app/src/main/res/{drawable/ic_computer_white_24dp.xml => drawable-night/ic_computer.xml} (100%)
rename app/src/main/res/{drawable/ic_crop_portrait_white_24dp.xml => drawable-night/ic_crop_portrait.xml} (100%)
rename app/src/main/res/{drawable/ic_delete_white_24dp.xml => drawable-night/ic_delete.xml} (100%)
rename app/src/main/res/{drawable/ic_directions_bike_white_24dp.xml => drawable-night/ic_directions_bike.xml} (100%)
rename app/src/main/res/{drawable/ic_directions_car_white_24dp.xml => drawable-night/ic_directions_car.xml} (100%)
rename app/src/main/res/{drawable/ic_done_white_24dp.xml => drawable-night/ic_done.xml} (100%)
rename app/src/main/res/{drawable/ic_drag_handle_white_24dp.xml => drawable-night/ic_drag_handle.xml} (100%)
rename app/src/main/res/{drawable/ic_edit_white_24dp.xml => drawable-night/ic_edit.xml} (100%)
rename app/src/main/res/{drawable/ic_expand_less_white_24dp.xml => drawable-night/ic_expand_less.xml} (100%)
rename app/src/main/res/{drawable/ic_expand_more_white_24dp.xml => drawable-night/ic_expand_more.xml} (100%)
rename app/src/main/res/{drawable/ic_explore_white_24dp.xml => drawable-night/ic_explore.xml} (100%)
rename app/src/main/res/{drawable/ic_fastfood_white_24dp.xml => drawable-night/ic_fastfood.xml} (100%)
rename app/src/main/res/{drawable/ic_favorite_white_24dp.xml => drawable-night/ic_favorite.xml} (100%)
rename app/src/main/res/{drawable/ic_file_download_white_24dp.xml => drawable-night/ic_file_download.xml} (100%)
rename app/src/main/res/{drawable/ic_filter_list_white_24dp.xml => drawable-night/ic_filter_list.xml} (100%)
rename app/src/main/res/{drawable/ic_fitness_center_white_24dp.xml => drawable-night/ic_fitness_center.xml} (100%)
rename app/src/main/res/{drawable/ic_headset_white_24dp.xml => drawable-night/ic_headset.xml} (100%)
rename app/src/main/res/{drawable/ic_help_white_24dp.xml => drawable-night/ic_help.xml} (100%)
rename app/src/main/res/{drawable/ic_history_white_24dp.xml => drawable-night/ic_history.xml} (100%)
rename app/src/main/res/{drawable/ic_home_white_24dp.xml => drawable-night/ic_home.xml} (100%)
rename app/src/main/res/{drawable/ic_import_export_white_24dp.xml => drawable-night/ic_import_export.xml} (100%)
rename app/src/main/res/{drawable/ic_info_outline_white_24dp.xml => drawable-night/ic_info_outline.xml} (100%)
rename app/src/main/res/{drawable/ic_insert_emoticon_white_24dp.xml => drawable-night/ic_insert_emoticon.xml} (100%)
rename app/src/main/res/{drawable/ic_language_white_24dp.xml => drawable-night/ic_language.xml} (100%)
rename app/src/main/res/{drawable/ic_list_white_24dp.xml => drawable-night/ic_list.xml} (100%)
rename app/src/main/res/{drawable/ic_live_tv_white_24dp.xml => drawable-night/ic_live_tv.xml} (100%)
rename app/src/main/res/{drawable/ic_megaphone_white_24dp.xml => drawable-night/ic_megaphone.xml} (100%)
rename app/src/main/res/{drawable/ic_mic_white_24dp.xml => drawable-night/ic_mic.xml} (100%)
rename app/src/main/res/{drawable/ic_more_vert_white_24dp.xml => drawable-night/ic_more_vert.xml} (100%)
rename app/src/main/res/{drawable/ic_motorcycle_white_24dp.xml => drawable-night/ic_motorcycle.xml} (100%)
rename app/src/main/res/{drawable/ic_movie_white_24dp.xml => drawable-night/ic_movie.xml} (100%)
rename app/src/main/res/{drawable/ic_music_note_white_24dp.xml => drawable-night/ic_music_note.xml} (100%)
rename app/src/main/res/{drawable/ic_palette_white_24dp.xml => drawable-night/ic_palette.xml} (100%)
rename app/src/main/res/{drawable/ic_pause_white_24dp.xml => drawable-night/ic_pause.xml} (100%)
rename app/src/main/res/{drawable/ic_people_white_24dp.xml => drawable-night/ic_people.xml} (100%)
rename app/src/main/res/{drawable/ic_person_white_24dp.xml => drawable-night/ic_person.xml} (100%)
rename app/src/main/res/{drawable/ic_pets_white_24dp.xml => drawable-night/ic_pets.xml} (100%)
rename app/src/main/res/{drawable/ic_picture_in_picture_white_24dp.xml => drawable-night/ic_picture_in_picture.xml} (100%)
rename app/src/main/res/{drawable/ic_play_arrow_white_24dp.xml => drawable-night/ic_play_arrow.xml} (100%)
rename app/src/main/res/{drawable/ic_playlist_add_white_24dp.xml => drawable-night/ic_playlist_add.xml} (100%)
rename app/src/main/res/{drawable/ic_playlist_add_check_white_24dp.xml => drawable-night/ic_playlist_add_check.xml} (100%)
rename app/src/main/res/{drawable/ic_public_white_24dp.xml => drawable-night/ic_public.xml} (100%)
rename app/src/main/res/{drawable/ic_radio_white_24dp.xml => drawable-night/ic_radio.xml} (100%)
rename app/src/main/res/{drawable/ic_refresh_white_24dp.xml => drawable-night/ic_refresh.xml} (100%)
rename app/src/main/res/{drawable/ic_restaurant_white_24dp.xml => drawable-night/ic_restaurant.xml} (100%)
rename app/src/main/res/{drawable/ic_rss_feed_white_24dp.xml => drawable-night/ic_rss_feed.xml} (100%)
rename app/src/main/res/{drawable/ic_save_white_24dp.xml => drawable-night/ic_save.xml} (100%)
rename app/src/main/res/{drawable/ic_school_white_24dp.xml => drawable-night/ic_school.xml} (100%)
rename app/src/main/res/{drawable/ic_search_white_24dp.xml => drawable-night/ic_search.xml} (100%)
rename app/src/main/res/{drawable/ic_search_add_white_24dp.xml => drawable-night/ic_search_add.xml} (100%)
rename app/src/main/res/{drawable/ic_settings_white_24dp.xml => drawable-night/ic_settings.xml} (100%)
rename app/src/main/res/{drawable/ic_settings_backup_restore_white_24dp.xml => drawable-night/ic_settings_backup_restore.xml} (100%)
rename app/src/main/res/{drawable/ic_share_white_24dp.xml => drawable-night/ic_share.xml} (100%)
rename app/src/main/res/{drawable/ic_shopping_cart_white_24dp.xml => drawable-night/ic_shopping_cart.xml} (100%)
rename app/src/main/res/{drawable/ic_sort_white_24dp.xml => drawable-night/ic_sort.xml} (100%)
rename app/src/main/res/{drawable/ic_stars_white_24dp.xml => drawable-night/ic_stars.xml} (100%)
rename app/src/main/res/{drawable/ic_telescope_white_24dp.xml => drawable-night/ic_telescope.xml} (100%)
rename app/src/main/res/{drawable/ic_thumb_down_white_24dp.xml => drawable-night/ic_thumb_down.xml} (100%)
rename app/src/main/res/{drawable/ic_thumb_up_white_24dp.xml => drawable-night/ic_thumb_up.xml} (100%)
rename app/src/main/res/{drawable/ic_trending_up_white_24dp.xml => drawable-night/ic_trending_up.xml} (100%)
rename app/src/main/res/{drawable/ic_tv_white_24dp.xml => drawable-night/ic_tv.xml} (100%)
rename app/src/main/res/{drawable/ic_videogame_asset_white_24dp.xml => drawable-night/ic_videogame_asset.xml} (100%)
rename app/src/main/res/{drawable/ic_volume_off_white_24dp.xml => drawable-night/ic_volume_off.xml} (100%)
rename app/src/main/res/{drawable/ic_volume_up_white_24dp.xml => drawable-night/ic_volume_up.xml} (100%)
rename app/src/main/res/{drawable/ic_watch_later_white_24dp.xml => drawable-night/ic_watch_later.xml} (100%)
rename app/src/main/res/{drawable/ic_wb_sunny_white_24dp.xml => drawable-night/ic_wb_sunny.xml} (100%)
rename app/src/main/res/{drawable/ic_whatshot_white_24dp.xml => drawable-night/ic_whatshot.xml} (100%)
rename app/src/main/res/{drawable/ic_work_white_24dp.xml => drawable-night/ic_work.xml} (100%)
rename app/src/main/res/drawable-xhdpi/{ic_close_white_24dp_png.png => ic_close_white.png} (100%)
rename app/src/main/res/drawable-xhdpi/{ic_hourglass_top_white_24dp_png.png => ic_hourglass_top_white.png} (100%)
rename app/src/main/res/drawable-xhdpi/{ic_replay_white_24dp_png.png => ic_replay_white.png} (100%)
rename app/src/main/res/drawable-xxhdpi/{ic_close_white_24dp_png.png => ic_close_white.png} (100%)
rename app/src/main/res/drawable-xxhdpi/{ic_hourglass_top_white_24dp_png.png => ic_hourglass_top_white.png} (100%)
rename app/src/main/res/drawable-xxhdpi/{ic_replay_white_24dp_png.png => ic_replay_white.png} (100%)
rename app/src/main/res/drawable-xxxhdpi/{ic_close_white_24dp_png.png => ic_close_white.png} (100%)
rename app/src/main/res/drawable-xxxhdpi/{ic_hourglass_top_white_24dp_png.png => ic_hourglass_top_white.png} (100%)
rename app/src/main/res/drawable-xxxhdpi/{ic_replay_white_24dp_png.png => ic_replay_white.png} (100%)
rename app/src/main/res/drawable/{ic_add_black_24dp.xml => ic_add.xml} (100%)
rename app/src/main/res/drawable/{ic_add_circle_outline_black_24dp.xml => ic_add_circle_outline.xml} (100%)
rename app/src/main/res/drawable/{ic_apps_black_24dp.xml => ic_apps.xml} (100%)
rename app/src/main/res/drawable/{ic_arrow_back_black_24dp.xml => ic_arrow_back.xml} (100%)
rename app/src/main/res/drawable/{ic_arrow_drop_down_white_24dp.xml => ic_arrow_drop_down.xml} (100%)
rename app/src/main/res/drawable/{ic_arrow_drop_up_white_24dp.xml => ic_arrow_drop_up.xml} (100%)
rename app/src/main/res/drawable/{ic_art_track_white_24dp.xml => ic_art_track.xml} (100%)
rename app/src/main/res/drawable/{ic_asterisk_black_24dp.xml => ic_asterisk.xml} (100%)
rename app/src/main/res/drawable/{ic_attach_money_black_24dp.xml => ic_attach_money.xml} (100%)
rename app/src/main/res/drawable/{ic_backup_black_24dp.xml => ic_backup.xml} (100%)
rename app/src/main/res/drawable/{ic_bookmark_black_24dp.xml => ic_bookmark.xml} (100%)
rename app/src/main/res/drawable/{ic_brightness_high_white_24dp.xml => ic_brightness_high.xml} (100%)
rename app/src/main/res/drawable/{ic_brightness_low_white_24dp.xml => ic_brightness_low.xml} (100%)
rename app/src/main/res/drawable/{ic_brightness_medium_white_24dp.xml => ic_brightness_medium.xml} (100%)
rename app/src/main/res/drawable/{ic_bug_report_black_24dp.xml => ic_bug_report.xml} (100%)
rename app/src/main/res/drawable/{ic_cast_black_24dp.xml => ic_cast.xml} (100%)
rename app/src/main/res/drawable/{ic_child_care_black_24dp.xml => ic_child_care.xml} (100%)
rename app/src/main/res/drawable/{ic_close_black_24dp.xml => ic_close.xml} (100%)
rename app/src/main/res/drawable/{ic_cloud_download_black_24dp.xml => ic_cloud_download.xml} (100%)
rename app/src/main/res/drawable/{ic_comment_white_24dp.xml => ic_comment.xml} (100%)
rename app/src/main/res/drawable/{ic_computer_black_24dp.xml => ic_computer.xml} (100%)
rename app/src/main/res/drawable/{ic_crop_portrait_black_24dp.xml => ic_crop_portrait.xml} (100%)
rename app/src/main/res/drawable/{ic_delete_black_24dp.xml => ic_delete.xml} (100%)
rename app/src/main/res/drawable/{ic_description_white_24dp.xml => ic_description.xml} (100%)
rename app/src/main/res/drawable/{ic_directions_bike_black_24dp.xml => ic_directions_bike.xml} (100%)
rename app/src/main/res/drawable/{ic_directions_car_black_24dp.xml => ic_directions_car.xml} (100%)
rename app/src/main/res/drawable/{ic_done_black_24dp.xml => ic_done.xml} (100%)
rename app/src/main/res/drawable/{ic_drag_handle_black_24dp.xml => ic_drag_handle.xml} (100%)
rename app/src/main/res/drawable/{ic_edit_black_24dp.xml => ic_edit.xml} (100%)
rename app/src/main/res/drawable/{ic_expand_less_black_24dp.xml => ic_expand_less.xml} (100%)
rename app/src/main/res/drawable/{ic_expand_more_black_24dp.xml => ic_expand_more.xml} (100%)
rename app/src/main/res/drawable/{ic_explore_black_24dp.xml => ic_explore.xml} (100%)
rename app/src/main/res/drawable/{ic_fast_forward_white_24dp.xml => ic_fast_forward.xml} (100%)
rename app/src/main/res/drawable/{ic_fast_rewind_white_24dp.xml => ic_fast_rewind.xml} (100%)
rename app/src/main/res/drawable/{ic_fastfood_black_24dp.xml => ic_fastfood.xml} (100%)
rename app/src/main/res/drawable/{ic_favorite_black_24dp.xml => ic_favorite.xml} (100%)
rename app/src/main/res/drawable/{ic_file_download_black_24dp.xml => ic_file_download.xml} (100%)
rename app/src/main/res/drawable/{ic_filter_list_black_24dp.xml => ic_filter_list.xml} (100%)
rename app/src/main/res/drawable/{ic_fitness_center_black_24dp.xml => ic_fitness_center.xml} (100%)
rename app/src/main/res/drawable/{ic_format_list_numbered_white_24.xml => ic_format_list_numbered.xml} (100%)
rename app/src/main/res/drawable/{ic_fullscreen_white_24dp.xml => ic_fullscreen.xml} (100%)
rename app/src/main/res/drawable/{ic_fullscreen_exit_white_24dp.xml => ic_fullscreen_exit.xml} (100%)
rename app/src/main/res/drawable/{ic_headset_black_24dp.xml => ic_headset.xml} (100%)
rename app/src/main/res/drawable/{ic_help_black_24dp.xml => ic_help.xml} (100%)
rename app/src/main/res/drawable/{ic_history_black_24dp.xml => ic_history.xml} (100%)
rename app/src/main/res/drawable/{ic_home_black_24dp.xml => ic_home.xml} (100%)
rename app/src/main/res/drawable/{ic_hourglass_top_white_24dp.xml => ic_hourglass_top.xml} (100%)
rename app/src/main/res/drawable/{ic_import_export_black_24dp.xml => ic_import_export.xml} (100%)
rename app/src/main/res/drawable/{ic_info_outline_black_24dp.xml => ic_info_outline.xml} (100%)
rename app/src/main/res/drawable/{ic_insert_emoticon_black_24dp.xml => ic_insert_emoticon.xml} (100%)
rename app/src/main/res/drawable/{ic_language_black_24dp.xml => ic_language.xml} (100%)
rename app/src/main/res/drawable/{ic_list_black_24dp.xml => ic_list.xml} (100%)
rename app/src/main/res/drawable/{ic_live_tv_black_24dp.xml => ic_live_tv.xml} (100%)
rename app/src/main/res/drawable/{ic_megaphone_black_24dp.xml => ic_megaphone.xml} (100%)
rename app/src/main/res/drawable/{ic_mic_black_24dp.xml => ic_mic.xml} (100%)
rename app/src/main/res/drawable/{ic_more_vert_black_24dp.xml => ic_more_vert.xml} (100%)
rename app/src/main/res/drawable/{ic_motorcycle_black_24dp.xml => ic_motorcycle.xml} (100%)
rename app/src/main/res/drawable/{ic_movie_black_24dp.xml => ic_movie.xml} (100%)
rename app/src/main/res/drawable/{ic_music_note_black_24dp.xml => ic_music_note.xml} (100%)
rename app/src/main/res/drawable/{ic_next_white_24dp.xml => ic_next.xml} (100%)
rename app/src/main/res/drawable/{ic_palette_black_24dp.xml => ic_palette.xml} (100%)
rename app/src/main/res/drawable/{ic_pause_black_24dp.xml => ic_pause.xml} (100%)
rename app/src/main/res/drawable/{ic_people_black_24dp.xml => ic_people.xml} (100%)
rename app/src/main/res/drawable/{ic_person_black_24dp.xml => ic_person.xml} (100%)
rename app/src/main/res/drawable/{ic_pets_black_24dp.xml => ic_pets.xml} (100%)
rename app/src/main/res/drawable/{ic_picture_in_picture_black_24dp.xml => ic_picture_in_picture.xml} (100%)
rename app/src/main/res/drawable/{ic_play_arrow_black_24dp.xml => ic_play_arrow.xml} (100%)
rename app/src/main/res/drawable/{ic_playlist_add_black_24dp.xml => ic_playlist_add.xml} (100%)
rename app/src/main/res/drawable/{ic_playlist_add_check_black_24dp.xml => ic_playlist_add_check.xml} (100%)
rename app/src/main/res/drawable/{ic_playlist_play_white_24dp.xml => ic_playlist_play.xml} (100%)
rename app/src/main/res/drawable/{ic_previous_white_24dp.xml => ic_previous.xml} (100%)
rename app/src/main/res/drawable/{ic_public_black_24dp.xml => ic_public.xml} (100%)
rename app/src/main/res/drawable/{ic_radio_black_24dp.xml => ic_radio.xml} (100%)
rename app/src/main/res/drawable/{ic_refresh_black_24dp.xml => ic_refresh.xml} (100%)
rename app/src/main/res/drawable/{ic_repeat_white_24dp.xml => ic_repeat.xml} (100%)
rename app/src/main/res/drawable/{ic_replay_white_24dp.xml => ic_replay.xml} (100%)
rename app/src/main/res/drawable/{ic_restaurant_black_24dp.xml => ic_restaurant.xml} (100%)
rename app/src/main/res/drawable/{ic_rss_feed_black_24dp.xml => ic_rss_feed.xml} (100%)
rename app/src/main/res/drawable/{ic_save_black_24dp.xml => ic_save.xml} (100%)
rename app/src/main/res/drawable/{ic_school_black_24dp.xml => ic_school.xml} (100%)
rename app/src/main/res/drawable/{ic_screen_rotation_white_24dp.xml => ic_screen_rotation.xml} (100%)
rename app/src/main/res/drawable/{ic_search_black_24dp.xml => ic_search.xml} (100%)
rename app/src/main/res/drawable/{ic_search_add_black_24dp.xml => ic_search_add.xml} (100%)
rename app/src/main/res/drawable/{ic_settings_black_24dp.xml => ic_settings.xml} (100%)
rename app/src/main/res/drawable/{ic_settings_backup_restore_black_24dp.xml => ic_settings_backup_restore.xml} (100%)
rename app/src/main/res/drawable/{ic_share_black_24dp.xml => ic_share.xml} (100%)
rename app/src/main/res/drawable/{ic_shopping_cart_black_24dp.xml => ic_shopping_cart.xml} (100%)
rename app/src/main/res/drawable/{ic_shuffle_white_24dp.xml => ic_shuffle.xml} (100%)
rename app/src/main/res/drawable/{ic_sort_black_24dp.xml => ic_sort.xml} (100%)
rename app/src/main/res/drawable/{ic_stars_black_24dp.xml => ic_stars.xml} (100%)
rename app/src/main/res/drawable/{ic_subtitles_white_24dp.xml => ic_subtitles.xml} (100%)
rename app/src/main/res/drawable/{ic_telescope_black_24dp.xml => ic_telescope.xml} (100%)
rename app/src/main/res/drawable/{ic_thumb_down_black_24dp.xml => ic_thumb_down.xml} (100%)
rename app/src/main/res/drawable/{ic_thumb_up_black_24dp.xml => ic_thumb_up.xml} (100%)
rename app/src/main/res/drawable/{ic_trending_up_black_24dp.xml => ic_trending_up.xml} (100%)
rename app/src/main/res/drawable/{ic_tv_black_24dp.xml => ic_tv.xml} (100%)
rename app/src/main/res/drawable/{ic_videogame_asset_black_24dp.xml => ic_videogame_asset.xml} (100%)
rename app/src/main/res/drawable/{ic_volume_down_white_24dp.xml => ic_volume_down.xml} (100%)
rename app/src/main/res/drawable/{ic_volume_mute_white_24dp.xml => ic_volume_mute.xml} (100%)
rename app/src/main/res/drawable/{ic_volume_off_black_24dp.xml => ic_volume_off.xml} (100%)
rename app/src/main/res/drawable/{ic_volume_up_black_24dp.xml => ic_volume_up.xml} (100%)
rename app/src/main/res/drawable/{ic_watch_later_black_24dp.xml => ic_watch_later.xml} (100%)
rename app/src/main/res/drawable/{ic_wb_sunny_black_24dp.xml => ic_wb_sunny.xml} (100%)
rename app/src/main/res/drawable/{ic_whatshot_black_24dp.xml => ic_whatshot.xml} (100%)
rename app/src/main/res/drawable/{ic_work_black_24dp.xml => ic_work.xml} (100%)
create mode 100644 app/src/main/res/drawable/white_edit_text_cursor.xml
create mode 100644 app/src/main/res/values-night/colors.xml
diff --git a/app/src/debug/res/xml/main_settings.xml b/app/src/debug/res/xml/main_settings.xml
index dfb8ffa34..d482d033c 100644
--- a/app/src/debug/res/xml/main_settings.xml
+++ b/app/src/debug/res/xml/main_settings.xml
@@ -6,50 +6,50 @@
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 534d81b09..90db7bead 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -182,27 +182,27 @@ public class MainActivity extends AppCompatActivity {
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER,
R.string.tab_subscriptions)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_channel));
+ .setIcon(R.drawable.ic_tv);
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_feed_title)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_rss));
+ .setIcon(R.drawable.ic_rss_feed);
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_bookmark));
+ .setIcon(R.drawable.ic_bookmark);
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_file_download));
+ .setIcon(R.drawable.ic_file_download);
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_history));
+ .setIcon(R.drawable.ic_history);
//Settings and About
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_settings));
+ .setIcon(R.drawable.ic_settings);
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_info_outline));
+ .setIcon(R.drawable.ic_info_outline);
toggle = new ActionBarDrawerToggle(this, mainBinding.getRoot(),
toolbarLayoutBinding.toolbar, R.string.drawer_open, R.string.drawer_close);
@@ -348,7 +348,7 @@ public class MainActivity extends AppCompatActivity {
}
private void showServices() {
- drawerHeaderBinding.drawerArrow.setImageResource(R.drawable.ic_arrow_drop_up_white_24dp);
+ drawerHeaderBinding.drawerArrow.setImageResource(R.drawable.ic_arrow_drop_up);
for (final StreamingService s : NewPipe.getServices()) {
final String title = s.getServiceInfo().getName()
@@ -414,7 +414,7 @@ public class MainActivity extends AppCompatActivity {
}
private void showTabs() throws ExtractionException {
- drawerHeaderBinding.drawerArrow.setImageResource(R.drawable.ic_arrow_drop_down_white_24dp);
+ drawerHeaderBinding.drawerArrow.setImageResource(R.drawable.ic_arrow_drop_down);
//Tabs
final int currentServiceId = ServiceHelper.getSelectedServiceId(this);
@@ -432,27 +432,27 @@ public class MainActivity extends AppCompatActivity {
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER, R.string.tab_subscriptions)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_channel));
+ .setIcon(R.drawable.ic_tv);
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_feed_title)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_rss));
+ .setIcon(R.drawable.ic_rss_feed);
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_bookmark));
+ .setIcon(R.drawable.ic_bookmark);
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_file_download));
+ .setIcon(R.drawable.ic_file_download);
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_history));
+ .setIcon(R.drawable.ic_history);
//Settings and About
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_settings));
+ .setIcon(R.drawable.ic_settings);
drawerLayoutBinding.navigation.getMenu()
.add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_info_outline));
+ .setIcon(R.drawable.ic_info_outline);
}
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index 179fab8dc..13efcb58d 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -91,7 +91,6 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
-import static org.schabi.newpipe.util.ThemeHelper.resolveResourceIdFromAttr;
/**
* Get the url from the intent and open it in the chosen preferred player.
@@ -231,7 +230,7 @@ public class RouterActivity extends AppCompatActivity {
new AlertDialog.Builder(context)
.setTitle(R.string.unsupported_url)
.setMessage(R.string.unsupported_url_dialog_message)
- .setIcon(ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_share))
+ .setIcon(R.drawable.ic_share)
.setPositiveButton(R.string.open_in_browser,
(dialog, which) -> ShareUtils.openUrlInBrowser(this, url))
.setNegativeButton(R.string.share,
@@ -427,16 +426,16 @@ public class RouterActivity extends AppCompatActivity {
final AdapterChoiceItem videoPlayer = new AdapterChoiceItem(
getString(R.string.video_player_key), getString(R.string.video_player),
- resolveResourceIdFromAttr(context, R.attr.ic_play_arrow));
+ R.drawable.ic_play_arrow);
final AdapterChoiceItem showInfo = new AdapterChoiceItem(
getString(R.string.show_info_key), getString(R.string.show_info),
- resolveResourceIdFromAttr(context, R.attr.ic_info_outline));
+ R.drawable.ic_info_outline);
final AdapterChoiceItem popupPlayer = new AdapterChoiceItem(
getString(R.string.popup_player_key), getString(R.string.popup_player),
- resolveResourceIdFromAttr(context, R.attr.ic_popup));
+ R.drawable.ic_picture_in_picture);
final AdapterChoiceItem backgroundPlayer = new AdapterChoiceItem(
getString(R.string.background_player_key), getString(R.string.background_player),
- resolveResourceIdFromAttr(context, R.attr.ic_headset));
+ R.drawable.ic_headset);
if (linkType == LinkType.STREAM) {
if (isExtVideoEnabled) {
@@ -481,7 +480,7 @@ public class RouterActivity extends AppCompatActivity {
returnList.add(new AdapterChoiceItem(getString(R.string.download_key),
getString(R.string.download),
- resolveResourceIdFromAttr(context, R.attr.ic_file_download)));
+ R.drawable.ic_file_download));
return returnList;
}
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index 484a46497..4d3726c38 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -394,8 +394,7 @@ public class DownloadDialog extends DialogFragment
}
toolbar.setTitle(R.string.download_dialog_title);
- toolbar.setNavigationIcon(
- ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_arrow_back));
+ toolbar.setNavigationIcon(R.drawable.ic_arrow_back);
toolbar.inflateMenu(R.menu.dialog_url);
toolbar.setNavigationOnClickListener(v -> requireDialog().dismiss());
toolbar.setNavigationContentDescription(R.string.cancel);
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
index 5fb68ba30..ed6fd18a7 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
@@ -1,7 +1,6 @@
package org.schabi.newpipe.fragments;
import android.content.Context;
-import android.content.res.ColorStateList;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
@@ -30,7 +29,6 @@ import org.schabi.newpipe.settings.tabs.Tab;
import org.schabi.newpipe.settings.tabs.TabsManager;
import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
import java.util.ArrayList;
import java.util.List;
@@ -87,8 +85,6 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
binding = FragmentMainBinding.bind(rootView);
- binding.mainTabLayout.setTabIconTint(ColorStateList.valueOf(
- ThemeHelper.resolveColorFromAttr(requireContext(), R.attr.colorAccent)));
binding.mainTabLayout.setupWithViewPager(binding.pager);
binding.mainTabLayout.addOnTabSelectedListener(this);
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index a5dfe2057..1e50a77f0 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -923,21 +923,21 @@ public final class VideoDetailFragment
if (shouldShowComments()) {
pageAdapter.addFragment(
CommentsFragment.getInstance(serviceId, url, title), COMMENTS_TAB_TAG);
- tabIcons.add(R.drawable.ic_comment_white_24dp);
+ tabIcons.add(R.drawable.ic_comment);
tabContentDescriptions.add(R.string.comments_tab_description);
}
if (showRelatedStreams && binding.relatedStreamsLayout == null) {
// temp empty fragment. will be updated in handleResult
pageAdapter.addFragment(new EmptyFragment(false), RELATED_TAB_TAG);
- tabIcons.add(R.drawable.ic_art_track_white_24dp);
+ tabIcons.add(R.drawable.ic_art_track);
tabContentDescriptions.add(R.string.related_streams_tab_description);
}
if (showDescription) {
// temp empty fragment. will be updated in handleResult
pageAdapter.addFragment(new EmptyFragment(false), DESCRIPTION_TAB_TAG);
- tabIcons.add(R.drawable.ic_description_white_24dp);
+ tabIcons.add(R.drawable.ic_description);
tabContentDescriptions.add(R.string.description_tab_description);
}
@@ -2274,11 +2274,10 @@ public final class VideoDetailFragment
}
private void setOverlayPlayPauseImage(final boolean playerIsPlaying) {
- final int attr = playerIsPlaying
- ? R.attr.ic_pause
- : R.attr.ic_play_arrow;
- binding.overlayPlayPauseButton.setImageResource(
- ThemeHelper.resolveResourceIdFromAttr(activity, attr));
+ final int drawable = playerIsPlaying
+ ? R.drawable.ic_pause
+ : R.drawable.ic_play_arrow;
+ binding.overlayPlayPauseButton.setImageResource(drawable);
}
private void setOverlayLook(final AppBarLayout appBar,
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
index 114947923..d0f90ee6b 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -61,7 +61,6 @@ import io.reactivex.rxjava3.disposables.Disposable;
import static org.schabi.newpipe.ktx.ViewUtils.animate;
import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
-import static org.schabi.newpipe.util.ThemeHelper.resolveResourceIdFromAttr;
public class PlaylistFragment extends BaseListInfoFragment {
private CompositeDisposable disposables;
@@ -307,7 +306,7 @@ public class PlaylistFragment extends BaseListInfoFragment {
getResources().getColor(R.color.transparent_background_color));
headerBinding.uploaderAvatarView.setImageDrawable(
AppCompatResources.getDrawable(requireContext(),
- resolveResourceIdFromAttr(requireContext(), R.attr.ic_radio))
+ R.drawable.ic_radio)
);
} else {
IMAGE_LOADER.displayImage(avatarUrl, headerBinding.uploaderAvatarView,
@@ -459,13 +458,13 @@ public class PlaylistFragment extends BaseListInfoFragment {
return;
}
- final int iconAttr = playlistEntity == null
- ? R.attr.ic_playlist_add : R.attr.ic_playlist_check;
+ final int drawable = playlistEntity == null
+ ? R.drawable.ic_playlist_add : R.drawable.ic_playlist_add_check;
final int titleRes = playlistEntity == null
? R.string.bookmark_playlist : R.string.unbookmark_playlist;
- playlistBookmarkButton.setIcon(resolveResourceIdFromAttr(activity, iconAttr));
+ playlistBookmarkButton.setIcon(drawable);
playlistBookmarkButton.setTitle(titleRes);
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
index d4bb4eebd..8e12680bc 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
@@ -117,8 +117,8 @@ public class SuggestionListAdapter
queryView = rootView.findViewById(R.id.suggestion_search);
insertView = rootView.findViewById(R.id.suggestion_insert);
- historyResId = resolveResourceIdFromAttr(rootView.getContext(), R.attr.ic_history);
- searchResId = resolveResourceIdFromAttr(rootView.getContext(), R.attr.ic_search);
+ historyResId = R.drawable.ic_history;
+ searchResId = R.drawable.ic_search;
}
private static int resolveResourceIdFromAttr(final Context context,
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
index 1bece369b..a2107d5e5 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -40,7 +40,6 @@ import org.schabi.newpipe.util.KoreUtil;
import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.util.OnClickGesture;
import org.schabi.newpipe.util.StreamDialogEntry;
-import org.schabi.newpipe.util.ThemeHelper;
import java.util.ArrayList;
import java.util.Arrays;
@@ -312,14 +311,13 @@ public class StatisticsPlaylistFragment
if (sortMode == StatisticSortMode.LAST_PLAYED) {
sortMode = StatisticSortMode.MOST_PLAYED;
setTitle(getString(R.string.title_most_played));
- headerBinding.sortButtonIcon.setImageResource(
- ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_history));
+ headerBinding.sortButtonIcon.setImageResource(R.drawable.ic_history);
headerBinding.sortButtonText.setText(R.string.title_last_played);
} else {
sortMode = StatisticSortMode.LAST_PLAYED;
setTitle(getString(R.string.title_last_played));
headerBinding.sortButtonIcon.setImageResource(
- ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_filter_list));
+ R.drawable.ic_filter_list);
headerBinding.sortButtonText.setText(R.string.title_most_played);
}
startLoading(true);
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt
index 19038be93..83a90213d 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt
@@ -1,10 +1,7 @@
package org.schabi.newpipe.local.subscription
-import android.content.Context
-import androidx.annotation.AttrRes
import androidx.annotation.DrawableRes
import org.schabi.newpipe.R
-import org.schabi.newpipe.util.ThemeHelper
enum class FeedGroupIcon(
/**
@@ -13,51 +10,51 @@ enum class FeedGroupIcon(
val id: Int,
/**
- * The attribute that points to a drawable resource. "R.attr" is used here to support multiple themes.
+ * The drawable resource.
*/
- @AttrRes val drawableResourceAttr: Int
+ @DrawableRes val drawableResource: Int
) {
- ALL(0, R.attr.ic_asterisk),
- MUSIC(1, R.attr.ic_music_note),
- EDUCATION(2, R.attr.ic_school),
- FITNESS(3, R.attr.ic_fitness_center),
- SPACE(4, R.attr.ic_telescope),
- COMPUTER(5, R.attr.ic_computer),
- GAMING(6, R.attr.ic_videogame_asset),
- SPORTS(7, R.attr.ic_sports),
- NEWS(8, R.attr.ic_megaphone),
- FAVORITES(9, R.attr.ic_heart),
- CAR(10, R.attr.ic_car),
- MOTORCYCLE(11, R.attr.ic_motorcycle),
- TREND(12, R.attr.ic_trending_up),
- MOVIE(13, R.attr.ic_movie),
- BACKUP(14, R.attr.ic_backup),
- ART(15, R.attr.ic_palette),
- PERSON(16, R.attr.ic_person),
- PEOPLE(17, R.attr.ic_people),
- MONEY(18, R.attr.ic_money),
- KIDS(19, R.attr.ic_child_care),
- FOOD(20, R.attr.ic_fastfood),
- SMILE(21, R.attr.ic_smile),
- EXPLORE(22, R.attr.ic_explore),
- RESTAURANT(23, R.attr.ic_restaurant),
- MIC(24, R.attr.ic_mic),
- HEADSET(25, R.attr.ic_headset),
- RADIO(26, R.attr.ic_radio),
- SHOPPING_CART(27, R.attr.ic_shopping_cart),
- WATCH_LATER(28, R.attr.ic_watch_later),
- WORK(29, R.attr.ic_work),
- HOT(30, R.attr.ic_kiosk_hot),
- CHANNEL(31, R.attr.ic_channel),
- BOOKMARK(32, R.attr.ic_bookmark),
- PETS(33, R.attr.ic_pets),
- WORLD(34, R.attr.ic_world),
- STAR(35, R.attr.ic_stars),
- SUN(36, R.attr.ic_sunny),
- RSS(37, R.attr.ic_rss);
+ ALL(0, R.drawable.ic_asterisk),
+ MUSIC(1, R.drawable.ic_music_note),
+ EDUCATION(2, R.drawable.ic_school),
+ FITNESS(3, R.drawable.ic_fitness_center),
+ SPACE(4, R.drawable.ic_telescope),
+ COMPUTER(5, R.drawable.ic_computer),
+ GAMING(6, R.drawable.ic_videogame_asset),
+ SPORTS(7, R.drawable.ic_directions_bike),
+ NEWS(8, R.drawable.ic_megaphone),
+ FAVORITES(9, R.drawable.ic_favorite),
+ CAR(10, R.drawable.ic_directions_car),
+ MOTORCYCLE(11, R.drawable.ic_motorcycle),
+ TREND(12, R.drawable.ic_trending_up),
+ MOVIE(13, R.drawable.ic_movie),
+ BACKUP(14, R.drawable.ic_backup),
+ ART(15, R.drawable.ic_palette),
+ PERSON(16, R.drawable.ic_person),
+ PEOPLE(17, R.drawable.ic_people),
+ MONEY(18, R.drawable.ic_attach_money),
+ KIDS(19, R.drawable.ic_child_care),
+ FOOD(20, R.drawable.ic_fastfood),
+ SMILE(21, R.drawable.ic_insert_emoticon),
+ EXPLORE(22, R.drawable.ic_explore),
+ RESTAURANT(23, R.drawable.ic_restaurant),
+ MIC(24, R.drawable.ic_mic),
+ HEADSET(25, R.drawable.ic_headset),
+ RADIO(26, R.drawable.ic_radio),
+ SHOPPING_CART(27, R.drawable.ic_shopping_cart),
+ WATCH_LATER(28, R.drawable.ic_watch_later),
+ WORK(29, R.drawable.ic_work),
+ HOT(30, R.drawable.ic_whatshot),
+ CHANNEL(31, R.drawable.ic_tv),
+ BOOKMARK(32, R.drawable.ic_bookmark),
+ PETS(33, R.drawable.ic_pets),
+ WORLD(34, R.drawable.ic_public),
+ STAR(35, R.drawable.ic_stars),
+ SUN(36, R.drawable.ic_wb_sunny),
+ RSS(37, R.drawable.ic_rss_feed);
@DrawableRes
- fun getDrawableRes(context: Context): Int {
- return ThemeHelper.resolveResourceIdFromAttr(context, drawableResourceAttr)
+ fun getDrawableRes(): Int {
+ return drawableResource
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
index d60d82cb4..016e1e404 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
@@ -62,7 +62,6 @@ import org.schabi.newpipe.util.FilePickerActivityHelper
import org.schabi.newpipe.util.NavigationHelper
import org.schabi.newpipe.util.OnClickGesture
import org.schabi.newpipe.util.ShareUtils
-import org.schabi.newpipe.util.ThemeHelper
import java.io.File
import java.text.SimpleDateFormat
import java.util.Date
@@ -257,7 +256,7 @@ class SubscriptionFragment : BaseStateFragment() {
feedGroupsCarousel = FeedGroupCarouselItem(requireContext(), carouselAdapter)
feedGroupsSortMenuItem = HeaderWithMenuItem(
getString(R.string.feed_groups_header_title),
- ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_sort),
+ R.drawable.ic_sort,
menuItemOnClickListener = ::openReorderDialog
)
add(Section(feedGroupsSortMenuItem, listOf(feedGroupsCarousel)))
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
index 5bd13356d..908bea00c 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
@@ -306,7 +306,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
groupSortOrder = feedGroupEntity?.sortOrder ?: -1
val feedGroupIcon = if (selectedIcon == null) icon else selectedIcon!!
- feedGroupCreateBinding.iconPreview.setImageResource(feedGroupIcon.getDrawableRes(requireContext()))
+ feedGroupCreateBinding.iconPreview.setImageResource(feedGroupIcon.getDrawableRes())
if (feedGroupCreateBinding.groupNameInput.text.isNullOrBlank()) {
feedGroupCreateBinding.groupNameInput.setText(name)
@@ -404,7 +404,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
if (groupId == NO_GROUP_SELECTED) {
val icon = selectedIcon ?: FeedGroupIcon.ALL
- feedGroupCreateBinding.iconPreview.setImageResource(icon.getDrawableRes(requireContext()))
+ feedGroupCreateBinding.iconPreview.setImageResource(icon.getDrawableRes())
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardItem.kt
index a9731df8a..7b78b3d95 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardItem.kt
@@ -25,7 +25,7 @@ data class FeedGroupCardItem(
override fun bind(viewBinding: FeedGroupCardItemBinding, position: Int) {
viewBinding.title.text = name
- viewBinding.icon.setImageResource(icon.getDrawableRes(viewBinding.root.context))
+ viewBinding.icon.setImageResource(icon.getDrawableRes())
}
override fun initializeViewBinding(view: View) = FeedGroupCardItemBinding.bind(view)
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupReorderItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupReorderItem.kt
index 74e481c4f..9a33de54d 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupReorderItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupReorderItem.kt
@@ -32,7 +32,7 @@ data class FeedGroupReorderItem(
override fun bind(viewBinding: FeedGroupReorderItemBinding, position: Int) {
viewBinding.groupName.text = name
- viewBinding.groupIcon.setImageResource(icon.getDrawableRes(viewBinding.root.context))
+ viewBinding.groupIcon.setImageResource(icon.getDrawableRes())
}
override fun bind(viewHolder: GroupieViewHolder, position: Int, payloads: MutableList) {
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt
index afca7064f..23d5bdd11 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt
@@ -86,7 +86,7 @@ class FeedImportExportItem(
private fun setupImportFromItems(listHolder: ViewGroup) {
val previousBackupItem = addItemView(
listHolder.context.getString(R.string.previous_export),
- ThemeHelper.resolveResourceIdFromAttr(listHolder.context, R.attr.ic_backup), listHolder
+ R.drawable.ic_backup, listHolder
)
previousBackupItem.setOnClickListener { onImportPreviousSelected() }
@@ -115,7 +115,7 @@ class FeedImportExportItem(
private fun setupExportToItems(listHolder: ViewGroup) {
val previousBackupItem = addItemView(
listHolder.context.getString(R.string.file),
- ThemeHelper.resolveResourceIdFromAttr(listHolder.context, R.attr.ic_save),
+ R.drawable.ic_save,
listHolder
)
previousBackupItem.setOnClickListener { onExportSelected() }
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt
index 11fc4833a..1b55d2e85 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt
@@ -13,7 +13,7 @@ class PickerIconItem(
val icon: FeedGroupIcon
) : BindableItem() {
@DrawableRes
- val iconRes: Int = icon.getDrawableRes(context)
+ val iconRes: Int = icon.getDrawableRes()
override fun getLayout(): Int = R.layout.picker_icon_item
diff --git a/app/src/main/java/org/schabi/newpipe/player/NotificationConstants.java b/app/src/main/java/org/schabi/newpipe/player/NotificationConstants.java
index cf58c8f76..6c9858d1b 100644
--- a/app/src/main/java/org/schabi/newpipe/player/NotificationConstants.java
+++ b/app/src/main/java/org/schabi/newpipe/player/NotificationConstants.java
@@ -50,11 +50,11 @@ public final class NotificationConstants {
R.drawable.exo_icon_fastforward,
R.drawable.exo_icon_previous,
R.drawable.exo_icon_next,
- R.drawable.ic_pause_white_24dp,
- R.drawable.ic_hourglass_top_white_24dp,
+ R.drawable.ic_pause,
+ R.drawable.ic_hourglass_top,
R.drawable.exo_icon_repeat_all,
R.drawable.exo_icon_shuffle_on,
- R.drawable.ic_close_white_24dp,
+ R.drawable.ic_close,
};
diff --git a/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java b/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java
index 43c1b4405..948343be2 100644
--- a/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java
+++ b/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java
@@ -273,14 +273,14 @@ public final class NotificationUtil {
|| player.getCurrentState() == Player.STATE_BLOCKED
|| player.getCurrentState() == Player.STATE_BUFFERING) {
// null intent -> show hourglass icon that does nothing when clicked
- return new NotificationCompat.Action(R.drawable.ic_hourglass_top_white_24dp_png,
+ return new NotificationCompat.Action(R.drawable.ic_hourglass_top,
player.getContext().getString(R.string.notification_action_buffering),
null);
}
case NotificationConstants.PLAY_PAUSE:
if (player.getCurrentState() == Player.STATE_COMPLETED) {
- return getAction(player, R.drawable.ic_replay_white_24dp_png,
+ return getAction(player, R.drawable.ic_replay,
R.string.exo_controls_pause_description, ACTION_PLAY_PAUSE);
} else if (player.isPlaying()
|| player.getCurrentState() == Player.STATE_PREFLIGHT
@@ -315,7 +315,7 @@ public final class NotificationUtil {
}
case NotificationConstants.CLOSE:
- return getAction(player, R.drawable.ic_close_white_24dp_png,
+ return getAction(player, R.drawable.ic_close,
R.string.close, ACTION_CLOSE);
case NotificationConstants.NOTHING:
diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
index d757a9268..08a2762a9 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
@@ -589,15 +589,15 @@ public final class PlayQueueActivity extends AppCompatActivity
switch (state) {
case Player.STATE_PAUSED:
queueControlBinding.controlPlayPause
- .setImageResource(R.drawable.ic_play_arrow_white_24dp);
+ .setImageResource(R.drawable.ic_play_arrow);
break;
case Player.STATE_PLAYING:
queueControlBinding.controlPlayPause
- .setImageResource(R.drawable.ic_pause_white_24dp);
+ .setImageResource(R.drawable.ic_pause);
break;
case Player.STATE_COMPLETED:
queueControlBinding.controlPlayPause
- .setImageResource(R.drawable.ic_replay_white_24dp);
+ .setImageResource(R.drawable.ic_replay);
break;
default:
break;
@@ -670,8 +670,7 @@ public final class PlayQueueActivity extends AppCompatActivity
//2) Icon change accordingly to current App Theme
// using rootView.getContext() because getApplicationContext() didn't work
final Context context = queueControlBinding.getRoot().getContext();
- item.setIcon(ThemeHelper.resolveResourceIdFromAttr(context,
- player.isMuted() ? R.attr.ic_volume_off : R.attr.ic_volume_up));
+ item.setIcon(player.isMuted() ? R.drawable.ic_volume_off : R.drawable.ic_volume_up);
}
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index f8e0732b3..53d9a3ef0 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -957,7 +957,7 @@ public final class Player implements
= LinearLayout.LayoutParams.MATCH_PARENT;
binding.secondaryControls.setVisibility(View.INVISIBLE);
binding.moreOptionsButton.setImageDrawable(AppCompatResources.getDrawable(context,
- R.drawable.ic_expand_more_white_24dp));
+ R.drawable.ic_expand_more));
binding.share.setVisibility(View.VISIBLE);
binding.openInBrowser.setVisibility(View.VISIBLE);
binding.switchMute.setVisibility(View.VISIBLE);
@@ -2020,7 +2020,7 @@ public final class Player implements
animate(binding.loadingPanel, true, 0);
animate(binding.surfaceForeground, true, 100);
- binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
+ binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow);
animatePlayButtons(false, 100);
binding.getRoot().setKeepScreenOn(false);
@@ -2049,7 +2049,7 @@ public final class Player implements
animate(binding.playPauseButton, false, 80, AnimationType.SCALE_AND_ALPHA, 0,
() -> {
- binding.playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp);
+ binding.playPauseButton.setImageResource(R.drawable.ic_pause);
animatePlayButtons(true, 200);
if (!isQueueVisible) {
binding.playPauseButton.requestFocus();
@@ -2090,7 +2090,7 @@ public final class Player implements
animate(binding.playPauseButton, false, 80, AnimationType.SCALE_AND_ALPHA, 0,
() -> {
- binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
+ binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow);
animatePlayButtons(true, 200);
if (!isQueueVisible) {
binding.playPauseButton.requestFocus();
@@ -2129,7 +2129,7 @@ public final class Player implements
animate(binding.playPauseButton, false, 0, AnimationType.SCALE_AND_ALPHA, 0,
() -> {
- binding.playPauseButton.setImageResource(R.drawable.ic_replay_white_24dp);
+ binding.playPauseButton.setImageResource(R.drawable.ic_replay);
animatePlayButtons(true, DEFAULT_CONTROLS_DURATION);
});
@@ -2290,7 +2290,7 @@ public final class Player implements
private void setMuteButton(final ImageButton button, final boolean isMuted) {
button.setImageDrawable(AppCompatResources.getDrawable(context, isMuted
- ? R.drawable.ic_volume_off_white_24dp : R.drawable.ic_volume_up_white_24dp));
+ ? R.drawable.ic_volume_off : R.drawable.ic_volume_up));
}
//endregion
@@ -2734,7 +2734,7 @@ public final class Player implements
}
seekBy(retrieveSeekDurationFromPreferences(this));
triggerProgressUpdate();
- showAndAnimateControl(R.drawable.ic_fast_forward_white_24dp, true);
+ showAndAnimateControl(R.drawable.ic_fast_forward, true);
}
public void fastRewind() {
@@ -2743,7 +2743,7 @@ public final class Player implements
}
seekBy(-retrieveSeekDurationFromPreferences(this));
triggerProgressUpdate();
- showAndAnimateControl(R.drawable.ic_fast_rewind_white_24dp, true);
+ showAndAnimateControl(R.drawable.ic_fast_rewind, true);
}
//endregion
@@ -3691,8 +3691,8 @@ public final class Player implements
|| DeviceUtils.isTablet(context))
? View.VISIBLE : View.GONE);
binding.screenRotationButton.setImageDrawable(AppCompatResources.getDrawable(context,
- isFullscreen ? R.drawable.ic_fullscreen_exit_white_24dp
- : R.drawable.ic_fullscreen_white_24dp));
+ isFullscreen ? R.drawable.ic_fullscreen_exit
+ : R.drawable.ic_fullscreen));
}
private void setResizeMode(@AspectRatioFrameLayout.ResizeMode final int resizeMode) {
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
index a0b2e7eba..998324c9c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
+++ b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
@@ -147,10 +147,10 @@ public class PlayerGestureListener
player.getVolumeImageView().setImageDrawable(
AppCompatResources.getDrawable(service, currentProgressPercent <= 0
- ? R.drawable.ic_volume_off_white_24dp
- : currentProgressPercent < 0.25 ? R.drawable.ic_volume_mute_white_24dp
- : currentProgressPercent < 0.75 ? R.drawable.ic_volume_down_white_24dp
- : R.drawable.ic_volume_up_white_24dp)
+ ? R.drawable.ic_volume_off
+ : currentProgressPercent < 0.25 ? R.drawable.ic_volume_mute
+ : currentProgressPercent < 0.75 ? R.drawable.ic_volume_down
+ : R.drawable.ic_volume_up)
);
if (player.getVolumeRelativeLayout().getVisibility() != View.VISIBLE) {
@@ -189,10 +189,10 @@ public class PlayerGestureListener
player.getBrightnessImageView().setImageDrawable(
AppCompatResources.getDrawable(service,
currentProgressPercent < 0.25
- ? R.drawable.ic_brightness_low_white_24dp
+ ? R.drawable.ic_brightness_low
: currentProgressPercent < 0.75
- ? R.drawable.ic_brightness_medium_white_24dp
- : R.drawable.ic_brightness_high_white_24dp)
+ ? R.drawable.ic_brightness_medium
+ : R.drawable.ic_brightness_high)
);
if (player.getBrightnessRelativeLayout().getVisibility() != View.VISIBLE) {
diff --git a/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java b/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
index bd3cbf79d..74585e12b 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
@@ -145,10 +145,8 @@ public class PeertubeInstanceListFragment extends Fragment {
final MenuItem restoreItem = menu
.add(Menu.NONE, MENU_ITEM_RESTORE_ID, Menu.NONE, R.string.restore_defaults);
restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-
- final int restoreIcon = ThemeHelper
- .resolveResourceIdFromAttr(requireContext(), R.attr.ic_restore_defaults);
- restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(), restoreIcon));
+ restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(),
+ R.drawable.ic_settings_backup_restore));
}
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java
index 52e50fbba..125b455f4 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java
@@ -14,7 +14,6 @@ import androidx.annotation.NonNull;
import androidx.appcompat.widget.AppCompatImageView;
import org.schabi.newpipe.R;
-import org.schabi.newpipe.util.ThemeHelper;
public final class AddTabDialog {
private final AlertDialog dialog;
@@ -60,7 +59,7 @@ public final class AddTabDialog {
private DialogListAdapter(final Context context, final ChooseTabListItem[] items) {
this.inflater = LayoutInflater.from(context);
this.items = items;
- this.fallbackIcon = ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_kiosk_hot);
+ this.fallbackIcon = R.drawable.ic_whatshot;
}
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
index 572741d03..52d128bf0 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
@@ -113,9 +113,8 @@ public class ChooseTabsFragment extends Fragment {
R.string.restore_defaults);
restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
- final int restoreIcon = ThemeHelper.resolveResourceIdFromAttr(requireContext(),
- R.attr.ic_restore_defaults);
- restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(), restoreIcon));
+ restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(),
+ R.drawable.ic_settings_backup_restore));
}
@Override
@@ -241,7 +240,7 @@ public class ChooseTabsFragment extends Fragment {
case KIOSK:
returnList.add(new ChooseTabListItem(tab.getTabId(),
getString(R.string.kiosk_page_summary),
- ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_kiosk_hot)));
+ R.drawable.ic_whatshot));
break;
case CHANNEL:
returnList.add(new ChooseTabListItem(tab.getTabId(),
@@ -252,8 +251,7 @@ public class ChooseTabsFragment extends Fragment {
if (!tabList.contains(tab)) {
returnList.add(new ChooseTabListItem(tab.getTabId(),
getString(R.string.default_kiosk_page_summary),
- ThemeHelper.resolveResourceIdFromAttr(context,
- R.attr.ic_kiosk_hot)));
+ R.drawable.ic_whatshot));
}
break;
case PLAYLIST:
diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
index 0ffda2261..b289009ce 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
@@ -30,7 +30,6 @@ import org.schabi.newpipe.local.playlist.LocalPlaylistFragment;
import org.schabi.newpipe.local.subscription.SubscriptionFragment;
import org.schabi.newpipe.util.KioskTranslator;
import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
import java.util.Objects;
@@ -188,7 +187,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_blank_page);
+ return R.drawable.ic_crop_portrait;
}
@Override
@@ -213,7 +212,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_channel);
+ return R.drawable.ic_tv;
}
@Override
@@ -239,7 +238,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_rss);
+ return R.drawable.ic_rss_feed;
}
@Override
@@ -264,7 +263,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_bookmark);
+ return R.drawable.ic_bookmark;
}
@Override
@@ -289,7 +288,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_history);
+ return R.drawable.ic_history;
}
@Override
@@ -409,7 +408,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_channel);
+ return R.drawable.ic_tv;
}
@Override
@@ -541,7 +540,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_bookmark);
+ return R.drawable.ic_bookmark;
}
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
index 2f0b3e132..f77aa0fda 100644
--- a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
+++ b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
@@ -63,20 +63,20 @@ public final class KioskTranslator {
case "Top 50":
case "New & hot":
case "conferences":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_hot);
+ return R.drawable.ic_whatshot;
case "Local":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_local);
+ return R.drawable.ic_home;
case "Recently added":
case "recent":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_recent);
+ return R.drawable.ic_add_circle_outline;
case "Most liked":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_thumb_up);
+ return R.drawable.ic_thumb_up;
case "live":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_live_tv);
+ return R.drawable.ic_live_tv;
case "Featured":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_stars);
+ return R.drawable.ic_stars;
case "Radio":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_radio);
+ return R.drawable.ic_radio;
default:
return 0;
}
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index 3270b2b6f..b47bc97fd 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -224,10 +224,9 @@ public class MissionsFragment extends Fragment {
mList.setAdapter(mAdapter);
if (mSwitch != null) {
- mSwitch.setIcon(ThemeHelper.resolveResourceIdFromAttr(
- requireContext(), mLinear
- ? R.attr.ic_grid
- : R.attr.ic_list));
+ mSwitch.setIcon(mLinear
+ ? R.drawable.ic_apps
+ : R.drawable.ic_list);
mSwitch.setTitle(mLinear ? R.string.grid : R.string.list);
mPrefs.edit().putBoolean("linear", mLinear).apply();
}
diff --git a/app/src/main/java/us/shandian/giga/util/Utility.java b/app/src/main/java/us/shandian/giga/util/Utility.java
index c090c7211..ab584f0e6 100644
--- a/app/src/main/java/us/shandian/giga/util/Utility.java
+++ b/app/src/main/java/us/shandian/giga/util/Utility.java
@@ -182,12 +182,12 @@ public class Utility {
public static int getIconForFileType(FileType type) {
switch (type) {
case MUSIC:
- return R.drawable.ic_headset_white_24dp;
+ return R.drawable.ic_headset;
default:
case VIDEO:
- return R.drawable.ic_movie_white_24dp;
+ return R.drawable.ic_movie;
case SUBTITLE:
- return R.drawable.ic_subtitles_white_24dp;
+ return R.drawable.ic_subtitles;
}
}
diff --git a/app/src/main/res/drawable-hdpi/ic_close_white_24dp_png.png b/app/src/main/res/drawable-hdpi/ic_close_white.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_close_white_24dp_png.png
rename to app/src/main/res/drawable-hdpi/ic_close_white.png
diff --git a/app/src/main/res/drawable-hdpi/ic_hourglass_top_white_24dp_png.png b/app/src/main/res/drawable-hdpi/ic_hourglass_top_white.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_hourglass_top_white_24dp_png.png
rename to app/src/main/res/drawable-hdpi/ic_hourglass_top_white.png
diff --git a/app/src/main/res/drawable-hdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-hdpi/ic_replay_white.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_replay_white_24dp_png.png
rename to app/src/main/res/drawable-hdpi/ic_replay_white.png
diff --git a/app/src/main/res/drawable-mdpi/ic_close_white_24dp_png.png b/app/src/main/res/drawable-mdpi/ic_close_white.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_close_white_24dp_png.png
rename to app/src/main/res/drawable-mdpi/ic_close_white.png
diff --git a/app/src/main/res/drawable-mdpi/ic_hourglass_top_white_24dp_png.png b/app/src/main/res/drawable-mdpi/ic_hourglass_top_white.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_hourglass_top_white_24dp_png.png
rename to app/src/main/res/drawable-mdpi/ic_hourglass_top_white.png
diff --git a/app/src/main/res/drawable-mdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-mdpi/ic_replay_white.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_replay_white_24dp_png.png
rename to app/src/main/res/drawable-mdpi/ic_replay_white.png
diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable-night/ic_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_add.xml
diff --git a/app/src/main/res/drawable/ic_add_circle_outline_white_24dp.xml b/app/src/main/res/drawable-night/ic_add_circle_outline.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_circle_outline_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_add_circle_outline.xml
diff --git a/app/src/main/res/drawable/ic_apps_white_24dp.xml b/app/src/main/res/drawable-night/ic_apps.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_apps_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_apps.xml
diff --git a/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml b/app/src/main/res/drawable-night/ic_arrow_back.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_back_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_arrow_back.xml
diff --git a/app/src/main/res/drawable/ic_asterisk_white_24dp.xml b/app/src/main/res/drawable-night/ic_asterisk.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_asterisk_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_asterisk.xml
diff --git a/app/src/main/res/drawable/ic_attach_money_white_24dp.xml b/app/src/main/res/drawable-night/ic_attach_money.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_attach_money_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_attach_money.xml
diff --git a/app/src/main/res/drawable/ic_backup_white_24dp.xml b/app/src/main/res/drawable-night/ic_backup.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_backup_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_backup.xml
diff --git a/app/src/main/res/drawable/ic_bookmark_white_24dp.xml b/app/src/main/res/drawable-night/ic_bookmark.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_bookmark_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_bookmark.xml
diff --git a/app/src/main/res/drawable/ic_bug_report_white_24dp.xml b/app/src/main/res/drawable-night/ic_bug_report.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_bug_report_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_bug_report.xml
diff --git a/app/src/main/res/drawable/ic_cast_white_24dp.xml b/app/src/main/res/drawable-night/ic_cast.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cast_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_cast.xml
diff --git a/app/src/main/res/drawable/ic_child_care_white_24dp.xml b/app/src/main/res/drawable-night/ic_child_care.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_child_care_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_child_care.xml
diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable-night/ic_close.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_close_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_close.xml
diff --git a/app/src/main/res/drawable/ic_cloud_download_white_24dp.xml b/app/src/main/res/drawable-night/ic_cloud_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cloud_download_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_cloud_download.xml
diff --git a/app/src/main/res/drawable/ic_computer_white_24dp.xml b/app/src/main/res/drawable-night/ic_computer.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_computer_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_computer.xml
diff --git a/app/src/main/res/drawable/ic_crop_portrait_white_24dp.xml b/app/src/main/res/drawable-night/ic_crop_portrait.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_crop_portrait_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_crop_portrait.xml
diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable-night/ic_delete.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_delete_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_delete.xml
diff --git a/app/src/main/res/drawable/ic_directions_bike_white_24dp.xml b/app/src/main/res/drawable-night/ic_directions_bike.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_directions_bike_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_directions_bike.xml
diff --git a/app/src/main/res/drawable/ic_directions_car_white_24dp.xml b/app/src/main/res/drawable-night/ic_directions_car.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_directions_car_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_directions_car.xml
diff --git a/app/src/main/res/drawable/ic_done_white_24dp.xml b/app/src/main/res/drawable-night/ic_done.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_done_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_done.xml
diff --git a/app/src/main/res/drawable/ic_drag_handle_white_24dp.xml b/app/src/main/res/drawable-night/ic_drag_handle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_drag_handle_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_drag_handle.xml
diff --git a/app/src/main/res/drawable/ic_edit_white_24dp.xml b/app/src/main/res/drawable-night/ic_edit.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_edit_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_edit.xml
diff --git a/app/src/main/res/drawable/ic_expand_less_white_24dp.xml b/app/src/main/res/drawable-night/ic_expand_less.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_less_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_expand_less.xml
diff --git a/app/src/main/res/drawable/ic_expand_more_white_24dp.xml b/app/src/main/res/drawable-night/ic_expand_more.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_more_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_expand_more.xml
diff --git a/app/src/main/res/drawable/ic_explore_white_24dp.xml b/app/src/main/res/drawable-night/ic_explore.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_explore_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_explore.xml
diff --git a/app/src/main/res/drawable/ic_fastfood_white_24dp.xml b/app/src/main/res/drawable-night/ic_fastfood.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fastfood_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_fastfood.xml
diff --git a/app/src/main/res/drawable/ic_favorite_white_24dp.xml b/app/src/main/res/drawable-night/ic_favorite.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_favorite_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_favorite.xml
diff --git a/app/src/main/res/drawable/ic_file_download_white_24dp.xml b/app/src/main/res/drawable-night/ic_file_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_download_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_file_download.xml
diff --git a/app/src/main/res/drawable/ic_filter_list_white_24dp.xml b/app/src/main/res/drawable-night/ic_filter_list.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_filter_list_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_filter_list.xml
diff --git a/app/src/main/res/drawable/ic_fitness_center_white_24dp.xml b/app/src/main/res/drawable-night/ic_fitness_center.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fitness_center_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_fitness_center.xml
diff --git a/app/src/main/res/drawable/ic_headset_white_24dp.xml b/app/src/main/res/drawable-night/ic_headset.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_headset_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_headset.xml
diff --git a/app/src/main/res/drawable/ic_help_white_24dp.xml b/app/src/main/res/drawable-night/ic_help.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_help_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_help.xml
diff --git a/app/src/main/res/drawable/ic_history_white_24dp.xml b/app/src/main/res/drawable-night/ic_history.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_history_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_history.xml
diff --git a/app/src/main/res/drawable/ic_home_white_24dp.xml b/app/src/main/res/drawable-night/ic_home.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_home_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_home.xml
diff --git a/app/src/main/res/drawable/ic_import_export_white_24dp.xml b/app/src/main/res/drawable-night/ic_import_export.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_import_export_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_import_export.xml
diff --git a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml b/app/src/main/res/drawable-night/ic_info_outline.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_info_outline_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_info_outline.xml
diff --git a/app/src/main/res/drawable/ic_insert_emoticon_white_24dp.xml b/app/src/main/res/drawable-night/ic_insert_emoticon.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_insert_emoticon_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_insert_emoticon.xml
diff --git a/app/src/main/res/drawable/ic_language_white_24dp.xml b/app/src/main/res/drawable-night/ic_language.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_language_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_language.xml
diff --git a/app/src/main/res/drawable/ic_list_white_24dp.xml b/app/src/main/res/drawable-night/ic_list.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_list_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_list.xml
diff --git a/app/src/main/res/drawable/ic_live_tv_white_24dp.xml b/app/src/main/res/drawable-night/ic_live_tv.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_live_tv_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_live_tv.xml
diff --git a/app/src/main/res/drawable/ic_megaphone_white_24dp.xml b/app/src/main/res/drawable-night/ic_megaphone.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_megaphone_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_megaphone.xml
diff --git a/app/src/main/res/drawable/ic_mic_white_24dp.xml b/app/src/main/res/drawable-night/ic_mic.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_mic_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_mic.xml
diff --git a/app/src/main/res/drawable/ic_more_vert_white_24dp.xml b/app/src/main/res/drawable-night/ic_more_vert.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_more_vert_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_more_vert.xml
diff --git a/app/src/main/res/drawable/ic_motorcycle_white_24dp.xml b/app/src/main/res/drawable-night/ic_motorcycle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_motorcycle_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_motorcycle.xml
diff --git a/app/src/main/res/drawable/ic_movie_white_24dp.xml b/app/src/main/res/drawable-night/ic_movie.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_movie_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_movie.xml
diff --git a/app/src/main/res/drawable/ic_music_note_white_24dp.xml b/app/src/main/res/drawable-night/ic_music_note.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_music_note_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_music_note.xml
diff --git a/app/src/main/res/drawable/ic_palette_white_24dp.xml b/app/src/main/res/drawable-night/ic_palette.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_palette_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_palette.xml
diff --git a/app/src/main/res/drawable/ic_pause_white_24dp.xml b/app/src/main/res/drawable-night/ic_pause.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pause_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_pause.xml
diff --git a/app/src/main/res/drawable/ic_people_white_24dp.xml b/app/src/main/res/drawable-night/ic_people.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_people_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_people.xml
diff --git a/app/src/main/res/drawable/ic_person_white_24dp.xml b/app/src/main/res/drawable-night/ic_person.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_person_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_person.xml
diff --git a/app/src/main/res/drawable/ic_pets_white_24dp.xml b/app/src/main/res/drawable-night/ic_pets.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pets_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_pets.xml
diff --git a/app/src/main/res/drawable/ic_picture_in_picture_white_24dp.xml b/app/src/main/res/drawable-night/ic_picture_in_picture.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_picture_in_picture_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_picture_in_picture.xml
diff --git a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml b/app/src/main/res/drawable-night/ic_play_arrow.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_play_arrow.xml
diff --git a/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml b/app/src/main/res/drawable-night/ic_playlist_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_playlist_add_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_playlist_add.xml
diff --git a/app/src/main/res/drawable/ic_playlist_add_check_white_24dp.xml b/app/src/main/res/drawable-night/ic_playlist_add_check.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_playlist_add_check_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_playlist_add_check.xml
diff --git a/app/src/main/res/drawable/ic_public_white_24dp.xml b/app/src/main/res/drawable-night/ic_public.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_public_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_public.xml
diff --git a/app/src/main/res/drawable/ic_radio_white_24dp.xml b/app/src/main/res/drawable-night/ic_radio.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_radio_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_radio.xml
diff --git a/app/src/main/res/drawable/ic_refresh_white_24dp.xml b/app/src/main/res/drawable-night/ic_refresh.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_refresh_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_refresh.xml
diff --git a/app/src/main/res/drawable/ic_restaurant_white_24dp.xml b/app/src/main/res/drawable-night/ic_restaurant.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_restaurant_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_restaurant.xml
diff --git a/app/src/main/res/drawable/ic_rss_feed_white_24dp.xml b/app/src/main/res/drawable-night/ic_rss_feed.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_rss_feed_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_rss_feed.xml
diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable-night/ic_save.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_save_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_save.xml
diff --git a/app/src/main/res/drawable/ic_school_white_24dp.xml b/app/src/main/res/drawable-night/ic_school.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_school_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_school.xml
diff --git a/app/src/main/res/drawable/ic_search_white_24dp.xml b/app/src/main/res/drawable-night/ic_search.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_search_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_search.xml
diff --git a/app/src/main/res/drawable/ic_search_add_white_24dp.xml b/app/src/main/res/drawable-night/ic_search_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_search_add_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_search_add.xml
diff --git a/app/src/main/res/drawable/ic_settings_white_24dp.xml b/app/src/main/res/drawable-night/ic_settings.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_settings_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_settings.xml
diff --git a/app/src/main/res/drawable/ic_settings_backup_restore_white_24dp.xml b/app/src/main/res/drawable-night/ic_settings_backup_restore.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_settings_backup_restore_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_settings_backup_restore.xml
diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable-night/ic_share.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_share_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_share.xml
diff --git a/app/src/main/res/drawable/ic_shopping_cart_white_24dp.xml b/app/src/main/res/drawable-night/ic_shopping_cart.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_shopping_cart_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_shopping_cart.xml
diff --git a/app/src/main/res/drawable/ic_sort_white_24dp.xml b/app/src/main/res/drawable-night/ic_sort.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_sort_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_sort.xml
diff --git a/app/src/main/res/drawable/ic_stars_white_24dp.xml b/app/src/main/res/drawable-night/ic_stars.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_stars_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_stars.xml
diff --git a/app/src/main/res/drawable/ic_telescope_white_24dp.xml b/app/src/main/res/drawable-night/ic_telescope.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_telescope_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_telescope.xml
diff --git a/app/src/main/res/drawable/ic_thumb_down_white_24dp.xml b/app/src/main/res/drawable-night/ic_thumb_down.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_thumb_down_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_thumb_down.xml
diff --git a/app/src/main/res/drawable/ic_thumb_up_white_24dp.xml b/app/src/main/res/drawable-night/ic_thumb_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_thumb_up_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_thumb_up.xml
diff --git a/app/src/main/res/drawable/ic_trending_up_white_24dp.xml b/app/src/main/res/drawable-night/ic_trending_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_trending_up_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_trending_up.xml
diff --git a/app/src/main/res/drawable/ic_tv_white_24dp.xml b/app/src/main/res/drawable-night/ic_tv.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_tv_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_tv.xml
diff --git a/app/src/main/res/drawable/ic_videogame_asset_white_24dp.xml b/app/src/main/res/drawable-night/ic_videogame_asset.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_videogame_asset_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_videogame_asset.xml
diff --git a/app/src/main/res/drawable/ic_volume_off_white_24dp.xml b/app/src/main/res/drawable-night/ic_volume_off.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_volume_off_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_volume_off.xml
diff --git a/app/src/main/res/drawable/ic_volume_up_white_24dp.xml b/app/src/main/res/drawable-night/ic_volume_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_volume_up_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_volume_up.xml
diff --git a/app/src/main/res/drawable/ic_watch_later_white_24dp.xml b/app/src/main/res/drawable-night/ic_watch_later.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_watch_later_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_watch_later.xml
diff --git a/app/src/main/res/drawable/ic_wb_sunny_white_24dp.xml b/app/src/main/res/drawable-night/ic_wb_sunny.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_wb_sunny_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_wb_sunny.xml
diff --git a/app/src/main/res/drawable/ic_whatshot_white_24dp.xml b/app/src/main/res/drawable-night/ic_whatshot.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_whatshot_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_whatshot.xml
diff --git a/app/src/main/res/drawable/ic_work_white_24dp.xml b/app/src/main/res/drawable-night/ic_work.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_work_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_work.xml
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white_24dp_png.png b/app/src/main/res/drawable-xhdpi/ic_close_white.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_close_white_24dp_png.png
rename to app/src/main/res/drawable-xhdpi/ic_close_white.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_hourglass_top_white_24dp_png.png b/app/src/main/res/drawable-xhdpi/ic_hourglass_top_white.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_hourglass_top_white_24dp_png.png
rename to app/src/main/res/drawable-xhdpi/ic_hourglass_top_white.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-xhdpi/ic_replay_white.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_replay_white_24dp_png.png
rename to app/src/main/res/drawable-xhdpi/ic_replay_white.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp_png.png b/app/src/main/res/drawable-xxhdpi/ic_close_white.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_close_white_24dp_png.png
rename to app/src/main/res/drawable-xxhdpi/ic_close_white.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hourglass_top_white_24dp_png.png b/app/src/main/res/drawable-xxhdpi/ic_hourglass_top_white.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_hourglass_top_white_24dp_png.png
rename to app/src/main/res/drawable-xxhdpi/ic_hourglass_top_white.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-xxhdpi/ic_replay_white.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp_png.png
rename to app/src/main/res/drawable-xxhdpi/ic_replay_white.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp_png.png b/app/src/main/res/drawable-xxxhdpi/ic_close_white.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp_png.png
rename to app/src/main/res/drawable-xxxhdpi/ic_close_white.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_hourglass_top_white_24dp_png.png b/app/src/main/res/drawable-xxxhdpi/ic_hourglass_top_white.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_hourglass_top_white_24dp_png.png
rename to app/src/main/res/drawable-xxxhdpi/ic_hourglass_top_white.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-xxxhdpi/ic_replay_white.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp_png.png
rename to app/src/main/res/drawable-xxxhdpi/ic_replay_white.png
diff --git a/app/src/main/res/drawable/ic_add_black_24dp.xml b/app/src/main/res/drawable/ic_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_black_24dp.xml
rename to app/src/main/res/drawable/ic_add.xml
diff --git a/app/src/main/res/drawable/ic_add_circle_outline_black_24dp.xml b/app/src/main/res/drawable/ic_add_circle_outline.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_circle_outline_black_24dp.xml
rename to app/src/main/res/drawable/ic_add_circle_outline.xml
diff --git a/app/src/main/res/drawable/ic_apps_black_24dp.xml b/app/src/main/res/drawable/ic_apps.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_apps_black_24dp.xml
rename to app/src/main/res/drawable/ic_apps.xml
diff --git a/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_back.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_back_black_24dp.xml
rename to app/src/main/res/drawable/ic_arrow_back.xml
diff --git a/app/src/main/res/drawable/ic_arrow_drop_down_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_drop_down.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_drop_down_white_24dp.xml
rename to app/src/main/res/drawable/ic_arrow_drop_down.xml
diff --git a/app/src/main/res/drawable/ic_arrow_drop_up_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_drop_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_drop_up_white_24dp.xml
rename to app/src/main/res/drawable/ic_arrow_drop_up.xml
diff --git a/app/src/main/res/drawable/ic_art_track_white_24dp.xml b/app/src/main/res/drawable/ic_art_track.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_art_track_white_24dp.xml
rename to app/src/main/res/drawable/ic_art_track.xml
diff --git a/app/src/main/res/drawable/ic_asterisk_black_24dp.xml b/app/src/main/res/drawable/ic_asterisk.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_asterisk_black_24dp.xml
rename to app/src/main/res/drawable/ic_asterisk.xml
diff --git a/app/src/main/res/drawable/ic_attach_money_black_24dp.xml b/app/src/main/res/drawable/ic_attach_money.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_attach_money_black_24dp.xml
rename to app/src/main/res/drawable/ic_attach_money.xml
diff --git a/app/src/main/res/drawable/ic_backup_black_24dp.xml b/app/src/main/res/drawable/ic_backup.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_backup_black_24dp.xml
rename to app/src/main/res/drawable/ic_backup.xml
diff --git a/app/src/main/res/drawable/ic_bookmark_black_24dp.xml b/app/src/main/res/drawable/ic_bookmark.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_bookmark_black_24dp.xml
rename to app/src/main/res/drawable/ic_bookmark.xml
diff --git a/app/src/main/res/drawable/ic_brightness_high_white_24dp.xml b/app/src/main/res/drawable/ic_brightness_high.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_brightness_high_white_24dp.xml
rename to app/src/main/res/drawable/ic_brightness_high.xml
diff --git a/app/src/main/res/drawable/ic_brightness_low_white_24dp.xml b/app/src/main/res/drawable/ic_brightness_low.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_brightness_low_white_24dp.xml
rename to app/src/main/res/drawable/ic_brightness_low.xml
diff --git a/app/src/main/res/drawable/ic_brightness_medium_white_24dp.xml b/app/src/main/res/drawable/ic_brightness_medium.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_brightness_medium_white_24dp.xml
rename to app/src/main/res/drawable/ic_brightness_medium.xml
diff --git a/app/src/main/res/drawable/ic_bug_report_black_24dp.xml b/app/src/main/res/drawable/ic_bug_report.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_bug_report_black_24dp.xml
rename to app/src/main/res/drawable/ic_bug_report.xml
diff --git a/app/src/main/res/drawable/ic_cast_black_24dp.xml b/app/src/main/res/drawable/ic_cast.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cast_black_24dp.xml
rename to app/src/main/res/drawable/ic_cast.xml
diff --git a/app/src/main/res/drawable/ic_child_care_black_24dp.xml b/app/src/main/res/drawable/ic_child_care.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_child_care_black_24dp.xml
rename to app/src/main/res/drawable/ic_child_care.xml
diff --git a/app/src/main/res/drawable/ic_close_black_24dp.xml b/app/src/main/res/drawable/ic_close.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_close_black_24dp.xml
rename to app/src/main/res/drawable/ic_close.xml
diff --git a/app/src/main/res/drawable/ic_cloud_download_black_24dp.xml b/app/src/main/res/drawable/ic_cloud_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cloud_download_black_24dp.xml
rename to app/src/main/res/drawable/ic_cloud_download.xml
diff --git a/app/src/main/res/drawable/ic_comment_white_24dp.xml b/app/src/main/res/drawable/ic_comment.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_comment_white_24dp.xml
rename to app/src/main/res/drawable/ic_comment.xml
diff --git a/app/src/main/res/drawable/ic_computer_black_24dp.xml b/app/src/main/res/drawable/ic_computer.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_computer_black_24dp.xml
rename to app/src/main/res/drawable/ic_computer.xml
diff --git a/app/src/main/res/drawable/ic_crop_portrait_black_24dp.xml b/app/src/main/res/drawable/ic_crop_portrait.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_crop_portrait_black_24dp.xml
rename to app/src/main/res/drawable/ic_crop_portrait.xml
diff --git a/app/src/main/res/drawable/ic_delete_black_24dp.xml b/app/src/main/res/drawable/ic_delete.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_delete_black_24dp.xml
rename to app/src/main/res/drawable/ic_delete.xml
diff --git a/app/src/main/res/drawable/ic_description_white_24dp.xml b/app/src/main/res/drawable/ic_description.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_description_white_24dp.xml
rename to app/src/main/res/drawable/ic_description.xml
diff --git a/app/src/main/res/drawable/ic_directions_bike_black_24dp.xml b/app/src/main/res/drawable/ic_directions_bike.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_directions_bike_black_24dp.xml
rename to app/src/main/res/drawable/ic_directions_bike.xml
diff --git a/app/src/main/res/drawable/ic_directions_car_black_24dp.xml b/app/src/main/res/drawable/ic_directions_car.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_directions_car_black_24dp.xml
rename to app/src/main/res/drawable/ic_directions_car.xml
diff --git a/app/src/main/res/drawable/ic_done_black_24dp.xml b/app/src/main/res/drawable/ic_done.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_done_black_24dp.xml
rename to app/src/main/res/drawable/ic_done.xml
diff --git a/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml b/app/src/main/res/drawable/ic_drag_handle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_drag_handle_black_24dp.xml
rename to app/src/main/res/drawable/ic_drag_handle.xml
diff --git a/app/src/main/res/drawable/ic_edit_black_24dp.xml b/app/src/main/res/drawable/ic_edit.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_edit_black_24dp.xml
rename to app/src/main/res/drawable/ic_edit.xml
diff --git a/app/src/main/res/drawable/ic_expand_less_black_24dp.xml b/app/src/main/res/drawable/ic_expand_less.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_less_black_24dp.xml
rename to app/src/main/res/drawable/ic_expand_less.xml
diff --git a/app/src/main/res/drawable/ic_expand_more_black_24dp.xml b/app/src/main/res/drawable/ic_expand_more.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_more_black_24dp.xml
rename to app/src/main/res/drawable/ic_expand_more.xml
diff --git a/app/src/main/res/drawable/ic_explore_black_24dp.xml b/app/src/main/res/drawable/ic_explore.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_explore_black_24dp.xml
rename to app/src/main/res/drawable/ic_explore.xml
diff --git a/app/src/main/res/drawable/ic_fast_forward_white_24dp.xml b/app/src/main/res/drawable/ic_fast_forward.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fast_forward_white_24dp.xml
rename to app/src/main/res/drawable/ic_fast_forward.xml
diff --git a/app/src/main/res/drawable/ic_fast_rewind_white_24dp.xml b/app/src/main/res/drawable/ic_fast_rewind.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fast_rewind_white_24dp.xml
rename to app/src/main/res/drawable/ic_fast_rewind.xml
diff --git a/app/src/main/res/drawable/ic_fastfood_black_24dp.xml b/app/src/main/res/drawable/ic_fastfood.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fastfood_black_24dp.xml
rename to app/src/main/res/drawable/ic_fastfood.xml
diff --git a/app/src/main/res/drawable/ic_favorite_black_24dp.xml b/app/src/main/res/drawable/ic_favorite.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_favorite_black_24dp.xml
rename to app/src/main/res/drawable/ic_favorite.xml
diff --git a/app/src/main/res/drawable/ic_file_download_black_24dp.xml b/app/src/main/res/drawable/ic_file_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_download_black_24dp.xml
rename to app/src/main/res/drawable/ic_file_download.xml
diff --git a/app/src/main/res/drawable/ic_filter_list_black_24dp.xml b/app/src/main/res/drawable/ic_filter_list.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_filter_list_black_24dp.xml
rename to app/src/main/res/drawable/ic_filter_list.xml
diff --git a/app/src/main/res/drawable/ic_fitness_center_black_24dp.xml b/app/src/main/res/drawable/ic_fitness_center.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fitness_center_black_24dp.xml
rename to app/src/main/res/drawable/ic_fitness_center.xml
diff --git a/app/src/main/res/drawable/ic_format_list_numbered_white_24.xml b/app/src/main/res/drawable/ic_format_list_numbered.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_format_list_numbered_white_24.xml
rename to app/src/main/res/drawable/ic_format_list_numbered.xml
diff --git a/app/src/main/res/drawable/ic_fullscreen_white_24dp.xml b/app/src/main/res/drawable/ic_fullscreen.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fullscreen_white_24dp.xml
rename to app/src/main/res/drawable/ic_fullscreen.xml
diff --git a/app/src/main/res/drawable/ic_fullscreen_exit_white_24dp.xml b/app/src/main/res/drawable/ic_fullscreen_exit.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fullscreen_exit_white_24dp.xml
rename to app/src/main/res/drawable/ic_fullscreen_exit.xml
diff --git a/app/src/main/res/drawable/ic_headset_black_24dp.xml b/app/src/main/res/drawable/ic_headset.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_headset_black_24dp.xml
rename to app/src/main/res/drawable/ic_headset.xml
diff --git a/app/src/main/res/drawable/ic_help_black_24dp.xml b/app/src/main/res/drawable/ic_help.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_help_black_24dp.xml
rename to app/src/main/res/drawable/ic_help.xml
diff --git a/app/src/main/res/drawable/ic_history_black_24dp.xml b/app/src/main/res/drawable/ic_history.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_history_black_24dp.xml
rename to app/src/main/res/drawable/ic_history.xml
diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_home_black_24dp.xml
rename to app/src/main/res/drawable/ic_home.xml
diff --git a/app/src/main/res/drawable/ic_hourglass_top_white_24dp.xml b/app/src/main/res/drawable/ic_hourglass_top.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_hourglass_top_white_24dp.xml
rename to app/src/main/res/drawable/ic_hourglass_top.xml
diff --git a/app/src/main/res/drawable/ic_import_export_black_24dp.xml b/app/src/main/res/drawable/ic_import_export.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_import_export_black_24dp.xml
rename to app/src/main/res/drawable/ic_import_export.xml
diff --git a/app/src/main/res/drawable/ic_info_outline_black_24dp.xml b/app/src/main/res/drawable/ic_info_outline.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_info_outline_black_24dp.xml
rename to app/src/main/res/drawable/ic_info_outline.xml
diff --git a/app/src/main/res/drawable/ic_insert_emoticon_black_24dp.xml b/app/src/main/res/drawable/ic_insert_emoticon.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_insert_emoticon_black_24dp.xml
rename to app/src/main/res/drawable/ic_insert_emoticon.xml
diff --git a/app/src/main/res/drawable/ic_language_black_24dp.xml b/app/src/main/res/drawable/ic_language.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_language_black_24dp.xml
rename to app/src/main/res/drawable/ic_language.xml
diff --git a/app/src/main/res/drawable/ic_list_black_24dp.xml b/app/src/main/res/drawable/ic_list.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_list_black_24dp.xml
rename to app/src/main/res/drawable/ic_list.xml
diff --git a/app/src/main/res/drawable/ic_live_tv_black_24dp.xml b/app/src/main/res/drawable/ic_live_tv.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_live_tv_black_24dp.xml
rename to app/src/main/res/drawable/ic_live_tv.xml
diff --git a/app/src/main/res/drawable/ic_megaphone_black_24dp.xml b/app/src/main/res/drawable/ic_megaphone.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_megaphone_black_24dp.xml
rename to app/src/main/res/drawable/ic_megaphone.xml
diff --git a/app/src/main/res/drawable/ic_mic_black_24dp.xml b/app/src/main/res/drawable/ic_mic.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_mic_black_24dp.xml
rename to app/src/main/res/drawable/ic_mic.xml
diff --git a/app/src/main/res/drawable/ic_more_vert_black_24dp.xml b/app/src/main/res/drawable/ic_more_vert.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_more_vert_black_24dp.xml
rename to app/src/main/res/drawable/ic_more_vert.xml
diff --git a/app/src/main/res/drawable/ic_motorcycle_black_24dp.xml b/app/src/main/res/drawable/ic_motorcycle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_motorcycle_black_24dp.xml
rename to app/src/main/res/drawable/ic_motorcycle.xml
diff --git a/app/src/main/res/drawable/ic_movie_black_24dp.xml b/app/src/main/res/drawable/ic_movie.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_movie_black_24dp.xml
rename to app/src/main/res/drawable/ic_movie.xml
diff --git a/app/src/main/res/drawable/ic_music_note_black_24dp.xml b/app/src/main/res/drawable/ic_music_note.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_music_note_black_24dp.xml
rename to app/src/main/res/drawable/ic_music_note.xml
diff --git a/app/src/main/res/drawable/ic_next_white_24dp.xml b/app/src/main/res/drawable/ic_next.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_next_white_24dp.xml
rename to app/src/main/res/drawable/ic_next.xml
diff --git a/app/src/main/res/drawable/ic_palette_black_24dp.xml b/app/src/main/res/drawable/ic_palette.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_palette_black_24dp.xml
rename to app/src/main/res/drawable/ic_palette.xml
diff --git a/app/src/main/res/drawable/ic_pause_black_24dp.xml b/app/src/main/res/drawable/ic_pause.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pause_black_24dp.xml
rename to app/src/main/res/drawable/ic_pause.xml
diff --git a/app/src/main/res/drawable/ic_people_black_24dp.xml b/app/src/main/res/drawable/ic_people.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_people_black_24dp.xml
rename to app/src/main/res/drawable/ic_people.xml
diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_person_black_24dp.xml
rename to app/src/main/res/drawable/ic_person.xml
diff --git a/app/src/main/res/drawable/ic_pets_black_24dp.xml b/app/src/main/res/drawable/ic_pets.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pets_black_24dp.xml
rename to app/src/main/res/drawable/ic_pets.xml
diff --git a/app/src/main/res/drawable/ic_picture_in_picture_black_24dp.xml b/app/src/main/res/drawable/ic_picture_in_picture.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_picture_in_picture_black_24dp.xml
rename to app/src/main/res/drawable/ic_picture_in_picture.xml
diff --git a/app/src/main/res/drawable/ic_play_arrow_black_24dp.xml b/app/src/main/res/drawable/ic_play_arrow.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_play_arrow_black_24dp.xml
rename to app/src/main/res/drawable/ic_play_arrow.xml
diff --git a/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml b/app/src/main/res/drawable/ic_playlist_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_playlist_add_black_24dp.xml
rename to app/src/main/res/drawable/ic_playlist_add.xml
diff --git a/app/src/main/res/drawable/ic_playlist_add_check_black_24dp.xml b/app/src/main/res/drawable/ic_playlist_add_check.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_playlist_add_check_black_24dp.xml
rename to app/src/main/res/drawable/ic_playlist_add_check.xml
diff --git a/app/src/main/res/drawable/ic_playlist_play_white_24dp.xml b/app/src/main/res/drawable/ic_playlist_play.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_playlist_play_white_24dp.xml
rename to app/src/main/res/drawable/ic_playlist_play.xml
diff --git a/app/src/main/res/drawable/ic_previous_white_24dp.xml b/app/src/main/res/drawable/ic_previous.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_previous_white_24dp.xml
rename to app/src/main/res/drawable/ic_previous.xml
diff --git a/app/src/main/res/drawable/ic_public_black_24dp.xml b/app/src/main/res/drawable/ic_public.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_public_black_24dp.xml
rename to app/src/main/res/drawable/ic_public.xml
diff --git a/app/src/main/res/drawable/ic_radio_black_24dp.xml b/app/src/main/res/drawable/ic_radio.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_radio_black_24dp.xml
rename to app/src/main/res/drawable/ic_radio.xml
diff --git a/app/src/main/res/drawable/ic_refresh_black_24dp.xml b/app/src/main/res/drawable/ic_refresh.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_refresh_black_24dp.xml
rename to app/src/main/res/drawable/ic_refresh.xml
diff --git a/app/src/main/res/drawable/ic_repeat_white_24dp.xml b/app/src/main/res/drawable/ic_repeat.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_repeat_white_24dp.xml
rename to app/src/main/res/drawable/ic_repeat.xml
diff --git a/app/src/main/res/drawable/ic_replay_white_24dp.xml b/app/src/main/res/drawable/ic_replay.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_replay_white_24dp.xml
rename to app/src/main/res/drawable/ic_replay.xml
diff --git a/app/src/main/res/drawable/ic_restaurant_black_24dp.xml b/app/src/main/res/drawable/ic_restaurant.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_restaurant_black_24dp.xml
rename to app/src/main/res/drawable/ic_restaurant.xml
diff --git a/app/src/main/res/drawable/ic_rss_feed_black_24dp.xml b/app/src/main/res/drawable/ic_rss_feed.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_rss_feed_black_24dp.xml
rename to app/src/main/res/drawable/ic_rss_feed.xml
diff --git a/app/src/main/res/drawable/ic_save_black_24dp.xml b/app/src/main/res/drawable/ic_save.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_save_black_24dp.xml
rename to app/src/main/res/drawable/ic_save.xml
diff --git a/app/src/main/res/drawable/ic_school_black_24dp.xml b/app/src/main/res/drawable/ic_school.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_school_black_24dp.xml
rename to app/src/main/res/drawable/ic_school.xml
diff --git a/app/src/main/res/drawable/ic_screen_rotation_white_24dp.xml b/app/src/main/res/drawable/ic_screen_rotation.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_screen_rotation_white_24dp.xml
rename to app/src/main/res/drawable/ic_screen_rotation.xml
diff --git a/app/src/main/res/drawable/ic_search_black_24dp.xml b/app/src/main/res/drawable/ic_search.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_search_black_24dp.xml
rename to app/src/main/res/drawable/ic_search.xml
diff --git a/app/src/main/res/drawable/ic_search_add_black_24dp.xml b/app/src/main/res/drawable/ic_search_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_search_add_black_24dp.xml
rename to app/src/main/res/drawable/ic_search_add.xml
diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_settings_black_24dp.xml
rename to app/src/main/res/drawable/ic_settings.xml
diff --git a/app/src/main/res/drawable/ic_settings_backup_restore_black_24dp.xml b/app/src/main/res/drawable/ic_settings_backup_restore.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_settings_backup_restore_black_24dp.xml
rename to app/src/main/res/drawable/ic_settings_backup_restore.xml
diff --git a/app/src/main/res/drawable/ic_share_black_24dp.xml b/app/src/main/res/drawable/ic_share.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_share_black_24dp.xml
rename to app/src/main/res/drawable/ic_share.xml
diff --git a/app/src/main/res/drawable/ic_shopping_cart_black_24dp.xml b/app/src/main/res/drawable/ic_shopping_cart.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_shopping_cart_black_24dp.xml
rename to app/src/main/res/drawable/ic_shopping_cart.xml
diff --git a/app/src/main/res/drawable/ic_shuffle_white_24dp.xml b/app/src/main/res/drawable/ic_shuffle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_shuffle_white_24dp.xml
rename to app/src/main/res/drawable/ic_shuffle.xml
diff --git a/app/src/main/res/drawable/ic_sort_black_24dp.xml b/app/src/main/res/drawable/ic_sort.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_sort_black_24dp.xml
rename to app/src/main/res/drawable/ic_sort.xml
diff --git a/app/src/main/res/drawable/ic_stars_black_24dp.xml b/app/src/main/res/drawable/ic_stars.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_stars_black_24dp.xml
rename to app/src/main/res/drawable/ic_stars.xml
diff --git a/app/src/main/res/drawable/ic_subtitles_white_24dp.xml b/app/src/main/res/drawable/ic_subtitles.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_subtitles_white_24dp.xml
rename to app/src/main/res/drawable/ic_subtitles.xml
diff --git a/app/src/main/res/drawable/ic_telescope_black_24dp.xml b/app/src/main/res/drawable/ic_telescope.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_telescope_black_24dp.xml
rename to app/src/main/res/drawable/ic_telescope.xml
diff --git a/app/src/main/res/drawable/ic_thumb_down_black_24dp.xml b/app/src/main/res/drawable/ic_thumb_down.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_thumb_down_black_24dp.xml
rename to app/src/main/res/drawable/ic_thumb_down.xml
diff --git a/app/src/main/res/drawable/ic_thumb_up_black_24dp.xml b/app/src/main/res/drawable/ic_thumb_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_thumb_up_black_24dp.xml
rename to app/src/main/res/drawable/ic_thumb_up.xml
diff --git a/app/src/main/res/drawable/ic_trending_up_black_24dp.xml b/app/src/main/res/drawable/ic_trending_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_trending_up_black_24dp.xml
rename to app/src/main/res/drawable/ic_trending_up.xml
diff --git a/app/src/main/res/drawable/ic_tv_black_24dp.xml b/app/src/main/res/drawable/ic_tv.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_tv_black_24dp.xml
rename to app/src/main/res/drawable/ic_tv.xml
diff --git a/app/src/main/res/drawable/ic_videogame_asset_black_24dp.xml b/app/src/main/res/drawable/ic_videogame_asset.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_videogame_asset_black_24dp.xml
rename to app/src/main/res/drawable/ic_videogame_asset.xml
diff --git a/app/src/main/res/drawable/ic_volume_down_white_24dp.xml b/app/src/main/res/drawable/ic_volume_down.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_volume_down_white_24dp.xml
rename to app/src/main/res/drawable/ic_volume_down.xml
diff --git a/app/src/main/res/drawable/ic_volume_mute_white_24dp.xml b/app/src/main/res/drawable/ic_volume_mute.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_volume_mute_white_24dp.xml
rename to app/src/main/res/drawable/ic_volume_mute.xml
diff --git a/app/src/main/res/drawable/ic_volume_off_black_24dp.xml b/app/src/main/res/drawable/ic_volume_off.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_volume_off_black_24dp.xml
rename to app/src/main/res/drawable/ic_volume_off.xml
diff --git a/app/src/main/res/drawable/ic_volume_up_black_24dp.xml b/app/src/main/res/drawable/ic_volume_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_volume_up_black_24dp.xml
rename to app/src/main/res/drawable/ic_volume_up.xml
diff --git a/app/src/main/res/drawable/ic_watch_later_black_24dp.xml b/app/src/main/res/drawable/ic_watch_later.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_watch_later_black_24dp.xml
rename to app/src/main/res/drawable/ic_watch_later.xml
diff --git a/app/src/main/res/drawable/ic_wb_sunny_black_24dp.xml b/app/src/main/res/drawable/ic_wb_sunny.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_wb_sunny_black_24dp.xml
rename to app/src/main/res/drawable/ic_wb_sunny.xml
diff --git a/app/src/main/res/drawable/ic_whatshot_black_24dp.xml b/app/src/main/res/drawable/ic_whatshot.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_whatshot_black_24dp.xml
rename to app/src/main/res/drawable/ic_whatshot.xml
diff --git a/app/src/main/res/drawable/ic_work_black_24dp.xml b/app/src/main/res/drawable/ic_work.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_work_black_24dp.xml
rename to app/src/main/res/drawable/ic_work.xml
diff --git a/app/src/main/res/drawable/white_edit_text_cursor.xml b/app/src/main/res/drawable/white_edit_text_cursor.xml
new file mode 100644
index 000000000..1da8092d4
--- /dev/null
+++ b/app/src/main/res/drawable/white_edit_text_cursor.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_player_queue_control.xml b/app/src/main/res/layout-land/activity_player_queue_control.xml
index 929d55a70..7162bc3ec 100644
--- a/app/src/main/res/layout-land/activity_player_queue_control.xml
+++ b/app/src/main/res/layout-land/activity_player_queue_control.xml
@@ -138,7 +138,7 @@
android:focusable="true"
android:scaleType="fitCenter"
android:tint="?attr/colorAccent"
- app:srcCompat="@drawable/ic_pause_white_24dp"
+ app:srcCompat="@drawable/ic_pause"
tools:ignore="ContentDescription" />
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index b037ca584..02bc169e2 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -199,7 +199,7 @@
android:layout_gravity="top|end"
android:layout_marginTop="11dp"
android:layout_marginEnd="10dp"
- app:srcCompat="@drawable/ic_expand_more_white_24dp"
+ app:srcCompat="@drawable/ic_expand_more"
tools:ignore="ContentDescription" />
@@ -333,7 +333,7 @@
android:text="@string/rss_button_title"
android:textSize="12sp"
android:theme="@style/RedButton"
- app:drawableLeftCompat="@drawable/ic_rss_feed_white_24dp"
+ app:drawableLeftCompat="@drawable/ic_rss_feed"
tools:ignore="RtlHardcoded"
android:visibility="gone"/>-->
@@ -367,7 +367,7 @@
android:layout_height="@dimen/video_item_detail_like_image_height"
android:layout_below="@id/detail_view_count_view"
android:contentDescription="@string/detail_likes_img_view_description"
- app:srcCompat="?attr/ic_thumb_up" />
+ app:srcCompat="@drawable/ic_thumb_up" />
+ app:drawableTopCompat="@drawable/ic_playlist_add" />
+ app:drawableTopCompat="@drawable/ic_headset" />
+ app:drawableTopCompat="@drawable/ic_picture_in_picture" />
+ app:drawableTopCompat="@drawable/ic_file_download" />
@@ -529,7 +529,7 @@
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/share"
android:textSize="@dimen/detail_control_text_size"
- app:drawableTopCompat="?attr/ic_share" />
+ app:drawableTopCompat="@drawable/ic_share" />
+ app:drawableTopCompat="@drawable/ic_language" />
+ app:drawableTopCompat="@drawable/ic_cast" />
@@ -605,6 +605,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
+ app:tabIndicatorGravity="top"
app:tabIconTint="?attr/colorAccent"
app:tabBackground="?attr/windowBackground"
app:tabGravity="fill"
@@ -705,7 +706,7 @@
android:scaleType="center"
android:focusable="true"
android:focusedByDefault="true"
- app:srcCompat="?attr/ic_play_arrow"
+ app:srcCompat="@drawable/ic_play_arrow"
tools:ignore="ContentDescription,RtlHardcoded" />
diff --git a/app/src/main/res/layout-large-land/player.xml b/app/src/main/res/layout-large-land/player.xml
index 07f3ae755..cbb162407 100644
--- a/app/src/main/res/layout-large-land/player.xml
+++ b/app/src/main/res/layout-large-land/player.xml
@@ -102,7 +102,7 @@
android:padding="@dimen/player_main_buttons_padding"
android:scaleType="fitXY"
android:visibility="gone"
- app:srcCompat="@drawable/ic_close_white_24dp"
+ app:srcCompat="@drawable/ic_close"
tools:ignore="ContentDescription,RtlHardcoded" />
@@ -205,7 +205,7 @@
android:paddingBottom="3dp"
android:scaleType="fitCenter"
android:visibility="gone"
- app:srcCompat="@drawable/ic_format_list_numbered_white_24"
+ app:srcCompat="@drawable/ic_format_list_numbered"
tools:ignore="ContentDescription,RtlHardcoded"
tools:visibility="visible" />
@@ -218,7 +218,7 @@
android:focusable="true"
android:padding="@dimen/player_main_buttons_padding"
android:scaleType="fitXY"
- app:srcCompat="@drawable/ic_expand_more_white_24dp"
+ app:srcCompat="@drawable/ic_expand_more"
tools:ignore="ContentDescription,RtlHardcoded" />
@@ -282,7 +282,7 @@
android:focusable="true"
android:padding="@dimen/player_main_buttons_padding"
android:scaleType="fitXY"
- app:srcCompat="@drawable/ic_cast_white_24dp"
+ app:srcCompat="@drawable/ic_cast"
tools:ignore="RtlHardcoded" />
@@ -415,7 +415,7 @@
android:padding="@dimen/player_main_buttons_padding"
android:scaleType="fitCenter"
android:visibility="gone"
- app:srcCompat="@drawable/ic_fullscreen_white_24dp"
+ app:srcCompat="@drawable/ic_fullscreen"
tools:ignore="ContentDescription,RtlHardcoded"
tools:visibility="visible" />
@@ -438,7 +438,7 @@
android:clickable="true"
android:focusable="true"
android:scaleType="fitCenter"
- app:srcCompat="@drawable/ic_previous_white_24dp"
+ app:srcCompat="@drawable/ic_previous"
tools:ignore="ContentDescription" />
@@ -449,7 +449,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter"
- app:srcCompat="@drawable/ic_pause_white_24dp"
+ app:srcCompat="@drawable/ic_pause"
tools:ignore="ContentDescription" />
@@ -514,7 +514,7 @@
android:focusable="true"
android:padding="10dp"
android:scaleType="fitXY"
- app:srcCompat="?attr/ic_close" />
+ app:srcCompat="@drawable/ic_close" />
@@ -580,7 +580,7 @@
android:padding="15dp"
android:visibility="gone"
tools:ignore="ContentDescription"
- tools:src="@drawable/ic_fast_rewind_white_24dp"
+ tools:src="@drawable/ic_fast_rewind"
tools:visibility="visible" />
@@ -629,7 +629,7 @@
android:layout_height="70dp"
android:layout_centerInParent="true"
tools:ignore="ContentDescription"
- tools:src="@drawable/ic_volume_up_white_24dp" />
+ tools:src="@drawable/ic_volume_up" />
+ tools:src="@drawable/ic_brightness_high" />
+ android:layout_height="wrap_content"
+ app:tabTextColor="@color/modeColor"
+ app:tabIndicatorColor="@color/modeColor" />
diff --git a/app/src/main/res/layout/activity_player_queue_control.xml b/app/src/main/res/layout/activity_player_queue_control.xml
index b063ec9db..b84c5aa3f 100644
--- a/app/src/main/res/layout/activity_player_queue_control.xml
+++ b/app/src/main/res/layout/activity_player_queue_control.xml
@@ -180,7 +180,7 @@
android:focusable="true"
android:scaleType="fitXY"
android:tint="?attr/colorAccent"
- app:srcCompat="@drawable/ic_repeat_white_24dp"
+ app:srcCompat="@drawable/ic_repeat"
tools:ignore="ContentDescription" />
diff --git a/app/src/main/res/layout/dialog_feed_group_create.xml b/app/src/main/res/layout/dialog_feed_group_create.xml
index 91002e006..1dbf8e761 100644
--- a/app/src/main/res/layout/dialog_feed_group_create.xml
+++ b/app/src/main/res/layout/dialog_feed_group_create.xml
@@ -30,7 +30,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription"
- tools:src="?attr/ic_asterisk" />
+ tools:src="@drawable/ic_asterisk" />
diff --git a/app/src/main/res/layout/dialog_playlists.xml b/app/src/main/res/layout/dialog_playlists.xml
index 77b884f4f..7564296b3 100644
--- a/app/src/main/res/layout/dialog_playlists.xml
+++ b/app/src/main/res/layout/dialog_playlists.xml
@@ -20,7 +20,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
- app:srcCompat="?attr/ic_playlist_add"
+ app:srcCompat="@drawable/ic_playlist_add"
tools:ignore="ContentDescription,RtlHardcoded" />
diff --git a/app/src/main/res/layout/feed_group_add_new_item.xml b/app/src/main/res/layout/feed_group_add_new_item.xml
index 14ee19ad4..882b38870 100644
--- a/app/src/main/res/layout/feed_group_add_new_item.xml
+++ b/app/src/main/res/layout/feed_group_add_new_item.xml
@@ -24,7 +24,7 @@
android:layout_height="14dp"
android:layout_gravity="center"
android:scaleType="centerInside"
- app:srcCompat="?attr/ic_add"
+ app:srcCompat="@drawable/ic_add"
tools:ignore="ContentDescription" />
+ tools:src="@drawable/ic_fastfood" />
+ tools:src="@drawable/ic_kiosk_hot" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/feed_import_export_group.xml b/app/src/main/res/layout/feed_import_export_group.xml
index 33d50f593..4a0b46692 100644
--- a/app/src/main/res/layout/feed_import_export_group.xml
+++ b/app/src/main/res/layout/feed_import_export_group.xml
@@ -53,7 +53,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginRight="16dp"
- app:srcCompat="?attr/ic_expand_more"
+ app:srcCompat="@drawable/ic_expand_more"
tools:ignore="ContentDescription,RtlHardcoded" />
diff --git a/app/src/main/res/layout/fragment_choose_tabs.xml b/app/src/main/res/layout/fragment_choose_tabs.xml
index b41066226..ac6a0f4e5 100644
--- a/app/src/main/res/layout/fragment_choose_tabs.xml
+++ b/app/src/main/res/layout/fragment_choose_tabs.xml
@@ -26,6 +26,6 @@
android:focusable="true"
app:backgroundTint="?attr/colorPrimary"
app:fabSize="auto"
- app:srcCompat="?attr/ic_add" />
+ app:srcCompat="@drawable/ic_add" />
diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml
index b68c29bc6..756f49031 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -57,7 +57,7 @@
android:layout_alignParentEnd="true"
android:layout_marginStart="6dp"
android:layout_marginEnd="12dp"
- app:srcCompat="?attr/ic_refresh"
+ app:srcCompat="@drawable/ic_refresh"
tools:ignore="ContentDescription" />
+ app:srcCompat="@drawable/ic_add" />
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 6087e2b2d..9945e96c1 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -11,6 +11,8 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="?attr/colorPrimary"
+ app:tabIconTint="@color/modeColor"
+ app:tabIndicatorColor="@color/modeColor"
app:tabGravity="fill"
app:tabMinWidth="60dp" />
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 28d30ebe8..0b10addf4 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -187,7 +187,7 @@
android:layout_gravity="top|end"
android:layout_marginTop="11dp"
android:layout_marginEnd="10dp"
- app:srcCompat="@drawable/ic_expand_more_white_24dp"
+ app:srcCompat="@drawable/ic_expand_more"
tools:ignore="ContentDescription" />
@@ -321,7 +321,7 @@
android:text="@string/rss_button_title"
android:textSize="12sp"
android:theme="@style/RedButton"
- app:drawableLeftCompat="@drawable/ic_rss_feed_white_24dp"
+ app:drawableLeftCompat="@drawable/ic_rss_feed"
tools:ignore="RtlHardcoded"
android:visibility="gone"/>-->
@@ -355,7 +355,7 @@
android:layout_height="@dimen/video_item_detail_like_image_height"
android:layout_below="@id/detail_view_count_view"
android:contentDescription="@string/detail_likes_img_view_description"
- app:srcCompat="?attr/ic_thumb_up" />
+ app:srcCompat="@drawable/ic_thumb_up" />
+ app:drawableTopCompat="@drawable/ic_playlist_add" />
+ app:drawableTopCompat="@drawable/ic_headset" />
+ app:drawableTopCompat="@drawable/ic_picture_in_picture" />
+ app:drawableTopCompat="@drawable/ic_file_download" />
@@ -513,7 +513,7 @@
android:paddingVertical="@dimen/detail_control_padding"
android:text="@string/share"
android:textSize="@dimen/detail_control_text_size"
- app:drawableTopCompat="?attr/ic_share" />
+ app:drawableTopCompat="@drawable/ic_share" />
+ app:drawableTopCompat="@drawable/ic_language" />
+ app:drawableTopCompat="@drawable/ic_cast" />
@@ -589,6 +589,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
+ app:tabIndicatorGravity="top"
app:tabIconTint="?attr/colorAccent"
app:tabBackground="?attr/windowBackground"
app:tabGravity="fill"
@@ -601,7 +602,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:alpha="0.9"
- android:background="?attr/windowBackground">
+ android:background="?attr/windowBackground"
+ android:theme="@style/ContrastTintTheme">
diff --git a/app/src/main/res/layout/header_with_menu_item.xml b/app/src/main/res/layout/header_with_menu_item.xml
index 580e8db4d..1a85b5945 100644
--- a/app/src/main/res/layout/header_with_menu_item.xml
+++ b/app/src/main/res/layout/header_with_menu_item.xml
@@ -28,5 +28,5 @@
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
- tools:src="?attr/ic_bookmark" />
+ tools:src="@drawable/ic_bookmark" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_instance.xml b/app/src/main/res/layout/item_instance.xml
index 534dc0ca4..b4ddfa6c1 100644
--- a/app/src/main/res/layout/item_instance.xml
+++ b/app/src/main/res/layout/item_instance.xml
@@ -76,7 +76,7 @@
android:paddingTop="12dp"
android:paddingRight="10dp"
android:paddingBottom="12dp"
- app:srcCompat="?attr/ic_drag_handle"
+ app:srcCompat="@drawable/ic_drag_handle"
tools:ignore="ContentDescription,RtlHardcoded" />
diff --git a/app/src/main/res/layout/item_search_suggestion.xml b/app/src/main/res/layout/item_search_suggestion.xml
index 8d2a226d9..4b1025fea 100644
--- a/app/src/main/res/layout/item_search_suggestion.xml
+++ b/app/src/main/res/layout/item_search_suggestion.xml
@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:theme="@style/ContrastTintTheme">
+ tools:src="@drawable/ic_history" />
diff --git a/app/src/main/res/layout/list_choose_tabs.xml b/app/src/main/res/layout/list_choose_tabs.xml
index a385f64a8..7110895f0 100644
--- a/app/src/main/res/layout/list_choose_tabs.xml
+++ b/app/src/main/res/layout/list_choose_tabs.xml
@@ -28,7 +28,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
tools:ignore="ContentDescription,RtlHardcoded"
- tools:src="?attr/ic_kiosk_hot" />
+ tools:src="@drawable/ic_kiosk_hot" />
diff --git a/app/src/main/res/layout/list_choose_tabs_dialog.xml b/app/src/main/res/layout/list_choose_tabs_dialog.xml
index 1fd917d1e..82183e18c 100644
--- a/app/src/main/res/layout/list_choose_tabs_dialog.xml
+++ b/app/src/main/res/layout/list_choose_tabs_dialog.xml
@@ -14,7 +14,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="?dialogPreferredPadding"
tools:ignore="ContentDescription,RtlHardcoded"
- tools:src="?attr/ic_kiosk_hot" />
+ tools:src="@drawable/ic_kiosk_hot" />
+ app:srcCompat="@drawable/ic_thumb_up" />
+ app:srcCompat="@drawable/ic_thumb_up" />
diff --git a/app/src/main/res/layout/list_playlist_item.xml b/app/src/main/res/layout/list_playlist_item.xml
index 61a6fca82..028a10a2e 100644
--- a/app/src/main/res/layout/list_playlist_item.xml
+++ b/app/src/main/res/layout/list_playlist_item.xml
@@ -38,7 +38,7 @@
android:textColor="@color/duration_text_color"
android:textSize="@dimen/video_item_search_duration_text_size"
android:textStyle="bold"
- app:drawableTopCompat="@drawable/ic_playlist_play_white_24dp"
+ app:drawableTopCompat="@drawable/ic_playlist_play"
tools:ignore="RtlHardcoded"
tools:text="314159" />
diff --git a/app/src/main/res/layout/list_playlist_mini_item.xml b/app/src/main/res/layout/list_playlist_mini_item.xml
index f31ef67f2..fcb7b5f3a 100644
--- a/app/src/main/res/layout/list_playlist_mini_item.xml
+++ b/app/src/main/res/layout/list_playlist_mini_item.xml
@@ -38,7 +38,7 @@
android:textColor="@color/duration_text_color"
android:textSize="@dimen/video_item_search_duration_text_size"
android:textStyle="bold"
- app:drawableTopCompat="@drawable/ic_playlist_play_white_24dp"
+ app:drawableTopCompat="@drawable/ic_playlist_play"
tools:ignore="RtlHardcoded"
tools:text="3141" />
diff --git a/app/src/main/res/layout/list_radio_icon_item.xml b/app/src/main/res/layout/list_radio_icon_item.xml
index abbd82a5c..46e7419ad 100644
--- a/app/src/main/res/layout/list_radio_icon_item.xml
+++ b/app/src/main/res/layout/list_radio_icon_item.xml
@@ -13,5 +13,5 @@
android:paddingStart="?attr/listPreferredItemPaddingLeft"
android:paddingEnd="?attr/listPreferredItemPaddingRight"
android:textColor="?attr/textColorAlertDialogListItem"
- tools:drawableLeft="?attr/ic_play_arrow"
+ tools:drawableLeft="@drawable/ic_play_arrow"
tools:text="Lorem ipsum dolor sit amet" />
diff --git a/app/src/main/res/layout/list_stream_playlist_grid_item.xml b/app/src/main/res/layout/list_stream_playlist_grid_item.xml
index 75aef9a9e..53b30120a 100644
--- a/app/src/main/res/layout/list_stream_playlist_grid_item.xml
+++ b/app/src/main/res/layout/list_stream_playlist_grid_item.xml
@@ -50,7 +50,7 @@
android:contentDescription="@string/detail_drag_description"
android:paddingLeft="@dimen/video_item_search_image_right_margin"
android:scaleType="center"
- app:srcCompat="?attr/ic_drag_handle"
+ app:srcCompat="@drawable/ic_drag_handle"
tools:ignore="RtlHardcoded,RtlSymmetry" />
+ app:srcCompat="@drawable/ic_more_vert" />
diff --git a/app/src/main/res/layout/mission_item_linear.xml b/app/src/main/res/layout/mission_item_linear.xml
index ad3a6aad5..b3fa2be53 100644
--- a/app/src/main/res/layout/mission_item_linear.xml
+++ b/app/src/main/res/layout/mission_item_linear.xml
@@ -71,7 +71,7 @@
android:layout_marginRight="4dp"
android:contentDescription="TODO"
android:scaleType="centerInside"
- app:srcCompat="@drawable/ic_more_vert_white_24dp" />
+ app:srcCompat="@drawable/ic_more_vert" />
diff --git a/app/src/main/res/layout/picker_icon_item.xml b/app/src/main/res/layout/picker_icon_item.xml
index f319f8c9a..ec040048d 100644
--- a/app/src/main/res/layout/picker_icon_item.xml
+++ b/app/src/main/res/layout/picker_icon_item.xml
@@ -11,4 +11,4 @@
android:padding="8dp"
android:scaleType="centerInside"
tools:ignore="ContentDescription"
- tools:src="?attr/ic_rss" />
+ tools:src="@drawable/ic_rss_feed" />
diff --git a/app/src/main/res/layout/picker_subscription_item.xml b/app/src/main/res/layout/picker_subscription_item.xml
index 62f5b28ec..84c6a9130 100644
--- a/app/src/main/res/layout/picker_subscription_item.xml
+++ b/app/src/main/res/layout/picker_subscription_item.xml
@@ -52,7 +52,7 @@
android:layout_gravity="top|center_horizontal"
android:layout_marginTop="4dp"
android:scaleType="centerInside"
- app:srcCompat="@drawable/ic_done_white_24dp"
+ app:srcCompat="@drawable/ic_done"
tools:ignore="ContentDescription" />
diff --git a/app/src/main/res/layout/play_queue_item.xml b/app/src/main/res/layout/play_queue_item.xml
index 4364aa84d..a5be55c94 100644
--- a/app/src/main/res/layout/play_queue_item.xml
+++ b/app/src/main/res/layout/play_queue_item.xml
@@ -46,7 +46,7 @@
android:layout_gravity="center_vertical"
android:padding="@dimen/video_item_search_image_right_margin"
android:scaleType="center"
- app:srcCompat="?attr/ic_drag_handle"
+ app:srcCompat="@drawable/ic_drag_handle"
tools:ignore="ContentDescription,RtlHardcoded" />
+ android:gravity="center"
+ android:theme="@style/WhiteTintTheme" >
@@ -281,7 +282,7 @@
android:focusable="true"
android:padding="@dimen/player_main_buttons_padding"
android:scaleType="fitXY"
- app:srcCompat="@drawable/ic_cast_white_24dp"
+ app:srcCompat="@drawable/ic_cast"
tools:ignore="RtlHardcoded" />
@@ -412,7 +413,7 @@
android:padding="@dimen/player_main_buttons_padding"
android:scaleType="fitCenter"
android:visibility="gone"
- app:srcCompat="@drawable/ic_fullscreen_white_24dp"
+ app:srcCompat="@drawable/ic_fullscreen"
tools:ignore="ContentDescription,RtlHardcoded"
tools:visibility="visible" />
@@ -435,7 +436,7 @@
android:clickable="true"
android:focusable="true"
android:scaleType="fitCenter"
- app:srcCompat="@drawable/ic_previous_white_24dp"
+ app:srcCompat="@drawable/ic_previous"
tools:ignore="ContentDescription" />
@@ -446,7 +447,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter"
- app:srcCompat="@drawable/ic_pause_white_24dp"
+ app:srcCompat="@drawable/ic_pause"
tools:ignore="ContentDescription" />
@@ -510,7 +511,7 @@
android:focusable="true"
android:padding="10dp"
android:scaleType="fitXY"
- app:srcCompat="?attr/ic_close" />
+ app:srcCompat="@drawable/ic_close" />
@@ -576,7 +577,7 @@
android:padding="15dp"
android:visibility="gone"
tools:ignore="ContentDescription"
- tools:src="@drawable/ic_fast_rewind_white_24dp"
+ tools:src="@drawable/ic_fast_rewind"
tools:visibility="visible" />
@@ -625,7 +626,7 @@
android:layout_height="70dp"
android:layout_centerInParent="true"
tools:ignore="ContentDescription"
- tools:src="@drawable/ic_volume_up_white_24dp" />
+ tools:src="@drawable/ic_volume_up" />
+ tools:src="@drawable/ic_brightness" />
+ app:srcCompat="@drawable/ic_close" />
diff --git a/app/src/main/res/layout/playlist_control.xml b/app/src/main/res/layout/playlist_control.xml
index 82220ea5b..0b58f3715 100644
--- a/app/src/main/res/layout/playlist_control.xml
+++ b/app/src/main/res/layout/playlist_control.xml
@@ -27,8 +27,8 @@
android:text="@string/controls_background_title"
android:textColor="?attr/colorAccent"
android:textSize="@dimen/channel_rss_title_size"
- app:drawableLeftCompat="?attr/ic_headset"
- app:drawableStartCompat="?attr/ic_headset" />
+ app:drawableLeftCompat="@drawable/ic_headset"
+ app:drawableStartCompat="@drawable/ic_headset" />
+ app:drawableLeftCompat="@drawable/ic_picture_in_picture"
+ app:drawableStartCompat="@drawable/ic_picture_in_picture" />
diff --git a/app/src/main/res/layout/settings_notification_action.xml b/app/src/main/res/layout/settings_notification_action.xml
index 6bbb22116..72b7cd984 100644
--- a/app/src/main/res/layout/settings_notification_action.xml
+++ b/app/src/main/res/layout/settings_notification_action.xml
@@ -19,7 +19,7 @@
app:layout_constraintTop_toTopOf="parent"
app:tint="?android:textColorPrimary"
tools:ignore="ContentDescription"
- tools:src="@drawable/ic_previous_white_24dp" />
+ tools:src="@drawable/ic_previous" />
diff --git a/app/src/main/res/menu/download_menu.xml b/app/src/main/res/menu/download_menu.xml
index f28d3d074..c12a7e768 100644
--- a/app/src/main/res/menu/download_menu.xml
+++ b/app/src/main/res/menu/download_menu.xml
@@ -5,28 +5,28 @@
-