diff --git a/OsmAnd/res/drawable-hdpi/map_action_aircraft.png b/OsmAnd/res/drawable-hdpi/map_action_aircraft.png deleted file mode 100644 index b49ffae59e..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_aircraft.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_bicycle_dark.png b/OsmAnd/res/drawable-hdpi/map_action_bicycle_dark.png deleted file mode 100644 index 8b1f254775..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_bicycle_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_bus_dark.png b/OsmAnd/res/drawable-hdpi/map_action_bus_dark.png deleted file mode 100644 index 0e72f04116..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_bus_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_camper.png b/OsmAnd/res/drawable-hdpi/map_action_camper.png deleted file mode 100644 index 08f6ec1d26..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_camper.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_campervan.png b/OsmAnd/res/drawable-hdpi/map_action_campervan.png deleted file mode 100644 index dda219fe4c..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_campervan.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_cancel.png b/OsmAnd/res/drawable-hdpi/map_action_cancel.png deleted file mode 100644 index 718053c411..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_cancel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_car_dark.png b/OsmAnd/res/drawable-hdpi/map_action_car_dark.png deleted file mode 100644 index 66d4fb6ce8..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_car_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_edit_dark.png b/OsmAnd/res/drawable-hdpi/map_action_edit_dark.png deleted file mode 100644 index 7a84c52ecc..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_edit_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_fav_dark.png b/OsmAnd/res/drawable-hdpi/map_action_fav_dark.png deleted file mode 100644 index bcff65516a..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_fav_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_flag_dark.png b/OsmAnd/res/drawable-hdpi/map_action_flag_dark.png deleted file mode 100644 index 3909f3c18f..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_flag_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_gshare_dark.png b/OsmAnd/res/drawable-hdpi/map_action_gshare_dark.png deleted file mode 100644 index 7ea5f3bbed..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_gshare_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_helicopter.png b/OsmAnd/res/drawable-hdpi/map_action_helicopter.png deleted file mode 100644 index 525e2c99da..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_helicopter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_horse.png b/OsmAnd/res/drawable-hdpi/map_action_horse.png deleted file mode 100644 index 1aedc777c7..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_horse.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_monowheel.png b/OsmAnd/res/drawable-hdpi/map_action_monowheel.png deleted file mode 100644 index d40da73641..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_monowheel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_motorcycle_dark.png b/OsmAnd/res/drawable-hdpi/map_action_motorcycle_dark.png deleted file mode 100644 index 66648794b7..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_motorcycle_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_offroad.png b/OsmAnd/res/drawable-hdpi/map_action_offroad.png deleted file mode 100644 index 2386299bc3..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_offroad.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_openstreetmap_logo.png b/OsmAnd/res/drawable-hdpi/map_action_openstreetmap_logo.png deleted file mode 100644 index a1a2c1b061..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_openstreetmap_logo.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_pedestrian_dark.png b/OsmAnd/res/drawable-hdpi/map_action_pedestrian_dark.png deleted file mode 100644 index 6220bbbfce..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_pedestrian_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_personal_transporter.png b/OsmAnd/res/drawable-hdpi/map_action_personal_transporter.png deleted file mode 100644 index 4a981fc92d..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_personal_transporter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_pickup_truck.png b/OsmAnd/res/drawable-hdpi/map_action_pickup_truck.png deleted file mode 100755 index dfe1daff62..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_pickup_truck.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_sail_boat_dark.png b/OsmAnd/res/drawable-hdpi/map_action_sail_boat_dark.png deleted file mode 100644 index c3af81852a..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_sail_boat_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_scooter.png b/OsmAnd/res/drawable-hdpi/map_action_scooter.png deleted file mode 100644 index 53a50e2a40..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_scooter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_settings.png b/OsmAnd/res/drawable-hdpi/map_action_settings.png deleted file mode 100644 index 9f462386e1..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_settings.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_shuttle_bus.png b/OsmAnd/res/drawable-hdpi/map_action_shuttle_bus.png deleted file mode 100644 index f62eb37750..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_shuttle_bus.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_skiing.png b/OsmAnd/res/drawable-hdpi/map_action_skiing.png deleted file mode 100644 index 48b4f4226c..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_skiing.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_subway.png b/OsmAnd/res/drawable-hdpi/map_action_subway.png deleted file mode 100644 index fa492562fe..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_subway.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_taxi.png b/OsmAnd/res/drawable-hdpi/map_action_taxi.png deleted file mode 100644 index 1f2d2fedf1..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_taxi.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_train.png b/OsmAnd/res/drawable-hdpi/map_action_train.png deleted file mode 100644 index a636843f8d..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_train.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_trekking_dark.png b/OsmAnd/res/drawable-hdpi/map_action_trekking_dark.png deleted file mode 100644 index 8fba82e784..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_trekking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_truck_dark.png b/OsmAnd/res/drawable-hdpi/map_action_truck_dark.png deleted file mode 100644 index 42d58f102c..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_truck_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_ufo.png b/OsmAnd/res/drawable-hdpi/map_action_ufo.png deleted file mode 100644 index d155379c32..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_ufo.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_utv.png b/OsmAnd/res/drawable-hdpi/map_action_utv.png deleted file mode 100644 index 7c34c8c326..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_utv.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_wagon.png b/OsmAnd/res/drawable-hdpi/map_action_wagon.png deleted file mode 100755 index 436b9ec48c..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_wagon.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_waypoint.png b/OsmAnd/res/drawable-hdpi/map_action_waypoint.png deleted file mode 100644 index 517713557e..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_waypoint.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_waypoints.png b/OsmAnd/res/drawable-hdpi/map_action_waypoints.png deleted file mode 100644 index 47f31c73e9..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_waypoints.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_world_globe.png b/OsmAnd/res/drawable-hdpi/map_action_world_globe.png deleted file mode 100644 index 6ad36c2b3a..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_action_world_globe.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_arrow_to_destination.png b/OsmAnd/res/drawable-hdpi/map_arrow_to_destination.png deleted file mode 100644 index f4a7fafb39..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_arrow_to_destination.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_bottom.png b/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_bottom.png deleted file mode 100644 index 5b578baff0..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_bottom.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_bottom_small.png b/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_bottom_small.png deleted file mode 100644 index 75de2bb8e1..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_bottom_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_center.png b/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_center.png deleted file mode 100644 index d1e144e137..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_center.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_center_small.png b/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_center_small.png deleted file mode 100644 index d415079d22..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_center_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_top.png b/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_top.png deleted file mode 100644 index a5955b481b..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_top.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_top_small.png b/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_top_small.png deleted file mode 100644 index 89e464a642..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/map_bg_point_rhomb_top_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_aircraft.png b/OsmAnd/res/drawable-mdpi/map_action_aircraft.png deleted file mode 100644 index 89e9ad9701..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_aircraft.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_bicycle_dark.png b/OsmAnd/res/drawable-mdpi/map_action_bicycle_dark.png deleted file mode 100644 index 68543a3a57..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_bicycle_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_bus_dark.png b/OsmAnd/res/drawable-mdpi/map_action_bus_dark.png deleted file mode 100644 index 6fd1627c8f..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_bus_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_camper.png b/OsmAnd/res/drawable-mdpi/map_action_camper.png deleted file mode 100644 index 210a1a2c5b..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_camper.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_campervan.png b/OsmAnd/res/drawable-mdpi/map_action_campervan.png deleted file mode 100644 index c1651fddc6..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_campervan.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_cancel.png b/OsmAnd/res/drawable-mdpi/map_action_cancel.png deleted file mode 100644 index 939f58b193..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_cancel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_car_dark.png b/OsmAnd/res/drawable-mdpi/map_action_car_dark.png deleted file mode 100644 index b02276cfd4..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_car_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_edit_dark.png b/OsmAnd/res/drawable-mdpi/map_action_edit_dark.png deleted file mode 100644 index d1b7340b56..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_edit_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_fav_dark.png b/OsmAnd/res/drawable-mdpi/map_action_fav_dark.png deleted file mode 100644 index ac5e8408e3..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_fav_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_flag_dark.png b/OsmAnd/res/drawable-mdpi/map_action_flag_dark.png deleted file mode 100644 index 67e9c04bc7..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_flag_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_gshare_dark.png b/OsmAnd/res/drawable-mdpi/map_action_gshare_dark.png deleted file mode 100644 index a8bf67e04c..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_gshare_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_helicopter.png b/OsmAnd/res/drawable-mdpi/map_action_helicopter.png deleted file mode 100644 index baddd20da4..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_helicopter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_horse.png b/OsmAnd/res/drawable-mdpi/map_action_horse.png deleted file mode 100644 index c9ed62dcc0..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_horse.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_monowheel.png b/OsmAnd/res/drawable-mdpi/map_action_monowheel.png deleted file mode 100644 index 1a0d4b4ca8..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_monowheel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_motorcycle_dark.png b/OsmAnd/res/drawable-mdpi/map_action_motorcycle_dark.png deleted file mode 100644 index 4663d5eb5a..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_motorcycle_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_offroad.png b/OsmAnd/res/drawable-mdpi/map_action_offroad.png deleted file mode 100644 index 3346f553a1..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_offroad.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_openstreetmap_logo.png b/OsmAnd/res/drawable-mdpi/map_action_openstreetmap_logo.png deleted file mode 100644 index 8283adb943..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_openstreetmap_logo.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_pedestrian_dark.png b/OsmAnd/res/drawable-mdpi/map_action_pedestrian_dark.png deleted file mode 100644 index 975278e960..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_pedestrian_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_personal_transporter.png b/OsmAnd/res/drawable-mdpi/map_action_personal_transporter.png deleted file mode 100644 index d2aca1284e..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_personal_transporter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_pickup_truck.png b/OsmAnd/res/drawable-mdpi/map_action_pickup_truck.png deleted file mode 100755 index de3ea08585..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_pickup_truck.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_sail_boat_dark.png b/OsmAnd/res/drawable-mdpi/map_action_sail_boat_dark.png deleted file mode 100644 index 06d72e9dc4..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_sail_boat_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_scooter.png b/OsmAnd/res/drawable-mdpi/map_action_scooter.png deleted file mode 100644 index 2ab9f2b08b..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_scooter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_settings.png b/OsmAnd/res/drawable-mdpi/map_action_settings.png deleted file mode 100644 index bb2cc22048..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_settings.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_shuttle_bus.png b/OsmAnd/res/drawable-mdpi/map_action_shuttle_bus.png deleted file mode 100644 index 6bcbc3eb9f..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_shuttle_bus.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_skiing.png b/OsmAnd/res/drawable-mdpi/map_action_skiing.png deleted file mode 100644 index 64c6816c9c..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_skiing.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_subway.png b/OsmAnd/res/drawable-mdpi/map_action_subway.png deleted file mode 100644 index c6fa37ab06..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_subway.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_taxi.png b/OsmAnd/res/drawable-mdpi/map_action_taxi.png deleted file mode 100644 index 2d6d8ecb8b..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_taxi.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_trekking_dark.png b/OsmAnd/res/drawable-mdpi/map_action_trekking_dark.png deleted file mode 100644 index bc47c14221..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_trekking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_truck_dark.png b/OsmAnd/res/drawable-mdpi/map_action_truck_dark.png deleted file mode 100644 index 924368afb0..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_truck_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_ufo.png b/OsmAnd/res/drawable-mdpi/map_action_ufo.png deleted file mode 100644 index 6ab64cc2cd..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_ufo.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_utv.png b/OsmAnd/res/drawable-mdpi/map_action_utv.png deleted file mode 100755 index c65fd59dfa..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_utv.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_wagon.png b/OsmAnd/res/drawable-mdpi/map_action_wagon.png deleted file mode 100755 index e9bdaa6554..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_wagon.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_waypoints.png b/OsmAnd/res/drawable-mdpi/map_action_waypoints.png deleted file mode 100644 index fb49c2f491..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_waypoints.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_world_globe.png b/OsmAnd/res/drawable-mdpi/map_action_world_globe.png deleted file mode 100644 index f12948b7a8..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_action_world_globe.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_arrow_to_destination.png b/OsmAnd/res/drawable-mdpi/map_arrow_to_destination.png deleted file mode 100644 index 1ebbe7b457..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_arrow_to_destination.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_bottom.png b/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_bottom.png deleted file mode 100644 index 687894f3fa..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_bottom.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_bottom_small.png b/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_bottom_small.png deleted file mode 100644 index c8d734ea8a..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_bottom_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_center.png b/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_center.png deleted file mode 100644 index 5800263660..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_center.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_center_small.png b/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_center_small.png deleted file mode 100644 index 63cf879a0d..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_center_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_top.png b/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_top.png deleted file mode 100644 index af86889aa7..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_top.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_top_small.png b/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_top_small.png deleted file mode 100644 index 99ef0f7541..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/map_bg_point_rhomb_top_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_aircraft.png b/OsmAnd/res/drawable-xhdpi/map_action_aircraft.png deleted file mode 100644 index 706c42b66f..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_aircraft.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_bicycle_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_bicycle_dark.png deleted file mode 100644 index 41162d6479..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_bicycle_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_bus_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_bus_dark.png deleted file mode 100644 index 01e55b411b..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_bus_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_camper.png b/OsmAnd/res/drawable-xhdpi/map_action_camper.png deleted file mode 100644 index 0ab012b2ad..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_camper.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_campervan.png b/OsmAnd/res/drawable-xhdpi/map_action_campervan.png deleted file mode 100644 index ea08d90a4d..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_campervan.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_cancel.png b/OsmAnd/res/drawable-xhdpi/map_action_cancel.png deleted file mode 100644 index 7f2de6194e..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_cancel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_car_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_car_dark.png deleted file mode 100644 index 60aec0a344..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_car_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_edit_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_edit_dark.png deleted file mode 100644 index 65f24663bc..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_edit_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_fav_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_fav_dark.png deleted file mode 100644 index 2a37a2dc82..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_fav_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_flag_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_flag_dark.png deleted file mode 100644 index 43cb50c36f..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_flag_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_gshare_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_gshare_dark.png deleted file mode 100644 index 518b936039..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_gshare_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_helicopter.png b/OsmAnd/res/drawable-xhdpi/map_action_helicopter.png deleted file mode 100644 index b2cb8fe6e7..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_helicopter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_horse.png b/OsmAnd/res/drawable-xhdpi/map_action_horse.png deleted file mode 100644 index 1a884cd8c4..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_horse.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_monowheel.png b/OsmAnd/res/drawable-xhdpi/map_action_monowheel.png deleted file mode 100644 index 7eb411971b..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_monowheel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_motorcycle_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_motorcycle_dark.png deleted file mode 100644 index fa378f2267..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_motorcycle_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_offroad.png b/OsmAnd/res/drawable-xhdpi/map_action_offroad.png deleted file mode 100644 index e8e7087332..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_offroad.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_openstreetmap_logo.png b/OsmAnd/res/drawable-xhdpi/map_action_openstreetmap_logo.png deleted file mode 100644 index 5556cf200f..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_openstreetmap_logo.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_pedestrian_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_pedestrian_dark.png deleted file mode 100644 index a69b18369d..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_pedestrian_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_personal_transporter.png b/OsmAnd/res/drawable-xhdpi/map_action_personal_transporter.png deleted file mode 100644 index d51bebb1cf..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_personal_transporter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_pickup_truck.png b/OsmAnd/res/drawable-xhdpi/map_action_pickup_truck.png deleted file mode 100755 index 914493aa21..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_pickup_truck.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_sail_boat_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_sail_boat_dark.png deleted file mode 100644 index 7554c835be..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_sail_boat_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_scooter.png b/OsmAnd/res/drawable-xhdpi/map_action_scooter.png deleted file mode 100644 index 1abff34c8c..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_scooter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_settings.png b/OsmAnd/res/drawable-xhdpi/map_action_settings.png deleted file mode 100644 index 3972159d46..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_settings.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_shuttle_bus.png b/OsmAnd/res/drawable-xhdpi/map_action_shuttle_bus.png deleted file mode 100644 index 777a9566c5..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_shuttle_bus.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_skiing.png b/OsmAnd/res/drawable-xhdpi/map_action_skiing.png deleted file mode 100644 index 2dce4af6b9..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_skiing.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_subway.png b/OsmAnd/res/drawable-xhdpi/map_action_subway.png deleted file mode 100644 index 8685bd0a42..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_subway.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_taxi.png b/OsmAnd/res/drawable-xhdpi/map_action_taxi.png deleted file mode 100644 index 4d7b07b460..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_taxi.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_train.png b/OsmAnd/res/drawable-xhdpi/map_action_train.png deleted file mode 100644 index 0467209c23..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_train.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_trekking_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_trekking_dark.png deleted file mode 100644 index 590b07b26d..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_trekking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_truck_dark.png b/OsmAnd/res/drawable-xhdpi/map_action_truck_dark.png deleted file mode 100644 index f241e764c9..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_truck_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_ufo.png b/OsmAnd/res/drawable-xhdpi/map_action_ufo.png deleted file mode 100644 index 55369953db..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_ufo.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_utv.png b/OsmAnd/res/drawable-xhdpi/map_action_utv.png deleted file mode 100755 index 6bf13b2a85..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_utv.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_wagon.png b/OsmAnd/res/drawable-xhdpi/map_action_wagon.png deleted file mode 100755 index abc457a137..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_wagon.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_waypoint.png b/OsmAnd/res/drawable-xhdpi/map_action_waypoint.png deleted file mode 100644 index 11635e7774..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_waypoint.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_waypoints.png b/OsmAnd/res/drawable-xhdpi/map_action_waypoints.png deleted file mode 100644 index ca9aaab90c..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_waypoints.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_world_globe.png b/OsmAnd/res/drawable-xhdpi/map_action_world_globe.png deleted file mode 100644 index 5b2b24f48a..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_action_world_globe.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_arrow_to_destination.png b/OsmAnd/res/drawable-xhdpi/map_arrow_to_destination.png deleted file mode 100644 index bcd01a3b27..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_arrow_to_destination.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_bottom.png b/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_bottom.png deleted file mode 100644 index 172ff41fd3..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_bottom.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_bottom_small.png b/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_bottom_small.png deleted file mode 100644 index cafcd6d6ca..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_bottom_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_center.png b/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_center.png deleted file mode 100644 index 0acadf15df..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_center.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_center_small.png b/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_center_small.png deleted file mode 100644 index 5800263660..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_center_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_top.png b/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_top.png deleted file mode 100644 index 281ad49f07..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_top.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_top_small.png b/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_top_small.png deleted file mode 100644 index 856ee8bc7e..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/map_bg_point_rhomb_top_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_aircraft.png b/OsmAnd/res/drawable-xxhdpi/map_action_aircraft.png deleted file mode 100644 index 3d4bb83c1c..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_aircraft.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_bicycle_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_bicycle_dark.png deleted file mode 100644 index f9b9cc43dc..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_bicycle_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_bus_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_bus_dark.png deleted file mode 100644 index db9e85f79c..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_bus_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_camper.png b/OsmAnd/res/drawable-xxhdpi/map_action_camper.png deleted file mode 100644 index d5f89c8561..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_camper.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_campervan.png b/OsmAnd/res/drawable-xxhdpi/map_action_campervan.png deleted file mode 100644 index 60c0f69634..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_campervan.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_cancel.png b/OsmAnd/res/drawable-xxhdpi/map_action_cancel.png deleted file mode 100644 index ea01fe05e2..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_cancel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_car_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_car_dark.png deleted file mode 100644 index 03414f264b..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_car_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_edit_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_edit_dark.png deleted file mode 100644 index 42eec822b5..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_edit_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_fav_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_fav_dark.png deleted file mode 100644 index 2b505969b5..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_fav_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_flag_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_flag_dark.png deleted file mode 100644 index 7096acce62..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_flag_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_gshare_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_gshare_dark.png deleted file mode 100644 index 7e2c60df6b..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_gshare_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_helicopter.png b/OsmAnd/res/drawable-xxhdpi/map_action_helicopter.png deleted file mode 100644 index 207f5adc64..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_helicopter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_horse.png b/OsmAnd/res/drawable-xxhdpi/map_action_horse.png deleted file mode 100644 index d3682d48e3..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_horse.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_monowheel.png b/OsmAnd/res/drawable-xxhdpi/map_action_monowheel.png deleted file mode 100644 index fd9c518b57..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_monowheel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_motorcycle_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_motorcycle_dark.png deleted file mode 100644 index c91d620e84..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_motorcycle_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_offroad.png b/OsmAnd/res/drawable-xxhdpi/map_action_offroad.png deleted file mode 100644 index a24c8505b9..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_offroad.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_openstreetmap_logo.png b/OsmAnd/res/drawable-xxhdpi/map_action_openstreetmap_logo.png deleted file mode 100644 index 11213d2703..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_openstreetmap_logo.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_pedestrian_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_pedestrian_dark.png deleted file mode 100644 index 5efdc34505..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_pedestrian_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_personal_transporter.png b/OsmAnd/res/drawable-xxhdpi/map_action_personal_transporter.png deleted file mode 100644 index 9871e04ee4..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_personal_transporter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_pickup_truck.png b/OsmAnd/res/drawable-xxhdpi/map_action_pickup_truck.png deleted file mode 100755 index 83984e2185..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_pickup_truck.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_sail_boat_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_sail_boat_dark.png deleted file mode 100644 index 0668160311..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_sail_boat_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_scooter.png b/OsmAnd/res/drawable-xxhdpi/map_action_scooter.png deleted file mode 100644 index 819fca3218..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_scooter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_settings.png b/OsmAnd/res/drawable-xxhdpi/map_action_settings.png deleted file mode 100644 index 0fac002ad8..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_settings.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_shuttle_bus.png b/OsmAnd/res/drawable-xxhdpi/map_action_shuttle_bus.png deleted file mode 100644 index 9014475e11..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_shuttle_bus.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_skiing.png b/OsmAnd/res/drawable-xxhdpi/map_action_skiing.png deleted file mode 100644 index fb94b43469..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_skiing.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_subway.png b/OsmAnd/res/drawable-xxhdpi/map_action_subway.png deleted file mode 100644 index 996f2f75a6..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_subway.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_taxi.png b/OsmAnd/res/drawable-xxhdpi/map_action_taxi.png deleted file mode 100644 index 3e47e47878..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_taxi.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_train.png b/OsmAnd/res/drawable-xxhdpi/map_action_train.png deleted file mode 100644 index cba8a6ee96..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_train.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_trekking_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_trekking_dark.png deleted file mode 100644 index acaf7a6975..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_trekking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_truck_dark.png b/OsmAnd/res/drawable-xxhdpi/map_action_truck_dark.png deleted file mode 100644 index 2ec34c5e95..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_truck_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_ufo.png b/OsmAnd/res/drawable-xxhdpi/map_action_ufo.png deleted file mode 100644 index 99e96616a5..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_ufo.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_utv.png b/OsmAnd/res/drawable-xxhdpi/map_action_utv.png deleted file mode 100755 index e93b45be5c..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_utv.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_wagon.png b/OsmAnd/res/drawable-xxhdpi/map_action_wagon.png deleted file mode 100755 index dd699b5580..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_wagon.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_waypoint.png b/OsmAnd/res/drawable-xxhdpi/map_action_waypoint.png deleted file mode 100644 index 249b5aa13d..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_waypoint.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_waypoints.png b/OsmAnd/res/drawable-xxhdpi/map_action_waypoints.png deleted file mode 100644 index 0ba0241b02..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_waypoints.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_world_globe.png b/OsmAnd/res/drawable-xxhdpi/map_action_world_globe.png deleted file mode 100644 index 3a8107e477..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_action_world_globe.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_arrow_to_destination.png b/OsmAnd/res/drawable-xxhdpi/map_arrow_to_destination.png deleted file mode 100644 index 507f7f0e58..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_arrow_to_destination.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_bottom.png b/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_bottom.png deleted file mode 100644 index 81ccbd89f1..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_bottom.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_bottom_small.png b/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_bottom_small.png deleted file mode 100644 index e7ef5a2473..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_bottom_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_center.png b/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_center.png deleted file mode 100644 index 396de521d1..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_center.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_center_small.png b/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_center_small.png deleted file mode 100644 index d1e144e137..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_center_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_top.png b/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_top.png deleted file mode 100644 index f3ef1b28b2..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_top.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_top_small.png b/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_top_small.png deleted file mode 100644 index 0b26ad5bee..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/map_bg_point_rhomb_top_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_aircraft.png b/OsmAnd/res/drawable-xxxhdpi/map_action_aircraft.png deleted file mode 100644 index 3324d58a31..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_aircraft.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_bicycle_dark.png b/OsmAnd/res/drawable-xxxhdpi/map_action_bicycle_dark.png deleted file mode 100644 index 36afa3aa50..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_bicycle_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_bus_dark.png b/OsmAnd/res/drawable-xxxhdpi/map_action_bus_dark.png deleted file mode 100644 index ab6e9fd957..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_bus_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_camper.png b/OsmAnd/res/drawable-xxxhdpi/map_action_camper.png deleted file mode 100644 index ddec5227fd..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_camper.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_campervan.png b/OsmAnd/res/drawable-xxxhdpi/map_action_campervan.png deleted file mode 100644 index 8d368fa8cb..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_campervan.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_car_dark.png b/OsmAnd/res/drawable-xxxhdpi/map_action_car_dark.png deleted file mode 100644 index c18d34b963..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_car_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_helicopter.png b/OsmAnd/res/drawable-xxxhdpi/map_action_helicopter.png deleted file mode 100644 index 7184c07bd4..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_helicopter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_horse.png b/OsmAnd/res/drawable-xxxhdpi/map_action_horse.png deleted file mode 100644 index 74847b5ad9..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_horse.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_monowheel.png b/OsmAnd/res/drawable-xxxhdpi/map_action_monowheel.png deleted file mode 100644 index 74ab290847..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_monowheel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_motorcycle_dark.png b/OsmAnd/res/drawable-xxxhdpi/map_action_motorcycle_dark.png deleted file mode 100644 index 9cb9a5ac1c..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_motorcycle_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_offroad.png b/OsmAnd/res/drawable-xxxhdpi/map_action_offroad.png deleted file mode 100644 index 4a3a198295..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_offroad.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_openstreetmap_logo.png b/OsmAnd/res/drawable-xxxhdpi/map_action_openstreetmap_logo.png deleted file mode 100644 index a839fa92e6..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_openstreetmap_logo.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_pedestrian_dark.png b/OsmAnd/res/drawable-xxxhdpi/map_action_pedestrian_dark.png deleted file mode 100644 index ba96886afe..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_pedestrian_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_personal_transporter.png b/OsmAnd/res/drawable-xxxhdpi/map_action_personal_transporter.png deleted file mode 100644 index 4f83d12778..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_personal_transporter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_pickup_truck.png b/OsmAnd/res/drawable-xxxhdpi/map_action_pickup_truck.png deleted file mode 100755 index f5cfe156e1..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_pickup_truck.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_sail_boat_dark.png b/OsmAnd/res/drawable-xxxhdpi/map_action_sail_boat_dark.png deleted file mode 100644 index 78a4320a03..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_sail_boat_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_scooter.png b/OsmAnd/res/drawable-xxxhdpi/map_action_scooter.png deleted file mode 100644 index b6b3922407..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_scooter.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_shuttle_bus.png b/OsmAnd/res/drawable-xxxhdpi/map_action_shuttle_bus.png deleted file mode 100644 index 78dc965559..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_shuttle_bus.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_skiing.png b/OsmAnd/res/drawable-xxxhdpi/map_action_skiing.png deleted file mode 100644 index 9484e68c42..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_skiing.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_subway.png b/OsmAnd/res/drawable-xxxhdpi/map_action_subway.png deleted file mode 100644 index 2643a0c73e..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_subway.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_taxi.png b/OsmAnd/res/drawable-xxxhdpi/map_action_taxi.png deleted file mode 100644 index a531ee01b2..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_taxi.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_trekking_dark.png b/OsmAnd/res/drawable-xxxhdpi/map_action_trekking_dark.png deleted file mode 100644 index 5e938c8fb9..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_trekking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_truck_dark.png b/OsmAnd/res/drawable-xxxhdpi/map_action_truck_dark.png deleted file mode 100644 index 5d33244bc5..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_truck_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_ufo.png b/OsmAnd/res/drawable-xxxhdpi/map_action_ufo.png deleted file mode 100644 index 4a857f367e..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_ufo.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_utv.png b/OsmAnd/res/drawable-xxxhdpi/map_action_utv.png deleted file mode 100755 index 8d9b9aab8e..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_utv.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_wagon.png b/OsmAnd/res/drawable-xxxhdpi/map_action_wagon.png deleted file mode 100755 index fc5f1db8f7..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_wagon.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_world_globe.png b/OsmAnd/res/drawable-xxxhdpi/map_action_world_globe.png deleted file mode 100644 index 1f121a8240..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_action_world_globe.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_bottom.png b/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_bottom.png deleted file mode 100644 index d6093d048a..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_bottom.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_bottom_small.png b/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_bottom_small.png deleted file mode 100644 index e4f752e880..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_bottom_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_center.png b/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_center.png deleted file mode 100644 index 29993b2a52..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_center.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_center_small.png b/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_center_small.png deleted file mode 100644 index 0acadf15df..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_center_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_top.png b/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_top.png deleted file mode 100644 index e62a7647e5..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_top.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_top_small.png b/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_top_small.png deleted file mode 100644 index 824b7349fd..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/map_bg_point_rhomb_top_small.png and /dev/null differ diff --git a/OsmAnd/res/drawable/map_action_ski_touring.xml b/OsmAnd/res/drawable/map_action_ski_touring.xml deleted file mode 100644 index f771350bd8..0000000000 --- a/OsmAnd/res/drawable/map_action_ski_touring.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/OsmAnd/res/drawable/map_action_snowmobile.xml b/OsmAnd/res/drawable/map_action_snowmobile.xml deleted file mode 100644 index 83463f1f5f..0000000000 --- a/OsmAnd/res/drawable/map_action_snowmobile.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/OsmAnd/res/layout/context_menu_action_item.xml b/OsmAnd/res/layout/context_menu_action_item.xml index 25c18a1845..6eb801d41a 100644 --- a/OsmAnd/res/layout/context_menu_action_item.xml +++ b/OsmAnd/res/layout/context_menu_action_item.xml @@ -12,10 +12,9 @@ + android:layout_width="@dimen/standard_icon_size" + android:layout_height="@dimen/standard_icon_size" + android:layout_marginBottom="@dimen/context_menu_main_actions_icon_margin" /> @@ -66,48 +70,58 @@ diff --git a/OsmAnd/res/layout/favorites_list_item.xml b/OsmAnd/res/layout/favorites_list_item.xml index cd227db55b..dd037282dd 100644 --- a/OsmAnd/res/layout/favorites_list_item.xml +++ b/OsmAnd/res/layout/favorites_list_item.xml @@ -30,10 +30,10 @@ android:minHeight="@dimen/favorites_list_item_height" android:layout_gravity="center_vertical" android:orientation="horizontal" - android:paddingStart="@dimen/list_header_text_left_margin" - android:paddingLeft="@dimen/list_header_text_left_margin" - android:paddingEnd="@dimen/list_header_text_left_margin" - android:paddingRight="@dimen/list_header_text_left_margin"> + android:paddingStart="@dimen/content_padding_small" + android:paddingLeft="@dimen/content_padding_small" + android:paddingEnd="@dimen/content_padding_small" + android:paddingRight="@dimen/content_padding_small"> @@ -57,7 +57,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:contentDescription="@string/favorite" - android:scaleType="center" tools:src="@drawable/bg_point_circle"/> diff --git a/OsmAnd/res/layout/first_usage_wizard_fragment.xml b/OsmAnd/res/layout/first_usage_wizard_fragment.xml index 815570c6fa..a77d8636de 100644 --- a/OsmAnd/res/layout/first_usage_wizard_fragment.xml +++ b/OsmAnd/res/layout/first_usage_wizard_fragment.xml @@ -638,7 +638,7 @@ android:layout_width="44dp" android:layout_height="44dp" android:contentDescription="@string/shared_string_cancel" - android:src="@drawable/map_action_cancel" + android:src="@drawable/ic_action_close" android:tint="@color/icon_color_default_light"/> diff --git a/OsmAnd/res/layout/global_preference_toolbar.xml b/OsmAnd/res/layout/global_preference_toolbar.xml index 6f6789eea7..2ad29a3a2f 100644 --- a/OsmAnd/res/layout/global_preference_toolbar.xml +++ b/OsmAnd/res/layout/global_preference_toolbar.xml @@ -6,23 +6,30 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/actionModeBackground" - android:minHeight="@dimen/toolbar_height" app:contentInsetLeft="0dp" app:contentInsetStart="0dp" app:contentInsetRight="0dp" app:contentInsetEnd="0dp"> + app:contentInsetStart="0dp" + app:theme="@style/ThemeOverlay.AppCompat.ActionBar"> + app:contentInsetEnd="0dp" + app:theme="@style/ThemeOverlay.AppCompat.ActionBar"> @@ -20,22 +20,22 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:minHeight="48dp" + android:minHeight="@dimen/bottom_sheet_list_item_height" android:background="?attr/bg_color" android:gravity="center" android:orientation="horizontal" android:paddingLeft="@dimen/content_padding" android:paddingRight="@dimen/content_padding" - android:paddingStart="@dimen/content_padding" - android:paddingEnd="@dimen/content_padding"> + android:paddingStart="@dimen/content_padding" + android:paddingEnd="@dimen/content_padding"> diff --git a/OsmAnd/res/layout/list_item_icon_and_menu.xml b/OsmAnd/res/layout/list_item_icon_and_menu.xml index b3ad8c8cbe..d0703ebb18 100644 --- a/OsmAnd/res/layout/list_item_icon_and_menu.xml +++ b/OsmAnd/res/layout/list_item_icon_and_menu.xml @@ -6,13 +6,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/bg_color" - android:minHeight="60dp" - tools:layout_height="60dp"> + android:minHeight="@dimen/setting_profile_item_height" + tools:layout_height="@dimen/setting_profile_item_height"> diff --git a/OsmAnd/res/layout/list_item_import.xml b/OsmAnd/res/layout/list_item_import.xml index 5d1e845d6b..862178e640 100644 --- a/OsmAnd/res/layout/list_item_import.xml +++ b/OsmAnd/res/layout/list_item_import.xml @@ -21,8 +21,8 @@ + android:layout_marginLeft="@dimen/content_padding" + android:layout_marginStart="@dimen/content_padding"> + android:orientation="horizontal"> diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml index 6c87325935..a57bfdb4ad 100644 --- a/OsmAnd/res/layout/map_context_menu_fragment.xml +++ b/OsmAnd/res/layout/map_context_menu_fragment.xml @@ -397,7 +397,7 @@ android:background="?attr/selectableItemBackground" android:contentDescription="@string/shared_string_close" android:scaleType="center" - tools:src="@drawable/map_action_cancel"/> + tools:src="@drawable/ic_action_close" /> diff --git a/OsmAnd/res/layout/mode_view.xml b/OsmAnd/res/layout/mode_view.xml index 4e53f468f7..990ba068cd 100644 --- a/OsmAnd/res/layout/mode_view.xml +++ b/OsmAnd/res/layout/mode_view.xml @@ -6,11 +6,11 @@ + android:background="?attr/dashboard_button" /> + tools:src="@drawable/ic_dashboard_dark" /> - \ 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 ce5a2a8e38..505a1dcd4b 100644 --- a/OsmAnd/res/layout/plan_route_info.xml +++ b/OsmAnd/res/layout/plan_route_info.xml @@ -503,14 +503,14 @@ + android:layout_width="@dimen/standard_icon_size" + android:layout_height="@dimen/standard_icon_size" + android:layout_gravity="center" + android:layout_marginStart="@dimen/content_padding_small" + android:layout_marginLeft="@dimen/content_padding_small" + android:layout_marginEnd="@dimen/route_info_buttons_padding_top_bottom" + android:layout_marginRight="@dimen/route_info_buttons_padding_top_bottom" + tools:src="@drawable/ic_action_settings" /> diff --git a/OsmAnd/res/layout/profile_preference_toolbar.xml b/OsmAnd/res/layout/profile_preference_toolbar.xml index 0460fca8a2..e275f43fdf 100644 --- a/OsmAnd/res/layout/profile_preference_toolbar.xml +++ b/OsmAnd/res/layout/profile_preference_toolbar.xml @@ -4,7 +4,6 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="@dimen/dashboard_map_toolbar" osmand:contentInsetLeft="0dp" osmand:contentInsetStart="0dp" osmand:contentInsetRight="0dp" @@ -14,6 +13,7 @@ @@ -21,9 +21,14 @@ diff --git a/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml b/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml index 06f2d1b7e7..f41dbd71ca 100644 --- a/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml +++ b/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml @@ -19,6 +19,7 @@ @@ -26,9 +27,14 @@ @@ -73,8 +79,8 @@ diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml index 131f2840a2..155aac492a 100644 --- a/OsmAnd/res/values-large/sizes.xml +++ b/OsmAnd/res/values-large/sizes.xml @@ -31,7 +31,7 @@ 140dp 81dp - 32dp + 36dp 48dp 120dp 17dp @@ -96,9 +96,12 @@ 65dp 60dp + 60dp 480dp 480dp - + 84dp + 13dp + 22sp 18sp 16sp @@ -154,6 +157,7 @@ 78dp 66dp 72dp + 96dp 36dp 11dp 12dp @@ -238,6 +242,7 @@ 21dp + 96dp 108dp 108dp diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml index b579010a6d..ea9f61267a 100644 --- a/OsmAnd/res/values/sizes.xml +++ b/OsmAnd/res/values/sizes.xml @@ -32,7 +32,9 @@ 15dp 32dp - 50dp + 50dp + 150dp + 40dp 240dp 360dp diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 000888d3fd..a4b152b3be 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,6 +11,10 @@ Thx - Hardy --> + A button to show or hide public transport on the map. + Show/hide public transport + Show public transport + Hide public transport • New offline Slope maps\n\n • Full customization of Favorites and GPX Waypoints – custom colors, icons, shapes\n\n diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java index 7b86740c72..48bfff7a4d 100644 --- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java +++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java @@ -64,7 +64,6 @@ public class ApplicationMode { private ApplicationMode parentAppMode; private int iconRes = R.drawable.ic_world_globe_dark; - private int iconMapRes = R.drawable.map_world_globe_dark; private int minDistanceForTurn = 50; private int arrivalDistance = 90; @@ -80,40 +79,40 @@ public class ApplicationMode { */ public static final ApplicationMode DEFAULT = createBase(R.string.app_mode_default, "default") .distanceForTurn(5).arrivalDistance(90) - .icon(R.drawable.ic_world_globe_dark, R.drawable.map_world_globe_dark).reg(); + .icon(R.drawable.ic_world_globe_dark).reg(); public static final ApplicationMode CAR = createBase(R.string.app_mode_car, "car") .distanceForTurn(35) - .icon(R.drawable.ic_action_car_dark, R.drawable.map_action_car_dark) + .icon(R.drawable.ic_action_car_dark) .description(R.string.base_profile_descr_car).reg(); public static final ApplicationMode BICYCLE = createBase(R.string.app_mode_bicycle, "bicycle") .distanceForTurn(15).arrivalDistance(60).offRouteDistance(50) - .icon(R.drawable.ic_action_bicycle_dark, R.drawable.map_action_bicycle_dark) + .icon(R.drawable.ic_action_bicycle_dark) .description(R.string.base_profile_descr_bicycle).reg(); public static final ApplicationMode PEDESTRIAN = createBase(R.string.app_mode_pedestrian, "pedestrian") .distanceForTurn(5).arrivalDistance(45).offRouteDistance(20) - .icon(R.drawable.ic_action_pedestrian_dark, R.drawable.map_action_pedestrian_dark) + .icon(R.drawable.ic_action_pedestrian_dark) .description(R.string.base_profile_descr_pedestrian).reg(); public static final ApplicationMode PUBLIC_TRANSPORT = createBase(R.string.app_mode_public_transport, "public_transport") - .icon(R.drawable.ic_action_bus_dark, R.drawable.map_action_bus_dark) + .icon(R.drawable.ic_action_bus_dark) .description(R.string.base_profile_descr_public_transport).reg(); public static final ApplicationMode BOAT = createBase(R.string.app_mode_boat, "boat") .distanceForTurn(20) - .icon(R.drawable.ic_action_sail_boat_dark, R.drawable.map_action_sail_boat_dark) + .icon(R.drawable.ic_action_sail_boat_dark) .description(R.string.base_profile_descr_boat).reg(); public static final ApplicationMode AIRCRAFT = createBase(R.string.app_mode_aircraft, "aircraft") .distanceForTurn(100) - .icon(R.drawable.ic_action_aircraft, R.drawable.map_action_aircraft) + .icon(R.drawable.ic_action_aircraft) .description(R.string.base_profile_descr_aircraft).reg(); public static final ApplicationMode SKI = createBase(R.string.app_mode_skiing, "ski") .distanceForTurn(15).arrivalDistance(60).offRouteDistance(50) - .icon(R.drawable.ic_action_skiing, R.drawable.map_action_skiing) + .icon(R.drawable.ic_action_skiing) .description(R.string.base_profile_descr_ski).reg(); public static List values(OsmandApplication app) { @@ -347,11 +346,6 @@ public class ApplicationMode { return iconRes; } - @DrawableRes - public int getMapIconRes() { - return iconMapRes; - } - public void setIconResName(String iconResName) { if (!Algorithms.isEmpty(iconResName)) { app.getSettings().ICON_RES_NAME.setModeValue(this, iconResName); @@ -362,10 +356,8 @@ public class ApplicationMode { String iconResName = app.getSettings().ICON_RES_NAME.getModeValue(this); try { int iconRes = app.getResources().getIdentifier(iconResName, "drawable", app.getPackageName()); - int iconMapRes = app.getResources().getIdentifier(iconResName.replace("ic_", "map_"), "drawable", app.getPackageName()); - if (iconRes != 0 && iconMapRes != 0) { + if (iconRes != 0) { this.iconRes = iconRes; - this.iconMapRes = iconMapRes; } } catch (Exception e) { // return R.drawable.map_world_globe_dark; @@ -729,8 +721,7 @@ public class ApplicationMode { return applicationMode; } - public ApplicationModeBuilder icon(int iconRes, int iconMapRes) { - applicationMode.iconMapRes = iconMapRes; + public ApplicationModeBuilder icon(int iconRes) { applicationMode.iconRes = iconRes; return this; } diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java index 09fe5f1a10..9edc07c5dc 100644 --- a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java @@ -386,9 +386,8 @@ public class ContextMenuAdapter { Drawable drawable = item.getIcon() != ContextMenuItem.INVALID_ID ? mIconsCache.getIcon(item.getIcon(), color) : null; if (drawable != null && tv != null) { - float density = getContext().getResources().getDisplayMetrics().density; - int paddingInPixels = (int) (24 * density); - int drawableSizeInPixels = (int) (24 * density); // 32 + int paddingInPixels = (int) getContext().getResources().getDimension(R.dimen.bottom_sheet_icon_margin); + int drawableSizeInPixels = (int) getContext().getResources().getDimension(R.dimen.standard_icon_size); drawable.setBounds(0, 0, drawableSizeInPixels, drawableSizeInPixels); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { tv.setCompoundDrawablesRelative(drawable, null, null, null); diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 7e9a6742c1..1dbfa86691 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -3747,6 +3747,9 @@ public class OsmandSettings { public final ListStringPreference TRANSPORT_DEFAULT_SETTINGS = (ListStringPreference) new ListStringPreference("transport_default_settings", "transportStops", ",").makeProfile(); + + public final ListStringPreference DISPLAYED_TRANSPORT_SETTINGS = (ListStringPreference) + new ListStringPreference("displayed_transport_settings", null, ",").makeProfile(); public final OsmandPreference SHOW_ARRIVAL_TIME_OTHERWISE_EXPECTED_TIME = new BooleanPreference("show_arrival_time", true).makeProfile(); diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java index 2388e0ffe8..7ebfac8005 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java @@ -22,6 +22,7 @@ import android.widget.CheckBox; import android.widget.ExpandableListView; import android.widget.Filter; import android.widget.Filterable; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; @@ -66,6 +67,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import static android.view.Gravity.CENTER; import static net.osmand.plus.myplaces.FavoritesActivity.FAV_TAB; import static net.osmand.plus.myplaces.FavoritesActivity.TAB_ID; @@ -958,14 +960,18 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen if (model.isAddressSpecified()) { distanceText.setText(String.format(getString(R.string.ltr_or_rtl_combine_via_comma), distance.trim(), model.getAddress())); } + int iconSize = (int) getResources().getDimension(R.dimen.favorites_icon_size); if(model.getBackgroundType().equals(FavouritePoint.BackgroundType.CIRCLE)){ int color = visible ? model.getColor() : getResources().getColor(disabledIconColor); int col = color == 0 || color == Color.BLACK ? getResources().getColor(R.color.color_favorite) : color; icon.setImageDrawable(UiUtilities.createTintedDrawable(getActivity(),model.getIconId(),col)); + iconSize = (int) getResources().getDimension(R.dimen.standard_icon_size); }else { icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getActivity(), visible ? model.getColor() : getResources().getColor(disabledIconColor), false, model)); } + FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(iconSize, iconSize, CENTER); + icon.setLayoutParams(lp); if (visible) { distanceText.setTextColor(getResources().getColor(R.color.color_distance)); } else { diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index ef9f6f9f6c..8cf474df8b 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -348,19 +348,19 @@ public class MapActivityActions implements DialogProvider { adapter.addItem(itemBuilder .setTitleId(R.string.shared_string_add, mapActivity) .setId(MAP_CONTEXT_MENU_ADD_ID) - .setIcon(R.drawable.map_action_fav_dark) + .setIcon(R.drawable.ic_action_fav_dark) .setOrder(0) .createItem()); adapter.addItem(itemBuilder .setTitleId(R.string.shared_string_marker, mapActivity) .setId(MAP_CONTEXT_MENU_MARKER_ID) - .setIcon(R.drawable.map_action_flag_dark) + .setIcon(R.drawable.ic_action_flag_dark) .setOrder(1) .createItem()); adapter.addItem(itemBuilder .setTitleId(R.string.shared_string_share, mapActivity) .setId(MAP_CONTEXT_MENU_SHARE_ID) - .setIcon(R.drawable.map_action_gshare_dark) + .setIcon(R.drawable.ic_action_gshare_dark) .setOrder(2) .createItem()); adapter.addItem(itemBuilder diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java index db1243321b..e906e13d1a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java +++ b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java @@ -170,13 +170,13 @@ public class AppModeDialog { final ApplicationMode mode = visible.get(i); final boolean checked = selected.contains(mode); ImageView iv = (ImageView) tb.findViewById(R.id.app_mode_icon); - View selection = tb.findViewById(R.id.selection); + ImageView selection = tb.findViewById(R.id.selection); Drawable drawable = ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode)); if (checked) { iv.setImageDrawable(drawable); iv.setContentDescription(String.format("%s %s", mode.toHumanString(), ctx.getString(R.string.item_checked))); if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) { - AndroidUtils.setBackground(ctx, iv, nightMode, R.drawable.btn_checked_border_light, R.drawable.btn_checked_border_light); + selection.setImageDrawable(ctx.getDrawable(R.drawable.btn_checked_border_light)); AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.ripple_light, R.drawable.ripple_light); } else { AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_light); @@ -189,7 +189,7 @@ public class AppModeDialog { } iv.setImageDrawable(drawable); if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) { - AndroidUtils.setBackground(ctx, iv, nightMode, R.drawable.btn_border_pressed_light, R.drawable.btn_border_pressed_light); + selection.setImageDrawable(ctx.getDrawable(R.drawable.btn_border_pressed_light)); AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.ripple_light, R.drawable.ripple_light); } else { AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.btn_border_pressed_trans_light, R.drawable.btn_border_pressed_trans_light); diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java index 224226f818..e8bf1d7ff1 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java @@ -11,8 +11,6 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; -import android.widget.ImageView; -import android.widget.ListView; import android.widget.Spinner; import android.widget.TextView; @@ -53,8 +51,8 @@ import net.osmand.plus.inapp.InAppPurchaseHelper; import net.osmand.plus.poi.PoiFiltersHelper; import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin; import net.osmand.plus.render.RendererRegistry; -import net.osmand.plus.settings.ConfigureMenuRootFragment.ScreenType; import net.osmand.plus.srtmplugin.SRTMPlugin; +import net.osmand.plus.transport.TransportLinesMenu; import net.osmand.plus.views.OsmandMapTileView; import net.osmand.plus.views.corenative.NativeCoreContext; import net.osmand.plus.wikipedia.WikipediaPoiMenu; @@ -141,10 +139,20 @@ public class ConfigureMapMenu { ma.getDashboard().updateListAdapter(createListAdapter(ma)); } }); + List customRules = getCustomRules(app); + adapter.setProfileDependent(true); + adapter.setNightMode(nightMode); + createLayersItems(customRules, adapter, ma, themeRes, nightMode); + createRenderingAttributeItems(customRules, adapter, ma, themeRes, nightMode); + return adapter; + } + + public static List getCustomRules(OsmandApplication app) { RenderingRulesStorage renderer = app.getRendererRegistry().getCurrentSelectedRenderer(); List customRules = new ArrayList<>(); boolean useDepthContours = app.getResourceManager().hasDepthContours() - && (InAppPurchaseHelper.isSubscribedToLiveUpdates(app) || InAppPurchaseHelper.isDepthContoursPurchased(app)); + && (InAppPurchaseHelper.isSubscribedToLiveUpdates(app) + || InAppPurchaseHelper.isDepthContoursPurchased(app)); if (renderer != null) { for (RenderingRuleProperty p : renderer.PROPS.getCustomRules()) { if (!RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN.equals(p.getCategory()) @@ -153,11 +161,7 @@ public class ConfigureMapMenu { } } } - adapter.setProfileDependent(true); - adapter.setNightMode(nightMode); - createLayersItems(customRules, adapter, ma, themeRes, nightMode); - createRenderingAttributeItems(customRules, adapter, ma, themeRes, nightMode); - return adapter; + return customRules; } private final class LayerMenuListener extends OnRowItemClick { @@ -193,7 +197,7 @@ public class ConfigureMapMenu { } @Override - public boolean onRowItemClick(ArrayAdapter adapter, View view, int itemId, int pos) { + public boolean onRowItemClick(final ArrayAdapter adapter, View view, int itemId, int pos) { if (itemId == R.string.layer_poi) { showPoiFilterDialog(adapter, adapter.getItem(pos)); return false; @@ -204,6 +208,26 @@ public class ConfigureMapMenu { ma.getDashboard().setDashboardVisibility(true, DashboardOnMap.DashboardType.WIKIPEDIA, AndroidUtils.getCenterViewCoordinates(view)); return false; + } else if (itemId == R.string.rendering_category_transport) { + final ContextMenuItem item = adapter.getItem(pos); + TransportLinesMenu.showTransportsDialog(ma, new CallbackWithObject() { + @Override + public boolean processResult(Boolean result) { + if (item != null) { + item.setSelected(result); + item.setColorRes(result ? R.color.osmand_orange : ContextMenuItem.INVALID_ID); + adapter.notifyDataSetChanged(); + } + return true; + } + }); + boolean selected = TransportLinesMenu.isShowLines(ma.getMyApplication()); + if (!selected && item != null) { + item.setSelected(true); + item.setColorRes(R.color.osmand_orange); + adapter.notifyDataSetChanged(); + } + return false; } else { CompoundButton btn = (CompoundButton) view.findViewById(R.id.toggle_item); if (btn != null && btn.getVisibility() == View.VISIBLE) { @@ -257,6 +281,17 @@ public class ConfigureMapMenu { return true; } }); + } else if (itemId == R.string.rendering_category_transport) { + boolean selected = TransportLinesMenu.isShowLines(ma.getMyApplication()); + TransportLinesMenu.toggleTransportLines(ma, !selected, new CallbackWithObject() { + @Override + public boolean processResult(Boolean result) { + item.setSelected(result); + item.setColorRes(result ? R.color.osmand_orange : ContextMenuItem.INVALID_ID); + adapter.notifyDataSetChanged(); + return true; + } + }); } else if (itemId == R.string.map_markers) { settings.SHOW_MAP_MARKERS.set(isChecked); } else if (itemId == R.string.layer_map) { @@ -364,179 +399,16 @@ public class ConfigureMapMenu { } */ - final List transportRules = new ArrayList<>(); - final List> transportPrefs = new ArrayList<>(); - Iterator it = customRules.iterator(); - while (it.hasNext()) { - RenderingRuleProperty p = it.next(); - if ("transport".equals(p.getCategory()) && p.isBoolean()) { - transportRules.add(p); - final OsmandSettings.CommonPreference pref = activity.getMyApplication().getSettings() - .getCustomRenderBooleanProperty(p.getAttrName()); - transportPrefs.add(pref); - it.remove(); - } - } - selected = false; - for (OsmandSettings.CommonPreference p : transportPrefs) { - if (p.get()) { - selected = true; - break; - } - } - final boolean transportSelected = selected; + selected = TransportLinesMenu.isShowLines(app); adapter.addItem(new ContextMenuItem.ItemBuilder() .setId(TRANSPORT_ID) .setTitleId(R.string.rendering_category_transport, activity) .setIcon(R.drawable.ic_action_transport_bus) .setSecondaryIcon(R.drawable.ic_action_additional_option) - .setSelected(transportSelected) - .setColor(transportSelected ? selectedProfileColorRes : ContextMenuItem.INVALID_ID) - .setListener(new ContextMenuAdapter.OnRowItemClick() { - ArrayAdapter adapter; - boolean transportSelectedInner = transportSelected; + .setSelected(selected) + .setColor(selected ? selectedProfileColorRes : ContextMenuItem.INVALID_ID) + .setListener(l).createItem()); - @Override - public boolean onRowItemClick(ArrayAdapter adapter, View view, int itemId, int position) { - if (transportSelectedInner) { - showTransportDialog(adapter, position); - return false; - } else { - CompoundButton btn = (CompoundButton) view.findViewById(R.id.toggle_item); - if (btn != null && btn.getVisibility() == View.VISIBLE) { - btn.setChecked(!btn.isChecked()); - adapter.getItem(position).setColorRes(btn.isChecked() ? selectedProfileColorRes : ContextMenuItem.INVALID_ID); - adapter.notifyDataSetChanged(); - return false; - } else { - return onContextMenuClick(adapter, itemId, position, false, null); - } - } - } - - @Override - public boolean onContextMenuClick(final ArrayAdapter ad, int itemId, - final int pos, boolean isChecked, int[] viewCoordinates) { - if (transportSelectedInner) { - for (int i = 0; i < transportPrefs.size(); i++) { - transportPrefs.get(i).set(false); - } - transportSelectedInner = false; - ad.getItem(pos).setColorRes(ContextMenuItem.INVALID_ID); - refreshMapComplete(activity); - activity.getMapLayers().updateLayers(activity.getMapView()); - } else { - ad.getItem(pos).setColorRes(selectedProfileColorRes); - showTransportDialog(ad, pos); - } - ad.notifyDataSetChanged(); - return false; - } - - private void showTransportDialog(final ArrayAdapter ad, final int pos) { - final AlertDialog.Builder b = new AlertDialog.Builder(new ContextThemeWrapper(activity, themeRes)); - b.setTitle(activity.getString(R.string.rendering_category_transport)); - - final int[] iconIds = new int[transportPrefs.size()]; - final boolean[] checkedItems = new boolean[transportPrefs.size()]; - for (int i = 0; i < transportPrefs.size(); i++) { - checkedItems[i] = transportPrefs.get(i).get(); - } - final String[] vals = new String[transportRules.size()]; - for (int i = 0; i < transportRules.size(); i++) { - RenderingRuleProperty p = transportRules.get(i); - String propertyName = SettingsActivity.getStringPropertyName(activity, p.getAttrName(), - p.getName()); - vals[i] = propertyName; - if ("transportStops".equals(p.getAttrName())) { - iconIds[i] = R.drawable.ic_action_transport_stop; - } else if ("publicTransportMode".equals(p.getAttrName())) { - iconIds[i] = R.drawable.ic_action_transport_bus; - } else if ("tramTrainRoutes".equals(p.getAttrName())) { - iconIds[i] = R.drawable.ic_action_transport_tram; - } else if ("subwayMode".equals(p.getAttrName())) { - iconIds[i] = R.drawable.ic_action_transport_subway; - } else { - iconIds[i] = R.drawable.ic_action_transport_bus; - } - } - - adapter = new ArrayAdapter(new ContextThemeWrapper(activity, themeRes), R.layout.popup_list_item_icon24_and_menu, R.id.title, vals) { - @NonNull - @Override - public View getView(final int position, View convertView, ViewGroup parent) { - View v = super.getView(position, convertView, parent); - final ImageView icon = (ImageView) v.findViewById(R.id.icon); - if (checkedItems[position]) { - icon.setImageDrawable(app.getUIUtilities().getIcon(iconIds[position], selectedProfileColorRes)); - } else { - icon.setImageDrawable(app.getUIUtilities().getThemedIcon(iconIds[position])); - } - v.findViewById(R.id.divider).setVisibility(View.GONE); - v.findViewById(R.id.description).setVisibility(View.GONE); - v.findViewById(R.id.secondary_icon).setVisibility(View.GONE); - final SwitchCompat check = (SwitchCompat) v.findViewById(R.id.toggle_item); - check.setOnCheckedChangeListener(null); - check.setChecked(checkedItems[position]); - check.setOnCheckedChangeListener(new OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - checkedItems[position] = isChecked; - if (checkedItems[position]) { - icon.setImageDrawable(app.getUIUtilities().getIcon(iconIds[position], selectedProfileColorRes)); - } else { - icon.setImageDrawable(app.getUIUtilities().getThemedIcon(iconIds[position])); - } - } - }); - UiUtilities.setupCompoundButton(nightMode, selectedProfileColor, check); - return v; - } - }; - - final ListView listView = new ListView(activity); - listView.setDivider(null); - listView.setClickable(true); - listView.setAdapter(adapter); - listView.setOnItemClickListener(new ListView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - checkedItems[position] = !checkedItems[position]; - adapter.notifyDataSetChanged(); - } - }); - b.setView(listView); - - b.setOnDismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - ContextMenuItem item = ad.getItem(pos); - if (item != null) { - item.setSelected(transportSelectedInner); - item.setColorRes(transportSelectedInner ? selectedProfileColorRes : ContextMenuItem.INVALID_ID); - ad.notifyDataSetChanged(); - } - - } - }); - b.setNegativeButton(R.string.shared_string_cancel, null); - b.setPositiveButton(R.string.shared_string_apply, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - transportSelectedInner = false; - for (int i = 0; i < transportPrefs.size(); i++) { - transportPrefs.get(i).set(checkedItems[i]); - if (!transportSelectedInner && checkedItems[i]) { - transportSelectedInner = true; - } - } - refreshMapComplete(activity); - activity.getMapLayers().updateLayers(activity.getMapView()); - } - }); - b.show(); - } - }).createItem()); selected = app.getSelectedGpxHelper().isShowingAnyGpxFiles(); adapter.addItem(new ContextMenuItem.ItemBuilder() .setId(GPX_FILES_ID) diff --git a/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java index a8bc0af1ab..b99e14c906 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java @@ -109,6 +109,8 @@ public class ExternalApiHelper { public static final String PARAM_CATEGORY = "category"; public static final String PARAM_LAT = "lat"; public static final String PARAM_LON = "lon"; + public static final String PARAM_MAP_LAT = "map_lat"; + public static final String PARAM_MAP_LON = "map_lon"; public static final String PARAM_COLOR = "color"; public static final String PARAM_VISIBLE = "visible"; @@ -451,6 +453,12 @@ public class ExternalApiHelper { result.putExtra(PARAM_LON, location.getLongitude()); } + LatLon mapLocation = mapActivity.getMapLocation(); + if (location != null) { + result.putExtra(PARAM_MAP_LAT, mapLocation.getLatitude()); + result.putExtra(PARAM_MAP_LON, mapLocation.getLongitude()); + } + final RoutingHelper routingHelper = app.getRoutingHelper(); if (routingHelper.isRouteCalculated()) { int time = routingHelper.getLeftTime(); diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java index 5b5bf87aac..1600d2d736 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java @@ -908,8 +908,8 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL favActionIconId = menuController.getFavActionIconId(); waypointActionIconId = menuController.getWaypointActionIconId(); } else { - favActionIconId = R.drawable.map_action_fav_dark; - waypointActionIconId = R.drawable.map_action_flag_dark; + favActionIconId = R.drawable.ic_action_fav_dark; + waypointActionIconId = R.drawable.ic_action_flag_dark; } } @@ -919,7 +919,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL if (mapActivity != null) { RoutingHelper routingHelper = mapActivity.getMyApplication().getRoutingHelper(); if (routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode()) { - res = R.drawable.map_action_waypoint; + res = R.drawable.ic_action_waypoint; } } return res; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java index 2ac283d347..bf5045038e 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java @@ -611,7 +611,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo TextView directionsButton = (TextView) view.findViewById(R.id.context_menu_directions_button); int iconResId = R.drawable.map_directions; if (menu.navigateInPedestrianMode()) { - iconResId = R.drawable.map_action_pedestrian_dark; + iconResId = R.drawable.ic_action_pedestrian_dark; } Drawable drawable = getIcon(iconResId, bottomButtonsColor); directionsButton.setTextColor(ContextCompat.getColor(mapActivity, bottomButtonsColor)); diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java index 112e315968..3e1dbd23bc 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java @@ -504,7 +504,7 @@ public abstract class MenuController extends BaseMenuController implements Colla } public int getFavActionIconId() { - return R.drawable.map_action_fav_dark; + return R.drawable.ic_action_fav_dark; } public int getFavActionStringId() { @@ -516,7 +516,7 @@ public abstract class MenuController extends BaseMenuController implements Colla } public int getWaypointActionIconId() { - return R.drawable.map_action_flag_dark; + return R.drawable.ic_action_flag_dark; } public int getWaypointActionStringId() { diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java index c62e72a566..a0681bc441 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java @@ -155,7 +155,7 @@ public class FavouritePointMenuController extends MenuController { @Override public int getFavActionIconId() { - return R.drawable.map_action_edit_dark; + return R.drawable.ic_action_edit_dark; } @Override diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java index 6446258faa..37f36cb86a 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java @@ -665,7 +665,7 @@ public class PlanRouteFragment extends BaseOsmAndFragment implements OsmAndLocat if (mapActivity != null) { final ImageButton appModesBtn = (ImageButton) mapActivity.findViewById(R.id.snap_to_road_image_button); appModesBtn.setBackgroundResource(nightMode ? R.drawable.btn_circle_night : R.drawable.btn_circle); - appModesBtn.setImageDrawable(getActiveIcon(planRouteContext.getSnappedMode().getMapIconRes())); + appModesBtn.setImageDrawable(getActiveIcon(planRouteContext.getSnappedMode().getIconRes())); appModesBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java index 1299018bda..7163ce83bf 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java @@ -808,7 +808,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment { ImageButton snapToRoadBtn = (ImageButton) mapActivity.findViewById(R.id.snap_to_road_image_button); snapToRoadBtn.setBackgroundResource(nightMode ? R.drawable.btn_circle_night : R.drawable.btn_circle); - snapToRoadBtn.setImageDrawable(getIcon(appMode.getMapIconRes(), appMode.getIconColorInfo().getColor(nightMode))); + snapToRoadBtn.setImageDrawable(getIcon(appMode.getIconRes(), appMode.getIconColorInfo().getColor(nightMode))); snapToRoadBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java index 714abee320..e778b5e0b7 100644 --- a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java +++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java @@ -34,6 +34,7 @@ import net.osmand.plus.quickaction.actions.NewAction; import net.osmand.plus.quickaction.actions.ShowHideFavoritesAction; import net.osmand.plus.quickaction.actions.ShowHideGpxTracksAction; import net.osmand.plus.quickaction.actions.ShowHidePoiAction; +import net.osmand.plus.quickaction.actions.ShowHideTransportLinesAction; import net.osmand.util.Algorithms; import java.lang.reflect.Type; @@ -223,6 +224,7 @@ public class QuickActionRegistry { quickActionTypes.add(ShowHidePoiAction.TYPE); quickActionTypes.add(MapStyleAction.TYPE); quickActionTypes.add(DayNightModeAction.TYPE); + quickActionTypes.add(ShowHideTransportLinesAction.TYPE); // navigation quickActionTypes.add(NavVoiceAction.TYPE); quickActionTypes.add(NavDirectionsFromAction.TYPE); diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideTransportLinesAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideTransportLinesAction.java new file mode 100644 index 0000000000..61f04f2c6f --- /dev/null +++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideTransportLinesAction.java @@ -0,0 +1,61 @@ +package net.osmand.plus.quickaction.actions; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.R; +import net.osmand.plus.activities.MapActivity; +import net.osmand.plus.quickaction.QuickAction; +import net.osmand.plus.quickaction.QuickActionType; +import net.osmand.plus.transport.TransportLinesMenu; + +public class ShowHideTransportLinesAction extends QuickAction { + + public static final QuickActionType TYPE = new QuickActionType(31, + "transport.showhide", ShowHideTransportLinesAction.class) + .nameRes(R.string.quick_action_show_hide_transport) + .iconRes(R.drawable.ic_action_transport_bus).nonEditable() + .category(QuickActionType.CONFIGURE_MAP); + + public ShowHideTransportLinesAction() { + super(TYPE); + } + + public ShowHideTransportLinesAction(QuickAction quickAction) { + super(quickAction); + } + + @Override + public void execute(final MapActivity activity) { + boolean enabled = TransportLinesMenu.isShowLines(activity.getMyApplication()); + TransportLinesMenu.toggleTransportLines(activity, !enabled, null); + } + + @Override + public void drawUI(ViewGroup parent, MapActivity activity) { + + View view = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.quick_action_with_text, parent, false); + + ((TextView) view.findViewById(R.id.text)).setText( + R.string.quick_action_transport_descr); + + parent.addView(view); + } + + @Override + public String getActionText(OsmandApplication application) { + + return TransportLinesMenu.isShowLines(application) + ? application.getString(R.string.quick_action_transport_hide) + : application.getString(R.string.quick_action_transport_show); + } + + @Override + public boolean isActionWithSlash(OsmandApplication application) { + return TransportLinesMenu.isShowLines(application); + } +} diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java index 1358390802..eee79c7f63 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java @@ -973,9 +973,9 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener LinearLayout optionsButton = (LinearLayout) mainView.findViewById(R.id.map_options_route_button); TextView optionsTitle = (TextView) mainView.findViewById(R.id.map_options_route_button_title); ImageView optionsIcon = (ImageView) mainView.findViewById(R.id.map_options_route_button_icon); - Drawable drawable = app.getUIUtilities().getIcon(R.drawable.map_action_settings, nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light); + Drawable drawable = app.getUIUtilities().getIcon(R.drawable.ic_action_settings, nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light); if (Build.VERSION.SDK_INT >= 21) { - Drawable active = app.getUIUtilities().getIcon(R.drawable.map_action_settings, nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light); + Drawable active = app.getUIUtilities().getIcon(R.drawable.ic_action_settings, nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light); drawable = AndroidUtils.createPressedStateListDrawable(drawable, active); } optionsIcon.setImageDrawable(drawable); @@ -2292,7 +2292,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener case ROUTE_INFO: return 0; case ROUTE_DETAILS: - return app != null ? app.getRoutingHelper().getAppMode().getMapIconRes() : R.drawable.map_directions; + return app != null ? app.getRoutingHelper().getAppMode().getIconRes() : R.drawable.map_directions; default: return 0; } diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java index 57f4b56e4a..610e2a3958 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java @@ -943,12 +943,12 @@ public class RoutingOptionsHelper { @Override public int getActiveIconId() { - return R.drawable.map_action_settings; + return R.drawable.ic_action_settings; } @Override public int getDisabledIconId() { - return R.drawable.map_action_settings; + return R.drawable.ic_action_settings; } } diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java index dcb86fa87c..3059f6d01d 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/settings/ImportedSettingsItemsAdapter.java @@ -10,7 +10,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import net.osmand.AndroidUtils; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; @@ -80,7 +79,7 @@ public class ImportedSettingsItemsAdapter extends switch (currentItemType) { case PROFILE: - holder.icon.setImageDrawable(uiUtils.getIcon(R.drawable.map_action_settings, activeColorRes)); + holder.icon.setImageDrawable(uiUtils.getIcon(R.drawable.ic_action_settings, activeColorRes)); holder.title.setText(R.string.shared_string_settings); break; case QUICK_ACTIONS: diff --git a/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java b/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java new file mode 100644 index 0000000000..8c47ed2838 --- /dev/null +++ b/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java @@ -0,0 +1,238 @@ +package net.osmand.plus.transport; + +import android.content.Context; +import android.content.DialogInterface; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.CompoundButton; +import android.widget.ImageView; +import android.widget.ListView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.SwitchCompat; +import androidx.core.content.ContextCompat; + +import net.osmand.CallbackWithObject; +import net.osmand.plus.ApplicationMode; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.OsmandSettings; +import net.osmand.plus.OsmandSettings.CommonPreference; +import net.osmand.plus.R; +import net.osmand.plus.UiUtilities; +import net.osmand.plus.activities.MapActivity; +import net.osmand.plus.activities.SettingsActivity; +import net.osmand.plus.dialogs.ConfigureMapMenu; +import net.osmand.render.RenderingRuleProperty; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class TransportLinesMenu { + + public static final String TRANSPORT_RENDERING_CATEGORY = "transport"; + + public static final String PT_TRANSPORT_STOPS = "transportStops"; + public static final String PT_PUBLIC_TRANSPORT_MODE = "publicTransportMode"; + public static final String PT_TRAM_TRAIN_ROUTES = "tramTrainRoutes"; + public static final String PT_SUBWAY_MODE = "subwayMode"; + + public static void toggleTransportLines(@NonNull MapActivity mapActivity, boolean enable, + @Nullable CallbackWithObject callback) { + OsmandApplication app = mapActivity.getMyApplication(); + OsmandSettings settings = app.getSettings(); + if (enable) { + List enabledTransportIds = settings.DISPLAYED_TRANSPORT_SETTINGS.getStringsList(); + if (enabledTransportIds != null) { + for (CommonPreference pref : getTransportPrefs(app, null)) { + boolean selected = enabledTransportIds.contains(pref.getId()); + pref.set(selected); + } + refreshMap(mapActivity); + } else { + showTransportsDialog(mapActivity, callback); + } + } else { + for (CommonPreference pref : getTransportPrefs(app, null)) { + pref.set(false); + } + refreshMap(mapActivity); + if (callback != null) { + callback.processResult(false); + } + } + } + + public static void showTransportsDialog(@NonNull final MapActivity mapActivity, + @Nullable final CallbackWithObject callback) { + final OsmandApplication app = mapActivity.getMyApplication(); + final OsmandSettings settings = app.getSettings(); + final ApplicationMode appMode = settings.getApplicationMode(); + + final List enabledTransportIds = app.getSettings().DISPLAYED_TRANSPORT_SETTINGS.getStringsList(); + final List transportRules = getTransportRules(app); + final List> transportPrefs = getTransportPrefs(app, transportRules); + + final boolean nightMode = app.getDaynightHelper().isNightModeForMapControls(); + final Context themedCtx = UiUtilities.getThemedContext(mapActivity, nightMode); + final int profileColorResId = appMode.getIconColorInfo().getColor(nightMode); + final int profileColor = ContextCompat.getColor(themedCtx, profileColorResId); + + final AlertDialog.Builder b = new AlertDialog.Builder(themedCtx); + b.setTitle(themedCtx.getString(R.string.rendering_category_transport)); + + final boolean[] checkedItems = new boolean[transportPrefs.size()]; + for (int i = 0; i < transportPrefs.size(); i++) { + boolean selected = enabledTransportIds != null + && enabledTransportIds.contains(transportPrefs.get(i).getId()); + checkedItems[i] = selected; + } + + final int[] iconIds = new int[transportPrefs.size()]; + final String[] vals = new String[transportRules.size()]; + + final Map transportIcons = new HashMap<>(); + transportIcons.put(PT_TRANSPORT_STOPS, R.drawable.ic_action_transport_stop); + transportIcons.put(PT_PUBLIC_TRANSPORT_MODE, R.drawable.ic_action_transport_bus); + transportIcons.put(PT_TRAM_TRAIN_ROUTES, R.drawable.ic_action_transport_tram); + transportIcons.put(PT_SUBWAY_MODE, R.drawable.ic_action_transport_subway); + + for (int i = 0; i < transportRules.size(); i++) { + RenderingRuleProperty p = transportRules.get(i); + String attrName = p.getAttrName(); + String propertyName = SettingsActivity + .getStringPropertyName(themedCtx, attrName, p.getName()); + vals[i] = propertyName; + Integer iconId = transportIcons.get(attrName); + if (iconId != null) { + iconIds[i] = iconId; + } else { + iconIds[i] = R.drawable.ic_action_transport_bus; + } + } + + final ArrayAdapter adapter = new ArrayAdapter(themedCtx, + R.layout.popup_list_item_icon24_and_menu, R.id.title, vals) { + @NonNull + @Override + public View getView(final int position, View convertView, ViewGroup parent) { + View v = super.getView(position, convertView, parent); + final ImageView icon = (ImageView) v.findViewById(R.id.icon); + if (checkedItems[position]) { + icon.setImageDrawable(app.getUIUtilities().getIcon(iconIds[position], profileColorResId)); + } else { + icon.setImageDrawable(app.getUIUtilities().getThemedIcon(iconIds[position])); + } + v.findViewById(R.id.divider).setVisibility(View.GONE); + v.findViewById(R.id.description).setVisibility(View.GONE); + v.findViewById(R.id.secondary_icon).setVisibility(View.GONE); + final SwitchCompat check = (SwitchCompat) v.findViewById(R.id.toggle_item); + check.setOnCheckedChangeListener(null); + check.setChecked(checkedItems[position]); + check.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + checkedItems[position] = isChecked; + if (checkedItems[position]) { + icon.setImageDrawable(app.getUIUtilities().getIcon(iconIds[position], profileColorResId)); + } else { + icon.setImageDrawable(app.getUIUtilities().getThemedIcon(iconIds[position])); + } + } + }); + UiUtilities.setupCompoundButton(nightMode, profileColor, check); + return v; + } + }; + + final ListView listView = new ListView(themedCtx); + listView.setDivider(null); + listView.setClickable(true); + listView.setAdapter(adapter); + listView.setOnItemClickListener(new ListView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + checkedItems[position] = !checkedItems[position]; + adapter.notifyDataSetChanged(); + } + }); + b.setView(listView); + + b.setOnDismissListener(new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface dialog) { + if (callback != null) { + callback.processResult(isShowLines(app)); + } + } + }); + + b.setNegativeButton(R.string.shared_string_cancel, null); + b.setPositiveButton(R.string.shared_string_apply, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + List transportIdsToSave = new ArrayList<>(); + for (int i = 0; i < transportPrefs.size(); i++) { + CommonPreference pref = transportPrefs.get(i); + boolean selected = checkedItems[i]; + if (selected) { + transportIdsToSave.add(pref.getId()); + } + pref.set(selected); + } + settings.DISPLAYED_TRANSPORT_SETTINGS.setStringsListForProfile(appMode, + transportIdsToSave.size() > 0 ? transportIdsToSave : null); + if (callback != null) { + callback.processResult(transportIdsToSave.size() > 0); + } + refreshMap(mapActivity); + } + }); + b.show(); + } + + public static List getTransportRules(OsmandApplication app) { + List transportRules = new ArrayList<>(); + for (RenderingRuleProperty property : ConfigureMapMenu.getCustomRules(app)) { + if (TRANSPORT_RENDERING_CATEGORY.equals(property.getCategory()) && property.isBoolean()) { + transportRules.add(property); + } + } + return transportRules; + } + + public static List> getTransportPrefs(@NonNull OsmandApplication app, + List transportRules) { + if (transportRules == null) { + transportRules = getTransportRules(app); + } + List> transportPrefs = new ArrayList<>(); + for (RenderingRuleProperty property : transportRules) { + final CommonPreference pref = app.getSettings() + .getCustomRenderBooleanProperty(property.getAttrName()); + transportPrefs.add(pref); + } + return transportPrefs; + } + + + private static void refreshMap(MapActivity mapActivity) { + ConfigureMapMenu.refreshMapComplete(mapActivity); + mapActivity.getMapLayers().updateLayers(mapActivity.getMapView()); + } + + public static boolean isShowLines(@NonNull OsmandApplication app) { + ApplicationMode appMode = app.getSettings().getApplicationMode(); + for (CommonPreference pref : getTransportPrefs(app, null)) { + if (pref.getModeValue(appMode)) { + return true; + } + } + return false; + } +} diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java index 7893a77f00..f0b0d988eb 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java @@ -8,9 +8,12 @@ import android.animation.ObjectAnimator; import android.annotation.SuppressLint; import android.content.DialogInterface; import android.content.pm.PackageManager; +import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.PointF; +import android.graphics.PorterDuff; +import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Build; import android.view.MotionEvent; @@ -259,7 +262,7 @@ public class MapControlsLayer extends OsmandMapLayer { private void initTopControls() { View configureMap = mapActivity.findViewById(R.id.map_layers_button); - layersHud = createHudButton(configureMap, R.drawable.map_world_globe_dark, LAYERS_HUD_ID) + layersHud = createHudButton(configureMap, R.drawable.ic_world_globe_dark, LAYERS_HUD_ID) .setIconColorId(R.color.on_map_icon_color, 0) .setBg(R.drawable.btn_inset_circle_trans, R.drawable.btn_inset_circle_night); controls.add(layersHud); @@ -818,7 +821,7 @@ public class MapControlsLayer extends OsmandMapLayer { ApplicationMode appMode = settings.getApplicationMode(); layersHud.setIconColorId(appMode.getIconColorInfo().getColor(isNight)); - if (layersHud.setIconResId(appMode.getMapIconRes())) { + if (layersHud.setIconResId(appMode.getIconRes())) { layersHud.update(app, isNight); } layersHud.updateVisibility(!routeDialogOpened && !trackDialogOpened && !isInMeasurementToolMode() && !isInPlanRouteMode() @@ -1159,19 +1162,25 @@ public class MapControlsLayer extends OsmandMapLayer { } else if (resId != 0) { d = ctx.getUIUtilities().getIcon(resId, nightMode ? resClrDark : resClrLight); } - if (iv instanceof ImageView) { if (compass) { ((ImageView) iv).setImageDrawable(new CompassDrawable(d)); } else { - ((ImageView) iv).setImageDrawable(d); + int iconSize = (int) ctx.getResources().getDimension(R.dimen.standard_icon_size); + Bitmap bitmap = Bitmap.createBitmap(iconSize, iconSize, Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(bitmap); + canvas.drawColor(0, PorterDuff.Mode.CLEAR); + if (d != null) { + d.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); + d.draw(canvas); + } + ((ImageView) iv).setImageDrawable(new BitmapDrawable(ctx.getResources(), bitmap)); } } else if (iv instanceof TextView) { ((TextView) iv).setCompoundDrawablesWithIntrinsicBounds( d, null, null, null); } } - } private String getZoomLevel(@NonNull RotatedTileBox tb) { diff --git a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java index c7f01306f0..0c136f029d 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java @@ -282,7 +282,7 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe private void updateQuickActionButton(boolean widgetVisible) { quickActionButton.setImageDrawable(app.getUIUtilities().getMapIcon( - !widgetVisible ? R.drawable.map_quick_action : R.drawable.map_action_cancel, !nightMode)); + !widgetVisible ? R.drawable.map_quick_action : R.drawable.ic_action_close, !nightMode)); quickActionButton.setBackgroundResource( nightMode ? R.drawable.btn_circle_night : R.drawable.btn_circle_trans); quickActionButton.setContentDescription(mapActivity.getString(!widgetVisible ? R.string.configure_screen_quick_action : R.string.shared_string_cancel));