diff --git a/OsmAnd/res/drawable-hdpi/list_activities_add_comment.png b/OsmAnd/res/drawable-hdpi/list_activities_add_comment.png index 549ef2fb4e..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_add_comment.png and b/OsmAnd/res/drawable-hdpi/list_activities_add_comment.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_audio_note.png b/OsmAnd/res/drawable-hdpi/list_activities_audio_note.png index 2d539e48fa..1e305fa16e 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_audio_note.png and b/OsmAnd/res/drawable-hdpi/list_activities_audio_note.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_close_bug.png b/OsmAnd/res/drawable-hdpi/list_activities_close_bug.png index 9bcab61e85..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_close_bug.png and b/OsmAnd/res/drawable-hdpi/list_activities_close_bug.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_config.png b/OsmAnd/res/drawable-hdpi/list_activities_config.png index c75d7810ab..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_config.png and b/OsmAnd/res/drawable-hdpi/list_activities_config.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_create_poi.png b/OsmAnd/res/drawable-hdpi/list_activities_create_poi.png new file mode 100644 index 0000000000..6ab9ec80ce Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_create_poi.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_directions_to_here.png b/OsmAnd/res/drawable-hdpi/list_activities_directions_to_here.png index ff31793e21..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_directions_to_here.png and b/OsmAnd/res/drawable-hdpi/list_activities_directions_to_here.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_download_map.png b/OsmAnd/res/drawable-hdpi/list_activities_download_map.png index 35bdfb27de..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_download_map.png and b/OsmAnd/res/drawable-hdpi/list_activities_download_map.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_fav_delete.png b/OsmAnd/res/drawable-hdpi/list_activities_fav_delete.png index c2fd16cdbe..160754b5c7 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_fav_delete.png and b/OsmAnd/res/drawable-hdpi/list_activities_fav_delete.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_fav_edit.png b/OsmAnd/res/drawable-hdpi/list_activities_fav_edit.png index 281dcfdfa7..2f6c66222f 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_fav_edit.png and b/OsmAnd/res/drawable-hdpi/list_activities_fav_edit.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_favorites.png b/OsmAnd/res/drawable-hdpi/list_activities_favorites.png index cb339c9bab..890f8f269d 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_favorites.png and b/OsmAnd/res/drawable-hdpi/list_activities_favorites.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_filter.png b/OsmAnd/res/drawable-hdpi/list_activities_filter.png index 84f65b4419..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_filter.png and b/OsmAnd/res/drawable-hdpi/list_activities_filter.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_gpx_tracks.png b/OsmAnd/res/drawable-hdpi/list_activities_gpx_tracks.png index cb8387b7f0..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_gpx_tracks.png and b/OsmAnd/res/drawable-hdpi/list_activities_gpx_tracks.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_gpx_tracks_old.png b/OsmAnd/res/drawable-hdpi/list_activities_gpx_tracks_old.png deleted file mode 100644 index 198e9a2879..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_gpx_tracks_old.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_gpx_waypoint.png b/OsmAnd/res/drawable-hdpi/list_activities_gpx_waypoint.png index 77d378dd0e..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_gpx_waypoint.png and b/OsmAnd/res/drawable-hdpi/list_activities_gpx_waypoint.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_gpx_waypoint_old.png b/OsmAnd/res/drawable-hdpi/list_activities_gpx_waypoint_old.png index e150ee58e8..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_gpx_waypoint_old.png and b/OsmAnd/res/drawable-hdpi/list_activities_gpx_waypoint_old.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_intermediate_delete.png b/OsmAnd/res/drawable-hdpi/list_activities_intermediate_delete.png index e5003c36fb..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_intermediate_delete.png and b/OsmAnd/res/drawable-hdpi/list_activities_intermediate_delete.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_map_src.png b/OsmAnd/res/drawable-hdpi/list_activities_map_src.png index 6ff519dd70..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_map_src.png and b/OsmAnd/res/drawable-hdpi/list_activities_map_src.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_menu_background.png b/OsmAnd/res/drawable-hdpi/list_activities_menu_background.png index 82855fcdde..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_menu_background.png and b/OsmAnd/res/drawable-hdpi/list_activities_menu_background.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_osm_bugs.png b/OsmAnd/res/drawable-hdpi/list_activities_osm_bugs.png index 7618ccb387..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_osm_bugs.png and b/OsmAnd/res/drawable-hdpi/list_activities_osm_bugs.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_overlay_map.png b/OsmAnd/res/drawable-hdpi/list_activities_overlay_map.png index d7600124b0..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_overlay_map.png and b/OsmAnd/res/drawable-hdpi/list_activities_overlay_map.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_parking_poi_add.png b/OsmAnd/res/drawable-hdpi/list_activities_parking_poi_add.png new file mode 100644 index 0000000000..6ab9ec80ce Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_parking_poi_add.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_parking_poi_remove.png b/OsmAnd/res/drawable-hdpi/list_activities_parking_poi_remove.png new file mode 100644 index 0000000000..6ab9ec80ce Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_parking_poi_remove.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_photo.png b/OsmAnd/res/drawable-hdpi/list_activities_photo.png index 2cb3564931..29640f6596 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_photo.png and b/OsmAnd/res/drawable-hdpi/list_activities_photo.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_plugin_menu_symbol.png b/OsmAnd/res/drawable-hdpi/list_activities_plugin_menu_symbol.png index 7153fab3d6..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_plugin_menu_symbol.png and b/OsmAnd/res/drawable-hdpi/list_activities_plugin_menu_symbol.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_poi.png b/OsmAnd/res/drawable-hdpi/list_activities_poi.png index 1d25bc53dc..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_poi.png and b/OsmAnd/res/drawable-hdpi/list_activities_poi.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_poi_labels.png b/OsmAnd/res/drawable-hdpi/list_activities_poi_labels.png index b992667112..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_poi_labels.png and b/OsmAnd/res/drawable-hdpi/list_activities_poi_labels.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_poi_modify.png b/OsmAnd/res/drawable-hdpi/list_activities_poi_modify.png index 3350f222a2..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_poi_modify.png and b/OsmAnd/res/drawable-hdpi/list_activities_poi_modify.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_poi_parking.png b/OsmAnd/res/drawable-hdpi/list_activities_poi_parking.png index a64aa1ac11..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_poi_parking.png and b/OsmAnd/res/drawable-hdpi/list_activities_poi_parking.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_poi_remove.png b/OsmAnd/res/drawable-hdpi/list_activities_poi_remove.png index 0c0df28366..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_poi_remove.png and b/OsmAnd/res/drawable-hdpi/list_activities_poi_remove.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_poi_show_website.png b/OsmAnd/res/drawable-hdpi/list_activities_poi_show_website.png index fa4304b8df..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_poi_show_website.png and b/OsmAnd/res/drawable-hdpi/list_activities_poi_show_website.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_remove_note.png b/OsmAnd/res/drawable-hdpi/list_activities_remove_note.png index 99f83d3a9e..160754b5c7 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_remove_note.png and b/OsmAnd/res/drawable-hdpi/list_activities_remove_note.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_route.png b/OsmAnd/res/drawable-hdpi/list_activities_route.png index ecaf8bfe17..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_route.png and b/OsmAnd/res/drawable-hdpi/list_activities_route.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_save.png b/OsmAnd/res/drawable-hdpi/list_activities_save.png index e078bc232e..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_save.png and b/OsmAnd/res/drawable-hdpi/list_activities_save.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_search_near_here.png b/OsmAnd/res/drawable-hdpi/list_activities_search_near_here.png new file mode 100644 index 0000000000..6ab9ec80ce Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_search_near_here.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_set_destination.png b/OsmAnd/res/drawable-hdpi/list_activities_set_destination.png new file mode 100644 index 0000000000..6ab9ec80ce Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_set_destination.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_set_intermediate.png b/OsmAnd/res/drawable-hdpi/list_activities_set_intermediate.png new file mode 100644 index 0000000000..6ab9ec80ce Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_set_intermediate.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_share_location.png b/OsmAnd/res/drawable-hdpi/list_activities_share_location.png new file mode 100644 index 0000000000..ec0b678f87 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_share_location.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_show_on_map.png b/OsmAnd/res/drawable-hdpi/list_activities_show_on_map.png index cc83d80319..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_show_on_map.png and b/OsmAnd/res/drawable-hdpi/list_activities_show_on_map.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_show_poi_description.png b/OsmAnd/res/drawable-hdpi/list_activities_show_poi_description.png index 632669137d..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_show_poi_description.png and b/OsmAnd/res/drawable-hdpi/list_activities_show_poi_description.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_show_poi_phone.png b/OsmAnd/res/drawable-hdpi/list_activities_show_poi_phone.png index b007556402..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_show_poi_phone.png and b/OsmAnd/res/drawable-hdpi/list_activities_show_poi_phone.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_show_route_from_here.png b/OsmAnd/res/drawable-hdpi/list_activities_show_route_from_here.png new file mode 100644 index 0000000000..6ab9ec80ce Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_show_route_from_here.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_target_delete.png b/OsmAnd/res/drawable-hdpi/list_activities_target_delete.png index 8a3547b1b2..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_target_delete.png and b/OsmAnd/res/drawable-hdpi/list_activities_target_delete.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_transparent.png b/OsmAnd/res/drawable-hdpi/list_activities_transparent.png index 016147f8fd..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_transparent.png and b/OsmAnd/res/drawable-hdpi/list_activities_transparent.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_transport_stops.png b/OsmAnd/res/drawable-hdpi/list_activities_transport_stops.png index d062cd826b..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_transport_stops.png and b/OsmAnd/res/drawable-hdpi/list_activities_transport_stops.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_underlay_map.png b/OsmAnd/res/drawable-hdpi/list_activities_underlay_map.png index c1bf1fefed..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_underlay_map.png and b/OsmAnd/res/drawable-hdpi/list_activities_underlay_map.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_update_map.png b/OsmAnd/res/drawable-hdpi/list_activities_update_map.png index c944969f67..6ab9ec80ce 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_update_map.png and b/OsmAnd/res/drawable-hdpi/list_activities_update_map.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_video_note.png b/OsmAnd/res/drawable-hdpi/list_activities_video_note.png index 16aaf22a27..14366ad611 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_video_note.png and b/OsmAnd/res/drawable-hdpi/list_activities_video_note.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_parking_poi_add.png b/OsmAnd/res/drawable-hdpi/list_parking_poi_add.png deleted file mode 100644 index 84a4f7479c..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/list_parking_poi_add.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/list_parking_poi_remove.png b/OsmAnd/res/drawable-hdpi/list_parking_poi_remove.png deleted file mode 100644 index d61ec48ed9..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/list_parking_poi_remove.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/list_view_create_poi.png b/OsmAnd/res/drawable-hdpi/list_view_create_poi.png deleted file mode 100644 index beef6e78b9..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/list_view_create_poi.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/list_view_expanded_shadows.png b/OsmAnd/res/drawable-hdpi/list_view_expanded_shadows.png deleted file mode 100644 index 8ce6df1752..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/list_view_expanded_shadows.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/list_view_search_near_here.png b/OsmAnd/res/drawable-hdpi/list_view_search_near_here.png deleted file mode 100644 index 0cdf0155fe..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/list_view_search_near_here.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/list_view_set_destination.png b/OsmAnd/res/drawable-hdpi/list_view_set_destination.png deleted file mode 100644 index 5e57db3b95..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/list_view_set_destination.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/list_view_set_intermediate.png b/OsmAnd/res/drawable-hdpi/list_view_set_intermediate.png deleted file mode 100644 index 28992713e3..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/list_view_set_intermediate.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/list_view_share_location.png b/OsmAnd/res/drawable-hdpi/list_view_share_location.png deleted file mode 100644 index dcfa973227..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/list_view_share_location.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/list_view_show_route_from_here.png b/OsmAnd/res/drawable-hdpi/list_view_show_route_from_here.png deleted file mode 100644 index cfb9ef38fc..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/list_view_show_route_from_here.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/poi_favourite_3d.png b/OsmAnd/res/drawable-hdpi/poi_favourite_3d.png deleted file mode 100644 index ad862acff1..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/poi_favourite_3d.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/tab_icon_favourite_menu.png b/OsmAnd/res/drawable-hdpi/tab_icon_favourite_menu.png deleted file mode 100644 index b6a9e71f62..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/tab_icon_favourite_menu.png and /dev/null differ diff --git a/OsmAnd/res/layout/list_menu_item.xml b/OsmAnd/res/layout/list_menu_item.xml new file mode 100644 index 0000000000..3548622891 --- /dev/null +++ b/OsmAnd/res/layout/list_menu_item.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java b/OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java index 0c8682ee80..5d193f8242 100644 --- a/OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java +++ b/OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java @@ -38,8 +38,9 @@ public class IntermediatePointsDialog { final List intermediates = targets.getIntermediatePointsWithTarget(); final List names = targets.getIntermediatePointNamesWithTarget(); final boolean[] checkedIntermediates = new boolean[intermediates.size()]; + final int padding = (int) (12 * activity.getResources().getDisplayMetrics().density + 0.5f); final ArrayAdapter listadapter = new ArrayAdapter(app, - changeOrder? R.layout.change_order_item : R.layout.layers_list_activity_item, R.id.title, + changeOrder? R.layout.change_order_item : R.layout.list_menu_item, R.id.title, intermediates) { @Override public View getView(final int position, View convertView, ViewGroup parent) { @@ -90,8 +91,9 @@ public class IntermediatePointsDialog { }); } else { tv.setCompoundDrawablesWithIntrinsicBounds( - position == intermediates.size() - 1? R.drawable.list_view_set_destination: - R.drawable.list_view_set_intermediate, 0, 0, 0); + position == intermediates.size() - 1? R.drawable.list_activities_set_destination: + R.drawable.list_activities_set_intermediate, 0, 0, 0); + tv.setCompoundDrawablePadding(padding); final CheckBox ch = ((CheckBox) v.findViewById(R.id.check_item)); ch.setVisibility(View.VISIBLE); ch.setChecked(true); diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index fa7e52ea02..03aedf939d 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -814,26 +814,29 @@ public class MapActivityActions implements DialogProvider { final ContextMenuAdapter adapter = iadapter == null ? new ContextMenuAdapter(mapActivity) : iadapter; Builder builder = new AlertDialog.Builder(mapActivity); - adapter.registerItem(R.string.context_menu_item_navigate_point, R.drawable.list_view_set_destination); + adapter.registerItem(R.string.context_menu_item_navigate_point, R.drawable.list_activities_set_destination); final TargetPointsHelper targets = getMyApplication().getTargetPointsHelper(); if(targets.getPointToNavigate() != null) { - adapter.registerItem(R.string.context_menu_item_intermediate_point, R.drawable.list_view_set_intermediate); + adapter.registerItem(R.string.context_menu_item_intermediate_point, R.drawable.list_activities_set_intermediate); } - adapter.registerItem(R.string.context_menu_item_show_route, R.drawable.list_view_show_route_from_here); - adapter.registerItem(R.string.context_menu_item_search, R.drawable.list_view_search_near_here); - adapter.registerItem(R.string.context_menu_item_share_location, R.drawable.list_view_share_location); + adapter.registerItem(R.string.context_menu_item_show_route, R.drawable.list_activities_show_route_from_here); + adapter.registerItem(R.string.context_menu_item_search, R.drawable.list_activities_search_near_here); + adapter.registerItem(R.string.context_menu_item_share_location, R.drawable.list_activities_share_location); adapter.registerItem(R.string.context_menu_item_add_favorite, R.drawable.list_activities_favorites); OsmandPlugin.registerMapContextMenu(mapActivity, latitude, longitude, adapter, selectedObj); - - ListAdapter listadapter = new ArrayAdapter(mapActivity, R.layout.layers_list_activity_item, R.id.title, + final int padding = (int) (12 * mapActivity.getResources().getDisplayMetrics().density + 0.5f); + ListAdapter listadapter = new ArrayAdapter(mapActivity, R.layout.list_menu_item, R.id.title, adapter.getItemNames()) { @Override public View getView(int position, View convertView, ViewGroup parent) { // User super class to create the View - View v = super.getView(position, convertView, parent); + View v = convertView; + if (v == null) { + v = mapActivity.getLayoutInflater().inflate(R.layout.list_menu_item, null); + } TextView tv = (TextView) v.findViewById(R.id.title); tv.setText(adapter.getItemName(position)); @@ -843,6 +846,7 @@ public class MapActivityActions implements DialogProvider { } else { tv.setCompoundDrawablesWithIntrinsicBounds(R.drawable.list_activities_transparent, 0, 0, 0); } + tv.setCompoundDrawablePadding(padding); final CheckBox ch = ((CheckBox) v.findViewById(R.id.check_item)); ch.setVisibility(View.GONE); @@ -1276,7 +1280,7 @@ public class MapActivityActions implements DialogProvider { }); qa.addActionItem(showOnMap); ActionItem setAsDestination = new ActionItem(); - setAsDestination.setIcon(activity.getResources().getDrawable(R.drawable.list_view_set_destination)); + setAsDestination.setIcon(activity.getResources().getDrawable(R.drawable.list_activities_set_destination)); setAsDestination.setTitle(activity.getString(R.string.navigate_to)); setAsDestination.setOnClickListener(new OnClickListener() { @Override diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java index 9772e44ae8..4b5837253c 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java @@ -296,15 +296,15 @@ public class MapActivityLayers { final LayerMenuListener listener = new LayerMenuListener(adapter, mapView, settings); Builder b = new AlertDialog.Builder(activity); + + final int padding = (int) (12 * activity.getResources().getDisplayMetrics().density + 0.5f); ListAdapter listAdapter = new ArrayAdapter( - activity, - R.layout.layers_list_activity_item, - R.id.title, - adapter.getItemNames()){ + activity, R.layout.list_menu_item, R.id.title, adapter.getItemNames()){ @Override public View getView(final int position, View convertView, ViewGroup parent) { - View v = activity.getLayoutInflater().inflate(R.layout.layers_list_activity_item, null); + // User super class to create the View + View v = activity.getLayoutInflater().inflate(R.layout.list_menu_item, null); TextView tv = (TextView)v.findViewById(R.id.title); tv.setText(adapter.getItemName(position)); @@ -314,11 +314,13 @@ public class MapActivityLayers { } else { tv.setCompoundDrawablesWithIntrinsicBounds(R.drawable.list_activities_transparent, 0, 0, 0); } + tv.setCompoundDrawablePadding(padding); final CheckBox ch = ((CheckBox) v.findViewById(R.id.check_item)); if(adapter.getSelection(position) == -1){ ch.setVisibility(View.INVISIBLE); } else { + ch.setOnCheckedChangeListener(null); ch.setChecked(adapter.getSelection(position) > 0); ch.setOnCheckedChangeListener(new OnCheckedChangeListener() { @Override diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterActivity.java index 06e1e0d7a3..8ce1852f0c 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterActivity.java @@ -153,7 +153,7 @@ public class SearchPoiFilterActivity extends ListActivity { icon.setImageResource(android.R.drawable.ic_search_category_default); } else { // label.setTypeface(Typeface.DEFAULT); - icon.setImageResource(model.isStandardFilter() ? R.drawable.folder : R.drawable.tab_icon_favourite_menu); + icon.setImageResource(model.isStandardFilter() ? R.drawable.folder : R.drawable.list_activities_favorites); } ImageView editIcon = (ImageView) row.findViewById(R.id.folder_edit_icon); if (model.isStandardFilter()) { diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java index d06f8789c6..01951dd7c8 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java @@ -154,7 +154,7 @@ public class OsmEditingPlugin extends OsmandPlugin { adapter.registerItem(R.string.poi_context_menu_modify, R.drawable.list_activities_poi_modify, listener, 1); adapter.registerItem(R.string.poi_context_menu_delete, R.drawable.list_activities_poi_remove, listener, 2); } else { - adapter.registerItem(R.string.context_menu_item_create_poi, R.drawable.list_view_create_poi, listener, -1); + adapter.registerItem(R.string.context_menu_item_create_poi, R.drawable.list_activities_create_poi, listener, -1); } adapter.registerItem(R.string.context_menu_item_open_bug, R.drawable.list_activities_osm_bugs, listener, -1); } diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java index 24486287d6..85532222a8 100644 --- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java +++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java @@ -213,7 +213,7 @@ public class ParkingPositionPlugin extends OsmandPlugin { } }; if (parkingPosition != null) - adapter.registerItem(R.string.context_menu_item_delete_parking_point, R.drawable.list_parking_poi_remove, removeListener, 0); + adapter.registerItem(R.string.context_menu_item_delete_parking_point, R.drawable.list_activities_parking_poi_remove, removeListener, 0); } OnContextMenuClick addListener = new OnContextMenuClick() { @@ -225,7 +225,7 @@ public class ParkingPositionPlugin extends OsmandPlugin { } } }; - adapter.registerItem(R.string.context_menu_item_add_parking_point, R.drawable.list_parking_poi_add, addListener, -1); + adapter.registerItem(R.string.context_menu_item_add_parking_point, R.drawable.list_activities_parking_poi_add, addListener, -1); }