Merge pull request #4260 from osmandapp/fab_waypoints

Fab waypoints

OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    android:id="@+id/add_gpx_waypoint_bottom_sheet"
+    android:id="@+id/add_gpx_point_bottom_sheet"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -25,14 +25,14 @@
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/add_gpx_waypoint_bottom_sheet_title"
+            android:id="@+id/add_gpx_point_bottom_sheet_title"
             style="@style/TextAppearance.ContextMenuTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:layout_marginTop="16dp"
-            android:text="@string/add_gpx_waypoint_bottom_sheet_title"/>
+            android:text="@string/waypoint_one"/>
 
         <TextView
             android:id="@+id/description"
@@ -53,7 +53,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:text="@string/shared_string_create"/>
+        android:text="@string/shared_string_add"/>
 
     <android.support.v7.widget.AppCompatButton
         android:id="@+id/cancel_button"

OsmAnd/res/layout-land/map_hud_bottom.xml

@@ -262,7 +262,7 @@
         tools:visibility="visible"/>
 
     <include
-        layout="@layout/add_gpx_waypoint_bottom_sheet"
+        layout="@layout/add_gpx_point_bottom_sheet"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|left"

OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    android:id="@+id/add_gpx_waypoint_bottom_sheet"
+    android:id="@+id/add_gpx_point_bottom_sheet"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -24,14 +24,14 @@
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/add_gpx_waypoint_bottom_sheet_title"
+            android:id="@+id/add_gpx_point_bottom_sheet_title"
             style="@style/TextAppearance.ContextMenuTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:layout_marginTop="16dp"
-            android:text="@string/add_gpx_waypoint_bottom_sheet_title"/>
+            tools:text="@string/waypoint_one"/>
 
         <TextView
             android:id="@+id/description"
@@ -55,7 +55,7 @@
                 android:id="@+id/create_button"
                 style="@style/DialogActionButton"
                 android:layout_marginRight="8dp"
-                android:text="@string/shared_string_create"/>
+                android:text="@string/shared_string_add"/>
 
             <Button
                 android:id="@+id/cancel_button"

OsmAnd/res/layout/map_hud_bottom.xml

@@ -223,7 +223,7 @@
         <include layout="@layout/move_marker_bottom_sheet"
                  tools:visibility="gone"/>
 
-        <include layout="@layout/add_gpx_waypoint_bottom_sheet"
+        <include layout="@layout/add_gpx_point_bottom_sheet"
                  tools:visibility="gone"/>
 
         <FrameLayout

OsmAnd/res/layout/points_tree.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
+                xmlns:osmand="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/MainLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -19,14 +21,93 @@
         android:groupIndicator="@android:color/transparent"/>
 
     <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fabButton"
+        android:id="@+id/menu_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
         android:layout_margin="16dp"
-        android:src="@drawable/ic_action_plus"
         android:contentDescription="@string/quick_action_new_action"
-        app:backgroundTint="@color/dashboard_blue"/>
+        android:src="@drawable/ic_action_plus"
+        app:backgroundTint="@color/dashboard_blue"
+        app:fabSize="normal"/>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/waypoint_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/menu_fab"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="24dp"
+        android:contentDescription="@string/quick_action_new_action"
+        android:src="@drawable/ic_action_marker_dark"
+        android:visibility="gone"
+        app:backgroundTint="@color/dashboard_blue"
+        app:fabSize="mini"
+        tools:visibility="visible"/>
+
+    <FrameLayout
+        android:id="@+id/waypoint_text_layout"
+        android:layout_toLeftOf="@id/waypoint_fab"
+        android:layout_toStartOf="@id/waypoint_fab"
+        android:layout_above="@id/menu_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/waypoint_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/add_waypoint"/>
+
+    </FrameLayout>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/route_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/waypoint_fab"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="16dp"
+        android:layout_marginRight="24dp"
+        android:contentDescription="@string/quick_action_new_action"
+        android:src="@drawable/ic_action_markers_dark"
+        android:visibility="gone"
+        app:backgroundTint="@color/dashboard_blue"
+        app:fabSize="mini"
+        tools:visibility="visible"/>
+
+    <FrameLayout
+        android:id="@+id/route_text_layout"
+        android:layout_toLeftOf="@id/route_fab"
+        android:layout_toStartOf="@id/route_fab"
+        android:layout_above="@id/waypoint_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginBottom="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:textColor="?android:attr/textColorPrimary"
+            osmand:typeface="@string/font_roboto_medium"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/route_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/add_route_point"/>
+
+    </FrameLayout>
 
 </RelativeLayout>

OsmAnd/res/values/strings.xml

@@ -2663,6 +2663,10 @@
     <string name="shared_string_action_name">Action name</string>
     <string name="mappilary_no_internet_desc">You need internet to view photos from Mapillary</string>
     <string name="retry">Retry</string>
-    <string name="add_gpx_waypoint_bottom_sheet_title">Add gpx waypoint</string>
+    <string name="add_route_point">Add Route Point</string>
-    <string name="shared_string_create">Create</string>
+    <string name="add_waypoint">Add Waypoint</string>
+    <string name="save_gpx_waypoint">Save GPX Waypoint</string>
+    <string name="save_route_point">Save Route Point</string>
+    <string name="waypoint_one">Waypoint 1</string>
+    <string name="route_point_one">Route Point 1</string>
 </resources>

OsmAnd/src/net/osmand/data/PointDescription.java

