From 14b8df51b56190dbe802f6c9f4838ab9a6bc5e07 Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Mon, 8 Jul 2019 12:04:07 +0300
Subject: [PATCH 1/8] add menu on save current track 1/2

---
 .../layout/fragment_on_save_current_track.xml | 55 ++++++++++++
 OsmAnd/res/values/strings.xml                 |  1 +
 .../src/net/osmand/plus/AppInitializer.java   |  2 +-
 .../plus/activities/SavingTrackHelper.java    | 32 +++++--
 .../OnSaveCurrentTrackFragment.java           | 88 +++++++++++++++++++
 .../monitoring/OsmandMonitoringPlugin.java    | 30 +++++--
 6 files changed, 195 insertions(+), 13 deletions(-)
 create mode 100644 OsmAnd/res/layout/fragment_on_save_current_track.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java

diff --git a/OsmAnd/res/layout/fragment_on_save_current_track.xml b/OsmAnd/res/layout/fragment_on_save_current_track.xml
new file mode 100644
index 0000000000..c4dc6ffd06
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_on_save_current_track.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:background="?attr/bg_color"
+	android:orientation="vertical">
+	
+		<TextView
+			android:id="@+id/saved_track_name_string"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:padding="@dimen/content_padding"
+			tools:text="Track 2019-02-26 12-52 saved"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/default_list_text_size"/>
+
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingBottom="12dp">
+
+		<Button
+			android:id="@+id/open_track_button"
+			android:background="?attr/dlg_btn_secondary"
+			android:layout_width="0dp"
+			android:layout_height="@dimen/bottom_sheet_cancel_button_height"
+			android:layout_weight="1"
+			android:text="Open track"
+			android:textColor="?attr/dlg_btn_secondary_text"
+			android:textSize="@dimen/default_desc_text_size"
+			android:layout_marginLeft="16dp"
+			android:layout_marginRight="8dp"
+
+			/>
+
+		<Button
+			android:id="@+id/show_on_map_button"
+			android:background="?attr/dlg_btn_primary"
+			android:layout_width="0dp"
+			android:layout_height="@dimen/bottom_sheet_cancel_button_height"
+			android:layout_weight="1"
+			android:text="Show on the map"
+			android:textAllCaps="true"
+			android:textColor="?attr/dlg_btn_primary_text"
+			android:textSize="@dimen/default_desc_text_size"
+			android:layout_marginLeft="8dp"
+			android:layout_marginRight="16dp"
+			/>
+
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index afa42491fe..d138a38e96 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,6 +11,7 @@
 	Thx - Hardy
 
 -->
+    <string name="shared_string_saved">saved</string>
     <string name="turn_screen_on_router">Wake on turn</string>
     <string name="turn_screen_on_time_descr">Set the time for which the screen will turn on.</string>
     <string name="turn_screen_on_sensor">Use proximity sensor</string>
diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java
index c8d4a562e5..11340e18a3 100644
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@@ -743,7 +743,7 @@ public class AppInitializer implements IProgress {
 			if (System.currentTimeMillis() - timeUpdated >= 1000 * 60 * 30) {
 				startTask(app.getString(R.string.saving_gpx_tracks), -1);
 				try {
-					warnings.addAll(app.savingTrackHelper.saveDataToGpx(app.getAppCustomization().getTracksDir()));
+					warnings.addAll(app.savingTrackHelper.saveDataToGpx(app.getAppCustomization().getTracksDir()).getWarnings());
 				} catch (RuntimeException e) {
 					warnings.add(e.getMessage());
 				}
diff --git a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
index 5d29aa5b1f..bda45dd53a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
@@ -188,10 +188,11 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 	}
 	
 	/**
-	 * @return warnings
+	 * @return warnings, filenames
 	 */
-	public synchronized List<String> saveDataToGpx(File dir ) {
-		List<String> warnings = new ArrayList<String>();
+	public synchronized SaveGpxResult saveDataToGpx(File dir) {
+		List<String> warnings = new ArrayList<>();
+		List<String> filenames = new ArrayList<>();
 		dir.mkdirs();
 		if (dir.getParentFile().canWrite()) {
 			if (dir.exists()) {
@@ -199,6 +200,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 
 				// save file
 				for (final String f : data.keySet()) {
+					log.debug("Filename: " + f);
 					File fout = new File(dir, f + ".gpx"); //$NON-NLS-1$
 					if (!data.get(f).isEmpty()) {
 						WptPt pt = data.get(f).findPointToShow();
@@ -214,6 +216,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 						}
 
 						String fileName = f + "_" + new SimpleDateFormat("HH-mm_EEE", Locale.US).format(new Date(pt.time)); //$NON-NLS-1$
+						filenames.add(fileName);
 						fout = new File(targetDir, fileName + ".gpx"); //$NON-NLS-1$
 						int ind = 1;
 						while (fout.exists()) {
@@ -224,7 +227,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 					Exception warn = GPXUtilities.writeGpxFile(fout, data.get(f));
 					if (warn != null) {
 						warnings.add(warn.getMessage());
-						return warnings;
+						return new SaveGpxResult(warnings, new ArrayList<String>());
 					}
 
 					GPXFile gpx = data.get(f);
@@ -257,7 +260,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 		currentTrack.getModifiablePointsToDisplay().clear();
 		currentTrack.getModifiableGpxFile().modifiedTime = System.currentTimeMillis();
 		prepareCurrentTrackForRecording();
-		return warnings;
+		return new SaveGpxResult(warnings, filenames);
 	}
 
 	public Map<String, GPXFile> collectRecordedData() {
@@ -685,5 +688,24 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 	public SelectedGpxFile getCurrentTrack() {
 		return currentTrack;
 	}
+	
+	public class SaveGpxResult {
+
+		public SaveGpxResult(List<String> warnings, List<String> filenames) {
+			this.warnings = warnings;
+			this.filenames = filenames;
+		}
+
+		List<String> warnings;
+		List<String> filenames;
+
+		public List<String> getWarnings() {
+			return warnings;
+		}
+
+		public List<String> getFilenames() {
+			return filenames;
+		}
+	}
 
 }
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
new file mode 100644
index 0000000000..6e9466fd61
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
@@ -0,0 +1,88 @@
+package net.osmand.plus.monitoring;
+
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentManager;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.style.StyleSpan;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import java.io.File;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.base.BottomSheetDialogFragment;
+import net.osmand.plus.myplaces.AvailableGPXFragment;
+
+public class OnSaveCurrentTrackFragment extends BottomSheetDialogFragment {
+
+	public static final String TAG = "OnSaveCurrentTrackBottomSheetFragment";
+	public static final String SAVED_TRACK_KEY = "saved_track_filename";
+	
+	
+	
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		final OsmandApplication app = getMyApplication();
+		Bundle args = getArguments();
+		String savedGpxName = "";
+		if (args != null && args.containsKey(SAVED_TRACK_KEY)) {
+			savedGpxName = args.getString(SAVED_TRACK_KEY, "");
+		} else {
+			dismiss();
+		}
+		
+		final File f = new File (app.getAppCustomization().getTracksDir() +"/"+ savedGpxName + ".gpx");
+		final boolean nightMode = !app.getSettings().isLightContent();
+		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+		View mainView = View
+			.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_on_save_current_track, container);
+		TextView tv = mainView.findViewById(R.id.saved_track_name_string);
+		Button openTrackBtn = mainView.findViewById(R.id.open_track_button);
+		Button showOnMapBtn = mainView.findViewById(R.id.show_on_map_button);
+		
+		SpannableStringBuilder ssb = new SpannableStringBuilder();
+		ssb.append(app.getResources().getString(R.string.shared_string_gpx_track)).append(" ");
+		int startIndex = ssb.length();
+		ssb.append(savedGpxName).append(" ");
+		ssb.setSpan(new StyleSpan(Typeface.BOLD), startIndex, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+		startIndex = ssb.length();
+		ssb.append(app.getResources().getString(R.string.shared_string_saved));
+		ssb.setSpan(new StyleSpan(Typeface.NORMAL), startIndex, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+		tv.setText(ssb);
+		
+		openTrackBtn.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				AvailableGPXFragment.openTrack(getActivity(), f);
+				dismiss();
+			}
+		});
+		
+		showOnMapBtn.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				//show track on MapActivity
+				dismiss();
+			}
+		});
+		return mainView;
+	}
+
+	public static void showInstance(FragmentManager fragmentManager, String filename) {
+		OnSaveCurrentTrackFragment f = new OnSaveCurrentTrackFragment();
+		Bundle b = new Bundle();
+		b.putString(SAVED_TRACK_KEY, filename);
+		f.setArguments(b);
+		f.show(fragmentManager, TAG);
+	}
+	
+}
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index eb60ba548f..6bdaac8cce 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -31,6 +31,7 @@ import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.SavingTrackHelper;
+import net.osmand.plus.activities.SavingTrackHelper.SaveGpxResult;
 import net.osmand.plus.dashboard.tools.DashFragmentData;
 import net.osmand.plus.views.MapInfoLayer;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
