diff --git a/OsmAnd/res/drawable-hdpi/a_1_navigation_cancel_small_dark.png b/OsmAnd/res/drawable-hdpi/a_1_navigation_cancel_small_dark.png deleted file mode 100644 index 3336760d5f..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/a_1_navigation_cancel_small_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_audio_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_audio_dark.png deleted file mode 100644 index 7380457321..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_audio_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_bus2_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_bus2_dark.png deleted file mode 100644 index d94d69cfb3..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_bus2_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_eye_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_eye_dark.png deleted file mode 100644 index 9b509ad036..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_eye_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_fav2_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_fav2_dark.png deleted file mode 100644 index e3b3007bcd..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_fav2_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_fav_light.png b/OsmAnd/res/drawable-hdpi/ic_action_fav_light.png deleted file mode 100644 index 6c76e89147..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_fav_light.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_finish_flag_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_finish_flag_dark.png deleted file mode 100644 index d1ba18fd8f..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_finish_flag_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_galert_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_galert_dark.png deleted file mode 100644 index 28df816d8c..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_galert_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gdown_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gdown_dark.png deleted file mode 100644 index 8e6e7e73b5..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gdown_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gedit_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gedit_dark.png deleted file mode 100644 index 603972aff3..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gedit_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_globus_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_globus_dark.png deleted file mode 100644 index d5fd9a397b..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_globus_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gplay_over_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gplay_over_dark.png deleted file mode 100644 index e0e57dafbb..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gplay_over_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_grefresh_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_grefresh_dark.png deleted file mode 100644 index 1aed04f359..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_grefresh_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_grot_left_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_grot_left_dark.png deleted file mode 100644 index 0b7315a0b5..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_grot_left_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gsearch_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gsearch_dark.png deleted file mode 100644 index 9839a13a22..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gsearch_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gup_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gup_dark.png deleted file mode 100644 index 8923955f87..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gup_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_history2_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_history2_dark.png deleted file mode 100644 index 9befb8539b..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_history2_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_map_marker_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_map_marker_dark.png deleted file mode 100644 index d78667029e..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_map_marker_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_ok_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_ok_dark.png deleted file mode 100644 index 9c4806b1c4..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_ok_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_settings_disabled_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_settings_disabled_dark.png deleted file mode 100644 index 13bf1d76a9..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_settings_disabled_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_destination_arrow.png b/OsmAnd/res/drawable-hdpi/ic_destination_arrow.png deleted file mode 100644 index 602319fac1..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_destination_arrow.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_destination_arrow_white.png b/OsmAnd/res/drawable-hdpi/ic_destination_arrow_white.png deleted file mode 100644 index 363cfbc1be..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_destination_arrow_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_flat_list_white.png b/OsmAnd/res/drawable-hdpi/ic_flat_list_white.png deleted file mode 100644 index 4483d52208..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_flat_list_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_config.png b/OsmAnd/res/drawable-hdpi/map_config.png deleted file mode 100644 index f1365980d7..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_config.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_config_white.png b/OsmAnd/res/drawable-hdpi/map_config_white.png deleted file mode 100644 index d25308159e..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_config_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_globus.png b/OsmAnd/res/drawable-hdpi/map_globus.png deleted file mode 100644 index 850f27cb72..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_globus.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_globus_white.png b/OsmAnd/res/drawable-hdpi/map_globus_white.png deleted file mode 100644 index 3c00630fe5..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_globus_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_layers_black.png b/OsmAnd/res/drawable-hdpi/map_layers_black.png deleted file mode 100644 index a3ccc703e5..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_layers_black.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_layers_white.png b/OsmAnd/res/drawable-hdpi/map_layers_white.png deleted file mode 100644 index 220c4f973a..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_layers_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_magnifier.png b/OsmAnd/res/drawable-hdpi/map_magnifier.png deleted file mode 100644 index 9b509ad036..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_magnifier.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_monitoring.png b/OsmAnd/res/drawable-hdpi/map_monitoring.png deleted file mode 100644 index 37525a18fe..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_monitoring.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/status_bar.9.png b/OsmAnd/res/drawable-hdpi/status_bar.9.png deleted file mode 100644 index 9e270b5c46..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/status_bar.9.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/street_name.png b/OsmAnd/res/drawable-hdpi/street_name.png deleted file mode 100644 index 0c584efc9c..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/street_name.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/street_name_dark.png b/OsmAnd/res/drawable-hdpi/street_name_dark.png deleted file mode 100644 index c8be287d12..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/street_name_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/widget_globus.png b/OsmAnd/res/drawable-hdpi/widget_globus.png deleted file mode 100644 index a3e88f9b4c..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/widget_globus.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/widget_icon_av_active_menu.png b/OsmAnd/res/drawable-hdpi/widget_icon_av_active_menu.png deleted file mode 100644 index c26401836b..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/widget_icon_av_active_menu.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/widget_lock_screen_dark.png b/OsmAnd/res/drawable-hdpi/widget_lock_screen_dark.png deleted file mode 100644 index a84f9a265a..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/widget_lock_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/widget_rendering_style.png b/OsmAnd/res/drawable-hdpi/widget_rendering_style.png deleted file mode 100644 index 63442f8975..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/widget_rendering_style.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/widget_ruler.png b/OsmAnd/res/drawable-hdpi/widget_ruler.png deleted file mode 100644 index 63442f8975..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/widget_ruler.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/widget_show_destination_arrow.png b/OsmAnd/res/drawable-hdpi/widget_show_destination_arrow.png deleted file mode 100644 index 63442f8975..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/widget_show_destination_arrow.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/widget_tracking.png b/OsmAnd/res/drawable-hdpi/widget_tracking.png deleted file mode 100644 index ab297edb20..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/widget_tracking.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/widget_transparent_skin.png b/OsmAnd/res/drawable-hdpi/widget_transparent_skin.png deleted file mode 100644 index 63442f8975..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/widget_transparent_skin.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_layers_black.png b/OsmAnd/res/drawable-large-hdpi/map_layers_black.png deleted file mode 100644 index 7c999d64ef..0000000000 Binary files a/OsmAnd/res/drawable-large-hdpi/map_layers_black.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_layers_white.png b/OsmAnd/res/drawable-large-hdpi/map_layers_white.png deleted file mode 100644 index 8fcf6597cb..0000000000 Binary files a/OsmAnd/res/drawable-large-hdpi/map_layers_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_magnifier.png b/OsmAnd/res/drawable-large-hdpi/map_magnifier.png deleted file mode 100644 index 8ef6a3567a..0000000000 Binary files a/OsmAnd/res/drawable-large-hdpi/map_magnifier.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_lock_screen_dark.png b/OsmAnd/res/drawable-large-hdpi/widget_lock_screen_dark.png deleted file mode 100644 index d1b68137af..0000000000 Binary files a/OsmAnd/res/drawable-large-hdpi/widget_lock_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_lock_screen_dark.png b/OsmAnd/res/drawable-large-xhdpi/widget_lock_screen_dark.png deleted file mode 100644 index 7b4d6c0fd5..0000000000 Binary files a/OsmAnd/res/drawable-large-xhdpi/widget_lock_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/map_config.png b/OsmAnd/res/drawable-large/map_config.png deleted file mode 100644 index f1365980d7..0000000000 Binary files a/OsmAnd/res/drawable-large/map_config.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/map_config_white.png b/OsmAnd/res/drawable-large/map_config_white.png deleted file mode 100644 index d25308159e..0000000000 Binary files a/OsmAnd/res/drawable-large/map_config_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/map_globus.png b/OsmAnd/res/drawable-large/map_globus.png deleted file mode 100644 index 850f27cb72..0000000000 Binary files a/OsmAnd/res/drawable-large/map_globus.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/map_globus_white.png b/OsmAnd/res/drawable-large/map_globus_white.png deleted file mode 100644 index 3c00630fe5..0000000000 Binary files a/OsmAnd/res/drawable-large/map_globus_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/map_layers_black.png b/OsmAnd/res/drawable-large/map_layers_black.png deleted file mode 100644 index a3ccc703e5..0000000000 Binary files a/OsmAnd/res/drawable-large/map_layers_black.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/map_layers_white.png b/OsmAnd/res/drawable-large/map_layers_white.png deleted file mode 100644 index 220c4f973a..0000000000 Binary files a/OsmAnd/res/drawable-large/map_layers_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/map_magnifier.png b/OsmAnd/res/drawable-large/map_magnifier.png deleted file mode 100644 index 9b509ad036..0000000000 Binary files a/OsmAnd/res/drawable-large/map_magnifier.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/map_monitoring.png b/OsmAnd/res/drawable-large/map_monitoring.png deleted file mode 100644 index 37525a18fe..0000000000 Binary files a/OsmAnd/res/drawable-large/map_monitoring.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/widget_globus.png b/OsmAnd/res/drawable-large/widget_globus.png deleted file mode 100644 index a3e88f9b4c..0000000000 Binary files a/OsmAnd/res/drawable-large/widget_globus.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/widget_icon_av_active_menu.png b/OsmAnd/res/drawable-large/widget_icon_av_active_menu.png deleted file mode 100644 index c26401836b..0000000000 Binary files a/OsmAnd/res/drawable-large/widget_icon_av_active_menu.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/widget_lock_screen_dark.png b/OsmAnd/res/drawable-large/widget_lock_screen_dark.png deleted file mode 100644 index a84f9a265a..0000000000 Binary files a/OsmAnd/res/drawable-large/widget_lock_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/widget_rendering_style.png b/OsmAnd/res/drawable-large/widget_rendering_style.png deleted file mode 100644 index 63442f8975..0000000000 Binary files a/OsmAnd/res/drawable-large/widget_rendering_style.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/widget_ruler.png b/OsmAnd/res/drawable-large/widget_ruler.png deleted file mode 100644 index 63442f8975..0000000000 Binary files a/OsmAnd/res/drawable-large/widget_ruler.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/widget_show_destination_arrow.png b/OsmAnd/res/drawable-large/widget_show_destination_arrow.png deleted file mode 100644 index 63442f8975..0000000000 Binary files a/OsmAnd/res/drawable-large/widget_show_destination_arrow.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_audio_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_audio_dark.png deleted file mode 100644 index 551326f4f8..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_audio_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_bus2_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_bus2_dark.png deleted file mode 100644 index 28ff33507b..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_bus2_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_eye_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_eye_dark.png deleted file mode 100644 index 940b41159d..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_eye_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_fav2_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_fav2_dark.png deleted file mode 100644 index 863538ffec..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_fav2_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_fav_light.png b/OsmAnd/res/drawable-mdpi/ic_action_fav_light.png deleted file mode 100644 index bc3498c85b..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_fav_light.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_finish_flag_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_finish_flag_dark.png deleted file mode 100644 index c7f19a8896..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_finish_flag_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_galert_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_galert_dark.png deleted file mode 100644 index 20c65f2c42..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_galert_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gdown_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gdown_dark.png deleted file mode 100644 index cf945c55c8..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gdown_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gedit_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gedit_dark.png deleted file mode 100644 index e1629be543..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gedit_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_globus_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_globus_dark.png deleted file mode 100644 index fb27472c3d..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_globus_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gplay_over_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gplay_over_dark.png deleted file mode 100644 index b3dadc934d..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gplay_over_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_grefresh_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_grefresh_dark.png deleted file mode 100644 index eef97e9ec0..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_grefresh_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_grot_left_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_grot_left_dark.png deleted file mode 100644 index 4e40ba2a1e..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_grot_left_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gsearch_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gsearch_dark.png deleted file mode 100644 index 076085c576..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gsearch_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gup_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gup_dark.png deleted file mode 100644 index 3438eb0797..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gup_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_history2_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_history2_dark.png deleted file mode 100644 index 672405a0e5..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_history2_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_map_marker_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_map_marker_dark.png deleted file mode 100644 index 6692b7fb57..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_map_marker_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_ok_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_ok_dark.png deleted file mode 100644 index f114dd082e..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_ok_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_settings_disabled_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_settings_disabled_dark.png deleted file mode 100644 index 8a6042b1e4..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_settings_disabled_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_destination_arrow.png b/OsmAnd/res/drawable-mdpi/ic_destination_arrow.png deleted file mode 100644 index cd973c7e77..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_destination_arrow.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_destination_arrow_white.png b/OsmAnd/res/drawable-mdpi/ic_destination_arrow_white.png deleted file mode 100644 index 10bbd5579f..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_destination_arrow_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_magnifier.png b/OsmAnd/res/drawable-mdpi/map_magnifier.png deleted file mode 100644 index 940b41159d..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_magnifier.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_audio_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_audio_dark.png deleted file mode 100644 index 4d1c15bc19..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_audio_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_bus2_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_bus2_dark.png deleted file mode 100644 index f75726be0f..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_bus2_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_eye_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_eye_dark.png deleted file mode 100644 index 8ef6a3567a..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_eye_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_fav2_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_fav2_dark.png deleted file mode 100644 index 9982b1f9e5..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_fav2_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_fav_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_fav_light.png deleted file mode 100644 index d7997d2448..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_fav_light.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_finish_flag_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_finish_flag_dark.png deleted file mode 100644 index 77bd0d9652..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_finish_flag_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_galert_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_galert_dark.png deleted file mode 100644 index c769737fd8..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_galert_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gdown_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gdown_dark.png deleted file mode 100644 index 843a849291..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gdown_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gedit_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gedit_dark.png deleted file mode 100644 index a6dd4ad52b..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gedit_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_globus_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_globus_dark.png deleted file mode 100644 index b81b42b6fa..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_globus_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gplay_over_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gplay_over_dark.png deleted file mode 100644 index 3795250ef7..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gplay_over_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_grefresh_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_grefresh_dark.png deleted file mode 100644 index 118fbc0382..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_grefresh_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_grot_left_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_grot_left_dark.png deleted file mode 100644 index 1082c38cc9..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_grot_left_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gsearch_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gsearch_dark.png deleted file mode 100644 index 795acdc1df..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gsearch_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gup_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gup_dark.png deleted file mode 100644 index 9140c01f84..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gup_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_history2_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_history2_dark.png deleted file mode 100644 index b400acefa5..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_history2_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_map_marker_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_map_marker_dark.png deleted file mode 100644 index 75fa5c1951..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_map_marker_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_ok_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_ok_dark.png deleted file mode 100644 index 230adaa6db..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_ok_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_settings_disabled_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_settings_disabled_dark.png deleted file mode 100644 index cd46e798cf..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_settings_disabled_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_destination_arrow.png b/OsmAnd/res/drawable-xhdpi/ic_destination_arrow.png deleted file mode 100644 index bb3e1ac68b..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_destination_arrow.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_destination_arrow_white.png b/OsmAnd/res/drawable-xhdpi/ic_destination_arrow_white.png deleted file mode 100644 index 99730ecf05..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_destination_arrow_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_flat_list_white.png b/OsmAnd/res/drawable-xhdpi/ic_flat_list_white.png deleted file mode 100644 index 7f3b83826a..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_flat_list_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_layers_black.png b/OsmAnd/res/drawable-xhdpi/map_layers_black.png deleted file mode 100644 index 7c999d64ef..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_layers_black.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_layers_white.png b/OsmAnd/res/drawable-xhdpi/map_layers_white.png deleted file mode 100644 index 8fcf6597cb..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_layers_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_magnifier.png b/OsmAnd/res/drawable-xhdpi/map_magnifier.png deleted file mode 100644 index 8ef6a3567a..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_magnifier.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/street_name_dark.png b/OsmAnd/res/drawable-xhdpi/street_name_dark.png deleted file mode 100644 index 4050c8aa9e..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/street_name_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/widget_lock_screen_dark.png b/OsmAnd/res/drawable-xhdpi/widget_lock_screen_dark.png deleted file mode 100644 index 7b4d6c0fd5..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/widget_lock_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_bus2_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_bus2_dark.png deleted file mode 100644 index 7f41e5cd10..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_bus2_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_fav2_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_fav2_dark.png deleted file mode 100644 index fc2e270992..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_fav2_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_fav_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_fav_light.png deleted file mode 100644 index 348e211e97..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_fav_light.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_finish_flag_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_finish_flag_dark.png deleted file mode 100644 index 4e65e033b1..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_finish_flag_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_history2_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_history2_dark.png deleted file mode 100644 index b9a933f4bf..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_history2_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_settings_disabled_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_settings_disabled_dark.png deleted file mode 100644 index e23d624a21..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_settings_disabled_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_destination_arrow.png b/OsmAnd/res/drawable-xxhdpi/ic_destination_arrow.png deleted file mode 100644 index 4a926851a6..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_destination_arrow.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_destination_arrow_white.png b/OsmAnd/res/drawable-xxhdpi/ic_destination_arrow_white.png deleted file mode 100644 index f5bcf3d044..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_destination_arrow_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_flat_list_white.png b/OsmAnd/res/drawable-xxhdpi/ic_flat_list_white.png deleted file mode 100644 index d059d42d19..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_flat_list_white.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/street_name_dark.png b/OsmAnd/res/drawable-xxhdpi/street_name_dark.png deleted file mode 100644 index cc0496909d..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/street_name_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/widget_lock_screen_dark.png b/OsmAnd/res/drawable-xxhdpi/widget_lock_screen_dark.png deleted file mode 100644 index d1b68137af..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/widget_lock_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable/ic_action_settings_dark.xml b/OsmAnd/res/drawable/ic_action_settings_dark.xml deleted file mode 100644 index 79a8eb74e3..0000000000 --- a/OsmAnd/res/drawable/ic_action_settings_dark.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OsmAnd/res/layout/plan_route_info.xml b/OsmAnd/res/layout/plan_route_info.xml index c962b36246..7e2857032e 100644 --- a/OsmAnd/res/layout/plan_route_info.xml +++ b/OsmAnd/res/layout/plan_route_info.xml @@ -32,7 +32,7 @@ diff --git a/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java b/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java index adcbc8198c..8f972c1c84 100644 --- a/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java @@ -129,7 +129,8 @@ public class PluginActivity extends OsmandActionBarActivity { Button getButton = (Button)findViewById(R.id.plugin_get); Button settingsButton = (Button)findViewById(R.id.plugin_settings); IconsCache ic = ((OsmandApplication) getApplication()).getIconsCache(); - settingsButton.setCompoundDrawablesWithIntrinsicBounds(ic.getContentIcon(R.drawable.ic_action_settings_dark), null, null, null); + settingsButton.setCompoundDrawablesWithIntrinsicBounds(ic.getContentIcon( + R.drawable.ic_action_settings_enabled_dark), null, null, null); View installHeader = findViewById(R.id.plugin_install_header); if (plugin.needsInstallation()) { @@ -146,10 +147,9 @@ public class PluginActivity extends OsmandActionBarActivity { enableDisableButton.setChecked(plugin.isActive()); final Class settingsActivity = plugin.getSettingsActivity(); - if (settingsActivity == null) { + if (settingsActivity == null || !plugin.isActive()) { settingsButton.setVisibility(View.GONE); } else { - settingsButton.setEnabled(plugin.isActive()); settingsButton.setVisibility(View.VISIBLE); } diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java index 18cab8fb9c..9500fbb61c 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java @@ -171,105 +171,6 @@ public class MapInfoWidgetsFactory { } - - - - private static boolean isScreenLocked = false; - private Drawable lockEnabled; - private Drawable lockDisabled; - public ImageView createLockInfo(final MapActivity map) { - final OsmandMapTileView view = map.getMapView(); - final Drawable lockEnabledNormal = view.getResources().getDrawable(R.drawable.lock_enabled); - final Drawable lockDisabledNormal = view.getResources().getDrawable(R.drawable.lock_disabled); - final Drawable lockEnabledWhite = view.getResources().getDrawable(R.drawable.lock_enabled_white); - final Drawable lockDisabledWhite = view.getResources().getDrawable(R.drawable.lock_disabled_white); - lockDisabled = lockDisabledNormal; - lockEnabled = lockEnabledNormal; - final ImageView lockView = null; -// final ImageViewWidget lockView = new ImageViewWidget(view.getContext()) { -// private boolean nightMode; -// @Override -// public boolean updateInfo(DrawSettings drawSettings) { -// boolean nightMode = drawSettings == null ? false : drawSettings.isNightMode(); -// if(nightMode != this.nightMode) { -// this.nightMode = nightMode; -// lockDisabled = drawSettings.isNightMode() ? lockDisabledWhite : lockDisabledNormal; -// lockEnabled = drawSettings.isNightMode() ? lockEnabledWhite : lockEnabledNormal; -// setImageDrawable(isScreenLocked ? lockEnabled : lockDisabled); -// return true; -// } -// return false; -// } -// }; - - if (isScreenLocked) { - map.getMapViewTrackingUtilities().backToLocationImpl(); - lockView.setBackgroundDrawable(lockEnabled); - } else { - lockView.setBackgroundDrawable(lockDisabled); - } - final FrameLayout transparentLockView = new FrameLayout(view.getContext()); - FrameLayout.LayoutParams fparams = new FrameLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT, Gravity.CENTER); - transparentLockView.setLayoutParams(fparams); - transparentLockView.setOnTouchListener(new View.OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - if (event.getAction() == MotionEvent.ACTION_UP) { - int[] locs = new int[2]; - lockView.getLocationOnScreen(locs); - int x = (int) event.getX() - locs[0]; - int y = (int) event.getY() - locs[1]; - transparentLockView.getLocationOnScreen(locs); - x += locs[0]; - y += locs[1]; - if (lockView.getWidth() >= x && x >= 0 && lockView.getHeight() >= y && y >= 0) { - lockView.performClick(); - return true; - } - blinkIcon(); - AccessibleToast.makeText(transparentLockView.getContext(), R.string.screen_is_locked, Toast.LENGTH_SHORT).show(); - return true; - } - return true; - } - - private void blinkIcon() { - lockView.setBackgroundDrawable(lockDisabled); - // TODO! -// map.postDelayed(new Runnable() { -// @Override -// public void run() { -// lockView.setBackgroundDrawable(lockEnabled); -// } -// }, 300); - } - - }); - final FrameLayout parent = null; // TODO - lockView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (isScreenLocked) { - parent.removeView(transparentLockView); - } - isScreenLocked = !isScreenLocked; - if (isScreenLocked) { - parent.addView(transparentLockView); - map.getMapViewTrackingUtilities().backToLocationImpl(); - lockView.setBackgroundDrawable(lockEnabled); - } else { - lockView.setBackgroundDrawable(lockDisabled); - } - } - }); - if(isScreenLocked){ - // TODO -// map.addLockView(transparentLockView); - } - return lockView; - } - - public static class TopTextView { private final RoutingHelper routingHelper; private final MapActivity map;