@@ -24,6 +24,7 @@ public class PointDescription {
 
 	public static final String POINT_TYPE_FAVORITE = "favorite";
 	public static final String POINT_TYPE_WPT = "wpt";
+	public static final String POINT_TYPE_RTE = "rte";
 	public static final String POINT_TYPE_POI = "poi";
 	public static final String POINT_TYPE_ADDRESS = "address";
 	public static final String POINT_TYPE_OSM_NOTE= "osm_note";
@@ -212,6 +213,10 @@ public class PointDescription {
 		return POINT_TYPE_WPT.equals(type);
 	}
 
+	public boolean isRte() {
+		return POINT_TYPE_RTE.equals(type);
+	}
+	
 	public boolean isPoi() {
 		return POINT_TYPE_POI.equals(type);
 	}

OsmAnd/src/net/osmand/plus/GPXUtilities.java

@@ -102,18 +102,6 @@ public class GPXUtilities {
 		public float speed;
 	}
 
-	public static class NewGpxWaypoint {
-		private GPXFile gpx;
-
-		public NewGpxWaypoint(GPXFile gpx) {
-			this.gpx = gpx;
-		}
-
-		public GPXFile getGpx() {
-			return gpx;
-		}
-	}
-
 	public static class WptPt extends GPXExtensions implements LocationPoint {
 		public boolean firstPoint = false;
 		public boolean lastPoint = false;
@@ -872,6 +860,29 @@ public class GPXUtilities {
 			}
 
 			points.add(pt);
+
+			modifiedTime = System.currentTimeMillis();
+
+			return pt;
+		}
+
+		public WptPt addRtePt(double lat, double lon, long time, String description, String name, String category, int color) {
+			double latAdjusted = Double.parseDouble(latLonFormat.format(lat));
+			double lonAdjusted = Double.parseDouble(latLonFormat.format(lon));
+			final WptPt pt = new WptPt(latAdjusted, lonAdjusted, time, Double.NaN, 0, Double.NaN);
+			pt.name = name;
+			pt.category = category;
+			pt.desc = description;
+			if (color != 0) {
+				pt.setColor(color);
+			}
+
+			if (routes.size() == 0) {
+				routes.add(new Route());
+			}
+			Route currentRoute = routes.get(routes.size() -1);
+			currentRoute.points.add(pt);
+
 			modifiedTime = System.currentTimeMillis();
 
 			return pt;

OsmAnd/src/net/osmand/plus/activities/MapActivity.java

@@ -57,8 +57,6 @@ import net.osmand.plus.AppInitializer;
 import net.osmand.plus.AppInitializer.AppInitializeListener;
 import net.osmand.plus.AppInitializer.InitEvents;
 import net.osmand.plus.ApplicationMode;
-import net.osmand.plus.GPXUtilities;
-import net.osmand.plus.GPXUtilities.NewGpxWaypoint;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.MapMarkersHelper.MapMarkerChangedListener;
@@ -106,6 +104,7 @@ import net.osmand.plus.routing.RoutingHelper.RouteCalculationProgressCallback;
 import net.osmand.plus.search.QuickSearchDialogFragment;
 import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchTab;
 import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchType;
+import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
 import net.osmand.plus.views.AnimateDraggingMapThread;
 import net.osmand.plus.views.MapControlsLayer;
 import net.osmand.plus.views.MapInfoLayer;
@@ -927,9 +926,9 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 				} else if (toShow instanceof QuadRect) {
 					QuadRect qr = (QuadRect) toShow;
 					mapView.fitRectToMap(qr.left, qr.right, qr.top, qr.bottom, (int) qr.width(), (int) qr.height(), 0);
-				} else if (toShow instanceof NewGpxWaypoint) {
+				} else if (toShow instanceof NewGpxPoint) {
-					NewGpxWaypoint newGpxWaypoint = (NewGpxWaypoint) toShow;
+					NewGpxPoint newGpxPoint = (NewGpxPoint) toShow;
-					getMapLayers().getContextMenuLayer().enterAddGpxWaypointMode(newGpxWaypoint);
+					getMapLayers().getContextMenuLayer().enterAddGpxPointMode(newGpxPoint);
 				} else {
 					mapContextMenu.show(latLonToShow, mapLabelToShow, toShow);
 				}

OsmAnd/src/net/osmand/plus/activities/TrackActivity.java

@@ -36,6 +36,7 @@ import java.util.List;
 public class TrackActivity extends TabActivity {
 
 	public static final String TRACK_FILE_NAME = "TRACK_FILE_NAME";
+	public static final String OPEN_POINTS_TAB = "OPEN_POINTS_TAB";
 	public static final String CURRENT_RECORDING = "CURRENT_RECORDING";
 	protected List<WeakReference<Fragment>> fragList = new ArrayList<>();
 	protected PagerSlidingTabStrip slidingTabLayout;
@@ -47,6 +48,7 @@ public class TrackActivity extends TabActivity {
 	private List<GpxDisplayGroup> displayGroups;
 	private List<GpxDisplayGroup> originalGroups = new ArrayList<>();
 	private boolean stopped = false;
+	public boolean openPointsTab = false;
 
 	public PagerSlidingTabStrip getSlidingTabLayout() {
 		return slidingTabLayout;
@@ -75,6 +77,9 @@ public class TrackActivity extends TabActivity {
 			}
 			actionBar.setElevation(0);
 		}
+		if (intent.hasExtra(OPEN_POINTS_TAB)) {
+			openPointsTab = true;
+		}
 		setContentView(R.layout.tab_content);
 	}
 
@@ -188,6 +193,9 @@ public class TrackActivity extends TabActivity {
 						if (isHavingWayPoints() || isHavingRoutePoints()) {
 							((OsmandFragmentPagerAdapter) mViewPager.getAdapter()).addTab(
 									getTabIndicator(R.string.points, TrackPointFragment.class));
+							if (openPointsTab) {
+								mViewPager.setCurrentItem(1, false);
+							}
 						} else {
 							slidingTabLayout.setVisibility(View.GONE);
 							getSupportActionBar().setElevation(AndroidUtils.dpToPx(getMyApplication(), 4f));

OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java

@@ -40,6 +40,7 @@ import net.osmand.plus.mapcontextmenu.MenuController.TitleProgressController;
 import net.osmand.plus.mapcontextmenu.controllers.MapDataMenuController;
 import net.osmand.plus.mapcontextmenu.editors.FavoritePointEditor;
 import net.osmand.plus.mapcontextmenu.editors.PointEditor;
+import net.osmand.plus.mapcontextmenu.editors.RtePtEditor;
 import net.osmand.plus.mapcontextmenu.editors.WptPtEditor;
 import net.osmand.plus.mapcontextmenu.other.MapMultiSelectionMenu;
 import net.osmand.plus.mapcontextmenu.other.ShareMenu;
@@ -64,6 +65,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 
 	private FavoritePointEditor favoritePointEditor;
 	private WptPtEditor wptPtEditor;
+	private RtePtEditor rtePtEditor;
 
 	private boolean active;
 	private LatLon latLon;
@@ -147,6 +149,9 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 		if (wptPtEditor != null) {
 			wptPtEditor.setMapActivity(mapActivity);
 		}
+		if (rtePtEditor != null) {
+			rtePtEditor.setMapActivity(mapActivity);
+		}
 
 		if (active) {
 			acquireMenuController(false);
@@ -196,11 +201,20 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 		return wptPtEditor;
 	}
 
+	public RtePtEditor getRtePtPointEditor() {
+		if (rtePtEditor == null) {
+			rtePtEditor = new RtePtEditor(mapActivity);
+		}
+		return rtePtEditor;
+	}
+
 	public PointEditor getPointEditor(String tag) {
 		if (favoritePointEditor != null && favoritePointEditor.getFragmentTag().equals(tag)) {
 			return favoritePointEditor;
 		} else if (wptPtEditor != null && wptPtEditor.getFragmentTag().equals(tag)) {
 			return wptPtEditor;
+		} else if (rtePtEditor != null && rtePtEditor.getFragmentTag().equals(tag)) {
+			return rtePtEditor;
 		}
 		return null;
 	}

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/RtePtEditor.java

@@ -0,0 +1,27 @@
+package net.osmand.plus.mapcontextmenu.editors;
+
+import net.osmand.plus.activities.MapActivity;
+
+public class RtePtEditor extends WptPtEditor {
+
+	public static final String TAG = "RtePtEditorFragment";
+
+	public RtePtEditor(MapActivity mapActivity) {
+		super(mapActivity);
+	}
+
+	@Override
+	public String getFragmentTag() {
+		return TAG;
+	}
+
+	@Override
+	public void showEditorFragment() {
+		RtePtEditorFragment.showInstance(mapActivity);
+	}
+
+	@Override
+	public void showEditorFragment(boolean skipDialog) {
+		RtePtEditorFragment.showInstance(mapActivity, skipDialog);
+	}
+}

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/RtePtEditorFragment.java

@@ -0,0 +1,43 @@
+package net.osmand.plus.mapcontextmenu.editors;
+
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+
+public class RtePtEditorFragment extends WptPtEditorFragment {
+
+	@Override
+	public void assignEditor() {
+		editor = getMapActivity().getContextMenu().getRtePtPointEditor();
+	}
+
+	@Override
+	public String getToolbarTitle() {
+		return getMapActivity().getResources().getString(R.string.save_route_point);
+	}
+
+	public static void showInstance(final MapActivity mapActivity) {
+		RtePtEditor editor = mapActivity.getContextMenu().getRtePtPointEditor();
+		//int slideInAnim = editor.getSlideInAnimation();
+		//int slideOutAnim = editor.getSlideOutAnimation();
+
+		RtePtEditorFragment fragment = new RtePtEditorFragment();
+		mapActivity.getSupportFragmentManager().beginTransaction()
+				//.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)
+				.add(R.id.fragmentContainer, fragment, editor.getFragmentTag())
+				.addToBackStack(null).commit();
+	}
+
+	public static void showInstance(final MapActivity mapActivity, boolean skipDialog) {
+		RtePtEditor editor = mapActivity.getContextMenu().getRtePtPointEditor();
+		//int slideInAnim = editor.getSlideInAnimation();
+		//int slideOutAnim = editor.getSlideOutAnimation();
+
+		RtePtEditorFragment fragment = new RtePtEditorFragment();
+		fragment.skipDialog = skipDialog;
+
+		mapActivity.getSupportFragmentManager().beginTransaction()
+				//.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)
+				.add(R.id.fragmentContainer, fragment, editor.getFragmentTag())
+				.addToBackStack(null).commit();
+	}
+}

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditor.java

@@ -9,9 +9,11 @@ import net.osmand.plus.activities.MapActivity;
 
 public class WptPtEditor extends PointEditor {
 
+	private OnDismissListener onDismissListener;
 	private GPXFile gpxFile;
 	private WptPt wpt;
 	private boolean gpxSelected;
+	private boolean newGpxPointProcessing;
 
 	public static final String TAG = "WptPtEditorFragment";
 
@@ -19,9 +21,24 @@ public class WptPtEditor extends PointEditor {
 		super(mapActivity);
 	}
 
-	@Override
+	public void setNewGpxPointProcessing(boolean newGpxPointProcessing) {
-	public String getFragmentTag() {
+		this.newGpxPointProcessing = newGpxPointProcessing;
-		return TAG;
+	}
+
+	public boolean isNewGpxPointProcessing() {
+		return newGpxPointProcessing;
+	}
+
+	public interface OnDismissListener {
+		void onDismiss();
+	}
+
+	public void setOnDismissListener(OnDismissListener listener) {
+		onDismissListener = listener;
+	}
+
+	public OnDismissListener getOnDismissListener() {
+		return onDismissListener;
 	}
 
 	public GPXFile getGpxFile() {
@@ -36,6 +53,11 @@ public class WptPtEditor extends PointEditor {
 		return wpt;
 	}
 
+	@Override
+	public String getFragmentTag() {
+		return TAG;
+	}
+
 	public void add(GPXFile gpxFile, LatLon latLon, String title) {
 		if (latLon == null) {
 			return;
@@ -50,7 +72,7 @@ public class WptPtEditor extends PointEditor {
 		wpt = new WptPt(latLon.getLatitude(), latLon.getLongitude(),
 				System.currentTimeMillis(), Double.NaN, 0, Double.NaN);
 		wpt.name = title;
-		WptPtEditorFragment.showInstance(mapActivity);
+		showEditorFragment();
 	}
 
 	public void add(GPXFile gpxFile, LatLon latLon, String title, String categoryName, int categoryColor, boolean skipDialog) {
@@ -86,7 +108,7 @@ public class WptPtEditor extends PointEditor {
 
 		wpt.category = categoryName;
 
-		WptPtEditorFragment.showInstance(mapActivity, skipDialog);
+		showEditorFragment(skipDialog);
 	}
 
 	public void edit(WptPt wpt) {
@@ -101,6 +123,14 @@ public class WptPtEditor extends PointEditor {
 			gpxFile = selectedGpxFile.getGpxFile();
 		}
 		this.wpt = wpt;
+		showEditorFragment();
+	}
+
+	public void showEditorFragment() {
 		WptPtEditorFragment.showInstance(mapActivity);
 	}
+
+	public void showEditorFragment(boolean skipDialog) {
+		WptPtEditorFragment.showInstance(mapActivity, skipDialog);
+	}
 }

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java

@@ -14,6 +14,7 @@ import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.mapcontextmenu.editors.WptPtEditor.OnDismissListener;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -26,7 +27,8 @@ import net.osmand.util.Algorithms;
 import java.io.File;
 
 public class WptPtEditorFragment extends PointEditorFragment {
-	private WptPtEditor editor;
+
+	protected WptPtEditor editor;
 	private WptPt wpt;
 	private SavingTrackHelper savingTrackHelper;
 	private GpxSelectionHelper selectedGpxHelper;
@@ -34,17 +36,21 @@ public class WptPtEditorFragment extends PointEditorFragment {
 	private boolean saved;
 	private int color;
 	private int defaultColor;
-	private boolean skipDialog;
+	protected boolean skipDialog;
 
 	@Override
 	public void onAttach(Activity activity) {
 		super.onAttach(activity);
 		savingTrackHelper = getMapActivity().getMyApplication().getSavingTrackHelper();
 		selectedGpxHelper = getMapActivity().getMyApplication().getSelectedGpxHelper();
-		editor = getMapActivity().getContextMenu().getWptPtPointEditor();
+		assignEditor();
 		defaultColor = getResources().getColor(R.color.gpx_color_point);
 	}
 
+	protected void assignEditor() {
+		editor = getMapActivity().getContextMenu().getWptPtPointEditor();
+	}
+
 	@Override
 	public void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -69,6 +75,17 @@ public class WptPtEditorFragment extends PointEditorFragment {
 		}
 	}
 
+	@Override
+	public void dismiss(boolean includingMenu) {
+		super.dismiss(includingMenu);
+		OnDismissListener listener = editor.getOnDismissListener();
+		if (listener != null) {
+			listener.onDismiss();
+		}
+		editor.setNewGpxPointProcessing(false);
+		editor.setOnDismissListener(null);
+	}
+
 	@Override
 	public PointEditor getEditor() {
 		return editor;
@@ -76,12 +93,16 @@ public class WptPtEditorFragment extends PointEditorFragment {
 
 	@Override
 	public String getToolbarTitle() {
+		if (editor.isNewGpxPointProcessing()) {
+			return getMapActivity().getResources().getString(R.string.save_gpx_waypoint);
+		} else {
 			if (editor.isNew()) {
 				return getMapActivity().getResources().getString(R.string.context_menu_item_add_waypoint);
 			} else {
 				return getMapActivity().getResources().getString(R.string.shared_string_edit);
 			}
 		}
+	}
 
 	public static void showInstance(final MapActivity mapActivity) {
 		WptPtEditor editor = mapActivity.getContextMenu().getWptPtPointEditor();

OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenu.java

@@ -12,6 +12,7 @@ import net.osmand.plus.mapcontextmenu.MenuController.MenuType;
 import net.osmand.plus.mapcontextmenu.MenuTitleController;
 import net.osmand.plus.views.ContextMenuLayer;
 import net.osmand.plus.views.ContextMenuLayer.IContextMenuProvider;
+import net.osmand.plus.views.OsmandMapTileView;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -194,8 +195,8 @@ public class MapMultiSelectionMenu extends BaseMenuController {
 	public void openContextMenu(@NonNull MenuObject menuObject) {
 		IContextMenuProvider provider = selectedObjects.remove(menuObject.getObject());
 		hide();
-		getMapActivity().getMapLayers().getContextMenuLayer().showContextMenu(
+		ContextMenuLayer contextMenuLayer = getMapActivity().getMapLayers().getContextMenuLayer();
-				menuObject.getLatLon(), menuObject.getPointDescription(), menuObject.getObject(), provider);
+		contextMenuLayer.showContextMenu(menuObject.getLatLon(), menuObject.getPointDescription(), menuObject.getObject(), provider);
 	}
 
 	private void clearSelectedObjects() {

OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java

@@ -9,6 +9,7 @@ import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.view.ActionMode;
@@ -20,6 +21,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AbsListView;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ExpandableListView;
@@ -30,16 +32,13 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
-import net.osmand.Location;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
-import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GPXUtilities.GPXFile;
-import net.osmand.plus.GPXUtilities.NewGpxWaypoint;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType;
@@ -58,6 +57,7 @@ import net.osmand.plus.activities.TrackActivity;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.base.OsmandExpandableListFragment;
 import net.osmand.plus.dialogs.DirectionsDialogs;
+import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
 import net.osmand.util.Algorithms;
 
 import java.io.File;
@@ -93,7 +93,12 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 	private Set<Integer> selectedGroups = new LinkedHashSet<>();
 	private ActionMode actionMode;
 	private SearchView searchView;
-	private FloatingActionButton fab;
+	private boolean menuOpened = false;
+	private FloatingActionButton menuFab;
+	private FloatingActionButton waypointFab;
+	private View waypointTextLayout;
+	private FloatingActionButton routePointFab;
+	private View routePointTextLayout;
 
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -104,6 +109,20 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 	@Override
 	public void onActivityCreated(Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
+		listView.setOnScrollListener(new AbsListView.OnScrollListener() {
+			@Override
+			public void onScrollStateChanged(AbsListView absListView, int i) {
+				if (i == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) {
+					if (menuOpened) {
+						closeMenu();
+					}
+				}
+			}
+
+			@Override
+			public void onScroll(AbsListView absListView, int i, int i1, int i2) {
+			}
+		});
 		listView.setBackgroundColor(getResources().getColor(
 				getMyApplication().getSettings().isLightContent() ? R.color.ctx_menu_info_view_bg_light
 						: R.color.ctx_menu_info_view_bg_dark));
@@ -115,26 +134,38 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 		ExpandableListView listView = (ExpandableListView) view.findViewById(android.R.id.list);
 		setHasOptionsMenu(true);
 
-		fab = (FloatingActionButton) view.findViewById(R.id.fabButton);
+		menuFab = (FloatingActionButton) view.findViewById(R.id.menu_fab);
-
+		menuFab.setOnClickListener(new View.OnClickListener() {
-		fab.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				final OsmandSettings settings = app.getSettings();
+				if (menuOpened) {
-				GPXFile gpx = getGpx();
+					closeMenu();
-				Location location = app.getLocationProvider().getLastKnownLocation();
+				} else {
-				if (location != null) {
+					openMenu();
-					settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
-							settings.getLastKnownMapZoom(),
-							new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.context_menu_item_add_waypoint)),
-							false,
-							new NewGpxWaypoint(gpx));
-
-					MapActivity.launchMapActivityMoveToTop(getActivity());
 				}
 			}
 		});
 
+		waypointFab = (FloatingActionButton) view.findViewById(R.id.waypoint_fab);
+		waypointFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
+				addPoint(pointDescription);
+			}
+		});
+		waypointTextLayout = view.findViewById(R.id.waypoint_text_layout);
+
+		routePointFab = (FloatingActionButton) view.findViewById(R.id.route_fab);
+		routePointFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
+				addPoint(pointDescription);
+			}
+		});
+		routePointTextLayout = view.findViewById(R.id.route_text_layout);
+
 		TextView tv = new TextView(getActivity());
 		tv.setText(R.string.none_selected_gpx);
 		tv.setTextSize(24);
@@ -146,6 +177,43 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 		return view;
 	}
 
+	private void addPoint(PointDescription pointDescription) {
+		Intent currentIntent = getTrackActivity().getIntent();
+		if (currentIntent != null) {
+			currentIntent.putExtra(TrackActivity.OPEN_POINTS_TAB, true);
+		}
+		final OsmandSettings settings = app.getSettings();
+		GPXFile gpx = getGpx();
+		LatLon location = settings.getLastKnownMapLocation();
+		if (gpx != null && location != null) {
+			settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
+					settings.getLastKnownMapZoom(),
+					pointDescription,
+					false,
+					new NewGpxPoint(gpx, pointDescription));
+
+			MapActivity.launchMapActivityMoveToTop(getActivity());
+		}
+	}
+
+	private void openMenu() {
+		menuFab.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_action_remove_dark));
+		waypointFab.setVisibility(View.VISIBLE);
+		waypointTextLayout.setVisibility(View.VISIBLE);
+		routePointFab.setVisibility(View.VISIBLE);
+		routePointTextLayout.setVisibility(View.VISIBLE);
+		menuOpened = true;
+	}
+
+	private void closeMenu() {
+		menuFab.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_action_plus));
+		waypointFab.setVisibility(View.GONE);
+		waypointTextLayout.setVisibility(View.GONE);
+		routePointFab.setVisibility(View.GONE);
+		routePointTextLayout.setVisibility(View.GONE);
+		menuOpened = false;
+	}
+
 	public TrackActivity getTrackActivity() {
 		return (TrackActivity) getActivity();
 	}
@@ -168,6 +236,11 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 		if (!adapter.isEmpty() && listView.getHeaderViewsCount() == 0) {
 			listView.addHeaderView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_header, null, false));
 			listView.addFooterView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_footer, null, false));
