diff --git a/OsmAnd/res/drawable-hdpi/ic_flat_list_dark.png b/OsmAnd/res/drawable-hdpi/ic_flat_list_dark.png deleted file mode 100644 index 1352f23a2e..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_flat_list_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_gpx_track.png b/OsmAnd/res/drawable-hdpi/ic_gpx_track.png deleted file mode 100644 index d53f05c141..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_gpx_track.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_next.png b/OsmAnd/res/drawable-hdpi/ic_next.png deleted file mode 100644 index d5f6cee246..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_next.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_overflow_menu_white.png b/OsmAnd/res/drawable-hdpi/ic_overflow_menu_white.png deleted file mode 100644 index a0001ebe32..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_overflow_menu_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_pause.png b/OsmAnd/res/drawable-hdpi/ic_pause.png deleted file mode 100644 index b4bdbb5588..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_pause.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_play_dark.png b/OsmAnd/res/drawable-hdpi/ic_play_dark.png deleted file mode 100644 index c25b806686..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_play_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_prev.png b/OsmAnd/res/drawable-hdpi/ic_prev.png deleted file mode 100644 index 86fa3379ff..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_prev.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_sdcard_16.png b/OsmAnd/res/drawable-hdpi/ic_sdcard_16.png deleted file mode 100644 index 45194b7973..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_sdcard_16.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_small_distance.png b/OsmAnd/res/drawable-hdpi/ic_small_distance.png deleted file mode 100644 index 5276886dd1..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_small_distance.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_small_group.png b/OsmAnd/res/drawable-hdpi/ic_small_group.png deleted file mode 100644 index 1ca12287f9..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_small_group.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_small_point.png b/OsmAnd/res/drawable-hdpi/ic_small_point.png deleted file mode 100644 index 80a383a9b6..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_small_point.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_small_time.png b/OsmAnd/res/drawable-hdpi/ic_small_time.png deleted file mode 100644 index 8076fa39af..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_small_time.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_small_turn_left.png b/OsmAnd/res/drawable-hdpi/ic_small_turn_left.png deleted file mode 100644 index 331c69b7a2..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_small_turn_left.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_small_turn_right.png b/OsmAnd/res/drawable-hdpi/ic_small_turn_right.png deleted file mode 100644 index 7128180ab4..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_small_turn_right.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_small_warning.png b/OsmAnd/res/drawable-hdpi/ic_small_warning.png deleted file mode 100644 index 97c711aa54..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_small_warning.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_sort_waypoint_dark.png b/OsmAnd/res/drawable-hdpi/ic_sort_waypoint_dark.png deleted file mode 100644 index 053954eef6..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_sort_waypoint_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_type_address.png b/OsmAnd/res/drawable-hdpi/ic_type_address.png deleted file mode 100644 index e9f8182179..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_type_address.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_type_bug.png b/OsmAnd/res/drawable-hdpi/ic_type_bug.png deleted file mode 100644 index f8fce6f78b..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_type_bug.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_type_coordinates.png b/OsmAnd/res/drawable-hdpi/ic_type_coordinates.png deleted file mode 100644 index 084b8705c0..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_type_coordinates.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_type_file.png b/OsmAnd/res/drawable-hdpi/ic_type_file.png deleted file mode 100644 index 15fa64ea0e..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_type_file.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_type_info.png b/OsmAnd/res/drawable-hdpi/ic_type_info.png deleted file mode 100644 index 169264c7c1..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_type_info.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_type_waypoint.png b/OsmAnd/res/drawable-hdpi/ic_type_waypoint.png deleted file mode 100644 index 5aa1ba16e3..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_type_waypoint.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_type_waypoints_group.png b/OsmAnd/res/drawable-hdpi/ic_type_waypoints_group.png deleted file mode 100644 index 702696f5dc..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_type_waypoints_group.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_warning.png b/OsmAnd/res/drawable-hdpi/ic_warning.png deleted file mode 100644 index 30eee6c4ec..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_warning.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_flat_list_dark.png b/OsmAnd/res/drawable-mdpi/ic_flat_list_dark.png deleted file mode 100644 index 28055acaa9..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_flat_list_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_gpx_track.png b/OsmAnd/res/drawable-mdpi/ic_gpx_track.png deleted file mode 100644 index 4b6d539b12..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_gpx_track.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_next.png b/OsmAnd/res/drawable-mdpi/ic_next.png deleted file mode 100644 index 3862a8cd35..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_next.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_overflow_menu_white.png b/OsmAnd/res/drawable-mdpi/ic_overflow_menu_white.png deleted file mode 100644 index eb2b0d75d8..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_overflow_menu_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_pause.png b/OsmAnd/res/drawable-mdpi/ic_pause.png deleted file mode 100644 index 026f38854c..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_pause.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_play_dark.png b/OsmAnd/res/drawable-mdpi/ic_play_dark.png deleted file mode 100644 index c7f4bcd42d..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_play_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_prev.png b/OsmAnd/res/drawable-mdpi/ic_prev.png deleted file mode 100644 index 5513b05aaf..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_prev.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_sdcard_16.png b/OsmAnd/res/drawable-mdpi/ic_sdcard_16.png deleted file mode 100644 index 3962ada988..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_sdcard_16.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_small_distance.png b/OsmAnd/res/drawable-mdpi/ic_small_distance.png deleted file mode 100644 index 069685596a..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_small_distance.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_small_group.png b/OsmAnd/res/drawable-mdpi/ic_small_group.png deleted file mode 100644 index 0e35fadf79..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_small_group.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_small_point.png b/OsmAnd/res/drawable-mdpi/ic_small_point.png deleted file mode 100644 index fe2baae843..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_small_point.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_small_time.png b/OsmAnd/res/drawable-mdpi/ic_small_time.png deleted file mode 100644 index 871df46af8..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_small_time.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_small_turn_left.png b/OsmAnd/res/drawable-mdpi/ic_small_turn_left.png deleted file mode 100644 index 55e5a86fa7..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_small_turn_left.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_small_turn_right.png b/OsmAnd/res/drawable-mdpi/ic_small_turn_right.png deleted file mode 100644 index 086e8cdc99..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_small_turn_right.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_small_warning.png b/OsmAnd/res/drawable-mdpi/ic_small_warning.png deleted file mode 100644 index 37bc1b2fbb..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_small_warning.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_sort_waypoint_dark.png b/OsmAnd/res/drawable-mdpi/ic_sort_waypoint_dark.png deleted file mode 100644 index eaa72df175..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_sort_waypoint_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_type_address.png b/OsmAnd/res/drawable-mdpi/ic_type_address.png deleted file mode 100644 index 07931e4219..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_type_address.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_type_bug.png b/OsmAnd/res/drawable-mdpi/ic_type_bug.png deleted file mode 100644 index cb17c576f7..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_type_bug.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_type_coordinates.png b/OsmAnd/res/drawable-mdpi/ic_type_coordinates.png deleted file mode 100644 index c7ce24d7ac..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_type_coordinates.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_type_file.png b/OsmAnd/res/drawable-mdpi/ic_type_file.png deleted file mode 100644 index 73b9303d9e..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_type_file.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_type_info.png b/OsmAnd/res/drawable-mdpi/ic_type_info.png deleted file mode 100644 index 9f9c761b9d..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_type_info.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_type_waypoint.png b/OsmAnd/res/drawable-mdpi/ic_type_waypoint.png deleted file mode 100644 index b3bb9a133b..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_type_waypoint.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_type_waypoints_group.png b/OsmAnd/res/drawable-mdpi/ic_type_waypoints_group.png deleted file mode 100644 index 0c76548a03..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_type_waypoints_group.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_warning.png b/OsmAnd/res/drawable-mdpi/ic_warning.png deleted file mode 100644 index 385c0f68af..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_warning.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_flat_list_dark.png b/OsmAnd/res/drawable-xhdpi/ic_flat_list_dark.png deleted file mode 100644 index 0a3f807e16..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_flat_list_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_gpx_track.png b/OsmAnd/res/drawable-xhdpi/ic_gpx_track.png deleted file mode 100644 index 8f5653b032..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_gpx_track.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_next.png b/OsmAnd/res/drawable-xhdpi/ic_next.png deleted file mode 100644 index 9afecd275b..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_next.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_overflow_menu_white.png b/OsmAnd/res/drawable-xhdpi/ic_overflow_menu_white.png deleted file mode 100644 index 67673adab6..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_overflow_menu_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_pause.png b/OsmAnd/res/drawable-xhdpi/ic_pause.png deleted file mode 100644 index 14b6d17d4a..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_pause.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_play_dark.png b/OsmAnd/res/drawable-xhdpi/ic_play_dark.png deleted file mode 100644 index 518dac837d..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_play_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_prev.png b/OsmAnd/res/drawable-xhdpi/ic_prev.png deleted file mode 100644 index 815b155c57..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_prev.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_sdcard_16.png b/OsmAnd/res/drawable-xhdpi/ic_sdcard_16.png deleted file mode 100644 index c94318f851..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_sdcard_16.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_distance.png b/OsmAnd/res/drawable-xhdpi/ic_small_distance.png deleted file mode 100644 index f83efa52c5..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_distance.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_group.png b/OsmAnd/res/drawable-xhdpi/ic_small_group.png deleted file mode 100644 index a440f345c7..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_group.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_point.png b/OsmAnd/res/drawable-xhdpi/ic_small_point.png deleted file mode 100644 index e3a6f6076e..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_point.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_time.png b/OsmAnd/res/drawable-xhdpi/ic_small_time.png deleted file mode 100644 index 569ea8d41b..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_time.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_turn_left.png b/OsmAnd/res/drawable-xhdpi/ic_small_turn_left.png deleted file mode 100644 index d422ef6a7a..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_turn_left.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_turn_right.png b/OsmAnd/res/drawable-xhdpi/ic_small_turn_right.png deleted file mode 100644 index 18b741574d..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_turn_right.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_warning.png b/OsmAnd/res/drawable-xhdpi/ic_small_warning.png deleted file mode 100644 index 31637b59ed..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_warning.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_sort_waypoint_dark.png b/OsmAnd/res/drawable-xhdpi/ic_sort_waypoint_dark.png deleted file mode 100644 index d793c24da3..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_sort_waypoint_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_address.png b/OsmAnd/res/drawable-xhdpi/ic_type_address.png deleted file mode 100644 index ea10839f41..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_address.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_bug.png b/OsmAnd/res/drawable-xhdpi/ic_type_bug.png deleted file mode 100644 index 2ed9104084..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_bug.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_coordinates.png b/OsmAnd/res/drawable-xhdpi/ic_type_coordinates.png deleted file mode 100644 index 5f13480fcf..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_coordinates.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_file.png b/OsmAnd/res/drawable-xhdpi/ic_type_file.png deleted file mode 100644 index 4558e51eab..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_file.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_info.png b/OsmAnd/res/drawable-xhdpi/ic_type_info.png deleted file mode 100644 index c0a597655d..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_info.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_waypoint.png b/OsmAnd/res/drawable-xhdpi/ic_type_waypoint.png deleted file mode 100644 index cdd1cf1125..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_waypoint.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_waypoints_group.png b/OsmAnd/res/drawable-xhdpi/ic_type_waypoints_group.png deleted file mode 100644 index bbad97af98..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_waypoints_group.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_warning.png b/OsmAnd/res/drawable-xhdpi/ic_warning.png deleted file mode 100644 index 6eb7943cd1..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_warning.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_flat_list_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_flat_list_dark.png deleted file mode 100644 index bc748aa857..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_flat_list_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_gpx_track.png b/OsmAnd/res/drawable-xxhdpi/ic_gpx_track.png deleted file mode 100644 index 0f446c05b6..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_gpx_track.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_next.png b/OsmAnd/res/drawable-xxhdpi/ic_next.png deleted file mode 100644 index 90773bc457..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_next.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_overflow_menu_white.png b/OsmAnd/res/drawable-xxhdpi/ic_overflow_menu_white.png deleted file mode 100644 index 2dedaef71f..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_overflow_menu_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_pause.png b/OsmAnd/res/drawable-xxhdpi/ic_pause.png deleted file mode 100644 index 72dfa9fa6c..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_pause.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_play_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_play_dark.png deleted file mode 100644 index aaaad57230..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_play_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_prev.png b/OsmAnd/res/drawable-xxhdpi/ic_prev.png deleted file mode 100644 index 3c2977640d..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_prev.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_sdcard_16.png b/OsmAnd/res/drawable-xxhdpi/ic_sdcard_16.png deleted file mode 100644 index 3314db26c1..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_sdcard_16.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_distance.png b/OsmAnd/res/drawable-xxhdpi/ic_small_distance.png deleted file mode 100644 index dfefffff19..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_distance.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_group.png b/OsmAnd/res/drawable-xxhdpi/ic_small_group.png deleted file mode 100644 index 7c4b45d02e..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_group.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_point.png b/OsmAnd/res/drawable-xxhdpi/ic_small_point.png deleted file mode 100644 index 5288e9239a..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_point.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_time.png b/OsmAnd/res/drawable-xxhdpi/ic_small_time.png deleted file mode 100644 index feb74d1ae3..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_time.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_turn_left.png b/OsmAnd/res/drawable-xxhdpi/ic_small_turn_left.png deleted file mode 100644 index f5ae7f1572..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_turn_left.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_turn_right.png b/OsmAnd/res/drawable-xxhdpi/ic_small_turn_right.png deleted file mode 100644 index 05240acafc..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_turn_right.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_warning.png b/OsmAnd/res/drawable-xxhdpi/ic_small_warning.png deleted file mode 100644 index eac498dafa..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_warning.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_sort_waypoint_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_sort_waypoint_dark.png deleted file mode 100644 index 9d18981042..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_sort_waypoint_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_address.png b/OsmAnd/res/drawable-xxhdpi/ic_type_address.png deleted file mode 100644 index 9605fc52ea..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_address.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_bug.png b/OsmAnd/res/drawable-xxhdpi/ic_type_bug.png deleted file mode 100644 index 844035fc30..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_bug.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_coordinates.png b/OsmAnd/res/drawable-xxhdpi/ic_type_coordinates.png deleted file mode 100644 index 4dc92d6e8f..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_coordinates.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_file.png b/OsmAnd/res/drawable-xxhdpi/ic_type_file.png deleted file mode 100644 index 196d40d6fb..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_file.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_info.png b/OsmAnd/res/drawable-xxhdpi/ic_type_info.png deleted file mode 100644 index 453545c7b1..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_info.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_waypoint.png b/OsmAnd/res/drawable-xxhdpi/ic_type_waypoint.png deleted file mode 100644 index 8ae1a6481c..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_waypoint.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_waypoints_group.png b/OsmAnd/res/drawable-xxhdpi/ic_type_waypoints_group.png deleted file mode 100644 index 1a13bfcc90..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_waypoints_group.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_warning.png b/OsmAnd/res/drawable-xxhdpi/ic_warning.png deleted file mode 100644 index 3f401317ef..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_warning.png and /dev/null differ diff --git a/OsmAnd/res/drawable/ic_flat_list_dark.xml b/OsmAnd/res/drawable/ic_flat_list_dark.xml new file mode 100644 index 0000000000..ebf9715ab4 --- /dev/null +++ b/OsmAnd/res/drawable/ic_flat_list_dark.xml @@ -0,0 +1,30 @@ + + + + + + + + + + diff --git a/OsmAnd/res/drawable/ic_overflow_menu_white.xml b/OsmAnd/res/drawable/ic_overflow_menu_white.xml new file mode 100644 index 0000000000..817822f640 --- /dev/null +++ b/OsmAnd/res/drawable/ic_overflow_menu_white.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_pause.xml b/OsmAnd/res/drawable/ic_pause.xml new file mode 100644 index 0000000000..ce71176eec --- /dev/null +++ b/OsmAnd/res/drawable/ic_pause.xml @@ -0,0 +1,12 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_play_dark.xml b/OsmAnd/res/drawable/ic_play_dark.xml new file mode 100644 index 0000000000..71fe86476b --- /dev/null +++ b/OsmAnd/res/drawable/ic_play_dark.xml @@ -0,0 +1,9 @@ + + + diff --git a/OsmAnd/res/drawable/ic_sdcard_16.xml b/OsmAnd/res/drawable/ic_sdcard_16.xml new file mode 100644 index 0000000000..905b305f42 --- /dev/null +++ b/OsmAnd/res/drawable/ic_sdcard_16.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_small_turn_left.xml b/OsmAnd/res/drawable/ic_small_turn_left.xml new file mode 100644 index 0000000000..057298f967 --- /dev/null +++ b/OsmAnd/res/drawable/ic_small_turn_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/OsmAnd/res/drawable/ic_small_turn_right.xml b/OsmAnd/res/drawable/ic_small_turn_right.xml new file mode 100644 index 0000000000..ca3939b6eb --- /dev/null +++ b/OsmAnd/res/drawable/ic_small_turn_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/OsmAnd/res/drawable/ic_small_warning.xml b/OsmAnd/res/drawable/ic_small_warning.xml new file mode 100644 index 0000000000..6d86be79d2 --- /dev/null +++ b/OsmAnd/res/drawable/ic_small_warning.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_sort_waypoint_dark.xml b/OsmAnd/res/drawable/ic_sort_waypoint_dark.xml new file mode 100644 index 0000000000..314b683062 --- /dev/null +++ b/OsmAnd/res/drawable/ic_sort_waypoint_dark.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/OsmAnd/res/drawable/ic_type_file.xml b/OsmAnd/res/drawable/ic_type_file.xml new file mode 100644 index 0000000000..6450c92503 --- /dev/null +++ b/OsmAnd/res/drawable/ic_type_file.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/OsmAnd/res/drawable/ic_type_waypoints_group.xml b/OsmAnd/res/drawable/ic_type_waypoints_group.xml new file mode 100644 index 0000000000..f3c1764ef0 --- /dev/null +++ b/OsmAnd/res/drawable/ic_type_waypoints_group.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/layout/current_gpx_item.xml b/OsmAnd/res/layout/current_gpx_item.xml index f67b85825b..3c61e64a6e 100644 --- a/OsmAnd/res/layout/current_gpx_item.xml +++ b/OsmAnd/res/layout/current_gpx_item.xml @@ -98,7 +98,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/gpx_small_icon_margin" - android:src="@drawable/ic_small_distance" + android:src="@drawable/ic_action_distance_16" android:layout_marginEnd="@dimen/gpx_small_icon_margin" /> diff --git a/OsmAnd/res/layout/favorites_list_item.xml b/OsmAnd/res/layout/favorites_list_item.xml index 6283d1ddf9..47b902e5de 100644 --- a/OsmAnd/res/layout/favorites_list_item.xml +++ b/OsmAnd/res/layout/favorites_list_item.xml @@ -117,7 +117,7 @@ android:layout_marginStart="@dimen/list_item_button_padding" android:layout_marginLeft="@dimen/list_item_button_padding" android:contentDescription="@string/favorite_category_name" - android:src="@drawable/ic_small_group" /> + android:src="@drawable/ic_action_group_name_16" /> + android:src="@drawable/ic_action_distance_16" /> + android:src="@drawable/ic_action_waypoint_16" /> + android:src="@drawable/ic_action_time_16" /> + android:src="@drawable/ic_action_group_name_16" /> + android:src="@drawable/ic_action_polygom_dark" /> 0) { ((TextView) view.findViewById(R.id.group_name)).setText(point.getCategoryDisplayName(getMyApplication())); - groupImage.setImageDrawable(getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_small_group)); + groupImage.setImageDrawable(getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_group_name_16)); } else { groupImage.setVisibility(View.GONE); } diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java index efb435cc5e..3099ca7118 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java @@ -734,13 +734,13 @@ public class GpxUiHelper { v.findViewById(R.id.unknown_section).setVisibility(View.GONE); ImageView distanceI = (ImageView) v.findViewById(R.id.distance_icon); distanceI.setVisibility(View.VISIBLE); - distanceI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_distance)); + distanceI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_distance_16)); ImageView pointsI = (ImageView) v.findViewById(R.id.points_icon); pointsI.setVisibility(View.VISIBLE); - pointsI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_point)); + pointsI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_waypoint_16)); ImageView timeI = (ImageView) v.findViewById(R.id.time_icon); timeI.setVisibility(View.VISIBLE); - timeI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_time)); + timeI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_time_16)); TextView time = (TextView) v.findViewById(R.id.time); TextView distance = (TextView) v.findViewById(R.id.distance); TextView pointsCount = (TextView) v.findViewById(R.id.points_count); diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java index 24a8e5e9be..823b708e92 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java @@ -54,12 +54,12 @@ public class GpxItemMenuBuilder extends MenuBuilder { int textColor = ContextCompat.getColor(ll.getContext(), light ? R.color.text_color_primary_light : R.color.text_color_primary_dark); - buildIcon(ll, gpxSmallIconMargin, R.drawable.ic_small_point); + buildIcon(ll, gpxSmallIconMargin, R.drawable.ic_action_waypoint_16); buildTextView(ll, gpxSmallTextMargin, gpxTextSize, textColor, "" + item.analysis.wptPoints); - buildIcon(ll, gpxSmallIconMargin, R.drawable.ic_small_distance); + buildIcon(ll, gpxSmallIconMargin, R.drawable.ic_action_distance_16); buildTextView(ll, gpxSmallTextMargin, gpxTextSize, textColor, OsmAndFormatter.getFormattedDistance(item.analysis.totalDistance, app)); - buildIcon(ll, gpxSmallIconMargin, R.drawable.ic_small_time); + buildIcon(ll, gpxSmallIconMargin, R.drawable.ic_action_time_16); buildTextView(ll, gpxSmallTextMargin, gpxTextSize, textColor, Algorithms.formatDuration((int) (item.analysis.timeSpan / 1000), app.accessibilityEnabled()) + ""); } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java index edbb581c0a..020041a10d 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java @@ -218,7 +218,7 @@ public class AMapPointMenuController extends MenuController { } } if (!TextUtils.isEmpty(point.getShortName())) { - return R.drawable.ic_small_group; + return R.drawable.ic_action_group_name_16; } return NO_ICON; } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/HistoryMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/HistoryMenuController.java index 446557af96..246dfe5b0a 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/HistoryMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/HistoryMenuController.java @@ -60,7 +60,7 @@ public class HistoryMenuController extends MenuController { @Override public Drawable getSecondLineTypeIcon() { if (hasTypeInDescription) { - return getIcon(R.drawable.ic_small_group); + return getIcon(R.drawable.ic_action_group_name_16); } else { return null; } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/PointDescriptionMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/PointDescriptionMenuController.java index 7362e6ab66..114a6fb6f1 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/PointDescriptionMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/PointDescriptionMenuController.java @@ -75,7 +75,7 @@ public class PointDescriptionMenuController extends MenuController { @Override public Drawable getSecondLineTypeIcon() { if (hasTypeInDescription) { - return getIcon(R.drawable.ic_small_group); + return getIcon(R.drawable.ic_action_group_name_16); } else { return null; } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/RenderedObjectMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/RenderedObjectMenuController.java index a8654f9ff6..c6a5e13e64 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/RenderedObjectMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/RenderedObjectMenuController.java @@ -58,7 +58,7 @@ public class RenderedObjectMenuController extends MenuController { if (renderedObject.getIconRes() != null && RenderingIcons.containsBigIcon(renderedObject.getIconRes())) { return RenderingIcons.getBigIconResourceId(renderedObject.getIconRes()); } else { - return R.drawable.ic_type_address; + return R.drawable.ic_action_street_name; } } diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryAutoCompleteAdapter.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryAutoCompleteAdapter.java index 5aeac322a5..111db7c38a 100644 --- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryAutoCompleteAdapter.java +++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryAutoCompleteAdapter.java @@ -137,7 +137,7 @@ public class MapillaryAutoCompleteAdapter extends ArrayAdapter implement nameTv.setText(names.get(position)); if (wrong) { - Drawable icon = app.getUIUtilities().getPaintedIcon(R.drawable.ic_warning, app.getResources().getColor(R.color.color_warning)); + Drawable icon = app.getUIUtilities().getPaintedIcon(R.drawable.ic_action_alert, app.getResources().getColor(R.color.color_warning)); iconIv.setImageDrawable(icon); iconIv.setVisibility(View.VISIBLE); } diff --git a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java index dd9b630132..34260adb63 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java @@ -241,10 +241,10 @@ public class DashTrackFragment extends DashBaseFragment { v.findViewById(R.id.points_icon).setVisibility(View.VISIBLE); ImageView distance = (ImageView) v.findViewById(R.id.distance_icon); distance.setVisibility(View.VISIBLE); - distance.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_distance)); + distance.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_distance_16)); ImageView pointsCount = (ImageView) v.findViewById(R.id.points_icon); pointsCount.setVisibility(View.VISIBLE); - pointsCount.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_point)); + pointsCount.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_waypoint_16)); } private void updateShowOnMap(final OsmandApplication app, final File f, final View pView, final ImageButton showOnMap) { diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java index f6ca2092ea..61e1284f59 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java @@ -404,9 +404,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement public void createCurrentTrackView() { ImageView distanceI = (ImageView) currentGpxView.findViewById(R.id.distance_icon); - distanceI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_distance)); + distanceI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_distance_16)); ImageView pointsI = (ImageView) currentGpxView.findViewById(R.id.points_icon); - pointsI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_point)); + pointsI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_waypoint_16)); updateCurrentTrack(); } @@ -1793,13 +1793,13 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement v.findViewById(R.id.unknown_section).setVisibility(View.GONE); ImageView distanceI = (ImageView) v.findViewById(R.id.distance_icon); distanceI.setVisibility(View.VISIBLE); - distanceI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_distance)); + distanceI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_distance_16)); ImageView pointsI = (ImageView) v.findViewById(R.id.points_icon); pointsI.setVisibility(View.VISIBLE); - pointsI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_point)); + pointsI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_waypoint_16)); ImageView timeI = (ImageView) v.findViewById(R.id.time_icon); timeI.setVisibility(View.VISIBLE); - timeI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_time)); + timeI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_time_16)); TextView time = (TextView) v.findViewById(R.id.time); TextView distance = (TextView) v.findViewById(R.id.distance); TextView pointsCount = (TextView) v.findViewById(R.id.points_count); diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java index 479a69e26b..b8146e5b7f 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java @@ -178,11 +178,11 @@ public class EditPOIMenuController extends MenuController { } } if (iconResId == 0) { - iconResId = R.drawable.ic_type_info; + iconResId = R.drawable.ic_action_info_dark; } return iconResId; } else if (osmPoint.getGroup() == OsmPoint.Group.BUG) { - return R.drawable.ic_type_bug; + return R.drawable.ic_action_bug_dark; } else { return 0; } diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsAdapter.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsAdapter.java index 9855203b0c..e13629eb52 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsAdapter.java @@ -273,7 +273,7 @@ public class OsmEditsAdapter extends ArrayAdapter { } } if (iconResId == 0) { - iconResId = R.drawable.ic_type_info; + iconResId = R.drawable.ic_action_info_dark; } int colorResId = R.color.color_distance; if (point.getAction() == OsmPoint.Action.CREATE) { @@ -287,7 +287,7 @@ public class OsmEditsAdapter extends ArrayAdapter { } return app.getUIUtilities().getIcon(iconResId, colorResId); } else if (point.getGroup() == OsmPoint.Group.BUG) { - return app.getUIUtilities().getIcon(R.drawable.ic_type_bug, R.color.color_distance); + return app.getUIUtilities().getIcon(R.drawable.ic_action_bug_dark, R.color.color_distance); } return null; } diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java index a7b6f03356..6812af21c0 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java @@ -120,9 +120,9 @@ public class OsmEditsFragment extends OsmAndListFragment implements SendPoiDialo String name = OsmEditingPlugin.getEditName(child); viewName.setText(name); if (child.getGroup() == Group.POI) { - icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_type_info, R.color.color_distance)); + icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_info_dark, R.color.color_distance)); } else if (child.getGroup() == Group.BUG) { - icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_type_bug, R.color.color_distance)); + icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_bug_dark, R.color.color_distance)); } TextView descr = (TextView) v.findViewById(R.id.description); diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java index d6501fddb1..a0b1ad1d55 100644 --- a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java +++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java @@ -25,7 +25,7 @@ public class ShowHideGpxTracksAction extends QuickAction { public static final QuickActionType TYPE = new QuickActionType(28, "gpx.showhide", ShowHideGpxTracksAction.class). - nameRes(R.string.quick_action_show_hide_gpx_tracks).iconRes(R.drawable.ic_gpx_track).nonEditable(). + nameRes(R.string.quick_action_show_hide_gpx_tracks).iconRes(R.drawable.ic_action_polygom_dark).nonEditable(). category(QuickActionType.CONFIGURE_MAP); diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java index 6ab46f14fc..57c35d79dc 100644 --- a/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java +++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java @@ -411,7 +411,7 @@ public class QuickSearchListAdapter extends ArrayAdapter { int colorId = worksNow ? worksLater ? R.color.color_ok : R.color.color_intermediate : R.color.color_warning; timeLayout.setVisibility(View.VISIBLE); - timeIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_small_time, colorId)); + timeIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_time_16, colorId)); timeText.setTextColor(app.getResources().getColor(colorId)); String rt = amenity.isClosed() ? app.getResources().getString(R.string.poi_operational_status_closed) : rs.getCurrentRuleTime(inst); timeText.setText(rt == null ? "" : rt); diff --git a/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java b/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java index 7b25eab016..fd29d60596 100644 --- a/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java +++ b/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java @@ -262,12 +262,12 @@ public class QuickSearchListItem { switch (searchResult.objectType) { case FAVORITE: case FAVORITE_GROUP: - return app.getUIUtilities().getThemedIcon(R.drawable.ic_small_group); + return app.getUIUtilities().getThemedIcon(R.drawable.ic_action_group_name_16); case RECENT_OBJ: HistoryEntry historyEntry = (HistoryEntry) searchResult.object; String typeName = historyEntry.getName().getTypeName(); if (typeName != null && !typeName.isEmpty()) { - return app.getUIUtilities().getThemedIcon(R.drawable.ic_small_group); + return app.getUIUtilities().getThemedIcon(R.drawable.ic_action_group_name_16); } else { return null; } diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/data/PointDescription.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/data/PointDescription.java index 5ef7a17d77..641d796d0b 100644 --- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/data/PointDescription.java +++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/data/PointDescription.java @@ -359,15 +359,15 @@ public class PointDescription { public int getIconId() { int iconId; if (isAddress()) { - iconId = OsmandResources.getDrawableId("ic_type_address"); + iconId = OsmandResources.getDrawableId("ic_action_street_name"); } else if (isFavorite()) { iconId = OsmandResources.getDrawableId("ic_type_favorites"); } else if (isLocation()) { - iconId = OsmandResources.getDrawableId("ic_type_coordinates"); + iconId = OsmandResources.getDrawableId("ic_action_marker_dark"); } else if (isPoi()) { - iconId = OsmandResources.getDrawableId("ic_type_info"); + iconId = OsmandResources.getDrawableId("ic_action_info_dark"); } else if (isWpt()) { - iconId = OsmandResources.getDrawableId("ic_type_waypoint"); + iconId = OsmandResources.getDrawableId("ic_action_flag_stroke"); } else if (isAudioNote()) { iconId = OsmandResources.getDrawableId("ic_type_audio"); } else if (isVideoNote()) { @@ -375,7 +375,7 @@ public class PointDescription { }else if (isPhotoNote()) { iconId = OsmandResources.getDrawableId("ic_type_img"); } else { - iconId = OsmandResources.getDrawableId("ic_type_address"); + iconId = OsmandResources.getDrawableId("ic_action_street_name"); } return iconId; } diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/controllers/PointDescriptionMenuController.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/controllers/PointDescriptionMenuController.java index 85df53de8c..eca55b02ef 100644 --- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/controllers/PointDescriptionMenuController.java +++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/controllers/PointDescriptionMenuController.java @@ -51,7 +51,7 @@ public class PointDescriptionMenuController extends MenuController { @Override public Drawable getSecondLineTypeIcon() { if (hasTypeInDescription) { - return getIcon(OsmandResources.getDrawableId("ic_small_group")); + return getIcon(OsmandResources.getDrawableId("ic_action_group_name_16")); } else { return null; } diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchListAdapter.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchListAdapter.java index 9d3137c84d..6b1cf39ab0 100644 --- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchListAdapter.java +++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchListAdapter.java @@ -209,7 +209,7 @@ public class QuickSearchListAdapter extends ArrayAdapter { timeIcon.setVisibility(View.VISIBLE); timeText.setVisibility(View.VISIBLE); - timeIcon.setImageDrawable(app.getIconsCache().getIcon("ic_small_time", colorId)); + timeIcon.setImageDrawable(app.getIconsCache().getIcon("ic_action_time_16", colorId)); timeText.setTextColor(app.getResources().getColor(colorId)); String rt = rs.getCurrentRuleTime(inst); timeText.setText(rt == null ? "" : rt);