diff --git a/OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_dark.9.png b/OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_dark.9.png
index 264542e296..05bea65370 100644
Binary files a/OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_dark.9.png and b/OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_dark.9.png differ
diff --git a/OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_light.9.png b/OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_light.9.png
index f9135bcae8..185a90d368 100644
Binary files a/OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_light.9.png and b/OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_light.9.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_action_edit_dark.png b/OsmAnd/res/drawable-hdpi/map_action_edit_dark.png
new file mode 100644
index 0000000000..7a84c52ecc
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_action_fav_dark.png b/OsmAnd/res/drawable-hdpi/map_action_fav_dark.png
new file mode 100644
index 0000000000..dfe6808cad
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_action_fav_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_action_flag_dark.png b/OsmAnd/res/drawable-hdpi/map_action_flag_dark.png
new file mode 100644
index 0000000000..5bc3ca2e17
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_action_flag_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_action_gshare_dark.png b/OsmAnd/res/drawable-hdpi/map_action_gshare_dark.png
new file mode 100644
index 0000000000..f4df454272
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_action_gshare_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_note_audio.png b/OsmAnd/res/drawable-hdpi/map_note_audio.png
index 5339890822..ec824f1f5a 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_note_audio.png and b/OsmAnd/res/drawable-hdpi/map_note_audio.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_note_photo.png b/OsmAnd/res/drawable-hdpi/map_note_photo.png
index dd528c5fe2..a586bcdd95 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_note_photo.png and b/OsmAnd/res/drawable-hdpi/map_note_photo.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_note_small.png b/OsmAnd/res/drawable-hdpi/map_note_small.png
index 089584f09c..d6ef5c7895 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_note_small.png and b/OsmAnd/res/drawable-hdpi/map_note_small.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_note_video.png b/OsmAnd/res/drawable-hdpi/map_note_video.png
index 11df3ffc0f..48066ca5c1 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_note_video.png and b/OsmAnd/res/drawable-hdpi/map_note_video.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_overflow_menu_white.png b/OsmAnd/res/drawable-hdpi/map_overflow_menu_white.png
new file mode 100644
index 0000000000..a0001ebe32
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_overflow_menu_white.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_pin_poi.png b/OsmAnd/res/drawable-hdpi/map_pin_poi.png
index d1790e5905..1d6a8d412b 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_pin_poi.png and b/OsmAnd/res/drawable-hdpi/map_pin_poi.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_pin_poi_small.png b/OsmAnd/res/drawable-hdpi/map_pin_poi_small.png
index ed0068ec09..65242db619 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_pin_poi_small.png and b/OsmAnd/res/drawable-hdpi/map_pin_poi_small.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_small_group.png b/OsmAnd/res/drawable-hdpi/map_small_group.png
new file mode 100644
index 0000000000..1ca12287f9
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_small_group.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield.png b/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield.png
index 62eaf89789..2f80b35243 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield.png and b/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield_small.png b/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield_small.png
index 6e26fe8d66..65558478b7 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield_small.png and b/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield_small.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_action_edit_dark.png b/OsmAnd/res/drawable-large-hdpi/map_action_edit_dark.png
new file mode 100644
index 0000000000..65f24663bc
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_action_fav_dark.png b/OsmAnd/res/drawable-large-hdpi/map_action_fav_dark.png
new file mode 100644
index 0000000000..9613a43ad6
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_action_fav_dark.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_action_flag_dark.png b/OsmAnd/res/drawable-large-hdpi/map_action_flag_dark.png
new file mode 100644
index 0000000000..e61d74d4e9
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_action_flag_dark.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_action_gshare_dark.png b/OsmAnd/res/drawable-large-hdpi/map_action_gshare_dark.png
new file mode 100644
index 0000000000..c49eca17c4
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_action_gshare_dark.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_osm_resolved.png b/OsmAnd/res/drawable-large-hdpi/map_osm_resolved.png
new file mode 100644
index 0000000000..5850ea0466
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_osm_resolved.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_osm_resolved_small.png b/OsmAnd/res/drawable-large-hdpi/map_osm_resolved_small.png
new file mode 100644
index 0000000000..cabf5388ea
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_osm_resolved_small.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_osm_unresolved.png b/OsmAnd/res/drawable-large-hdpi/map_osm_unresolved.png
new file mode 100644
index 0000000000..4475cda0ab
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_osm_unresolved.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_osm_unresolved_small.png b/OsmAnd/res/drawable-large-hdpi/map_osm_unresolved_small.png
new file mode 100644
index 0000000000..4038709e71
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_osm_unresolved_small.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_overflow_menu_white.png b/OsmAnd/res/drawable-large-hdpi/map_overflow_menu_white.png
new file mode 100644
index 0000000000..67673adab6
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_overflow_menu_white.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_small_group.png b/OsmAnd/res/drawable-large-hdpi/map_small_group.png
new file mode 100644
index 0000000000..a440f345c7
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_small_group.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_action_edit_dark.png b/OsmAnd/res/drawable-large-xhdpi/map_action_edit_dark.png
new file mode 100644
index 0000000000..42eec822b5
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_action_fav_dark.png b/OsmAnd/res/drawable-large-xhdpi/map_action_fav_dark.png
new file mode 100644
index 0000000000..d2407408a1
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_action_fav_dark.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_action_flag_dark.png b/OsmAnd/res/drawable-large-xhdpi/map_action_flag_dark.png
new file mode 100644
index 0000000000..7b41a25dfb
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_action_flag_dark.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_action_gshare_dark.png b/OsmAnd/res/drawable-large-xhdpi/map_action_gshare_dark.png
new file mode 100644
index 0000000000..f862a3f3f5
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_action_gshare_dark.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_osm_resolved.png b/OsmAnd/res/drawable-large-xhdpi/map_osm_resolved.png
new file mode 100644
index 0000000000..3f016cf216
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_osm_resolved.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_osm_resolved_small.png b/OsmAnd/res/drawable-large-xhdpi/map_osm_resolved_small.png
new file mode 100644
index 0000000000..15a0b462e2
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_osm_resolved_small.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_osm_unresolved.png b/OsmAnd/res/drawable-large-xhdpi/map_osm_unresolved.png
new file mode 100644
index 0000000000..dd70e4bfbb
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_osm_unresolved.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_osm_unresolved_small.png b/OsmAnd/res/drawable-large-xhdpi/map_osm_unresolved_small.png
new file mode 100644
index 0000000000..d9afeef173
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_osm_unresolved_small.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_overflow_menu_white.png b/OsmAnd/res/drawable-large-xhdpi/map_overflow_menu_white.png
new file mode 100644
index 0000000000..2dedaef71f
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_overflow_menu_white.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_small_group.png b/OsmAnd/res/drawable-large-xhdpi/map_small_group.png
new file mode 100644
index 0000000000..7c4b45d02e
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_small_group.png differ
diff --git a/OsmAnd/res/drawable-large/map_action_edit_dark.png b/OsmAnd/res/drawable-large/map_action_edit_dark.png
new file mode 100644
index 0000000000..7a84c52ecc
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-large/map_action_fav_dark.png b/OsmAnd/res/drawable-large/map_action_fav_dark.png
new file mode 100644
index 0000000000..dfe6808cad
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_action_fav_dark.png differ
diff --git a/OsmAnd/res/drawable-large/map_action_flag_dark.png b/OsmAnd/res/drawable-large/map_action_flag_dark.png
new file mode 100644
index 0000000000..5bc3ca2e17
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_action_flag_dark.png differ
diff --git a/OsmAnd/res/drawable-large/map_action_gshare_dark.png b/OsmAnd/res/drawable-large/map_action_gshare_dark.png
new file mode 100644
index 0000000000..f4df454272
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_action_gshare_dark.png differ
diff --git a/OsmAnd/res/drawable-large/map_osm_resolved.png b/OsmAnd/res/drawable-large/map_osm_resolved.png
new file mode 100644
index 0000000000..a2fd06e3f5
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_osm_resolved.png differ
diff --git a/OsmAnd/res/drawable-large/map_osm_resolved_small.png b/OsmAnd/res/drawable-large/map_osm_resolved_small.png
new file mode 100644
index 0000000000..b34a4af881
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_osm_resolved_small.png differ
diff --git a/OsmAnd/res/drawable-large/map_osm_unresolved.png b/OsmAnd/res/drawable-large/map_osm_unresolved.png
new file mode 100644
index 0000000000..d590a5283a
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_osm_unresolved.png differ
diff --git a/OsmAnd/res/drawable-large/map_osm_unresolved_small.png b/OsmAnd/res/drawable-large/map_osm_unresolved_small.png
new file mode 100644
index 0000000000..92dc738c0a
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_osm_unresolved_small.png differ
diff --git a/OsmAnd/res/drawable-large/map_overflow_menu_white.png b/OsmAnd/res/drawable-large/map_overflow_menu_white.png
new file mode 100644
index 0000000000..a0001ebe32
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_overflow_menu_white.png differ
diff --git a/OsmAnd/res/drawable-large/map_small_group.png b/OsmAnd/res/drawable-large/map_small_group.png
new file mode 100644
index 0000000000..1ca12287f9
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_small_group.png differ
diff --git a/OsmAnd/res/drawable-mdpi/bg_contextmenu_dots_dark.9.png b/OsmAnd/res/drawable-mdpi/bg_contextmenu_dots_dark.9.png
index 761a7a4a08..a2e4404ccd 100644
Binary files a/OsmAnd/res/drawable-mdpi/bg_contextmenu_dots_dark.9.png and b/OsmAnd/res/drawable-mdpi/bg_contextmenu_dots_dark.9.png differ
diff --git a/OsmAnd/res/drawable-mdpi/bg_contextmenu_dots_light.9.png b/OsmAnd/res/drawable-mdpi/bg_contextmenu_dots_light.9.png
index a283a2e86f..1aae0ac824 100644
Binary files a/OsmAnd/res/drawable-mdpi/bg_contextmenu_dots_light.9.png and b/OsmAnd/res/drawable-mdpi/bg_contextmenu_dots_light.9.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_action_edit_dark.png b/OsmAnd/res/drawable-mdpi/map_action_edit_dark.png
new file mode 100644
index 0000000000..d1b7340b56
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_action_fav_dark.png b/OsmAnd/res/drawable-mdpi/map_action_fav_dark.png
new file mode 100644
index 0000000000..04044ab479
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_action_fav_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_action_flag_dark.png b/OsmAnd/res/drawable-mdpi/map_action_flag_dark.png
new file mode 100644
index 0000000000..8e75e65563
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_action_flag_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_action_gshare_dark.png b/OsmAnd/res/drawable-mdpi/map_action_gshare_dark.png
new file mode 100644
index 0000000000..fe0882eec6
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_action_gshare_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_note_audio.png b/OsmAnd/res/drawable-mdpi/map_note_audio.png
index 1af55e6f5f..c74bbab0e1 100644
Binary files a/OsmAnd/res/drawable-mdpi/map_note_audio.png and b/OsmAnd/res/drawable-mdpi/map_note_audio.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_note_photo.png b/OsmAnd/res/drawable-mdpi/map_note_photo.png
index 0b5ada072f..a6f06ef560 100644
Binary files a/OsmAnd/res/drawable-mdpi/map_note_photo.png and b/OsmAnd/res/drawable-mdpi/map_note_photo.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_note_small.png b/OsmAnd/res/drawable-mdpi/map_note_small.png
index 35a168ab0e..48e778db2d 100644
Binary files a/OsmAnd/res/drawable-mdpi/map_note_small.png and b/OsmAnd/res/drawable-mdpi/map_note_small.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_note_video.png b/OsmAnd/res/drawable-mdpi/map_note_video.png
index 04785df4e5..f0429b740c 100644
Binary files a/OsmAnd/res/drawable-mdpi/map_note_video.png and b/OsmAnd/res/drawable-mdpi/map_note_video.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_overflow_menu_white.png b/OsmAnd/res/drawable-mdpi/map_overflow_menu_white.png
new file mode 100644
index 0000000000..eb2b0d75d8
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_overflow_menu_white.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_pin_poi.png b/OsmAnd/res/drawable-mdpi/map_pin_poi.png
index cc5c9c3ffe..eae4ed951a 100644
Binary files a/OsmAnd/res/drawable-mdpi/map_pin_poi.png and b/OsmAnd/res/drawable-mdpi/map_pin_poi.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_pin_poi_small.png b/OsmAnd/res/drawable-mdpi/map_pin_poi_small.png
index 3c91203d55..b9ee787477 100644
Binary files a/OsmAnd/res/drawable-mdpi/map_pin_poi_small.png and b/OsmAnd/res/drawable-mdpi/map_pin_poi_small.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_small_group.png b/OsmAnd/res/drawable-mdpi/map_small_group.png
new file mode 100644
index 0000000000..0e35fadf79
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_small_group.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield.png b/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield.png
index c33b07e5e2..b953bd5a38 100644
Binary files a/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield.png and b/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield_small.png b/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield_small.png
index 3abd8998fa..c832fda288 100644
Binary files a/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield_small.png and b/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield_small.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_dark.9.png b/OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_dark.9.png
index 6c8f7fe555..60ca608b9c 100644
Binary files a/OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_dark.9.png and b/OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_dark.9.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_light.9.png b/OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_light.9.png
index bddcf440d9..eee6b20e1b 100644
Binary files a/OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_light.9.png and b/OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_light.9.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_action_edit_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_edit_dark.png
new file mode 100644
index 0000000000..65f24663bc
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_action_fav_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_fav_dark.png
new file mode 100644
index 0000000000..9613a43ad6
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_action_fav_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_action_flag_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_flag_dark.png
new file mode 100644
index 0000000000..e61d74d4e9
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_action_flag_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_action_gshare_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_gshare_dark.png
new file mode 100644
index 0000000000..c49eca17c4
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_action_gshare_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_note_audio.png b/OsmAnd/res/drawable-xhdpi/map_note_audio.png
index cc82413085..237069e0da 100644
Binary files a/OsmAnd/res/drawable-xhdpi/map_note_audio.png and b/OsmAnd/res/drawable-xhdpi/map_note_audio.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_note_photo.png b/OsmAnd/res/drawable-xhdpi/map_note_photo.png
index c1763561f9..365a9a5b60 100644
Binary files a/OsmAnd/res/drawable-xhdpi/map_note_photo.png and b/OsmAnd/res/drawable-xhdpi/map_note_photo.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_note_small.png b/OsmAnd/res/drawable-xhdpi/map_note_small.png
index 11cb3918c6..5d1d0b5347 100644
Binary files a/OsmAnd/res/drawable-xhdpi/map_note_small.png and b/OsmAnd/res/drawable-xhdpi/map_note_small.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_note_video.png b/OsmAnd/res/drawable-xhdpi/map_note_video.png
index aa207e10ad..a5f9dba5d9 100644
Binary files a/OsmAnd/res/drawable-xhdpi/map_note_video.png and b/OsmAnd/res/drawable-xhdpi/map_note_video.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_overflow_menu_white.png b/OsmAnd/res/drawable-xhdpi/map_overflow_menu_white.png
new file mode 100644
index 0000000000..67673adab6
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_overflow_menu_white.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_pin_poi.png b/OsmAnd/res/drawable-xhdpi/map_pin_poi.png
index 73642a9cc0..1f218bdca1 100644
Binary files a/OsmAnd/res/drawable-xhdpi/map_pin_poi.png and b/OsmAnd/res/drawable-xhdpi/map_pin_poi.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_pin_poi_small.png b/OsmAnd/res/drawable-xhdpi/map_pin_poi_small.png
index 4d222e5051..287964f5d6 100644
Binary files a/OsmAnd/res/drawable-xhdpi/map_pin_poi_small.png and b/OsmAnd/res/drawable-xhdpi/map_pin_poi_small.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_small_group.png b/OsmAnd/res/drawable-xhdpi/map_small_group.png
new file mode 100644
index 0000000000..a440f345c7
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_small_group.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield.png b/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield.png
index e589d0b1cf..606b1af8a6 100644
Binary files a/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield.png and b/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield_small.png b/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield_small.png
index 11bc552da0..59a9d8360a 100644
Binary files a/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield_small.png and b/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield_small.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_dark.9.png b/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_dark.9.png
index b5f1df8723..3b8cb267d3 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_dark.9.png and b/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_dark.9.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_light.9.png b/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_light.9.png
index 34dba3a4ad..dd524935c2 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_light.9.png and b/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_light.9.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_edit_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_edit_dark.png
new file mode 100644
index 0000000000..42eec822b5
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_fav_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_fav_dark.png
new file mode 100644
index 0000000000..d2407408a1
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_action_fav_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_flag_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_flag_dark.png
new file mode 100644
index 0000000000..7b41a25dfb
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_action_flag_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_gshare_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_gshare_dark.png
new file mode 100644
index 0000000000..f862a3f3f5
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_action_gshare_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_note_audio.png b/OsmAnd/res/drawable-xxhdpi/map_note_audio.png
index b1752cdcc7..f00aa9a3b4 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/map_note_audio.png and b/OsmAnd/res/drawable-xxhdpi/map_note_audio.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_note_photo.png b/OsmAnd/res/drawable-xxhdpi/map_note_photo.png
index c671049a6b..8a2a815188 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/map_note_photo.png and b/OsmAnd/res/drawable-xxhdpi/map_note_photo.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_note_small.png b/OsmAnd/res/drawable-xxhdpi/map_note_small.png
index 1c10f1a6b6..36f1170503 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/map_note_small.png and b/OsmAnd/res/drawable-xxhdpi/map_note_small.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_note_video.png b/OsmAnd/res/drawable-xxhdpi/map_note_video.png
index fedf35f2dc..8f09403f52 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/map_note_video.png and b/OsmAnd/res/drawable-xxhdpi/map_note_video.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_overflow_menu_white.png b/OsmAnd/res/drawable-xxhdpi/map_overflow_menu_white.png
new file mode 100644
index 0000000000..2dedaef71f
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_overflow_menu_white.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_pin_poi.png b/OsmAnd/res/drawable-xxhdpi/map_pin_poi.png
index 5b5aa045e9..cd2a444309 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/map_pin_poi.png and b/OsmAnd/res/drawable-xxhdpi/map_pin_poi.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_pin_poi_small.png b/OsmAnd/res/drawable-xxhdpi/map_pin_poi_small.png
index ad2cde151e..9a335a91c6 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/map_pin_poi_small.png and b/OsmAnd/res/drawable-xxhdpi/map_pin_poi_small.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_small_group.png b/OsmAnd/res/drawable-xxhdpi/map_small_group.png
new file mode 100644
index 0000000000..7c4b45d02e
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_small_group.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield.png b/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield.png
index b747faeb2b..fd74fb4a1d 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield.png and b/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield_small.png b/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield_small.png
index d218cdc107..de66729794 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield_small.png and b/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield_small.png differ
diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index fa2d1d9cdd..75c14dd8a0 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -16,7 +16,7 @@
@@ -32,22 +32,22 @@
android:id="@+id/context_menu_top_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
+ android:layout_marginBottom="@dimen/context_menu_first_line_bottom_margin"
android:baselineAligned="false"
android:orientation="horizontal">
@@ -60,13 +60,13 @@
@@ -107,8 +107,8 @@
@@ -209,8 +209,8 @@
android:background="?android:selectableItemBackground"
android:drawableLeft="@drawable/ic_action_delete_dark"
android:gravity="center"
- android:paddingLeft="10dp"
- android:paddingRight="10dp"
+ android:paddingLeft="@dimen/context_menu_button_padding_x"
+ android:paddingRight="@dimen/context_menu_button_padding_x"
android:text="@string/shared_string_delete"
android:textColor="?attr/contextMenuButtonColor"
android:textSize="@dimen/default_desc_text_size"/>
@@ -221,12 +221,12 @@
android:id="@+id/title_progress_container"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="-16dp"
+ android:layout_marginTop="@dimen/context_menu_buttons_top_margin"
android:clickable="true"
android:gravity="center_vertical"
- android:minHeight="52dp"
+ android:minHeight="@dimen/context_menu_progress_min_height"
android:orientation="horizontal"
- android:paddingBottom="4dp"
+ android:paddingBottom="@dimen/context_menu_buttons_padding_bottom"
android:paddingLeft="72dp"
android:paddingRight="2dp"
android:visibility="gone"
@@ -264,12 +264,12 @@
+ tools:src="@drawable/map_action_cancel"/>
@@ -285,7 +285,7 @@
android:id="@+id/context_menu_buttons"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="54dp">
+ android:layout_height="@dimen/context_menu_action_buttons_h">
+ android:src="@drawable/map_action_fav_dark"/>
+ android:src="@drawable/map_action_flag_dark"/>
+ android:src="@drawable/map_action_gshare_dark"/>
+ android:src="@drawable/map_overflow_menu_white"/>
@@ -382,7 +382,7 @@
android:layout_width="@dimen/fab_size_with_shadow"
android:layout_height="@dimen/fab_size_with_shadow"
android:layout_gravity="right"
- android:layout_marginRight="12dp"
+ android:layout_marginRight="@dimen/fab_margin_right"
android:background="@drawable/fab_background_style"
android:scaleType="center"
android:src="@drawable/map_directions"/>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 65f02f8da2..28b0a13f67 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1,4 +1,5 @@
-
+
+
Regionen
Regionsweite Karten
Weltweite Karten
@@ -2137,4 +2138,52 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
Feedback
Kontakt
Kartenlegende
-
\ No newline at end of file
+ Plaziert einen Dashboard-Knopf auf dem Bildschirm
+ \"Aus\" startet direkt die Kartenansicht.
+ in die Zwischenablage kopiert
+ " • Neue Kontext-bezogene Benutzeroberfläche bei Auswahl von Orten auf der Karte und anderen Ansichten\n\n • Kartenansicht wird nun direkt gestartet, außer bei Auswahl von \'Zeige Dashboard bei App-Start\'\n\n • Auswahl der anzuzeigenden Elemente im Dashboard möglich\n\n • Zum Herunterladen von Kartendateien können nun Regionen direkt durch Tippen auf der Weltkarte ausgewählt werden\n\n • Die POI-Suche ermöglicht nun speziellere Abfragen\n\n • Verbesserungen beim Editieren von POI- und OSM-Objekten\n\n • Oberfläche und Struktur zum Herunterladen der Karten wurden überarbeitet\n\n und mehr ... "
+ offline speichern
+ geänderter OSM-POI
+ OSM-POI löschen
+ Offene OSM-Notiz
+ Wiedereröffnete OSM-Notiz
+ Kommentierte OSM-Notiz
+ Gelöschte OSM-Notiz
+ Erstellte OSM-Notiz
+ OSM-Notiz (Note)
+ Notiz erstellen
+ Kommentar hinzufügen
+ Notiz wieder öffnen
+ Notiz schließen
+ Notiz erfolgreich erstellt
+ Fehler aufgetreten: Notiz wurde nicht erstellt
+ Notiz wurde erfolgreich geschlossen
+ Fehler aufgetreten: Notiz wurde nicht geschlossen
+ GPX-Wegpunkt löschen?
+ GPX-Wegpunkt bearbeiten
+ Friesisch
+ Albanisch (Tosk)
+ Wieder öffnen
+ Basis
+ Fortgeschritten
+ Kontakt-Informationen
+ Art-des POI
+ Anzahl der Zeilen im Dashboard %1$s
+ %1$s Downloads übrig
+ Herunterladen - %1$d Datei
+ Zeige das Banner der freien Version
+ Bitte das Seezeichen-Plugin aktivieren
+ Bitte das SRTM-Plugin aktivieren
+ Vollversion
+ Soll die reine Straßenkarte wirklich heruntergeladen werden, obwohl die vollständige Karte vorhanden ist?
+ %1$.1f von %2$.1f MB
+ Alles aktualisieren (%1$s MB)
+ Verbrauchte freie Downloads
+ Name des Landes eingeben
+ Soll der POI wirklich ohne Art des POI gespeichert werden?
+ OSM-Änderung bearbeiten
+ Dashboard immer starten
+ Kartenansicht immer starten
+ Neue Auswahl des Startvorgangs
+ Es ist nun auswählbar, ob beim Start der App gleich die Kartenansicht oder das Dashboard angezeigt wird. (Jederzeit in den Dashboard-Einstellungen änderbar)
+
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 8b56927161..bd38fd8c4e 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -99,7 +99,7 @@
Ruta GPX
Encontradas varias categorías PDI que responden a la consulta:
Los datos locales para buscar PDI no están presentes.
- Búsqueda por nombre
+ Buscar por nombre
El archivo de datos del PDI \'%1$s\' es redundante y puede ser borrado.
El archivo local para guardar cambios de PDIs no fue encontrado ni pudo ser creado.
Actualizar a OsmAnd+
@@ -724,7 +724,7 @@
Rotonda: Tome la %1$dª salida hacia
Manténgase a la izquierda y continúe
Manténgase a la derecha y continúe
- ASAP
+ Lo antes posible
Público
Identificable
Trazable
@@ -1564,7 +1564,7 @@
Utilizar HTTPS
Inicio
Actualizaciones disponibles para %1$s mapa(s)
- Búsqueda por
+ Buscar por
Mostrar todo
Coordenadas
Utilizar renderizado OpenGL
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index caa6b3251e..690e645b5f 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -41,6 +41,25 @@
6dp
+
+
+
+ 30dp
+ 25dp
+ 21dp
+ 24dp
+ 6dp
+ 114dp
+ 15dp
+ -24dp
+ 6dp
+ 78dp
+ 66dp
+ 80dp
+
+ 90dp
+ 18dp
+
65dp
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index 4fc8c5a7d3..9a0347574a 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -1707,4 +1707,5 @@
Sigaretas
Butega de fogos de artifìtziu
-
+Acontzadura de eletrodomèsticos
+
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 9b01fb1baf..753f7de02b 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -1,4 +1,5 @@
-
+
+
Ammustra sa positzione semper a su tzentru
Boghe
Mistura
@@ -2017,8 +2018,10 @@
Colore GPX
Largària GPX
Istile pro sas istradas
- Optziones noas de cumintzu
- Podes isseberare sa mègius manera de allumìngiu de s\'aplicatzione, cun sa mapa o su pannellu de controllu. As a pòdere cambiare s’issebera tua prus a tardu in sas impostatziones.
- Lassa sas impostatziones atuales
- Ammustra sa mapa a s’allumìngiu
+ Issèbera noa de allumìngiu
+ Como podes isseberare sa mègius manera de allumìngiu de s\'aplicatzione, deretamente dae sa mapa o cun su pannellu de controllu in antis. As a pòdere semper cambiare s’issèbera tua prus a tardu in sas impostatziones de su pannellu.
+ Ammustra semper su pannellu de controllu
+ Ammustra semper sa mapa
+ Pone unu butone pro su pannellu de controllu in s’ischermu de sa mapa
+ Intra dae sa mapa
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index d6bdfc359f..3282a0f8ed 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -101,7 +101,23 @@
2dp
6dp
+
+
+ 20dp
+ 17dp
+ 14dp
+ 16dp
+ 4dp
+ 76dp
+ 10dp
+ -16dp
+ 4dp
+ 52dp
+ 44dp
+ 54dp
+
62dp
+ 12dp
19sp
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
index 78970ed346..99c5e767f8 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@@ -53,6 +53,7 @@ public class MapContextMenu extends MenuTitleController {
private LatLon myLocation;
private Float heading;
private boolean inLocationUpdate = false;
+ private long locationUpdateTime;
private int favActionIconId;
@@ -348,7 +349,7 @@ public class MapContextMenu extends MenuTitleController {
if (menuController != null) {
favActionIconId = menuController.getFavActionIconId();
} else {
- favActionIconId = R.drawable.ic_action_fav_dark;
+ favActionIconId = R.drawable.map_action_fav_dark;
}
}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index a315f64db5..a7eae34304 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -360,13 +360,8 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
});
final ImageButton buttonWaypoint = (ImageButton) view.findViewById(R.id.context_menu_route_button);
- if (getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) {
- buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_flag_dark,
+ buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_flag_dark,
light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
- } else {
- buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_waypoints,
- light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
- }
buttonWaypoint.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -375,7 +370,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
});
final ImageButton buttonShare = (ImageButton) view.findViewById(R.id.context_menu_share_button);
- buttonShare.setImageDrawable(iconsCache.getIcon(R.drawable.abc_ic_menu_share_mtrl_alpha,
+ buttonShare.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_gshare_dark,
light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
buttonShare.setOnClickListener(new View.OnClickListener() {
@Override
@@ -385,7 +380,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
});
final ImageButton buttonMore = (ImageButton) view.findViewById(R.id.context_menu_more_button);
- buttonMore.setImageDrawable(iconsCache.getIcon(R.drawable.ic_overflow_menu_white,
+ buttonMore.setImageDrawable(iconsCache.getIcon(R.drawable.map_overflow_menu_white,
light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
buttonMore.setOnClickListener(new View.OnClickListener() {
@Override
@@ -758,7 +753,8 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
private void updateCompassVisibility() {
View compassView = view.findViewById(R.id.compass_layout);
- if (menu.displayDistanceDirection() && menu.getCurrentMenuState() != MenuState.FULL_SCREEN) {
+ boolean gpsFixed = getMyApplication().getLocationProvider().getGPSInfo().fixed;
+ if (gpsFixed && menu.displayDistanceDirection() && menu.getCurrentMenuState() != MenuState.FULL_SCREEN) {
updateDistanceDirection();
compassView.setVisibility(View.VISIBLE);
} else {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
index 7b28f7f000..f80f1583eb 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
@@ -138,7 +138,7 @@ public abstract class MenuController extends BaseMenuController {
protected void addMyLocationToPlainItems(PointDescription pointDescription, LatLon latLon) {
if (pointDescription != null) {
- addPlainMenuItem(R.drawable.map_my_location, PointDescription.getLocationName(getMapActivity(),
+ addPlainMenuItem(R.drawable.ic_action_get_my_location, PointDescription.getLocationName(getMapActivity(),
latLon.getLatitude(), latLon.getLongitude(), true).replaceAll("\n", ""), false);
}
}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java
index ed1424de4c..5350930258 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java
@@ -67,12 +67,12 @@ public class FavouritePointMenuController extends MenuController {
@Override
public Drawable getSecondLineTypeIcon() {
- return getIcon(R.drawable.ic_small_group);
+ return getIcon(R.drawable.map_small_group);
}
@Override
public int getFavActionIconId() {
- return R.drawable.ic_action_edit_dark;
+ return R.drawable.map_action_edit_dark;
}
@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WptPtMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WptPtMenuController.java
index 852959b4b7..098b385091 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WptPtMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WptPtMenuController.java
@@ -66,7 +66,7 @@ public class WptPtMenuController extends MenuController {
if (Algorithms.isEmpty(getTypeStr())) {
return null;
} else {
- return getIcon(R.drawable.ic_small_group);
+ return getIcon(R.drawable.map_small_group);
}
}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java
index 9098dbe39c..b0336dccc5 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java
@@ -120,7 +120,7 @@ public class FavoritePointEditorFragment extends PointEditorFragment {
Algorithms.stringsEqual(favorite.getDescription(), point.getDescription())) {
if (needDismiss) {
- dismiss(true);
+ dismiss(false);
}
return;
}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
index 6feff03e63..5337cf0d8e 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
@@ -161,9 +161,9 @@ public abstract class PointEditorFragment extends Fragment {
@Override
public void onDestroyView() {
-// if (!wasSaved() && !getEditor().isNew()) {
-// save(false);
-// }
+ if (!wasSaved() && !getEditor().isNew()) {
+ save(false);
+ }
super.onDestroyView();
getActivity().findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.VISIBLE);
}