+			View view = new View(getActivity());
+			view.setLayoutParams(new AbsListView.LayoutParams(
+					AbsListView.LayoutParams.MATCH_PARENT,
+					AndroidUtils.dpToPx(getActivity(), 72)));
+			listView.addFooterView(view);
 		}
 	}
 
@@ -270,6 +343,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		menu.clear();
+		getTrackActivity().getClearToolbar(false);
 		MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark,
 				R.drawable.ic_action_search_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
 		searchView = new SearchView(getActivity());

OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java

@@ -0,0 +1,156 @@
+package net.osmand.plus.views;
+
+import android.content.Intent;
+import android.graphics.PointF;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import net.osmand.data.LatLon;
+import net.osmand.data.PointDescription;
+import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.GPXUtilities.GPXFile;
+import net.osmand.plus.IconsCache;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.TrackActivity;
+import net.osmand.plus.mapcontextmenu.MapContextMenu;
+import net.osmand.plus.mapcontextmenu.editors.RtePtEditor;
+import net.osmand.plus.mapcontextmenu.editors.WptPtEditor;
+import net.osmand.plus.mapcontextmenu.editors.WptPtEditor.OnDismissListener;
+
+public class AddGpxPointBottomSheetHelper implements OnDismissListener {
+	private final View view;
+	private final TextView title;
+	private final TextView description;
+	private final ImageView icon;
+	private final MapActivity mapActivity;
+	private final MapContextMenu contextMenu;
+	private final ContextMenuLayer contextMenuLayer;
+	private final IconsCache iconsCache;
+	private String titleText;
+	private boolean applyingPositionMode;
+	private NewGpxPoint newGpxPoint;
+	private PointDescription pointDescription;
+
+	public AddGpxPointBottomSheetHelper(final MapActivity activity, ContextMenuLayer ctxMenuLayer) {
+		this.contextMenuLayer = ctxMenuLayer;
+		iconsCache = activity.getMyApplication().getIconsCache();
+		mapActivity = activity;
+		contextMenu = activity.getContextMenu();
+		view = activity.findViewById(R.id.add_gpx_point_bottom_sheet);
+		title = (TextView) view.findViewById(R.id.add_gpx_point_bottom_sheet_title);
+		description = (TextView) view.findViewById(R.id.description);
+		icon = (ImageView) view.findViewById(R.id.icon);
+
+		view.findViewById(R.id.create_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				contextMenuLayer.createGpxPoint();
+				GPXFile gpx = newGpxPoint.getGpx();
+				LatLon latLon = contextMenu.getLatLon();
+				if (pointDescription.isWpt()) {
+					WptPtEditor editor = activity.getContextMenu().getWptPtPointEditor();
+					editor.setOnDismissListener(AddGpxPointBottomSheetHelper.this);
+					editor.setNewGpxPointProcessing(true);
+					editor.add(gpx, latLon, titleText);
+				} else if (pointDescription.isRte()) {
+					RtePtEditor editor = activity.getContextMenu().getRtePtPointEditor();
+					editor.setOnDismissListener(AddGpxPointBottomSheetHelper.this);
+					editor.setNewGpxPointProcessing(true);
+					editor.add(gpx, latLon, titleText);
+				}
+			}
+		});
+		view.findViewById(R.id.cancel_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				hide();
+				contextMenuLayer.cancelAddGpxPoint();
+			}
+		});
+	}
+
+	public void onDraw(RotatedTileBox rt) {
+		PointF point = contextMenuLayer.getMovableCenterPoint(rt);
+		double lat = rt.getLatFromPixel(point.x, point.y);
+		double lon = rt.getLonFromPixel(point.x, point.y);
+		description.setText(PointDescription.getLocationName(mapActivity, lat, lon, true));
+	}
+
+	public void setTitle(String title) {
+		if (title.equals("")) {
+			if (pointDescription.isWpt()) {
+				title = mapActivity.getString(R.string.waypoint_one);
+			} else if (pointDescription.isRte()) {
+				title = mapActivity.getString(R.string.route_point_one);
+			}
+		}
+		titleText = title;
+		this.title.setText(titleText);
+	}
+
+	public boolean isVisible() {
+		return view.getVisibility() == View.VISIBLE;
+	}
+
+	public void show(NewGpxPoint newPoint) {
+		this.newGpxPoint = newPoint;
+		pointDescription = newPoint.getPointDescription();
+		if (pointDescription.isWpt()) {
+			setTitle(mapActivity.getString(R.string.waypoint_one));
+			icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_marker_dark));
+		} else if (pointDescription.isRte()) {
+			setTitle(mapActivity.getString(R.string.route_point_one));
+			icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_markers_dark));
+		}
+		exitApplyPositionMode();
+		view.setVisibility(View.VISIBLE);
+	}
+
+	public void hide() {
+		exitApplyPositionMode();
+		view.setVisibility(View.GONE);
+	}
+
+	public void enterApplyPositionMode() {
+		if (!applyingPositionMode) {
+			applyingPositionMode = true;
+			view.findViewById(R.id.create_button).setEnabled(false);
+		}
+	}
+
+	public void exitApplyPositionMode() {
+		if (applyingPositionMode) {
+			applyingPositionMode = false;
+			view.findViewById(R.id.create_button).setEnabled(true);
+		}
+	}
+
+	@Override
+	public void onDismiss() {
+		Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());
+		newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, newGpxPoint.getGpx().path);
+		newIntent.putExtra(TrackActivity.OPEN_POINTS_TAB, true);
+		newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+		mapActivity.startActivity(newIntent);
+	}
+
+	public static class NewGpxPoint {
+		private PointDescription pointDescription;
+		private GPXFile gpx;
+
+		public NewGpxPoint(GPXFile gpx, PointDescription pointDescription) {
+			this.gpx = gpx;
+			this.pointDescription = pointDescription;
+		}
+
+		public GPXFile getGpx() {
+			return gpx;
+		}
+
+		public PointDescription getPointDescription() {
+			return pointDescription;
+		}
+	}
+}