@@ -40,6 +41,7 @@ import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 import java.util.List;
 
 import gnu.trove.list.array.TIntArrayList;
+import net.osmand.util.Algorithms;
 
 public class OsmandMonitoringPlugin extends OsmandPlugin {
 	public static final String ID = "osmand.monitoring";
@@ -288,7 +290,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 				int which = holder[0];
 				int item = items.get(which);
 				if(item == R.string.save_current_track){
-					saveCurrentTrack();
+					saveCurrentTrack(map);
 				} else if(item == R.string.gpx_monitoring_start) {
 					if (app.getLocationProvider().checkGPSEnabled(map)) {
 						startGPXMonitoring(map, showTrackSelection);
@@ -330,11 +332,20 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 	}
 
 	public void saveCurrentTrack() {
-		saveCurrentTrack(null);
+		saveCurrentTrack(null, null);
+	}
+	
+	public void saveCurrentTrack(@Nullable final Runnable onComplete) {
+		saveCurrentTrack(onComplete, null);
 	}
 
-	public void saveCurrentTrack(@Nullable final Runnable onComplete) {
-		app.getTaskManager().runInBackground(new OsmAndTaskRunnable<Void, Void, Void>() {
+	public void saveCurrentTrack(@Nullable final Activity activity) {
+		saveCurrentTrack(null, activity);
+	}
+	
+	public void saveCurrentTrack(@Nullable final Runnable onComplete, @Nullable final
+		Activity activity) {
+		app.getTaskManager().runInBackground(new OsmAndTaskRunnable<Void, Void, SaveGpxResult>() {
 
 			@Override
 			protected void onPreExecute() {
@@ -343,11 +354,12 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 			}
 
 			@Override
-			protected Void doInBackground(Void... params) {
+			protected SaveGpxResult doInBackground(Void... params) {
 				try {
 					SavingTrackHelper helper = app.getSavingTrackHelper();
-					helper.saveDataToGpx(app.getAppCustomization().getTracksDir());
+					SaveGpxResult result = helper.saveDataToGpx(app.getAppCustomization().getTracksDir());
 					helper.close();
+					return result;
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
@@ -355,10 +367,14 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 			}
 
 			@Override
-			protected void onPostExecute(Void aVoid) {
+			protected void onPostExecute(SaveGpxResult result) {
 				isSaving = false;
 				app.getNotificationHelper().refreshNotifications();
 				updateControl();
+				if (activity instanceof MapActivity && !Algorithms.isEmpty(result.getFilenames())) {
+					OnSaveCurrentTrackFragment.showInstance(((MapActivity) activity)
+						.getSupportFragmentManager(), result.getFilenames().get(0));
+				}
 				if (onComplete != null) {
 					onComplete.run();
 				}

From 2be7fe1c7746f8e4e25f17e654216a980fbf8526 Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Mon, 8 Jul 2019 16:48:56 +0300
Subject: [PATCH 2/8] add menu on save current track 2/2 add utility method to
 insert styled substring.

---
 .../layout/fragment_on_save_current_track.xml | 21 ++++++-----
 OsmAnd/res/values/strings.xml                 |  3 +-
 OsmAnd/src/net/osmand/AndroidUtils.java       | 24 ++++++++++++
 .../OnSaveCurrentTrackFragment.java           | 37 +++++++++++--------
 4 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_on_save_current_track.xml b/OsmAnd/res/layout/fragment_on_save_current_track.xml
index c4dc6ffd06..ea38ee7d03 100644
--- a/OsmAnd/res/layout/fragment_on_save_current_track.xml
+++ b/OsmAnd/res/layout/fragment_on_save_current_track.xml
@@ -21,19 +21,20 @@
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:paddingBottom="12dp">
+		android:paddingBottom="@dimen/content_padding_small">
 
 		<Button
 			android:id="@+id/open_track_button"
 			android:background="?attr/dlg_btn_secondary"
 			android:layout_width="0dp"
-			android:layout_height="@dimen/bottom_sheet_cancel_button_height"
+			android:layout_height="@dimen/bottom_sheet_cancel_button_height_small"
 			android:layout_weight="1"
-			android:text="Open track"
+			android:text="@string/shared_string_open_track"
 			android:textColor="?attr/dlg_btn_secondary_text"
 			android:textSize="@dimen/default_desc_text_size"
-			android:layout_marginLeft="16dp"
-			android:layout_marginRight="8dp"
+			android:textAllCaps="false"
+			android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+			android:layout_marginRight="@dimen/bottom_sheet_content_margin_small"
 
 			/>
 
@@ -41,14 +42,14 @@
 			android:id="@+id/show_on_map_button"
 			android:background="?attr/dlg_btn_primary"
 			android:layout_width="0dp"
-			android:layout_height="@dimen/bottom_sheet_cancel_button_height"
+			android:layout_height="@dimen/bottom_sheet_cancel_button_height_small"
 			android:layout_weight="1"
-			android:text="Show on the map"
-			android:textAllCaps="true"
+			android:text="@string/shared_string_show_on_map"
+			android:textAllCaps="false"
 			android:textColor="?attr/dlg_btn_primary_text"
 			android:textSize="@dimen/default_desc_text_size"
-			android:layout_marginLeft="8dp"
-			android:layout_marginRight="16dp"
+			android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
+			android:layout_marginRight="@dimen/bottom_sheet_content_margin"
 			/>
 
 	</LinearLayout>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index d138a38e96..67418f1137 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,7 +11,8 @@
 	Thx - Hardy
 
 -->
-    <string name="shared_string_saved">saved</string>
+    <string name="shared_string_open_track">Open track</string>
+    <string name="shared_string_track_is_saved">Track %s is saved</string>
     <string name="turn_screen_on_router">Wake on turn</string>
     <string name="turn_screen_on_time_descr">Set the time for which the screen will turn on.</string>
     <string name="turn_screen_on_sensor">Use proximity sensor</string>
diff --git a/OsmAnd/src/net/osmand/AndroidUtils.java b/OsmAnd/src/net/osmand/AndroidUtils.java
index 63f3789102..273f22e2e2 100644
--- a/OsmAnd/src/net/osmand/AndroidUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidUtils.java
@@ -13,6 +13,7 @@ import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.PointF;
+import android.graphics.Typeface;
 import android.graphics.drawable.ClipDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
@@ -31,10 +32,13 @@ import android.support.v4.content.ContextCompat;
 import android.support.v4.content.FileProvider;
 import android.text.Spannable;
 import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.text.style.ImageSpan;
+import android.text.style.StyleSpan;
 import android.text.style.URLSpan;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
@@ -551,4 +555,24 @@ public class AndroidUtils {
 		KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
 		return keyguardManager.inKeyguardRestrictedInputMode();
 	}
+
+	public static CharSequence insertStyledSubstring(CharSequence preFormattedString, CharSequence textToInsert, int typefaceStyle) {
+		final String placeholder = "%s";
+		if (typefaceStyle < 0 || typefaceStyle > 3) {
+			return preFormattedString;
+		}
+		if (!preFormattedString.toString().contains(placeholder)) {
+			return preFormattedString;
+		}
+		int indexOfPlaceholder = preFormattedString.toString().indexOf(placeholder);
+		SpannableStringBuilder ssb = new SpannableStringBuilder();
+		ssb.append(preFormattedString.subSequence(0, indexOfPlaceholder));
+		int startIndex = ssb.length();
+		ssb.append(textToInsert).append(" ");
+		ssb.setSpan(new StyleSpan(typefaceStyle), startIndex, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+		startIndex = ssb.length();
+		ssb.append(preFormattedString.subSequence(indexOfPlaceholder+2, preFormattedString.length()));
+		ssb.setSpan(new StyleSpan(Typeface.NORMAL), startIndex, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+		return ssb;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
index 6e9466fd61..3cfe963b02 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
@@ -5,9 +5,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentManager;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.style.StyleSpan;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,10 +13,15 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 import java.io.File;
+import net.osmand.AndroidUtils;
+import net.osmand.GPXUtilities;
+import net.osmand.GPXUtilities.WptPt;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.myplaces.AvailableGPXFragment;
+import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo;
 
 public class OnSaveCurrentTrackFragment extends BottomSheetDialogFragment {
 
@@ -39,7 +41,7 @@ public class OnSaveCurrentTrackFragment extends BottomSheetDialogFragment {
 		} else {
 			dismiss();
 		}
-		
+
 		final File f = new File (app.getAppCustomization().getTracksDir() +"/"+ savedGpxName + ".gpx");
 		final boolean nightMode = !app.getSettings().isLightContent();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
@@ -48,17 +50,9 @@ public class OnSaveCurrentTrackFragment extends BottomSheetDialogFragment {
 		TextView tv = mainView.findViewById(R.id.saved_track_name_string);
 		Button openTrackBtn = mainView.findViewById(R.id.open_track_button);
 		Button showOnMapBtn = mainView.findViewById(R.id.show_on_map_button);
-		
-		SpannableStringBuilder ssb = new SpannableStringBuilder();
-		ssb.append(app.getResources().getString(R.string.shared_string_gpx_track)).append(" ");
-		int startIndex = ssb.length();
-		ssb.append(savedGpxName).append(" ");
-		ssb.setSpan(new StyleSpan(Typeface.BOLD), startIndex, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-		startIndex = ssb.length();
-		ssb.append(app.getResources().getString(R.string.shared_string_saved));
-		ssb.setSpan(new StyleSpan(Typeface.NORMAL), startIndex, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-		tv.setText(ssb);
-		
+
+		tv.setText(AndroidUtils.insertStyledSubstring(app.getString(R.string.shared_string_track_is_saved), savedGpxName, Typeface.BOLD));
+
 		openTrackBtn.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -71,6 +65,18 @@ public class OnSaveCurrentTrackFragment extends BottomSheetDialogFragment {
 			@Override
 			public void onClick(View v) {
 				//show track on MapActivity
+				GpxInfo gpxInfo = new GpxInfo();
+				gpxInfo.setGpx(GPXUtilities.loadGPXFile(f));
+				boolean e = true;
+				if (gpxInfo.gpx != null) {
+					OsmandSettings settings = app.getSettings();
+					WptPt loc = gpxInfo.gpx.findPointToShow();
+					if (loc != null) {
+						settings.setMapLocationToShow(loc.lat, loc.lon, settings.getLastKnownMapZoom());
+						e = false;
+						app.getSelectedGpxHelper().setGpxFileToDisplay(gpxInfo.gpx);
+					}
+				}
 				dismiss();
 			}
 		});
@@ -84,5 +90,4 @@ public class OnSaveCurrentTrackFragment extends BottomSheetDialogFragment {
 		f.setArguments(b);
 		f.show(fragmentManager, TAG);
 	}
-	
 }

From 91144109f1eea733b43a729b583b4aa04c8a5452 Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Mon, 8 Jul 2019 17:20:01 +0300
Subject: [PATCH 3/8] strings fix

---
 OsmAnd/res/values-ar/strings.xml                                | 1 -
 OsmAnd/res/values-az/strings.xml                                | 1 -
 OsmAnd/res/values-b+be+Latn/strings.xml                         | 1 -
 OsmAnd/res/values-b+hsb/strings.xml                             | 1 -
 OsmAnd/res/values-b+kab/strings.xml                             | 1 -
 OsmAnd/res/values-be/strings.xml                                | 1 -
 OsmAnd/res/values-ca/strings.xml                                | 1 -
 OsmAnd/res/values-cs/strings.xml                                | 1 -
 OsmAnd/res/values-da/strings.xml                                | 1 -
 OsmAnd/res/values-de/strings.xml                                | 1 -
 OsmAnd/res/values-el/strings.xml                                | 1 -
 OsmAnd/res/values-eo/strings.xml                                | 1 -
 OsmAnd/res/values-es-rAR/strings.xml                            | 1 -
 OsmAnd/res/values-es-rUS/strings.xml                            | 1 -
 OsmAnd/res/values-es/strings.xml                                | 1 -
 OsmAnd/res/values-eu/strings.xml                                | 1 -
 OsmAnd/res/values-fa/strings.xml                                | 1 -
 OsmAnd/res/values-fi/strings.xml                                | 1 -
 OsmAnd/res/values-fr/strings.xml                                | 1 -
 OsmAnd/res/values-gl/strings.xml                                | 1 -
 OsmAnd/res/values-he/strings.xml                                | 1 -
 OsmAnd/res/values-hu/strings.xml                                | 1 -
 OsmAnd/res/values-hy/strings.xml                                | 1 -
 OsmAnd/res/values-id/strings.xml                                | 1 -
 OsmAnd/res/values-is/strings.xml                                | 1 -
 OsmAnd/res/values-it/strings.xml                                | 1 -
 OsmAnd/res/values-ja/strings.xml                                | 1 -
 OsmAnd/res/values-kn/strings.xml                                | 1 -
 OsmAnd/res/values-ku/strings.xml                                | 1 -
 OsmAnd/res/values-lt/strings.xml                                | 1 -
 OsmAnd/res/values-lv/strings.xml                                | 1 -
 OsmAnd/res/values-nb/strings.xml                                | 1 -
 OsmAnd/res/values-nl/strings.xml                                | 1 -
 OsmAnd/res/values-oc/strings.xml                                | 1 -
 OsmAnd/res/values-pl/strings.xml                                | 1 -
 OsmAnd/res/values-pt-rBR/strings.xml                            | 1 -
 OsmAnd/res/values-pt/strings.xml                                | 1 -
 OsmAnd/res/values-ro/strings.xml                                | 1 -
 OsmAnd/res/values-ru/strings.xml                                | 1 -
 OsmAnd/res/values-sc/strings.xml                                | 1 -
 OsmAnd/res/values-sk/strings.xml                                | 1 -
 OsmAnd/res/values-sl/strings.xml                                | 1 -
 OsmAnd/res/values-sr/strings.xml                                | 1 -
 OsmAnd/res/values-sv/strings.xml                                | 1 -
 OsmAnd/res/values-ta/strings.xml                                | 1 -
 OsmAnd/res/values-tr/strings.xml                                | 1 -
 OsmAnd/res/values-uk/strings.xml                                | 1 -
 OsmAnd/res/values-zh-rCN/strings.xml                            | 1 -
 OsmAnd/res/values-zh-rTW/strings.xml                            | 1 -
 OsmAnd/res/values/strings.xml                                   | 2 +-
 .../osmand/plus/mapmarkers/CoordinateInputDialogFragment.java   | 2 +-
 .../net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java    | 2 +-
 52 files changed, 3 insertions(+), 52 deletions(-)

diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index ca2b938899..b480761c62 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -2475,7 +2475,6 @@
     <string name="plan_route">تخطيط الطريق</string>
     <string name="shared_string_sort">فرز</string>
     <string name="coordinate_input">تنسيق الإدخال</string>
-    <string name="is_saved">تم حفظه</string>
     <string name="marker_save_as_track_descr">تصدير علاماتك إلى ملف يمكنك تحديده هنا:</string>
     <string name="marker_save_as_track">حفظ كمسار</string>
     <string name="move_to_history">نقل إلى السجل</string>
diff --git a/OsmAnd/res/values-az/strings.xml b/OsmAnd/res/values-az/strings.xml
index 68cf34ec45..5c5169df16 100644
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@@ -1713,7 +1713,6 @@
     <string name="fast_coordinates_input">Sürətli koordinat daxiletmə</string>
     <string name="use_location">Mövqe istifadə et</string>
     <string name="coordinate_input">Koordinat daxiletmə</string>
-    <string name="is_saved">yadda saxlandı</string>
     <string name="marker_save_as_track_descr">İşarələrinizi aşağıdakı GPX faylına ixrac edin:</string>
     <string name="move_to_history">Tarixçəyə daşı</string>
     <string name="group_will_be_removed_after_restart">Proqramı növbəti dəfə başlatdığınızda qrup yox olacaq.</string>
diff --git a/OsmAnd/res/values-b+be+Latn/strings.xml b/OsmAnd/res/values-b+be+Latn/strings.xml
index 564696cbd6..9de70a919d 100644
--- a/OsmAnd/res/values-b+be+Latn/strings.xml
+++ b/OsmAnd/res/values-b+be+Latn/strings.xml
@@ -2533,7 +2533,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="plan_route">Planavać maršrut</string>
     <string name="shared_string_sort">Sartavać</string>
     <string name="coordinate_input">Uvod kaardynat</string>
-    <string name="is_saved">zachavany</string>
     <string name="marker_save_as_track_descr">Ekspartavać vašy paznaki ŭ nastupny GPX-fajl:</string>
     <string name="marker_save_as_track">Zachavać jak GPX-fajl</string>
     <string name="move_to_history">Pieramiaścić u historyju</string>
diff --git a/OsmAnd/res/values-b+hsb/strings.xml b/OsmAnd/res/values-b+hsb/strings.xml
index c01b2cefbe..d50d50c7b7 100644
--- a/OsmAnd/res/values-b+hsb/strings.xml
+++ b/OsmAnd/res/values-b+hsb/strings.xml
@@ -1091,7 +1091,6 @@
     <string name="use_location">Stejišćo wužiwać</string>
     <string name="my_location">Moje stejišćo</string>
     <string name="shared_string_sort">Sortěrować</string>
-    <string name="is_saved">bu składowane</string>
     <string name="osm_edit_context_menu_delete">OSM-změnu wotstronić</string>
     <string name="local_recordings_delete_all_confirm">Chceš %1$d noticu wotstronić. Sy sej wěsty/a?</string>
     <string name="shared_string_delete">Wotstronić</string>
diff --git a/OsmAnd/res/values-b+kab/strings.xml b/OsmAnd/res/values-b+kab/strings.xml
index c37cad0574..29239746c2 100644
--- a/OsmAnd/res/values-b+kab/strings.xml
+++ b/OsmAnd/res/values-b+kab/strings.xml
@@ -292,7 +292,6 @@
     <string name="shared_string_road">Abrid</string>
     <string name="shared_string_finish">Fakk</string>
     <string name="shared_string_sort">Smizzwer</string>
-    <string name="is_saved">yettwasekles</string>
     <string name="descendingly">amnusruy</string>
     <string name="ascendingly">igemmen</string>
     <string name="order_by">Asmizzwer s :</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 07dfdc8bc1..308be0f2b3 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2538,7 +2538,6 @@
     <string name="plan_route">Планаваць маршрут</string>
     <string name="shared_string_sort">Упарадкаваць</string>
     <string name="coordinate_input">Увод каардынат</string>
-    <string name="is_saved">захаваны</string>
     <string name="marker_save_as_track_descr">Экспартаваць вашыя адзнакі ў наступны GPX-файл:</string>
     <string name="marker_save_as_track">Захаваць як GPX-файл</string>
     <string name="move_to_history">Перамясціць у гісторыю</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index b4d7ec8b95..84ea697ba0 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -2546,7 +2546,6 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="shared_string_finish">Finalitza</string>
     <string name="shared_string_sort">Ordena</string>
     <string name="coordinate_input">Entrada de coordenades</string>
-    <string name="is_saved">s\'ha desat</string>
     <string name="marker_save_as_track_descr">Exporteu els vostres marcadors al fitxer GPX següent:</string>
     <string name="marker_save_as_track">Desa com un fitxer GPX</string>
     <string name="move_to_history">Mou a l\'historial</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 945133906a..db0c37d8ac 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -2393,7 +2393,6 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="plan_route">Naplánovat trasu</string>
     <string name="shared_string_sort">Seřadit</string>
     <string name="coordinate_input">Zadání souřadnic</string>
-    <string name="is_saved">je uložen</string>
     <string name="marker_save_as_track_descr">Vyexportovat vaše značky do tohoto GPX souboru:</string>
     <string name="marker_save_as_track">Uložit jako soubor GPX</string>
     <string name="move_to_history">Přesunout do historie</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 436ef687fa..968593d8ec 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2544,7 +2544,6 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="plan_route">Planlæg rute</string>
     <string name="shared_string_sort">Sorter</string>
     <string name="coordinate_input">Koordinatindtastning</string>
-    <string name="is_saved">er gemt</string>
     <string name="marker_save_as_track_descr">Eksporter markører til følgende GPX-fil:</string>
     <string name="marker_save_as_track">Gem som GPX-fil</string>
     <string name="move_to_history">Flyt til historik</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 0bb1aaa77e..766db49177 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2543,7 +2543,6 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="plan_route">Route planen</string>
     <string name="shared_string_sort">Sortieren</string>
     <string name="coordinate_input">Koordinateneingabe</string>
-    <string name="is_saved">ist gespeichert</string>
     <string name="marker_save_as_track_descr">Markierungen in die hier festgelegte GPX-Datei exportieren:</string>
     <string name="marker_save_as_track">Als GPX-Datei speichern</string>
     <string name="move_to_history">In den Verlauf verschieben</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index de6f410d13..1385bdf994 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1712,7 +1712,6 @@
     <string name="plan_route">Σχεδιασμός διαδρομής</string>
     <string name="shared_string_sort">Ταξινόμηση</string>
     <string name="coordinate_input">Η εισαγωγή συντεταγμένης</string>
-    <string name="is_saved">αποθηκεύτηκε</string>
     <string name="marker_save_as_track_descr">Εξαγωγή των δεικτών σας στο παρακάτω αρχείο GPX:</string>
     <string name="marker_save_as_track">Αποθήκευση ως αρχείο GPX</string>
     <string name="move_to_history">Μετακίνηση στο ιστορικό</string>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index bb3aefd455..5aa09eb533 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -2531,7 +2531,6 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="plan_route">Plani kurson</string>
     <string name="shared_string_sort">Ordigi</string>
     <string name="coordinate_input">Enigi koordinatojn</string>
-    <string name="is_saved">estas konservita</string>
     <string name="marker_save_as_track_descr">Elporti map-markojn al dosiero la GPX-dosiero:</string>
     <string name="marker_save_as_track">Konservi kiel GPX-dosieron</string>
     <string name="move_to_history">Movi al historio</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index caf611f3d8..d23166d2dc 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2540,7 +2540,6 @@ Lon %2$s</string>
     <string name="plan_route">Planificar ruta</string>
     <string name="shared_string_sort">Ordenar</string>
     <string name="coordinate_input">Ingresar coordenadas</string>
-    <string name="is_saved">está guardado</string>
     <string name="marker_save_as_track_descr">Exporta los marcadores al siguiente archivo GPX:</string>
     <string name="marker_save_as_track">Guardar como archivo GPX</string>
     <string name="move_to_history">Mover al historial</string>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index 295d79a2c4..58bd58dd51 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -2541,7 +2541,6 @@ Lon %2$s</string>
     <string name="plan_route">Planificar ruta</string>
     <string name="shared_string_sort">Ordenar</string>
     <string name="coordinate_input">Ingresar coordenadas</string>
-    <string name="is_saved">está guardado</string>
     <string name="marker_save_as_track_descr">Exporta los marcadores al siguiente archivo GPX:</string>
     <string name="marker_save_as_track">Guardar como archivo GPX</string>
     <string name="move_to_history">Mover al historial</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 66a4775c8c..93a64817af 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -2558,7 +2558,6 @@
     <string name="plan_route">Planificar ruta</string>
     <string name="shared_string_sort">Ordenar</string>
     <string name="coordinate_input">Ingresar coordenadas</string>
-    <string name="is_saved">está guardado</string>
     <string name="marker_save_as_track_descr">Exporta los marcadores al siguiente archivo GPX:</string>
     <string name="marker_save_as_track">Guardar como archivo GPX</string>
     <string name="move_to_history">Mover al historial</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 5b4d43f4fc..ae1912968d 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -2620,7 +2620,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="plan_route">Planifikatu ibilbidea</string>
     <string name="shared_string_sort">Ordenatu</string>
     <string name="coordinate_input">Koordenatuen sarrera</string>
-    <string name="is_saved">gorde da</string>
     <string name="marker_save_as_track_descr">Esportatu zure markatzaileak honako GPX fitxategi honetara:</string>
     <string name="marker_save_as_track">Gorde GPX fitxategi gisa</string>
     <string name="move_to_history">Eraman historialera</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 4212ff98ad..06f13ff8e2 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -2264,7 +2264,6 @@
     <string name="plan_route">طراحی مسیر</string>
     <string name="shared_string_sort">مرتب‌سازی</string>
     <string name="coordinate_input">واردکردن مختصات</string>
-    <string name="is_saved">ذخیره شد</string>
     <string name="marker_save_as_track_descr">نشانه‌هایتان را در این فایل GPX ذخیره کنید:</string>
     <string name="move_to_history">فرستادن به سابقه</string>
     <string name="group_will_be_removed_after_restart">گروه با راه‌اندازی مجدد برنامه حذف می‌شود.</string>
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index d6e71ae56a..7d0cb7a781 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -1972,7 +1972,6 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="plan_route">Suunnittele reitti</string>
     <string name="shared_string_sort">Lajittele</string>
     <string name="coordinate_input">Koordinaattien syöttö</string>
-    <string name="is_saved">on talletettu</string>
     <string name="marker_save_as_track_descr">Vie markkerisi seuraavaan GPX-tiedostoon:</string>
     <string name="marker_save_as_track">Tallenna GPX-tiedostona</string>
     <string name="move_to_history">Siirrä historiaan</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index b73e442836..cd5db378e5 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -2517,7 +2517,6 @@ représentant la zone : %1$s x %2$s</string>
     <string name="plan_route">Itinéraire planifié</string>
     <string name="shared_string_sort">Trier</string>
     <string name="coordinate_input">Saisie des coordonnées</string>
-    <string name="is_saved">a été enregistré</string>
     <string name="marker_save_as_track_descr">Exporter vos marques dans le fichier GPX suivant :</string>
     <string name="marker_save_as_track">Enregistrer comme fichier GPX</string>
     <string name="move_to_history">Déplacer vers l\'historique</string>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index 586aeaad05..7177ce4a73 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -2299,7 +2299,6 @@ Lon %2$s</string>
     <string name="plan_route">Planificar rota</string>
     <string name="shared_string_sort">Ordenar</string>
     <string name="coordinate_input">Inserir coordenadas</string>
-    <string name="is_saved">foi gardado</string>
     <string name="marker_save_as_track_descr">Exporte as súas marcaxes cara un ficheiro que pode fornecer eiquí:</string>
     <string name="move_to_history">Mover ao historial</string>
     <string name="group_will_be_removed_after_restart">O grupo será riscado após o reinicio.</string>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 200f1e712b..7a84e72185 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -2591,7 +2591,6 @@
     <string name="empty_state_osm_edits_descr">ניתן ליצור או לערוך נקודות עניין ב־OSM, לפתוח או להגיב על הערות OSM ולתרום קובצי GPX שהוקלטו.</string>
     <string name="empty_state_markers_history_desc">סמנים שסומנו כיוון שעברת אותם יופיעו במסך הזה.</string>
     <string name="mark_passed">סמן שעברת</string>
-    <string name="is_saved">נשמר</string>
     <string name="show_passed">הצגת אלו שעברת</string>
     <string name="hide_passed">הסתרת אלו שעברת</string>
     <string name="index_item_world_wikivoyage">מאמרי ויקימסע מכל רחבי העולם</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index aeb930124e..89300cf161 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -2381,7 +2381,6 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="plan_route">Útvonal tervezése</string>
     <string name="shared_string_sort">Sorba rendezés</string>
     <string name="coordinate_input">Koordináta bevitele</string>
-    <string name="is_saved">mentve</string>
     <string name="marker_save_as_track_descr">Jelölők exportálása az alábbi GPX fájlba:</string>
     <string name="marker_save_as_track">Mentés GPX fájlként</string>
     <string name="move_to_history">Áthelyezés az előzményekbe</string>
diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml
index 9482e03239..64c63cbce3 100644
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@@ -155,7 +155,6 @@
     <string name="plan_route">Պլանավորել երթուղին</string>
     <string name="shared_string_sort">Տեսակավորել</string>
     <string name="coordinate_input">Կոորդինատների մուտքագրում</string>
-    <string name="is_saved">պահպանված է</string>
     <string name="marker_save_as_track_descr">Արտահանեք ձեր մարկերները հետևյալ GPX ֆայլի մեջ:</string>
     <string name="marker_save_as_track">Պահպանել որպես GPX ֆայլ</string>
     <string name="move_to_history">Տեղափոխեք պատմություն</string>
diff --git a/OsmAnd/res/values-id/strings.xml b/OsmAnd/res/values-id/strings.xml
index 18768194a3..1944c5e456 100644
--- a/OsmAnd/res/values-id/strings.xml
+++ b/OsmAnd/res/values-id/strings.xml
@@ -149,7 +149,6 @@
     <string name="plan_route">Rencanakan rute</string>
     <string name="shared_string_sort">Urutkan</string>
     <string name="coordinate_input">Input koordinat</string>
-    <string name="is_saved">telah disimpan</string>
     <string name="marker_save_as_track_descr">Ekspor penanda anda ke file yang dapat Anda tentukan di sini:</string>
     <string name="marker_save_as_track">Simpan sebagai berkas GPX</string>
     <string name="move_to_history">Pindahkan ke riwayat</string>
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index 8af8fcb2fd..9cfc925b52 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -2248,7 +2248,6 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="shared_string_finish">Ljúka</string>
     <string name="plan_route">Skipuleggja leið</string>
     <string name="coordinate_input">Innsett hnit</string>
-    <string name="is_saved">eru vistuð</string>
     <string name="marker_save_as_track_descr">Flyttu kortamerkin þín út í eftirfarandi GPX-skrá:</string>
     <string name="marker_save_as_track">Vista sem GPX-skrá</string>
     <string name="move_to_history">Flytja í aðgerðaferil</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 53863966be..3b8e472e10 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2458,7 +2458,6 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="plan_route">Pianifica percorso</string>
     <string name="shared_string_sort">Ordina</string>
     <string name="coordinate_input">Inserimento coordinate</string>
-    <string name="is_saved">è salvato</string>
     <string name="marker_save_as_track_descr">Esporta i tuoi marcatori nel seguente file GPX:</string>
     <string name="marker_save_as_track">Salva come file GPX</string>
     <string name="move_to_history">Sposta nella cronologia</string>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index fb40228e46..2c8a7356a9 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -2508,7 +2508,6 @@ POIの更新は利用できません</string>
     <string name="plan_route">ルートプランの設定</string>
     <string name="shared_string_sort">並べ替え</string>
     <string name="coordinate_input">座標入力</string>
-    <string name="is_saved">は、保存されました</string>
     <string name="marker_save_as_track_descr">マーカーは以下に指定したファイル名でエクスポートされます:</string>
     <string name="marker_save_as_track">経路を保存</string>
     <string name="move_to_history">履歴に移動</string>
diff --git a/OsmAnd/res/values-kn/strings.xml b/OsmAnd/res/values-kn/strings.xml
index d0ea2ce75f..a09ca6927b 100644
--- a/OsmAnd/res/values-kn/strings.xml
+++ b/OsmAnd/res/values-kn/strings.xml
@@ -256,7 +256,6 @@
     <string name="nearest_cities">ಹತ್ತಿರದ ನಗರಗಳು</string>
     <string name="select_city">ನಗರವನ್ನು ಆರಿಸು</string>
     <string name="select_postcode">ಅಂಚೆಸಂಖ್ಯೆಯನ್ನು ಆರಿಸು</string>
-    <string name="is_saved">ಉಳಿಸಲಾಗಿದೆ</string>
     <string name="shared_string_list">ಪಟ್ಟಿ</string>
     <string name="shared_string_groups">ಗುಂಪುಗಳು</string>
     <string name="passed">ಕೊನೆಯದಾಗಿ ಬಳಸಿದ್ದು: %1$s</string>
diff --git a/OsmAnd/res/values-ku/strings.xml b/OsmAnd/res/values-ku/strings.xml
index 34b4e6a899..7e95e3764b 100644
--- a/OsmAnd/res/values-ku/strings.xml
+++ b/OsmAnd/res/values-ku/strings.xml
@@ -124,7 +124,6 @@
     <string name="make_round_trip_descr">Cihê destpêkê bike cihê amanc.</string>
     
     <string name="shared_string_sort">Tesnîf bike</string>
-    <string name="is_saved">hat tomarkirin</string>
     <string name="enter_new_name">Navê nû binivîse</string>
 	<string name="shared_string_back">Paşve</string>
 	<string name="shared_string_view">Dîtin</string>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 09d68bb4e4..7175ed4295 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -2392,7 +2392,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="context_menu_item_modify_note">Keisti OSM pastabą</string>
     <string name="fast_coordinates_input">Sparčioji koordinatės įvestis</string>
     <string name="routing_attr_avoid_ice_roads_fords_name">Vengti ledo kelių, brastų</string>
-    <string name="is_saved">išsaugota</string>
     <string name="move_to_history">Perkelti į istoriją</string>
     <string name="group_will_be_removed_after_restart">Grupė bus pašalinta iš naujo paleidus aplikaciją.</string>
     <string name="show_arrows_on_the_map">Rodyti rodykles žemėlapyje</string>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index 846d5d328c..85ce00fbce 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -2487,7 +2487,6 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="plan_route">Plānot maršrutu</string>
     <string name="shared_string_sort">Kārtot</string>
     <string name="coordinate_input">Koordināšu ievade</string>
-    <string name="is_saved">Saglabāts</string>
     <string name="marker_save_as_track_descr">Eksportēt marķierus jūsu izvēlētajā failā:</string>
     <string name="marker_save_as_track">Saglabāt kā treku</string>
     <string name="move_to_history">Pārvietot uz vēsturi</string>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index adac9cb648..b37bce4c4a 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -2142,7 +2142,6 @@
     <string name="plan_route">Planlegg rute</string>
     <string name="shared_string_sort">Sorter</string>
     <string name="coordinate_input">Koordinatinntasting</string>
-    <string name="is_saved">blir lagret</string>
     <string name="marker_save_as_track_descr">Eksporter dine markører til følgende GPX-fil:</string>
     <string name="marker_save_as_track">Lagre som GPX-fil</string>
     <string name="all_markers_moved_to_history">Alle kartmarkører flyttet til historikk</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 4bd3a8d562..d2ab69f69a 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2427,7 +2427,6 @@ voor Gebied: %1$s x %2$s</string>
     <string name="plan_route">Plan route</string>
     <string name="shared_string_sort">Sorteer</string>
     <string name="coordinate_input">Invoer van coördinaten</string>
-    <string name="is_saved">is opgeslagen</string>
     <string name="marker_save_as_track_descr">Exporteer uw Markeervlaggetjes naar het volgende bestand:</string>
     <string name="marker_save_as_track">Opslaan als GPX-track</string>
     <string name="move_to_history">Verplaats naar geschiedenis</string>
diff --git a/OsmAnd/res/values-oc/strings.xml b/OsmAnd/res/values-oc/strings.xml
index b5de1c2a87..11bb33675f 100644
--- a/OsmAnd/res/values-oc/strings.xml
+++ b/OsmAnd/res/values-oc/strings.xml
@@ -376,7 +376,6 @@
     <string name="plan_route">Planificar l\'itinerari</string>
     <string name="shared_string_sort">Ordenar</string>
     <string name="coordinate_input">Intrada dei coordonadas</string>
-    <string name="is_saved">sauvagardat</string>
     <string name="marker_save_as_track">Sauvagardar per fichier GPX</string>
     <string name="move_to_history">Moure a la cronologia</string>
     <string name="show_guide_line">Mostrar lei linhas de direccion</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 14443fcf25..b32b7b29b5 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -2465,7 +2465,6 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="move_to_history">Przenieś do historii</string>
     <string name="group_will_be_removed_after_restart">Grupa zostanie usunięta po ponownym uruchomieniu.</string>
     <string name="use_system_keyboard">Użycie klawiatury systemowej</string>
-    <string name="is_saved">jest zapisany</string>
     <string name="wrong_format">Błędny format</string>
     <string name="shared_string_road">Droga</string>
     <string name="show_map">Wyświetl mapę</string>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index e340def452..2d6b062e0e 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -1987,7 +1987,6 @@ Pôr do Sol: %2$s</string>
     <string name="plan_route">Planejar rota</string>
     <string name="shared_string_sort">Ordenar</string>
     <string name="coordinate_input">Inserção de coordenada</string>
-    <string name="is_saved">está salvo</string>
     <string name="marker_save_as_track_descr">Exporte seus marcadores para o seguinte arquivo GPX:</string>
     <string name="marker_save_as_track">Salvar como arquivo GPX</string>
     <string name="move_to_history">Mover para o histórico</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 35abe97194..72bc806bac 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -1834,7 +1834,6 @@
     <string name="plan_route">Planear percurso</string>
     <string name="shared_string_sort">Classificar</string>
     <string name="coordinate_input">Introdução de coordenada</string>
-    <string name="is_saved">está guardado</string>
     <string name="marker_save_as_track_descr">Exporte os seus marcadores para um ficheiro que pode especificar aqui:</string>
     <string name="marker_save_as_track">Guardar como ficheiro GPX</string>
     <string name="move_to_history">Mover para histórico</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index 11deb269dc..c001cf7ba3 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -1741,7 +1741,6 @@
     <string name="routing_attr_avoid_ice_roads_fords_description">Evită drumurile cu polei și traversarile râurilor.</string>
     <string name="plan_route">Planul rutei</string>
     <string name="coordinate_input">Introduceți coordonatele</string>
-    <string name="is_saved">este salvat</string>
     <string name="marker_save_as_track_descr">Exportați marcajele dvs. în următorul fișier GPX:</string>
     <string name="marker_save_as_track">Salvați ca fișier GPX</string>
     <string name="group_will_be_removed_after_restart">Grupul va dispărea data viitoare când porniți aplicația.</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 8f26722e07..8d81d8fd04 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -2473,7 +2473,6 @@
     <string name="route_is_calculated">Маршрут рассчитан</string>
     <string name="round_trip">Путешествие</string>
     <string name="add_location_as_first_point_descr">Добавить ваше местоположение как точку старта при планировании маршрута.</string>
-    <string name="is_saved">сохранено</string>
     <string name="show_passed">Показать пройденные</string>
     <string name="hide_passed">Скрыть пройденные</string>
     <string name="remove_from_map_markers">Удалить из маркеров карты</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 11b18b3e43..2c312af9a4 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2530,7 +2530,6 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="plan_route">Pranìfica àndala</string>
     <string name="shared_string_sort">Òrdina</string>
     <string name="coordinate_input">Insertada de sas coordinadas</string>
-    <string name="is_saved">est istadu sarvadu</string>
     <string name="marker_save_as_track_descr">Esporta sos marcadores tuos in custu documentu GPX:</string>
     <string name="marker_save_as_track">Sarva comente documentu GPX</string>
     <string name="move_to_history">Pone in sa cronologia</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index db7c744b9c..cf60626b1a 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2523,7 +2523,6 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="plan_route">Naplánovať trasu</string>
     <string name="shared_string_sort">Zotriediť</string>
     <string name="coordinate_input">Zadanie súradníc</string>
-    <string name="is_saved">je uložený</string>
     <string name="marker_save_as_track_descr">Exportovať vaše značky do nasledovného súboru GPX:</string>
     <string name="marker_save_as_track">Uložiť ako súbor GPX</string>
     <string name="move_to_history">Presunúť do histórie</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 63700ff20e..7458ccf398 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -2529,7 +2529,6 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="plan_route">Načrtovanje poti</string>
     <string name="shared_string_sort">Razvrsti</string>
     <string name="coordinate_input">Vpis koordinat</string>
-    <string name="is_saved">je shranjeno</string>
     <string name="marker_save_as_track">Shrani kot datoteko GPX</string>
     <string name="move_to_history">Premakni v zgodovino</string>
     <string name="group_will_be_removed_after_restart">Skupina bo odstranjena ob ponovnem zagonu programa.</string>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index e3fc911f0f..bcc6af7fd7 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -1449,7 +1449,6 @@
     <string name="plan_route">План путовања</string>
     <string name="shared_string_sort">Распореди</string>
     <string name="coordinate_input">Унос координата</string>
-    <string name="is_saved">је сачуван</string>
     <string name="marker_save_as_track_descr">Извезите ознаке у следећи GPX фајл:</string>
     <string name="marker_save_as_track">Сачувај као GPX фајл</string>
     <string name="move_to_history">Премести у историју</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 72cc88f77e..c21c9edd42 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -2196,7 +2196,6 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="routing_attr_avoid_ice_roads_fords_description">Undvik isvägar och vadställen.</string>
     <string name="my_location">Min plats</string>
     <string name="shared_string_sort">Sortera</string>
-    <string name="is_saved">har sparats</string>
     <string name="marker_save_as_track">Spara som GPX-fil</string>
     <string name="move_to_history">Flytta till historiken</string>
     <string name="show_arrows_on_the_map">Visa pilar på kartan</string>
diff --git a/OsmAnd/res/values-ta/strings.xml b/OsmAnd/res/values-ta/strings.xml
index 4f679df3db..01a5a7ffb9 100644
--- a/OsmAnd/res/values-ta/strings.xml
+++ b/OsmAnd/res/values-ta/strings.xml
@@ -94,7 +94,6 @@
     <string name="plan_route">பாதையை திட்டமிடு</string>
     <string name="shared_string_sort">வகைபடுத்து.</string>
     <string name="coordinate_input">ஒருங்கிணைப்பு உள்ளீடு</string>
-    <string name="is_saved">சேமிக்கபட்டது</string>
     <string name="marker_save_as_track_descr">பின்வரும் ஜிபிஎக்ஸ் கோப்புக்கு குறிப்பாங்களை ஏற்றுமதி செய்:</string>
     <string name="marker_save_as_track">ஜிபிஎக்ஸ் கோப்பாக சேமி</string>
     <string name="move_to_history">வறலாற்றுக்கு நகர்த்து</string>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index da7574f53a..801695af9f 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -2063,7 +2063,6 @@
     <string name="my_location">Konumum</string>
     <string name="shared_string_finish">Bitir</string>
     <string name="shared_string_sort">Sırala</string>
-    <string name="is_saved">kaydedildi</string>
     <string name="descendingly">azalan</string>
     <string name="ascendingly">artan</string>
     <string name="date_added">Tarih eklendi</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index b6791ba80b..d8e05864bc 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -2530,7 +2530,6 @@
     <string name="plan_route">Планувати маршрут</string>
     <string name="shared_string_sort">Впорядкувати</string>
     <string name="coordinate_input">Введення координат</string>
-    <string name="is_saved">збережено</string>
     <string name="marker_save_as_track_descr">Експортувати Ваші маркери у наступний GPX-файл:</string>
     <string name="marker_save_as_track">Зберегти як GPX-файл</string>
     <string name="move_to_history">Перемістити в історію</string>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index 0f06b4e502..81a1af23b4 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -2350,7 +2350,6 @@
     <string name="use_location">使用位置</string>
     <string name="shared_string_sort">排序</string>
     <string name="coordinate_input">坐标输入</string>
-    <string name="is_saved">已保存</string>
     <string name="marker_save_as_track">保存为轨迹</string>
     <string name="today">今天</string>
     <string name="yesterday">昨天</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index bfe9cf7b61..5b09cd85bf 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2527,7 +2527,6 @@
     <string name="plan_route">計畫路線</string>
     <string name="shared_string_sort">分類</string>
     <string name="coordinate_input">座標輸入</string>
-    <string name="is_saved">已儲存</string>
     <string name="marker_save_as_track_descr">將您的標記匯出到下方的 GPX 檔案：</string>
     <string name="marker_save_as_track">另存為 GPX 檔案</string>
     <string name="move_to_history">移至歷程</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 67418f1137..773adf0d9a 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,6 +11,7 @@
 	Thx - Hardy
 
 -->
+    <string name="shared_string_file_is_saved">%s is saved</string>
     <string name="shared_string_open_track">Open track</string>
     <string name="shared_string_track_is_saved">Track %s is saved</string>
     <string name="turn_screen_on_router">Wake on turn</string>
@@ -556,7 +557,6 @@
     <string name="plan_route">Plan route</string>
     <string name="shared_string_sort">Sort</string>
     <string name="coordinate_input">Coordinate input</string>
-    <string name="is_saved">is saved</string>
     <string name="marker_save_as_track_descr">Export your markers to the following GPX file:</string>
     <string name="marker_save_as_track">Save as GPX file</string>
     <string name="move_to_history">Move to history</string>
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
index c4b89a0d96..64722adb18 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
@@ -1076,7 +1076,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 				if (listener != null) {
 					listener.onPointsSaved();
 				}
-				snackbar = Snackbar.make(mainView, fileName + " " + getString(R.string.is_saved) + ".", Snackbar.LENGTH_LONG)
+				snackbar = Snackbar.make(mainView, String.format(getString(R.string.shared_string_file_is_saved), fileName) + ".", Snackbar.LENGTH_LONG)
 						.setAction(R.string.shared_string_show, new View.OnClickListener() {
 							@Override
 							public void onClick(View view) {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
index 2a908da4d8..02d8029de9 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
@@ -479,7 +479,7 @@ public class MapMarkersDialogFragment extends android.support.v4.app.DialogFragm
 			@Override
 			public void saveGpx(final String fileName) {
 				final String gpxPath = mapActivity.getMyApplication().getMapMarkersHelper().generateGpx(fileName);
-				snackbar = Snackbar.make(viewPager, fileName + " " + getString(R.string.is_saved) + ".", Snackbar.LENGTH_LONG)
+				snackbar = Snackbar.make(viewPager, String.format(getString(R.string.shared_string_file_is_saved), fileName) + ".", Snackbar.LENGTH_LONG)
 						.setAction(R.string.shared_string_show, new View.OnClickListener() {
 							@Override
 							public void onClick(View view) {

From 2eacd29ba234d9c98865b0ecf9244ff02dcc1d94 Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Tue, 9 Jul 2019 09:24:04 +0300
Subject: [PATCH 4/8] code clean up

---
 .../net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
index 3cfe963b02..2c131ad837 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
@@ -64,16 +64,13 @@ public class OnSaveCurrentTrackFragment extends BottomSheetDialogFragment {
 		showOnMapBtn.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				//show track on MapActivity
 				GpxInfo gpxInfo = new GpxInfo();
 				gpxInfo.setGpx(GPXUtilities.loadGPXFile(f));
-				boolean e = true;
 				if (gpxInfo.gpx != null) {
 					OsmandSettings settings = app.getSettings();
 					WptPt loc = gpxInfo.gpx.findPointToShow();
 					if (loc != null) {
 						settings.setMapLocationToShow(loc.lat, loc.lon, settings.getLastKnownMapZoom());
-						e = false;
 						app.getSelectedGpxHelper().setGpxFileToDisplay(gpxInfo.gpx);
 					}
 				}

From a3516688609a773ae16db6dcf14f41936e89c676 Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Tue, 9 Jul 2019 12:22:02 +0300
Subject: [PATCH 5/8] pr cleanup

---
 OsmAnd/src/net/osmand/AndroidUtils.java       | 35 ++++++++++---------
 .../osmand/plus/activities/MapActivity.java   |  4 +++
 .../OnSaveCurrentTrackFragment.java           |  2 +-
 .../monitoring/OsmandMonitoringPlugin.java    | 18 ++++++----
 4 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/OsmAnd/src/net/osmand/AndroidUtils.java b/OsmAnd/src/net/osmand/AndroidUtils.java
index 273f22e2e2..2c3c5f7c34 100644
--- a/OsmAnd/src/net/osmand/AndroidUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidUtils.java
@@ -68,10 +68,13 @@ import static android.util.TypedValue.COMPLEX_UNIT_SP;
 
 public class AndroidUtils {
 
+	public static final String STRING_PLACEHOLDER = "%s";
+	
 	/**
 	 * @param context
 	 * @return true if Hardware keyboard is available
 	 */
+	
 	public static boolean isHardwareKeyboardAvailable(Context context) {
 		return context.getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS;
 	}
@@ -555,24 +558,22 @@ public class AndroidUtils {
 		KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
 		return keyguardManager.inKeyguardRestrictedInputMode();
 	}
+	
+	public static CharSequence getStyledString(CharSequence baseString, CharSequence stringToInsertAndStyle, int typefaceStyle) {
+		
+		if (typefaceStyle == Typeface.NORMAL || typefaceStyle == Typeface.BOLD 
+			|| typefaceStyle == Typeface.ITALIC || typefaceStyle == Typeface.BOLD_ITALIC 
+			|| baseString.toString().contains(STRING_PLACEHOLDER)) {
 
-	public static CharSequence insertStyledSubstring(CharSequence preFormattedString, CharSequence textToInsert, int typefaceStyle) {
-		final String placeholder = "%s";
-		if (typefaceStyle < 0 || typefaceStyle > 3) {
-			return preFormattedString;
+			int indexOfPlaceholder = baseString.toString().indexOf(STRING_PLACEHOLDER);
+			
+			SpannableStringBuilder ssb = new SpannableStringBuilder(
+				baseString.toString().replace(STRING_PLACEHOLDER, stringToInsertAndStyle));
+			ssb.setSpan(new StyleSpan(typefaceStyle), indexOfPlaceholder, 
+				stringToInsertAndStyle.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+			return ssb;
+		} else {
+			return baseString;
 		}
-		if (!preFormattedString.toString().contains(placeholder)) {
-			return preFormattedString;
-		}
-		int indexOfPlaceholder = preFormattedString.toString().indexOf(placeholder);
-		SpannableStringBuilder ssb = new SpannableStringBuilder();
-		ssb.append(preFormattedString.subSequence(0, indexOfPlaceholder));
-		int startIndex = ssb.length();
-		ssb.append(textToInsert).append(" ");
-		ssb.setSpan(new StyleSpan(typefaceStyle), startIndex, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-		startIndex = ssb.length();
-		ssb.append(preFormattedString.subSequence(indexOfPlaceholder+2, preFormattedString.length()));
-		ssb.setSpan(new StyleSpan(Typeface.NORMAL), startIndex, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-		return ssb;
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 11fb488f19..c2099dab6d 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -1032,6 +1032,10 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		return mIsDestroyed;
 	}
 
+	public boolean isActivityStopped() {
+		return stopped;
+	}
+
 	private void restartApp() {
 		AlertDialog.Builder bld = new AlertDialog.Builder(this);
 		bld.setMessage(R.string.storage_permission_restart_is_required);
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
index 2c131ad837..9cd177191c 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
@@ -51,7 +51,7 @@ public class OnSaveCurrentTrackFragment extends BottomSheetDialogFragment {
 		Button openTrackBtn = mainView.findViewById(R.id.open_track_button);
 		Button showOnMapBtn = mainView.findViewById(R.id.show_on_map_button);
 
-		tv.setText(AndroidUtils.insertStyledSubstring(app.getString(R.string.shared_string_track_is_saved), savedGpxName, Typeface.BOLD));
+		tv.setText(AndroidUtils.getStyledString(app.getString(R.string.shared_string_track_is_saved), savedGpxName, Typeface.BOLD));
 
 		openTrackBtn.setOnClickListener(new OnClickListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index 6bdaac8cce..4b3e65c3ea 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -18,6 +18,7 @@ import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 
+import java.lang.ref.WeakReference;
 import net.osmand.AndroidUtils;
 import net.osmand.Location;
 import net.osmand.ValueHolder;
@@ -290,7 +291,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 				int which = holder[0];
 				int item = items.get(which);
 				if(item == R.string.save_current_track){
-					saveCurrentTrack(map);
+					saveCurrentTrack(new WeakReference<>(map));
 				} else if(item == R.string.gpx_monitoring_start) {
 					if (app.getLocationProvider().checkGPSEnabled(map)) {
 						startGPXMonitoring(map, showTrackSelection);
@@ -339,12 +340,12 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 		saveCurrentTrack(onComplete, null);
 	}
 
-	public void saveCurrentTrack(@Nullable final Activity activity) {
-		saveCurrentTrack(null, activity);
+	public void saveCurrentTrack(@Nullable final WeakReference<Activity> weakReferenceToActivity) {
+		saveCurrentTrack(null, weakReferenceToActivity);
 	}
 	
-	public void saveCurrentTrack(@Nullable final Runnable onComplete, @Nullable final
-		Activity activity) {
+	public void saveCurrentTrack(@Nullable final Runnable onComplete, 
+		@Nullable final WeakReference<Activity> weakReferenceToActivity) {
 		app.getTaskManager().runInBackground(new OsmAndTaskRunnable<Void, Void, SaveGpxResult>() {
 
 			@Override
@@ -371,8 +372,11 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 				isSaving = false;
 				app.getNotificationHelper().refreshNotifications();
 				updateControl();
-				if (activity instanceof MapActivity && !Algorithms.isEmpty(result.getFilenames())) {
-					OnSaveCurrentTrackFragment.showInstance(((MapActivity) activity)
+				if (weakReferenceToActivity != null && weakReferenceToActivity.get() instanceof MapActivity
+					&& !((MapActivity) weakReferenceToActivity.get()).isActivityStopped()
+					&& !((MapActivity) weakReferenceToActivity.get()).isActivityDestroyed()
+					&& !Algorithms.isEmpty(result.getFilenames())) {
+					OnSaveCurrentTrackFragment.showInstance(((MapActivity) weakReferenceToActivity.get())
 						.getSupportFragmentManager(), result.getFilenames().get(0));
 				}
 				if (onComplete != null) {

From ab96fe684e57397593f8d5d43ba558c8ae9bcd23 Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Tue, 9 Jul 2019 12:32:24 +0300
Subject: [PATCH 6/8] pr cleanup

---
 .../src/net/osmand/plus/activities/MapActivity.java |  4 ----
 .../plus/monitoring/OsmandMonitoringPlugin.java     | 13 +++++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index c2099dab6d..11fb488f19 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -1032,10 +1032,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		return mIsDestroyed;
 	}
 
-	public boolean isActivityStopped() {
-		return stopped;
-	}
-
 	private void restartApp() {
 		AlertDialog.Builder bld = new AlertDialog.Builder(this);
 		bld.setMessage(R.string.storage_permission_restart_is_required);
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index 4b3e65c3ea..9efc14030d 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -372,13 +372,14 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 				isSaving = false;
 				app.getNotificationHelper().refreshNotifications();
 				updateControl();
-				if (weakReferenceToActivity != null && weakReferenceToActivity.get() instanceof MapActivity
-					&& !((MapActivity) weakReferenceToActivity.get()).isActivityStopped()
-					&& !((MapActivity) weakReferenceToActivity.get()).isActivityDestroyed()
-					&& !Algorithms.isEmpty(result.getFilenames())) {
-					OnSaveCurrentTrackFragment.showInstance(((MapActivity) weakReferenceToActivity.get())
-						.getSupportFragmentManager(), result.getFilenames().get(0));
+				if (weakReferenceToActivity != null) {
+					final Activity a = weakReferenceToActivity.get();
+					if (a instanceof MapActivity && !a.isFinishing() && !Algorithms.isEmpty(result.getFilenames())) {
+						OnSaveCurrentTrackFragment.showInstance(((MapActivity) a)
+							.getSupportFragmentManager(), result.getFilenames().get(0));	
+					}
 				}
+				
 				if (onComplete != null) {
 					onComplete.run();
 				}

From 4b818a46eae2547ef55756eb302cdb9300ce736f Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Tue, 9 Jul 2019 12:39:07 +0300
Subject: [PATCH 7/8] pr cleanup

---
 .../plus/monitoring/OsmandMonitoringPlugin.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index 9efc14030d..9de7ccf589 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -340,12 +340,12 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 		saveCurrentTrack(onComplete, null);
 	}
 
-	public void saveCurrentTrack(@Nullable final WeakReference<Activity> weakReferenceToActivity) {
-		saveCurrentTrack(null, weakReferenceToActivity);
+	public void saveCurrentTrack(@Nullable final WeakReference<Activity> mapActivityRef) {
+		saveCurrentTrack(null, mapActivityRef);
 	}
 	
 	public void saveCurrentTrack(@Nullable final Runnable onComplete, 
-		@Nullable final WeakReference<Activity> weakReferenceToActivity) {
+		@Nullable final WeakReference<Activity> mapActivityRef) {
 		app.getTaskManager().runInBackground(new OsmAndTaskRunnable<Void, Void, SaveGpxResult>() {
 
 			@Override
@@ -372,9 +372,9 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 				isSaving = false;
 				app.getNotificationHelper().refreshNotifications();
 				updateControl();
-				if (weakReferenceToActivity != null) {
-					final Activity a = weakReferenceToActivity.get();
-					if (a instanceof MapActivity && !a.isFinishing() && !Algorithms.isEmpty(result.getFilenames())) {
+				if (mapActivityRef != null && !Algorithms.isEmpty(result.getFilenames())) {
+					final Activity a = mapActivityRef.get();
+					if (a instanceof MapActivity && !a.isFinishing()) {
 						OnSaveCurrentTrackFragment.showInstance(((MapActivity) a)
 							.getSupportFragmentManager(), result.getFilenames().get(0));	
 					}

From 186c18826324e9fe4aa09160da621230c3f60502 Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Tue, 9 Jul 2019 13:35:25 +0300
Subject: [PATCH 8/8] code clean up

---
 .../plus/monitoring/OsmandMonitoringPlugin.java | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index 9de7ccf589..73bf7137e1 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -291,7 +291,11 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 				int which = holder[0];
 				int item = items.get(which);
 				if(item == R.string.save_current_track){
-					saveCurrentTrack(new WeakReference<>(map));
+					if (map instanceof MapActivity) {
+						saveCurrentTrack(new WeakReference<>((MapActivity) map));
+					} else {
+						saveCurrentTrack();
+					}
 				} else if(item == R.string.gpx_monitoring_start) {
 					if (app.getLocationProvider().checkGPSEnabled(map)) {
 						startGPXMonitoring(map, showTrackSelection);
@@ -340,12 +344,12 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 		saveCurrentTrack(onComplete, null);
 	}
 
-	public void saveCurrentTrack(@Nullable final WeakReference<Activity> mapActivityRef) {
+	public void saveCurrentTrack(@Nullable final WeakReference<MapActivity> mapActivityRef) {
 		saveCurrentTrack(null, mapActivityRef);
 	}
 	
 	public void saveCurrentTrack(@Nullable final Runnable onComplete, 
-		@Nullable final WeakReference<Activity> mapActivityRef) {
+		@Nullable final WeakReference<MapActivity> mapActivityRef) {
 		app.getTaskManager().runInBackground(new OsmAndTaskRunnable<Void, Void, SaveGpxResult>() {
 
 			@Override
@@ -373,10 +377,9 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 				app.getNotificationHelper().refreshNotifications();
 				updateControl();
 				if (mapActivityRef != null && !Algorithms.isEmpty(result.getFilenames())) {
-					final Activity a = mapActivityRef.get();
-					if (a instanceof MapActivity && !a.isFinishing()) {
-						OnSaveCurrentTrackFragment.showInstance(((MapActivity) a)
-							.getSupportFragmentManager(), result.getFilenames().get(0));	
+					final MapActivity a = mapActivityRef.get();
+					if (a != null && !a.isFinishing()) {
+						OnSaveCurrentTrackFragment.showInstance(a.getSupportFragmentManager(), result.getFilenames().get(0));	
 					}
 				}