OsmAnd/src/net/osmand/plus/views/AddWaypointBottomSheetHelper.java

@@ -1,102 +0,0 @@
-package net.osmand.plus.views;
-
-import android.content.Context;
-import android.graphics.PointF;
-import android.graphics.drawable.Drawable;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import net.osmand.data.LatLon;
-import net.osmand.data.PointDescription;
-import net.osmand.data.RotatedTileBox;
-import net.osmand.plus.GPXUtilities;
-import net.osmand.plus.GPXUtilities.GPXFile;
-import net.osmand.plus.GPXUtilities.NewGpxWaypoint;
-import net.osmand.plus.IconsCache;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.mapcontextmenu.MapContextMenu;
-
-public class AddWaypointBottomSheetHelper {
-	private final View view;
-	private final TextView title;
-	private String titleText = "";
-	private final TextView description;
-	private final Context context;
-	private final MapContextMenu contextMenu;
-	private final ContextMenuLayer contextMenuLayer;
-	private boolean applyingPositionMode;
-	private NewGpxWaypoint newGpxWaypoint;
-
-	public AddWaypointBottomSheetHelper(final MapActivity activity, ContextMenuLayer ctxMenuLayer) {
-		this.contextMenuLayer = ctxMenuLayer;
-		view = activity.findViewById(R.id.add_gpx_waypoint_bottom_sheet);
-		title = (TextView) view.findViewById(R.id.add_gpx_waypoint_bottom_sheet_title);
-		description = (TextView) view.findViewById(R.id.description);
-		context = activity;
-		contextMenu = activity.getContextMenu();
-		ImageView icon = (ImageView) view.findViewById(R.id.icon);
-
-		IconsCache iconsCache = activity.getMyApplication().getIconsCache();
-		icon.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_photo_dark, R.color.marker_green));
-		view.findViewById(R.id.create_button).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				contextMenuLayer.createGpxWaypoint();
-				GPXFile gpx = newGpxWaypoint.getGpx();
-				LatLon latLon = contextMenu.getLatLon();
-				activity.getContextMenu().getWptPtPointEditor().add(gpx, latLon, titleText);
-			}
-		});
-		view.findViewById(R.id.cancel_button).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				hide();
-				contextMenuLayer.cancelAddGpxWaypoint();
-			}
-		});
-	}
-
-	public void onDraw(RotatedTileBox rt) {
-		PointF point = contextMenuLayer.getMovableCenterPoint(rt);
-		double lat = rt.getLatFromPixel(point.x, point.y);
-		double lon = rt.getLonFromPixel(point.x, point.y);
-		description.setText(PointDescription.getLocationName(context, lat, lon, true));
-	}
-
-	public void setTitle(String title) {
-		titleText = title;
-		this.title.setText(titleText);
-	}
-
-	public boolean isVisible() {
-		return view.getVisibility() == View.VISIBLE;
-	}
-
-	public void show(Drawable drawable, NewGpxWaypoint newGpxWaypoint) {
-		this.newGpxWaypoint = newGpxWaypoint;
-		exitApplyPositionMode();
-		view.setVisibility(View.VISIBLE);
-		((ImageView) view.findViewById(R.id.icon)).setImageDrawable(drawable);
-	}
-
-	public void hide() {
-		exitApplyPositionMode();
-		view.setVisibility(View.GONE);
-	}
-
-	public void enterApplyPositionMode() {
-		if (!applyingPositionMode) {
-			applyingPositionMode = true;
-			view.findViewById(R.id.create_button).setEnabled(false);
-		}
-	}
-
-	public void exitApplyPositionMode() {
-		if (applyingPositionMode) {
-			applyingPositionMode = false;
-			view.findViewById(R.id.create_button).setEnabled(true);
-		}
-	}
-}

OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java

@@ -35,13 +35,13 @@ import net.osmand.osm.PoiFilter;
 import net.osmand.osm.PoiType;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
-import net.osmand.plus.GPXUtilities.NewGpxWaypoint;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.mapcontextmenu.other.MapMultiSelectionMenu;
 import net.osmand.plus.render.MapRenderRepositories;
 import net.osmand.plus.render.NativeOsmandLibrary;
+import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
 import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
@@ -76,14 +76,14 @@ public class ContextMenuLayer extends OsmandMapLayer {
 	private GestureDetector movementListener;
 
 	private final MoveMarkerBottomSheetHelper mMoveMarkerBottomSheetHelper;
-	private final AddWaypointBottomSheetHelper mAddWaypointBottomSheetHelper;
+	private final AddGpxPointBottomSheetHelper mAddGpxPointBottomSheetHelper;
 	private boolean mInChangeMarkerPositionMode;
 	private IContextMenuProvider selectedObjectContextMenuProvider;
 	private boolean cancelApplyingNewMarkerPosition;
 	private LatLon applyingMarkerLatLon;
 	private boolean wasCollapseButtonVisible;
 	private boolean mInGpxDetailsMode;
-	private boolean mInAddGpxWaypointMode;
+	private boolean mInAddGpxPointMode;
 
 	private List<String> publicTransportTypes;
 	private Object selectedObject;
@@ -94,7 +94,11 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		multiSelectionMenu = menu.getMultiSelectionMenu();
 		movementListener = new GestureDetector(activity, new MenuLayerOnGestureListener());
 		mMoveMarkerBottomSheetHelper = new MoveMarkerBottomSheetHelper(activity, this);
-		mAddWaypointBottomSheetHelper = new AddWaypointBottomSheetHelper(activity, this);
+		mAddGpxPointBottomSheetHelper = new AddGpxPointBottomSheetHelper(activity, this);
+	}
+
+	public AddGpxPointBottomSheetHelper getAddGpxPointBottomSheetHelper() {
+		return mAddGpxPointBottomSheetHelper;
 	}
 
 	@Override
@@ -207,10 +211,10 @@ public class ContextMenuLayer extends OsmandMapLayer {
 				contextMarker.draw(canvas);
 			}
 			mMoveMarkerBottomSheetHelper.onDraw(box);
-		} else if (mInAddGpxWaypointMode) {
+		} else if (mInAddGpxPointMode) {
 			canvas.translate(box.getPixWidth() / 2 - contextMarker.getWidth() / 2, box.getPixHeight() / 2 - contextMarker.getHeight());
 			contextMarker.draw(canvas);
-			mAddWaypointBottomSheetHelper.onDraw(box);
+			mAddGpxPointBottomSheetHelper.onDraw(box);
 		} else if (menu.isActive()) {
 			LatLon latLon = menu.getLatLon();
 			int x = (int) box.getPixXFromLatLon(latLon.getLatitude(), latLon.getLongitude());
@@ -289,7 +293,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 	}
 
 	public Object getMoveableObject() {
-		return mInChangeMarkerPositionMode || mInAddGpxWaypointMode ? menu.getObject() : null;
+		return mInChangeMarkerPositionMode ? menu.getObject() : null;
 	}
 
 	public boolean isInChangeMarkerPositionMode() {
@@ -300,8 +304,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		return mInGpxDetailsMode;
 	}
 
-	public boolean isInAddGpxWaypointMode() {
+	public boolean isInAddGpxPointMode() {
-		return mInAddGpxWaypointMode;
+		return mInAddGpxPointMode;
 	}
 
 	public boolean isObjectMoveable(Object o) {
@@ -318,14 +322,14 @@ public class ContextMenuLayer extends OsmandMapLayer {
 	}
 
 	public void applyMovedObject(Object o, LatLon position, ApplyMovedObjectCallback callback) {
-		if (selectedObjectContextMenuProvider != null) {
+		if (selectedObjectContextMenuProvider != null && !isInAddGpxPointMode()) {
 			if (selectedObjectContextMenuProvider instanceof IMoveObjectProvider) {
 				final IMoveObjectProvider l = (IMoveObjectProvider) selectedObjectContextMenuProvider;
 				if (l.isObjectMovable(o)) {
 					l.applyNewObjectPosition(o, position, callback);
 				}
 			}
-		} else if (mInChangeMarkerPositionMode || mInAddGpxWaypointMode) {
+		} else if (mInChangeMarkerPositionMode || mInAddGpxPointMode) {
 			callback.onApplyMovedObject(true, null);
 		}
 	}
@@ -351,11 +355,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 					mMoveMarkerBottomSheetHelper.hide();
 					quitMovingMarker();
 
-					PointDescription pointDescription = null;
+
-					if (selectedObjectContextMenuProvider != null) {
-						pointDescription = selectedObjectContextMenuProvider.getObjectName(newObject);
-					}
-					menu.show(ll, pointDescription, newObject);
 					view.refreshMap();
 				}
 				selectedObjectContextMenuProvider = null;
@@ -369,9 +369,9 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		});
 	}
 
-	public void createGpxWaypoint() {
+	public void createGpxPoint() {
-		if (!mInAddGpxWaypointMode) {
+		if (!mInAddGpxPointMode) {
-			throw new IllegalStateException("Not in add gpx waypoint mode");
+			throw new IllegalStateException("Not in add gpx point mode");
 		}
 
 		RotatedTileBox tileBox = activity.getMapView().getCurrentRotatedTileBox();
@@ -381,14 +381,14 @@ public class ContextMenuLayer extends OsmandMapLayer {
 
 		Object obj = getMoveableObject();
 		cancelApplyingNewMarkerPosition = false;
-		mAddWaypointBottomSheetHelper.enterApplyPositionMode();
+		mAddGpxPointBottomSheetHelper.enterApplyPositionMode();
 		applyMovedObject(obj, ll, new ApplyMovedObjectCallback() {
 			@Override
 			public void onApplyMovedObject(boolean success, @Nullable Object newObject) {
-				mAddWaypointBottomSheetHelper.exitApplyPositionMode();
+				mAddGpxPointBottomSheetHelper.exitApplyPositionMode();
 				if (success && !cancelApplyingNewMarkerPosition) {
-					mAddWaypointBottomSheetHelper.hide();
+					mAddGpxPointBottomSheetHelper.hide();
-					quitAddGpxWaipoint();
+					quitAddGpxPoint();
 
 					PointDescription pointDescription = null;
 					if (selectedObjectContextMenuProvider != null) {
@@ -449,8 +449,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		}
 	}
 
-	private void quitAddGpxWaipoint() {
+	private void quitAddGpxPoint() {
-		mInAddGpxWaypointMode = false;
+		mInAddGpxPointMode = false;
 		mark(View.VISIBLE, R.id.map_ruler_layout,
 				R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
 
@@ -460,14 +460,14 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		}
 	}
 
-	public void enterAddGpxWaypointMode(NewGpxWaypoint newGpxWaypoint) {
+	public void enterAddGpxPointMode(NewGpxPoint newGpxPoint) {
 		menu.updateMapCenter(null);
 		menu.hide();
 
 		activity.disableDrawer();
 
-		mInAddGpxWaypointMode = true;
+		mInAddGpxPointMode = true;
-		mAddWaypointBottomSheetHelper.show(menu.getLeftIcon(), newGpxWaypoint);
+		mAddGpxPointBottomSheetHelper.show(newGpxPoint);
 		mark(View.INVISIBLE, R.id.map_ruler_layout,
 				R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
 
@@ -529,9 +529,9 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		applyingMarkerLatLon = null;
 	}
 
-	public void cancelAddGpxWaypoint() {
+	public void cancelAddGpxPoint() {
 		cancelApplyingNewMarkerPosition = true;
-		quitAddGpxWaipoint();
+		quitAddGpxPoint();
 		activity.getContextMenu().show();
 		applyingMarkerLatLon = null;
 	}
@@ -547,6 +547,11 @@ public class ContextMenuLayer extends OsmandMapLayer {
 								   @Nullable PointDescription pointDescription,
 								   @Nullable Object object,
 								   @Nullable IContextMenuProvider provider) {
+		if (mInAddGpxPointMode) {
+			String title = pointDescription == null ? "" : pointDescription.getName();
+			mAddGpxPointBottomSheetHelper.setTitle(title);
+			view.getAnimatedDraggingThread().startMoving(latLon.getLatitude(), latLon.getLongitude(), view.getZoom(), true);
+		} else {
 			selectedObjectContextMenuProvider = provider;
 			hideVisibleMenues();
 			activity.getMapViewTrackingUtilities().setMapLinkedToLocation(false);
@@ -556,6 +561,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 				menu.setCenterMarker(true);
 			}
 			menu.show(latLon, pointDescription, object);
+		}
 		return true;
 	}
 
@@ -641,10 +647,9 @@ public class ContextMenuLayer extends OsmandMapLayer {
 			if (latLon == null) {
 				latLon = getLatLon(point, tileBox);
 			}
-			if (mInAddGpxWaypointMode) {
+			if (mInAddGpxPointMode) {
-				if (pointDescription != null) {
+				String title = pointDescription == null ? "" : pointDescription.getName();
-					mAddWaypointBottomSheetHelper.setTitle(pointDescription.getName());
+				mAddGpxPointBottomSheetHelper.setTitle(title);
-				}
 				view.getAnimatedDraggingThread().startMoving(latLon.getLatitude(), latLon.getLongitude(), view.getZoom(), true);
 			} else {
 				showContextMenu(latLon, pointDescription, selectedObj, provider);
@@ -661,7 +666,12 @@ public class ContextMenuLayer extends OsmandMapLayer {
 			selectedObjectContextMenuProvider = null;
 			LatLon latLon = getLatLon(point, tileBox);
 			activity.getMapViewTrackingUtilities().setMapLinkedToLocation(false);
+			if (mInAddGpxPointMode) {
+				mAddGpxPointBottomSheetHelper.setTitle("");
+				view.getAnimatedDraggingThread().startMoving(latLon.getLatitude(), latLon.getLongitude(), view.getZoom(), true);
+			} else {
 				menu.show(latLon, null, null);
+			}
 			return true;
 		}
 		return false;
@@ -690,7 +700,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 	}
 
 	public boolean disableLongPressOnMap() {
-		if (mInChangeMarkerPositionMode || mInGpxDetailsMode || mInAddGpxWaypointMode) {
+		if (mInChangeMarkerPositionMode || mInGpxDetailsMode || mInAddGpxPointMode) {
 			return true;
 		}
 		boolean res = false;

OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java

@@ -1120,8 +1120,8 @@ public class MapControlsLayer extends OsmandMapLayer {
 	}
 
 	private boolean isInMovingMarkerMode(){
-		return mapQuickActionLayer == null ? contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxWaypointMode():
+		return mapQuickActionLayer == null ? contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxPointMode():
-				mapQuickActionLayer.isInMovingMarkerMode() || contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxWaypointMode();
+				mapQuickActionLayer.isInMovingMarkerMode() || contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxPointMode();
 	}
 
 	private boolean isInGpxDetailsMode() {