From ca6ebeac3b6dffb92cab79168c21e27a58c3d824 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 23 Feb 2015 16:19:53 +0200
Subject: [PATCH 1/6] Gpx tracks card and My tracks updated

---
 OsmAnd/res/layout/available_gpx.xml           | 37 +++++++++++++++++++
 OsmAnd/res/layout/dash_gpx_track_item.xml     |  8 ++--
 OsmAnd/res/layout/dashboard.xml               | 14 +++----
 OsmAnd/res/values/strings.xml                 |  3 +-
 .../plus/activities/AvailableGPXFragment.java | 33 +++++++++++++++++
 .../OsmandExpandableListFragment.java         |  4 +-
 .../plus/monitoring/DashTrackFragment.java    |  4 ++
 7 files changed, 90 insertions(+), 13 deletions(-)
 create mode 100644 OsmAnd/res/layout/available_gpx.xml

diff --git a/OsmAnd/res/layout/available_gpx.xml b/OsmAnd/res/layout/available_gpx.xml
new file mode 100644
index 0000000000..d45911e47b
--- /dev/null
+++ b/OsmAnd/res/layout/available_gpx.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:orientation="vertical"
+			  android:layout_width="match_parent"
+			  android:layout_height="match_parent">
+
+	<LinearLayout android:id="@+id/current_track"
+				  android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<include android:layout_height="wrap_content"
+				 android:layout_width="match_parent"
+				 layout="@layout/dash_gpx_track_item"/>
+
+		<Button android:id="@+id/map_btn"
+				android:text="@string/back_to_map"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"/>
+
+		</LinearLayout>
+
+
+	<ExpandableListView
+		android:id="@android:id/list"
+		style="@style/OsmandListView"
+		android:layout_width="fill_parent"
+		android:layout_height="0dp"
+		android:background="?attr/expandable_list_background"
+		android:layout_marginLeft="0dp"
+		android:layout_marginRight="0dp"
+		android:layout_marginTop="0dp"
+		android:layout_weight="1"
+		android:groupIndicator="@android:color/transparent"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_gpx_track_item.xml b/OsmAnd/res/layout/dash_gpx_track_item.xml
index a3f4783d0b..1adc373af9 100644
--- a/OsmAnd/res/layout/dash_gpx_track_item.xml
+++ b/OsmAnd/res/layout/dash_gpx_track_item.xml
@@ -17,7 +17,7 @@
 					  android:layout_marginRight="@dimen/showAllButtonMarginRight"
 					  android:layout_height="wrap_content">
 			<TextView android:id="@+id/name"
-					  android:textColor="@color/dashboard_black"
+					  android:textColor="?android:textColorPrimary"
 					  android:layout_width="wrap_content"
 					  android:layout_height="wrap_content"/>
 			<LinearLayout android:orientation="horizontal"
@@ -56,14 +56,16 @@
 			</LinearLayout>
 		</LinearLayout>
 
-		<ImageView android:id="@+id/stop"
+		<ImageButton android:id="@+id/stop"
 				   android:visibility="gone"
 				   android:layout_gravity="center_vertical"
+				   android:background="?attr/dashboard_button"
 				   android:layout_width="wrap_content"
 				   android:layout_height="wrap_content"/>
 
-		<ImageView android:id="@+id/show_on_map"
+		<ImageButton android:id="@+id/show_on_map"
 				   android:layout_gravity="center_vertical"
+				   android:background="?attr/dashboard_button"
 				   android:layout_width="@dimen/dashListItemHeight"
 				   android:layout_height="@dimen/dashListItemHeight"/>
 	</LinearLayout>
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 26d8a01a30..f7d2a148e9 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -60,13 +60,13 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
 
-			<!--<fragment-->
-					<!--xmlns:android="http://schemas.android.com/apk/res/android"-->
-					<!--android:id="@+id/TracksFragment"-->
-					<!--android:name="net.osmand.plus.dashboard.DashTrackFragment"-->
-					<!--android:layout_marginTop="@dimen/dashCardMargin"-->
-					<!--android:layout_width="match_parent"-->
-					<!--android:layout_height="wrap_content"/>-->
+			<fragment
+					xmlns:android="http://schemas.android.com/apk/res/android"
+					android:id="@+id/TracksFragment"
+					android:name="net.osmand.plus.monitoring.DashTrackFragment"
+					android:layout_marginTop="@dimen/dashCardMargin"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
 
 			<!--<fragment-->
 					<!--xmlns:android="http://schemas.android.com/apk/res/android"-->
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index aade191905..3908e339dd 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,7 +9,8 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
-
+	<string name="currently_recording_track">Currently recording track</string>
+	<string name="back_to_map">Back to map</string>
 	<string name="plugin_nautical_descr1">Activating this view changes the map style to Nautical, thus showing all nautical navigation marks and chart symbols.</string>
 	<string name="plugin_nautical_descr2">A map file containing all nautical symbols globally is availabe as one single download called \'World seamarks\'.</string>
 	<string name="plugin_nautical_descr3">This view can be reverted by either de-activating it again here, or by changing the \'Map style\' under \'Configure map\' as desired.</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index 147ea3111d..6323fa1279 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -27,6 +27,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.ScreenOrientationHelper;
+import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.util.Algorithms;
 import android.app.Activity;
@@ -39,6 +40,7 @@ import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBarActivity;
@@ -109,6 +111,27 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			asyncLoader = new LoadGpxTask();
 			asyncLoader.execute(getActivity());
 		}
+		OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
+		GpxSelectionHelper.SelectedGpxFile currentTrack = savingTrackHelper.getCurrentTrack();
+		View v = getView();
+		if (v == null){
+			return;
+		}
+		if (plugin != null && savingTrackHelper.getCurrentGpx() != null) {
+
+
+			v.findViewById(R.id.current_track).setVisibility(View.VISIBLE);
+			((TextView)v.findViewById(R.id.name)).setText(R.string.currently_recording_track);
+			String description = GpxUiHelper.getDescription(getMyApplication(), currentTrack.getGpxFile(), null, true);
+			int startindex = description.indexOf(">");
+			int endindex = description.indexOf("</font>");
+			String distnace = description.substring(startindex + 1, endindex);
+			((TextView)v.findViewById(R.id.distance)).setText(distnace);
+			v.findViewById(R.id.time_icon).setVisibility(View.GONE);
+		} else {
+			v.findViewById(R.id.current_track).setVisibility(View.GONE);
+		}
+		//TODO implement updating view of current track
 	}
 
 	@Override
@@ -120,6 +143,16 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	}
 
 
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		View v = inflater.inflate(R.layout.available_gpx, container, false);
+		listView =(ExpandableListView) v.findViewById(android.R.id.list);
+		if(this.adapter != null) {
+			listView.setAdapter(this.adapter);
+		}
+		return v;
+	}
+
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		menu.clear();
diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java b/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java
index b286e16955..459ef0429c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java
@@ -21,8 +21,8 @@ public abstract class OsmandExpandableListFragment extends Fragment
 		implements OnChildClickListener {
 	
 	
-	private ExpandableListView listView;
-	private ExpandableListAdapter adapter;
+	protected ExpandableListView listView;
+	protected ExpandableListAdapter adapter;
 
 
 	public OsmandApplication getMyApplication() {
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
index f0ee8ab704..d29388e34b 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
@@ -18,6 +18,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -92,6 +93,9 @@ public class DashTrackFragment extends DashBaseFragment {
 					setText(distnace);
 			view.findViewById(R.id.time_icon).setVisibility(View.GONE);
 			//view.findViewById(R.id.distance_icon).setVisibility(View.GONE);
+			view.findViewById(R.id.stop).setVisibility(View.GONE);
+			((ImageButton)view.findViewById(R.id.show_on_map)).
+					setImageDrawable(getResources().getDrawable(R.drawable.ic_action_map));
 			tracks.addView(view);
 		}
 	}

From 1fdc3cb31c7bc7fc6f68f99c4d3563a04eb31acc Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 23 Feb 2015 16:51:24 +0200
Subject: [PATCH 2/6] Updated search history view

---
 ...it_dialog.xml => favorite_edit_dialog.xml} |  0
 ..._list_item.xml => favorites_list_item.xml} |  0
 OsmAnd/res/layout/local_index_list_item.xml   |  3 +-
 .../res/layout/search_history_list_item.xml   | 70 ++++++++++++++-----
 .../activities/FavoritesListFragment.java     |  5 +-
 .../activities/FavoritesTreeFragment.java     |  4 +-
 .../search/SearchHistoryFragment.java         | 37 +++++-----
 .../osmand/plus/dialogs/FavoriteDialogs.java  |  2 +-
 8 files changed, 81 insertions(+), 40 deletions(-)
 rename OsmAnd/res/layout/{favourite_edit_dialog.xml => favorite_edit_dialog.xml} (100%)
 rename OsmAnd/res/layout/{favourites_list_item.xml => favorites_list_item.xml} (100%)

diff --git a/OsmAnd/res/layout/favourite_edit_dialog.xml b/OsmAnd/res/layout/favorite_edit_dialog.xml
similarity index 100%
rename from OsmAnd/res/layout/favourite_edit_dialog.xml
rename to OsmAnd/res/layout/favorite_edit_dialog.xml
diff --git a/OsmAnd/res/layout/favourites_list_item.xml b/OsmAnd/res/layout/favorites_list_item.xml
similarity index 100%
rename from OsmAnd/res/layout/favourites_list_item.xml
rename to OsmAnd/res/layout/favorites_list_item.xml
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 3a922e413d..3627ec48ce 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -15,8 +15,7 @@
 		android:focusable="false"
 		android:visibility="gone"
 		android:layout_marginRight="@dimen/local_index_check_right_margin"
-		android:layout_marginTop="@dimen/favorites_icon_top_margin"
-/>
+		android:layout_marginTop="@dimen/favorites_icon_top_margin"/>
 
 	<ImageView
 		android:id="@+id/icon"
diff --git a/OsmAnd/res/layout/search_history_list_item.xml b/OsmAnd/res/layout/search_history_list_item.xml
index 75effe3d8d..8193e02817 100644
--- a/OsmAnd/res/layout/search_history_list_item.xml
+++ b/OsmAnd/res/layout/search_history_list_item.xml
@@ -10,28 +10,66 @@
 			  android:paddingRight="@dimen/list_content_padding"
 			  android:paddingTop="5dp">
 
-	<TextView
-		android:id="@+id/label"
-		style="@style/ListText"
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginRight="@dimen/favorites_icon_right_margin"
+		android:layout_marginTop="@dimen/favorites_icon_top_margin"
+		android:focusable="false"
+		android:src="@drawable/ic_sdcard"/>
+
+
+	<LinearLayout
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical"
-		android:layout_marginRight="3dp"
 		android:layout_weight="1"
-		android:ellipsize="end"
-		android:maxLines="1"
-		android:textColor="?android:textColorPrimary"
-		tools:text="@string/lorem_ipsum"/>
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/name"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:maxLines="1"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/dashFavNameTextSize"
+			tools:text="@string/lorem_ipsum"/>
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+
+			<ImageView
+				android:id="@+id/direction"
+				android:layout_width="@dimen/dashFavDirectionSize"
+				android:layout_height="@dimen/dashFavDirectionSize"
+				android:layout_gravity="center_vertical"
+				android:visibility="gone"/>
+
+			<TextView
+				android:id="@+id/distance"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="2dp"
+				android:textColor="?android:textColorSecondary"
+				android:textSize="@dimen/showAllButtonTextSize"
+				tools:text="100500 km"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
 
 	<ImageButton
-		android:id="@+id/remove"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:id="@+id/options"
+		android:layout_width="@dimen/list_item_height"
+		android:layout_height="@dimen/list_item_height"
 		android:layout_gravity="center_vertical"
-		android:background="?attr/reset_image"
-		android:contentDescription="@string/default_buttons_delete"
-		android:paddingLeft="2dp"
-		android:paddingRight="2dp"
-		android:paddingTop="2dp"/>
+		android:background="?attr/options_button_background"
+		android:focusable="false"
+		android:src="?attr/list_settings_icon"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
index 1a6f9d5455..4dc224cf09 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
@@ -21,7 +21,6 @@ import net.osmand.plus.activities.search.SearchActivity;
 import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.dialogs.DirectionsDialogs;
-import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 import android.app.Activity;
 import android.content.Intent;
@@ -156,7 +155,7 @@ public class FavoritesListFragment extends ListFragment implements SearchActivit
 		}
 
 		public FavouritesAdapter(Activity activity, List<FavouritePoint> list) {
-			super(activity, R.layout.favourites_list_item, list);
+			super(activity, R.layout.favorites_list_item, list);
 			this.activity = activity;
 			this.app = ((OsmandApplication) activity.getApplication());
 			boolean light = app.getSettings().isLightContent();
@@ -178,7 +177,7 @@ public class FavoritesListFragment extends ListFragment implements SearchActivit
 			View row = convertView;
 			if (row == null) {
 				LayoutInflater inflater = activity.getLayoutInflater();
-				row = inflater.inflate(R.layout.favourites_list_item, parent, false);
+				row = inflater.inflate(R.layout.favorites_list_item, parent, false);
 			}
 
 			TextView name = (TextView) row.findViewById(R.id.favourite_label);
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index a402a31877..2bdf7f5ed1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -204,7 +204,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 	private boolean editPoint(final FavouritePoint point) {
 		Builder builder = new AlertDialog.Builder(getActivity());
 		builder.setTitle(R.string.favourites_context_menu_edit);
-		final View v = getActivity().getLayoutInflater().inflate(R.layout.favourite_edit_dialog,
+		final View v = getActivity().getLayoutInflater().inflate(R.layout.favorite_edit_dialog,
 				getExpandableListView(), false);
 		final AutoCompleteTextView cat = (AutoCompleteTextView) v.findViewById(R.id.Category);
 		final EditText editText = (EditText) v.findViewById(R.id.Name);
@@ -762,7 +762,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 			View row = convertView;
 			if (row == null) {
 				LayoutInflater inflater = getActivity().getLayoutInflater();
-				row = inflater.inflate(R.layout.favourites_list_item, parent, false);
+				row = inflater.inflate(R.layout.favorites_list_item, parent, false);
 			}
 
 			TextView name = (TextView) row.findViewById(R.id.favourite_label);
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
index cbb412638f..47ce21c7e3 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
@@ -10,11 +10,16 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild;
+import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
 import net.osmand.util.MapUtils;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.ListFragment;
@@ -24,6 +29,7 @@ import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
@@ -95,7 +101,9 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 			location = ((OsmandApplication) activity.getApplication()).getSettings().getLastKnownMapLocation();
 		}
 		historyAdapter.clear();
-		historyAdapter.addAll(helper.getHistoryEntries());
+		for(HistoryEntry entry : helper.getHistoryEntries()){
+			historyAdapter.add(entry);
+		}
 		locationUpdate(location);
 		clearButton.setVisibility(historyAdapter.isEmpty() ? View.GONE : View.VISIBLE);
 		
@@ -144,33 +152,26 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 				LayoutInflater inflater = getActivity().getLayoutInflater();
 				row = inflater.inflate(R.layout.search_history_list_item, parent, false);
 			}
-			TextView label = (TextView) row.findViewById(R.id.label);
+			TextView nameText = (TextView) row.findViewById(R.id.name);
+			TextView distanceText = (TextView) row.findViewById(R.id.distance);
 			String distance = "";
-			ImageButton icon = (ImageButton) row.findViewById(R.id.remove);
+			ImageButton options = (ImageButton) row.findViewById(R.id.options);
 			final HistoryEntry model = getItem(position);
 			if (location != null) {
 				int dist = (int) (MapUtils.getDistance(location, model.getLat(), model.getLon()));
 				distance = OsmAndFormatter.getFormattedDistance(dist, (OsmandApplication) getActivity().getApplication()) + "  ";
 			}
-			String rnk = MessageFormat.format(" {0,number,#.##E00} ", ((float)model.getRank(System.currentTimeMillis())));
-			label.setText(distance + rnk  + model.getName().getName(), BufferType.SPANNABLE);
-			((Spannable) label.getText()).setSpan(new ForegroundColorSpan(getResources().getColor(R.color.color_distance)), 0, distance.length(), 0);
-			icon.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					helper.remove(model);
-					historyAdapter.remove(model);
-				}
+			distanceText.setText(distance);
+			nameText.setText(model.getName().getName(), BufferType.SPANNABLE);
 
-			});
-			View.OnClickListener clickListener = new View.OnClickListener() {
+			options.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
 					selectModel(model, v);
 				}
-			};
 
-			label.setOnClickListener(clickListener);
+			});
+
 			return row;
 		}
 	}
@@ -181,4 +182,8 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 			 ((SearchActivity) getActivity()).getClearToolbar(false);
 		}
 	}
+
+	public OsmandApplication getMyApplication() {
+		return (OsmandApplication) getActivity().getApplication();
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
index 14bf014246..146c93d0d5 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
@@ -175,7 +175,7 @@ public class FavoriteDialogs {
 	public  static Dialog createAddFavouriteDialog(final Activity activity, final Bundle args) {
     	Builder builder = new AlertDialog.Builder(activity);
 		builder.setTitle(R.string.favourites_context_menu_edit);
-		final View v = activity.getLayoutInflater().inflate(R.layout.favourite_edit_dialog, null, false);
+		final View v = activity.getLayoutInflater().inflate(R.layout.favorite_edit_dialog, null, false);
 		final FavouritesDbHelper helper = ((OsmandApplication) activity.getApplication()).getFavorites();
 		builder.setView(v);
 		final EditText editText =  (EditText) v.findViewById(R.id.Name);

From a4369d6f0428632b0f90703120c133592d6af16a Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 23 Feb 2015 18:46:38 +0200
Subject: [PATCH 3/6] Updated search history view

---
 OsmAnd/res/layout/search_history_list_item.xml    |  4 +---
 .../activities/search/SearchHistoryFragment.java  | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/search_history_list_item.xml b/OsmAnd/res/layout/search_history_list_item.xml
index 8193e02817..126f2e1865 100644
--- a/OsmAnd/res/layout/search_history_list_item.xml
+++ b/OsmAnd/res/layout/search_history_list_item.xml
@@ -7,7 +7,6 @@
 			  android:orientation="horizontal"
 			  android:paddingBottom="5dp"
 			  android:paddingLeft="@dimen/list_content_padding"
-			  android:paddingRight="@dimen/list_content_padding"
 			  android:paddingTop="5dp">
 
 	<ImageView
@@ -46,8 +45,7 @@
 				android:id="@+id/direction"
 				android:layout_width="@dimen/dashFavDirectionSize"
 				android:layout_height="@dimen/dashFavDirectionSize"
-				android:layout_gravity="center_vertical"
-				android:visibility="gone"/>
+				android:layout_gravity="center_vertical"/>
 
 			<TextView
 				android:id="@+id/distance"
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
index 47ce21c7e3..27d9df3b9c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
@@ -19,6 +19,9 @@ import net.osmand.util.MapUtils;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.media.Image;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
@@ -35,6 +38,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
@@ -135,6 +139,7 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 
 	class HistoryAdapter extends ArrayAdapter<HistoryEntry> {
 		private LatLon location;
+		Drawable arrowImage;
 
 		public void updateLocation(LatLon l) {
 			location = l;
@@ -143,6 +148,14 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 
 		public HistoryAdapter(List<HistoryEntry> list) {
 			super(getActivity(), R.layout.search_history_list_item, list);
+			arrowImage = getResources().getDrawable(R.drawable.ic_destination_arrow_white);
+			arrowImage.mutate();
+			boolean light = getMyApplication().getSettings().isLightContent();
+			if (light) {
+				arrowImage.setColorFilter(getResources().getColor(R.color.color_distance), PorterDuff.Mode.MULTIPLY);
+			} else {
+				arrowImage.setColorFilter(getResources().getColor(R.color.color_distance), PorterDuff.Mode.MULTIPLY);
+			}
 		}
 
 		@Override
@@ -155,6 +168,8 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 			TextView nameText = (TextView) row.findViewById(R.id.name);
 			TextView distanceText = (TextView) row.findViewById(R.id.distance);
 			String distance = "";
+			ImageView arrow = (ImageView) row.findViewById(R.id.direction);
+			arrow.setImageDrawable(arrowImage);
 			ImageButton options = (ImageButton) row.findViewById(R.id.options);
 			final HistoryEntry model = getItem(position);
 			if (location != null) {

From 80be3b8b1c66e134d4fece0278e89ccc7e4202fc Mon Sep 17 00:00:00 2001
From: Bars107 <barsik107@gmail.com>
Date: Tue, 24 Feb 2015 14:58:03 +0200
Subject: [PATCH 4/6] Added renaming for audio video notes

---
 .../layout/dash_audio_video_notes_item.xml    | 69 -------------------
 OsmAnd/res/layout/note.xml                    |  9 +++
 OsmAnd/res/values/strings.xml                 |  1 +
 .../audionotes/AudioVideoNotesPlugin.java     | 31 ++++++---
 .../DashAudioVideoNotesFragment.java          | 38 +++++-----
 .../osmand/plus/audionotes/NotesFragment.java | 45 +++++-------
 6 files changed, 73 insertions(+), 120 deletions(-)
 delete mode 100644 OsmAnd/res/layout/dash_audio_video_notes_item.xml

diff --git a/OsmAnd/res/layout/dash_audio_video_notes_item.xml b/OsmAnd/res/layout/dash_audio_video_notes_item.xml
deleted file mode 100644
index ff426d59f7..0000000000
--- a/OsmAnd/res/layout/dash_audio_video_notes_item.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="@dimen/dashListItemHeight"
-	android:orientation="vertical">
-
-	<View
-		android:id="@+id/divider"
-		android:layout_width="match_parent"
-		android:layout_height="1dp"
-		android:background="?attr/dashboard_divider"/>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="horizontal">
-
-		<ImageView
-			android:id="@+id/icon"
-			android:layout_width="@dimen/dashNoteIconSize"
-			android:layout_height="@dimen/dashNoteIconSize"
-			android:layout_gravity="center_vertical"
-			android:layout_marginLeft="@dimen/dashFavIconMargin"
-			android:layout_marginRight="@dimen/dashFavIconMargin"
-			tools:src="@drawable/ic_type_audio" />
-
-		<LinearLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:layout_weight="1"
-			android:orientation="vertical">
-
-			<TextView
-				android:id="@+id/name"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:lines="1"
-				android:textColor="?android:textColorPrimary"
-				android:textSize="@dimen/dashFavNameTextSize"
-				tools:text="@string/lorem_ipsum" />
-
-			<TextView
-				android:id="@+id/descr"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:lines="1"
-				android:textSize="@dimen/showAllButtonTextSize"
-				android:textColor="?android:textColorSecondary"
-				tools:text="@string/lorem_ipsum" />
-
-		</LinearLayout>
-
-		<ImageButton
-			android:id="@+id/play"
-			android:layout_width="@dimen/dashListItemHeight"
-			android:layout_height="@dimen/dashListItemHeight"
-			android:layout_gravity="center_vertical"
-			android:layout_marginLeft="@dimen/dashFavIconMargin"
-			android:background="?attr/dashboard_button"
-			android:src="@drawable/ic_play_light"/>
-	</LinearLayout>
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/note.xml b/OsmAnd/res/layout/note.xml
index 4879876f82..c98c4fe83c 100644
--- a/OsmAnd/res/layout/note.xml
+++ b/OsmAnd/res/layout/note.xml
@@ -64,4 +64,13 @@
 		android:focusable="false"
 		android:src="?attr/list_settings_icon"/>
 
+	<ImageButton
+		android:id="@+id/play"
+		android:layout_width="@dimen/dashListItemHeight"
+		android:layout_height="@dimen/dashListItemHeight"
+		android:layout_gravity="center_vertical"
+		android:layout_marginLeft="@dimen/dashFavIconMargin"
+		android:background="?attr/dashboard_button"
+		android:src="@drawable/ic_play_light"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 1938a185a4..92113f53e9 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+	<string name="rename_failed">Rename failed.</string>
 	<string name="days_behind">days behind</string>
 	<string name="currently_recording_track">Currently recording track</string>
 	<string name="back_to_map">Back to map</string>
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index 7693ec5411..ce6f940b60 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -67,6 +67,7 @@ import android.media.MediaRecorder;
 import android.media.SoundPool;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Environment;
 import android.provider.MediaStore;
 import android.view.Display;
 import android.view.KeyEvent;
@@ -138,9 +139,8 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			this.file = f;
 		}
 
-		public File file;
+		private File file;
 
-		private String name;
 		private double lat;
 		private double lon;
 		private long duration = -1;
@@ -172,12 +172,26 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			}
 		}
 
-		public void setName(String name) {
-			this.name = name;
+		public File getFile() {
+			return file;
+		}
+
+		public boolean setName(String name) {
+			int index = file.getAbsolutePath().lastIndexOf("/") + 1;
+			if (index < 0){
+				return false;
+			}
+			File directory = new File(file.getAbsolutePath().substring(0, index));
+			File to        = new File(directory, name.trim());
+			if (file.renameTo(to)){
+				file = to;
+				return true;
+			}
+			return false;
 		}
 
 		public String getName() {
-			return name;
+			return file.getName();
 		}
 
 		public boolean isPhoto() {
@@ -289,13 +303,12 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		}
 
 		public String getSmallDescription(Context ctx) {
-			String nm = name == null ? "" : name;
-			
+
 			String time = AndroidUtils.formatDateTime(ctx,file.lastModified());
 			if (isPhoto()) {
-				return ctx.getString(R.string.recording_photo_description, nm, time).trim();
+				return ctx.getString(R.string.recording_photo_description, "", time).trim();
 			}
-			return ctx.getString(R.string.recording_description, nm, "", time).trim();
+			return ctx.getString(R.string.recording_description, "", "", time).trim();
 		}
 
 		private String getDuration(Context ctx) {
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
index 7d1e50de06..109d42cdee 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
@@ -94,15 +94,22 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 
 		for (final AudioVideoNotesPlugin.Recording recording : notes){
 			LayoutInflater inflater = getActivity().getLayoutInflater();
-			View view = inflater.inflate(R.layout.dash_audio_video_notes_item, null, false);
+			View view = inflater.inflate(R.layout.note, null, false);
 
 			getNoteView(recording, view, getActivity(), plugin);
+			view.findViewById(R.id.play).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					plugin.playRecording(getActivity(), recording);
+				}
+			});
+			view.findViewById(R.id.options).setVisibility(View.GONE);
 			view.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
 					getMyApplication().getSettings().setMapLocationToShow(recording.getLatitude(), recording.getLongitude(), 15, 
 							new PointDescription(PointDescription.POINT_TYPE_NOTE, 
-							!Algorithms.isEmpty(recording.getName())? recording.getName() : recording.getDescription(getActivity())), true,
+							(recording.getName() != null) ? recording.getName() : recording.getDescription(getActivity())), true,
 							recording); //$NON-NLS-1$
 					MapActivity.launchMapActivityMoveToTop(getActivity());
 				}
@@ -113,29 +120,28 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 
 	public static void getNoteView(final AudioVideoNotesPlugin.Recording recording, View view,
 								   final Context ctx, final AudioVideoNotesPlugin plugin) {
-		if (recording.getName() != null){
-			((TextView) view.findViewById(R.id.name)).setText(recording.getName());
-			((TextView) view.findViewById(R.id.descr)).setText(recording.getDescription(ctx));
-		} else {
-			((TextView) view.findViewById(R.id.name)).setText(recording.getDescription(ctx));
-			view.findViewById(R.id.descr).setVisibility(View.GONE);
+		String name = recording.getName();
+		TextView nameText = ((TextView) view.findViewById(R.id.name));
+		if (name != null) {
+			nameText.setText(name);
+		} else if (recording.isAudio()) {
+			nameText.setText(R.string.audio);
+		} else if (recording.isVideo()) {
+			nameText.setText(R.string.video);
+		} else if (recording.isPhoto()) {
+			nameText.setText(R.string.photo);
 		}
+		((TextView) view.findViewById(R.id.descr)).setText(recording.getDescription(ctx));
 
 		ImageView icon = (ImageView) view.findViewById(R.id.icon);
-		if (recording.isAudio()){
+		if (recording.isAudio()) {
 			icon.setImageResource(R.drawable.ic_type_audio);
-		} else if (recording.isVideo()){
+		} else if (recording.isVideo()) {
 			icon.setImageResource(R.drawable.ic_type_video);
 		} else {
 			icon.setImageResource(R.drawable.ic_type_img);
 		}
 
-		view.findViewById(R.id.play).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				plugin.playRecording(ctx, recording);
-			}
-		});
 	}
 
 }
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
index bf5271c561..6a083907f3 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
@@ -28,6 +28,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import android.support.v4.app.ListFragment;
+import android.widget.Toast;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -89,27 +90,8 @@ public class NotesFragment extends ListFragment {
 			}
 
 			final AudioVideoNotesPlugin.Recording recording = getItem(position);
-			String name = recording.getName();
-			TextView nameText = ((TextView) row.findViewById(R.id.name));
-			if (name != null) {
-				nameText.setText(name);
-			} else if (recording.isAudio()) {
-				nameText.setText(R.string.audio);
-			} else if (recording.isVideo()) {
-				nameText.setText(R.string.video);
-			} else if (recording.isPhoto()) {
-				nameText.setText(R.string.photo);
-			}
-			((TextView) row.findViewById(R.id.descr)).setText(recording.getDescription(getActivity()));
-
-			ImageView icon = (ImageView) row.findViewById(R.id.icon);
-			if (recording.isAudio()) {
-				icon.setImageResource(R.drawable.ic_type_audio);
-			} else if (recording.isVideo()) {
-				icon.setImageResource(R.drawable.ic_type_video);
-			} else {
-				icon.setImageResource(R.drawable.ic_type_img);
-			}
+			DashAudioVideoNotesFragment.getNoteView(recording, row, getActivity(), plugin);
+			row.findViewById(R.id.play).setVisibility(View.GONE);
 			ImageButton options = (ImageButton) row.findViewById(R.id.options);
 			options.setOnClickListener(new View.OnClickListener() {
 				@Override
@@ -173,15 +155,15 @@ public class NotesFragment extends ListFragment {
 			public boolean onMenuItemClick(MenuItem item) {
 				Intent sharingIntent = new Intent(Intent.ACTION_SEND);
 				if (recording.isPhoto()) {
-					Uri screenshotUri = Uri.parse(recording.file.getAbsolutePath());
+					Uri screenshotUri = Uri.parse(recording.getFile().getAbsolutePath());
 					sharingIntent.setType("image/*");
 					sharingIntent.putExtra(Intent.EXTRA_STREAM, screenshotUri);
 				} else if (recording.isAudio()) {
-					Uri audioUri = Uri.parse(recording.file.getAbsolutePath());
+					Uri audioUri = Uri.parse(recording.getFile().getAbsolutePath());
 					sharingIntent.setType("audio/*");
 					sharingIntent.putExtra(Intent.EXTRA_STREAM, audioUri);
 				} else if (recording.isVideo()) {
-					Uri videoUri = Uri.parse(recording.file.getAbsolutePath());
+					Uri videoUri = Uri.parse(recording.getFile().getAbsolutePath());
 					sharingIntent.setType("video/*");
 					sharingIntent.putExtra(Intent.EXTRA_STREAM, videoUri);
 				}
@@ -229,12 +211,23 @@ public class NotesFragment extends ListFragment {
 				getListView(), false);
 		final EditText editText = (EditText) v.findViewById(R.id.name);
 		builder.setView(v);
-		editText.setText(recording.getName());
+		String fileName = recording.getName();
+		int extInd = recording.getName().lastIndexOf(".");
+		final String extension;
+		if (extInd >= 0){
+			extension = fileName.substring(extInd, fileName.length());
+		} else {
+			extension = "";
+		}
+
+		editText.setText(recording.getName().substring(0, extInd));
 		builder.setNegativeButton(R.string.default_buttons_cancel, null);
 		builder.setPositiveButton(R.string.default_buttons_apply, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
-				recording.setName(editText.getText().toString());
+				if(!recording.setName(editText.getText().toString() + extension)) {
+					Toast.makeText(getActivity(),R.string.rename_failed,Toast.LENGTH_SHORT).show();
+				}
 				recording.setDescription();
 				listAdapter.notifyDataSetInvalidated();
 			}

From 9dda58934ce48288fbe3eaf29dfb03d4253b6e6b Mon Sep 17 00:00:00 2001
From: Bars107 <barsik107@gmail.com>
Date: Tue, 24 Feb 2015 18:53:17 +0200
Subject: [PATCH 5/6] Updated tracks card on dashboard. Added current track for
 tracks in my places.

---
 OsmAnd/res/layout/available_gpx.xml           |  38 +++--
 OsmAnd/res/layout/dash_favorites_item.xml     |   2 +-
 OsmAnd/res/layout/dash_gpx_track_item.xml     | 152 +++++++++++-------
 OsmAnd/res/layout/dash_map_fragment.xml       |   2 +-
 OsmAnd/res/layout/favorites_list_item.xml     |   2 +-
 OsmAnd/res/layout/note.xml                    | 121 +++++++-------
 OsmAnd/res/values/colors.xml                  |   4 +-
 .../ActionBarPreferenceActivity.java          |   1 +
 .../plus/activities/AvailableGPXFragment.java |  92 ++++++-----
 .../plus/activities/FavoritesActivity.java    |  18 ++-
 .../audionotes/AudioVideoNotesPlugin.java     |   2 +-
 .../DashAudioVideoNotesFragment.java          |   2 +
 .../plus/dashboard/DashFavoritesFragment.java |   2 +
 .../plus/monitoring/DashTrackFragment.java    |  67 ++++++--
 14 files changed, 316 insertions(+), 189 deletions(-)

diff --git a/OsmAnd/res/layout/available_gpx.xml b/OsmAnd/res/layout/available_gpx.xml
index d45911e47b..0bb085b1fc 100644
--- a/OsmAnd/res/layout/available_gpx.xml
+++ b/OsmAnd/res/layout/available_gpx.xml
@@ -1,24 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
 			  android:layout_width="match_parent"
-			  android:layout_height="match_parent">
+			  android:layout_height="match_parent"
+			  android:orientation="vertical">
 
-	<LinearLayout android:id="@+id/current_track"
-				  android:orientation="vertical"
+	<LinearLayout
+		android:id="@+id/current_track"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="wrap_content"
+		android:background="?attr/card_bg"
+		android:orientation="vertical">
 
-		<include android:layout_height="wrap_content"
-				 android:layout_width="match_parent"
-				 layout="@layout/dash_gpx_track_item"/>
+		<include
+			layout="@layout/dash_gpx_track_item"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
 
-		<Button android:id="@+id/map_btn"
-				android:text="@string/back_to_map"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"/>
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:background="?attr/dashboard_divider"/>
 
-		</LinearLayout>
+		<Button
+			android:id="@+id/map_btn"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:background="?attr/expandable_list_item_background"
+			android:text="@string/back_to_map"/>
+
+	</LinearLayout>
 
 
 	<ExpandableListView
@@ -26,11 +36,11 @@
 		style="@style/OsmandListView"
 		android:layout_width="fill_parent"
 		android:layout_height="0dp"
-		android:background="?attr/expandable_list_background"
 		android:layout_marginLeft="0dp"
 		android:layout_marginRight="0dp"
 		android:layout_marginTop="0dp"
 		android:layout_weight="1"
+		android:background="?attr/expandable_list_background"
 		android:groupIndicator="@android:color/transparent"/>
 
 
diff --git a/OsmAnd/res/layout/dash_favorites_item.xml b/OsmAnd/res/layout/dash_favorites_item.xml
index 20eacc6ec6..62c9076754 100644
--- a/OsmAnd/res/layout/dash_favorites_item.xml
+++ b/OsmAnd/res/layout/dash_favorites_item.xml
@@ -77,7 +77,7 @@
 					android:layout_height="wrap_content"
 					android:layout_gravity="center_vertical"
 					android:layout_marginLeft="4dp"
-					android:textColor="@color/dashboard_descr_colol"
+					android:textColor="@color/icon_color_light"
 					android:textSize="@dimen/showAllButtonTextSize"/>
 			</LinearLayout>
 
diff --git a/OsmAnd/res/layout/dash_gpx_track_item.xml b/OsmAnd/res/layout/dash_gpx_track_item.xml
index 1adc373af9..9ac98dd620 100644
--- a/OsmAnd/res/layout/dash_gpx_track_item.xml
+++ b/OsmAnd/res/layout/dash_gpx_track_item.xml
@@ -1,73 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
+			  xmlns:tools="http://schemas.android.com/tools"
 			  android:layout_width="match_parent"
-			  android:layout_height="@dimen/dashListItemHeight">
-	<View android:layout_width="match_parent"
-		  android:background="?attr/dashboard_divider"
-		  android:layout_height="1dp"/>
-	<LinearLayout android:orientation="horizontal"
-				  android:layout_width="match_parent"
-				  android:layout_height="wrap_content">
-		<LinearLayout android:orientation="vertical"
-					  android:layout_width="0dp"
-					  android:layout_weight="1"
-					  android:layout_gravity="center_vertical"
-					  android:layout_marginLeft="@dimen/subHeaderMarginLeft"
-					  android:layout_marginRight="@dimen/showAllButtonMarginRight"
-					  android:layout_height="wrap_content">
-			<TextView android:id="@+id/name"
-					  android:textColor="?android:textColorPrimary"
-					  android:layout_width="wrap_content"
-					  android:layout_height="wrap_content"/>
-			<LinearLayout android:orientation="horizontal"
-						  android:layout_width="match_parent"
-						  android:layout_height="wrap_content">
-				<ImageView android:id="@+id/points_icon"
-						   android:src="@drawable/ic_small_point"
-						   android:layout_gravity="center_vertical"
-						   android:layout_width="wrap_content"
-						   android:layout_height="wrap_content"/>
-				<TextView android:id="@+id/points_count"
-						  android:textColor="@color/dashboard_descr_colol"
-						  android:layout_width="wrap_content"
-						  android:layout_height="wrap_content"/>
+			  android:layout_height="wrap_content"
+			  android:minHeight="@dimen/dashListItemHeight"
+			  android:orientation="vertical">
 
-				<ImageView android:id="@+id/distance_icon"
-						   android:src="@drawable/ic_small_distance"
-						   android:layout_marginLeft="@dimen/dashPluginMargin"
-						   android:layout_gravity="center_vertical"
-						   android:layout_width="wrap_content"
-						   android:layout_height="wrap_content"/>
-				<TextView android:id="@+id/distance"
-						  android:textColor="@color/dashboard_descr_colol"
-						  android:layout_width="wrap_content"
-						  android:layout_height="wrap_content"/>
+	<View
+		android:id="@+id/divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:background="?attr/dashboard_divider"/>
 
-				<ImageView android:id="@+id/time_icon"
-						   android:src="@drawable/ic_small_time"
-						   android:layout_gravity="center_vertical"
-						   android:layout_width="wrap_content"
-						   android:layout_height="wrap_content"/>
-				<TextView android:id="@+id/time"
-						  android:textColor="@color/dashboard_descr_colol"
-						  android:layout_width="wrap_content"
-						  android:layout_height="wrap_content"/>
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="@dimen/subHeaderMarginLeft"
+			android:layout_marginRight="@dimen/showAllButtonMarginRight"
+			android:layout_weight="1"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/name"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textColor="?android:textColorPrimary"
+				tools:text="@string/validate_gpx_upload_name_pwd"/>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal">
+
+				<ImageView
+					android:id="@+id/points_icon"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:src="@drawable/ic_small_point"/>
+
+				<TextView
+					android:id="@+id/points_count"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textColor="@color/icon_color_light"/>
+
+				<ImageView
+					android:id="@+id/distance_icon"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:layout_marginLeft="@dimen/dashPluginMargin"
+					android:src="@drawable/ic_small_distance"/>
+
+				<TextView
+					android:id="@+id/distance"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textColor="@color/icon_color_light"/>
+
+				<ImageView
+					android:id="@+id/time_icon"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:src="@drawable/ic_small_time"/>
+
+				<TextView
+					android:id="@+id/time"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textColor="@color/icon_color_light"/>
 			</LinearLayout>
 		</LinearLayout>
 
-		<ImageButton android:id="@+id/stop"
-				   android:visibility="gone"
-				   android:layout_gravity="center_vertical"
-				   android:background="?attr/dashboard_button"
-				   android:layout_width="wrap_content"
-				   android:layout_height="wrap_content"/>
+		<ImageButton
+			android:id="@+id/stop"
+			android:layout_width="@dimen/dashListItemHeight"
+			android:layout_height="@dimen/dashListItemHeight"
+			android:layout_gravity="center_vertical"
+			android:layout_marginRight="@dimen/favorites_icon_right_margin"
+			android:background="?attr/options_button_background"
+			android:src="@drawable/ic_action_rec_stop"
+			android:visibility="gone"
+			tools:visibility="visible"/>
 
-		<ImageButton android:id="@+id/show_on_map"
-				   android:layout_gravity="center_vertical"
-				   android:background="?attr/dashboard_button"
-				   android:layout_width="@dimen/dashListItemHeight"
-				   android:layout_height="@dimen/dashListItemHeight"/>
+		<ImageButton
+			android:id="@+id/show_on_map"
+			android:layout_width="@dimen/dashListItemHeight"
+			android:layout_height="@dimen/dashListItemHeight"
+			android:layout_gravity="center_vertical"
+			android:background="?attr/options_button_background"
+			android:src="@drawable/ic_action_gsave_dark"/>
 	</LinearLayout>
 
 
diff --git a/OsmAnd/res/layout/dash_map_fragment.xml b/OsmAnd/res/layout/dash_map_fragment.xml
index a8d0e524de..4f10bd82da 100644
--- a/OsmAnd/res/layout/dash_map_fragment.xml
+++ b/OsmAnd/res/layout/dash_map_fragment.xml
@@ -22,7 +22,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:maxLines="3"
-					android:textColor="@color/dashboard_descr_colol"
+					android:textColor="@color/icon_color_light"
 					android:text="@string/loading_data"
 					android:textSize="@dimen/dashProgressTextSize"/>
 		</LinearLayout>
diff --git a/OsmAnd/res/layout/favorites_list_item.xml b/OsmAnd/res/layout/favorites_list_item.xml
index 609391c1ae..69537c2b8a 100644
--- a/OsmAnd/res/layout/favorites_list_item.xml
+++ b/OsmAnd/res/layout/favorites_list_item.xml
@@ -84,7 +84,7 @@
 					android:layout_height="wrap_content"
 					android:layout_gravity="center_vertical"
 					android:layout_marginLeft="4dp"
-					android:textColor="@color/dashboard_descr_colol"
+					android:textColor="@color/icon_color_light"
 					android:textSize="@dimen/showAllButtonTextSize"/>
 			</LinearLayout>
 
diff --git a/OsmAnd/res/layout/note.xml b/OsmAnd/res/layout/note.xml
index c98c4fe83c..5898e02b07 100644
--- a/OsmAnd/res/layout/note.xml
+++ b/OsmAnd/res/layout/note.xml
@@ -5,72 +5,85 @@
 			  android:layout_height="wrap_content"
 			  android:background="?attr/expandable_list_item_background"
 			  android:minHeight="@dimen/list_item_height"
-			  android:orientation="horizontal"
+			  android:orientation="vertical"
 			  android:paddingLeft="@dimen/list_content_padding">
 
-	<CheckBox
-		android:id="@+id/check_local_index"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_vertical"
-		android:layout_marginRight="@dimen/local_index_check_right_margin"
-		android:focusable="false"
-		android:visibility="gone"/>
-
-	<ImageView
-		android:id="@+id/icon"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_vertical"
-		android:layout_marginRight="@dimen/favorites_icon_right_margin"
-		android:focusable="false"
-		android:src="@drawable/ic_sdcard"/>
+	<View
+		android:id="@+id/divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:visibility="gone"
+		android:background="?attr/dashboard_divider"/>
 
 	<LinearLayout
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1"
-		android:orientation="vertical">
-
-		<TextView
-			android:id="@+id/name"
-			style="@style/ListText.Small"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+		<CheckBox
+			android:id="@+id/check_local_index"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:maxLines="1"
-			android:ellipsize="end"
-			tools:text="@string/app_version"/>
+			android:layout_gravity="center_vertical"
+			android:layout_marginRight="@dimen/local_index_check_right_margin"
+			android:focusable="false"
+			android:visibility="gone"/>
 
-
-		<TextView
-			android:id="@+id/descr"
+		<ImageView
+			android:id="@+id/icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:gravity="center_vertical"
-			android:textSize="@dimen/download_descr_text_size"
-			android:maxLines="25"
-			tools:text="@string/app_mode_aircraft"/>
+			android:layout_gravity="center_vertical"
+			android:layout_marginRight="@dimen/favorites_icon_right_margin"
+			android:focusable="false"
+			android:src="@drawable/ic_sdcard"/>
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="1"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/name"
+				style="@style/ListText.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:maxLines="1"
+				android:ellipsize="end"
+				tools:text="@string/app_version"/>
 
 
-	</LinearLayout>
+			<TextView
+				android:id="@+id/descr"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical"
+				android:textSize="@dimen/download_descr_text_size"
+				android:maxLines="25"
+				tools:text="@string/app_mode_aircraft"/>
+
+
+		</LinearLayout>
+
+		<ImageButton
+			android:id="@+id/options"
+			android:layout_width="@dimen/list_item_height"
+			android:layout_height="@dimen/list_item_height"
+			android:layout_gravity="center_vertical"
+			android:background="?attr/options_button_background"
+			android:focusable="false"
+			android:src="?attr/list_settings_icon"/>
+
+		<ImageButton
+			android:id="@+id/play"
+			android:layout_width="@dimen/dashListItemHeight"
+			android:layout_height="@dimen/dashListItemHeight"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="@dimen/dashFavIconMargin"
+			android:background="?attr/dashboard_button"
+			android:src="@drawable/ic_play_light"/>
+		</LinearLayout>
 
-	<ImageButton
-		android:id="@+id/options"
-		android:layout_width="@dimen/list_item_height"
-		android:layout_height="@dimen/list_item_height"
-		android:layout_gravity="center_vertical"
-		android:background="?attr/options_button_background"
-		android:focusable="false"
-		android:src="?attr/list_settings_icon"/>
 
-	<ImageButton
-		android:id="@+id/play"
-		android:layout_width="@dimen/dashListItemHeight"
-		android:layout_height="@dimen/dashListItemHeight"
-		android:layout_gravity="center_vertical"
-		android:layout_marginLeft="@dimen/dashFavIconMargin"
-		android:background="?attr/dashboard_button"
-		android:src="@drawable/ic_play_light"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 26c1b12534..0136008297 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -20,7 +20,9 @@
     <color name="search_background_dark">#292f33</color>
 
 
-	<color name="dashboard_descr_colol">#727272</color>
+	<color name="icon_color_light">#727272</color>
+
+	<color name="dashboard_gpx_on_map">#448AFF</color>
 	<color name="dashboard_background">#eaeaea</color>
 	<color name="dashboard_divider_light">#F0F0F0</color>
 	<color name="dashboard_divider_dark">#3d474c</color>
diff --git a/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java b/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
index 0eb1a2eced..e9f0ca4b8a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
@@ -48,6 +48,7 @@ public abstract class ActionBarPreferenceActivity extends PreferenceActivity {
 		}
 		tb.setClickable(true);
 		Drawable back = getResources().getDrawable(R.drawable.abc_ic_ab_back_mtrl_am_alpha);
+		back.mutate();
 		back.setColorFilter(0xffffffff, PorterDuff.Mode.MULTIPLY);
 		tb.setNavigationIcon(back);
 		tb.setBackgroundColor(getResources().getColor(getResIdFromAttribute(this, R.attr.pstsTabBackground)));
diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index 6323fa1279..11092c71b2 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -37,7 +37,9 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.TypedArray;
+import android.graphics.PorterDuff;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -111,27 +113,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			asyncLoader = new LoadGpxTask();
 			asyncLoader.execute(getActivity());
 		}
-		OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
-		GpxSelectionHelper.SelectedGpxFile currentTrack = savingTrackHelper.getCurrentTrack();
-		View v = getView();
-		if (v == null){
-			return;
-		}
-		if (plugin != null && savingTrackHelper.getCurrentGpx() != null) {
 
+		updateCurrentTrack(getView());
 
-			v.findViewById(R.id.current_track).setVisibility(View.VISIBLE);
-			((TextView)v.findViewById(R.id.name)).setText(R.string.currently_recording_track);
-			String description = GpxUiHelper.getDescription(getMyApplication(), currentTrack.getGpxFile(), null, true);
-			int startindex = description.indexOf(">");
-			int endindex = description.indexOf("</font>");
-			String distnace = description.substring(startindex + 1, endindex);
-			((TextView)v.findViewById(R.id.distance)).setText(distnace);
-			v.findViewById(R.id.time_icon).setVisibility(View.GONE);
-		} else {
-			v.findViewById(R.id.current_track).setVisibility(View.GONE);
-		}
-		//TODO implement updating view of current track
 	}
 
 	@Override
@@ -142,6 +126,24 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 	}
 
+	private void updateCurrentTrack(View v){
+		if (v == null){
+			return;
+		}
+		OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
+
+		GpxSelectionHelper.SelectedGpxFile currentTrack = savingTrackHelper.getCurrentTrack();
+		if (plugin != null && savingTrackHelper.getCurrentGpx() != null) {
+			v.findViewById(R.id.current_track).setVisibility(View.VISIBLE);
+			String description = GpxUiHelper.getDescription(getMyApplication(), currentTrack.getGpxFile(), null, true);
+			int startindex = description.indexOf(">");
+			int endindex = description.indexOf("</font>");
+			String distance = description.substring(startindex + 1, endindex);
+			((TextView)v.findViewById(R.id.distance)).setText(distance);
+		} else {
+			v.findViewById(R.id.current_track).setVisibility(View.GONE);
+		}
+	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -150,6 +152,29 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		if(this.adapter != null) {
 			listView.setAdapter(this.adapter);
 		}
+
+		((TextView)v.findViewById(R.id.name)).setText(R.string.currently_recording_track);
+		v.findViewById(R.id.time_icon).setVisibility(View.GONE);
+
+		Drawable icon = getResources().getDrawable(R.drawable.ic_action_rec_stop);
+		icon.mutate();
+		boolean light = getMyApplication().getSettings().isLightContent();
+		if (light){
+			icon.setColorFilter(0xff727272, PorterDuff.Mode.MULTIPLY);
+		}
+		ImageButton stop = ((ImageButton)v.findViewById(R.id.stop));
+		stop.setImageDrawable(icon);
+		stop.setVisibility(View.VISIBLE);
+
+		icon = getResources().getDrawable(R.drawable.ic_action_gsave_dark);
+		icon.mutate();
+		if  (light) {
+			icon.setColorFilter(0xff727272, PorterDuff.Mode.MULTIPLY);
+		}
+		ImageButton save = ((ImageButton)v.findViewById(R.id.show_on_map));
+		v.findViewById(R.id.divider).setVisibility(View.GONE);
+		save.setImageDrawable(icon);
+		updateCurrentTrack(v);
 		return v;
 	}
 
@@ -225,7 +250,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			}
 		};
 		optionsMenuAdapter.item(R.string.show_gpx_route)
-				.icons(R.drawable.ic_action_map_marker_dark, R.drawable.ic_action_map_marker_dark).listen(listener).reg();
+				.icons(R.drawable.ic_show_on_map, R.drawable.ic_show_on_map).listen(listener).reg();
 		optionsMenuAdapter.item(R.string.local_index_mi_delete)
 				.icons(R.drawable.ic_action_delete_dark, R.drawable.ic_action_delete_dark).listen(listener).reg();
 		optionsMenuAdapter.item(R.string.local_index_mi_reload)
@@ -532,26 +557,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 	}
 
-	private void showContextMenu(final GpxInfo info) {
-		Builder builder = new AlertDialog.Builder(getActivity());
-		final ContextMenuAdapter adapter = new ContextMenuAdapter(getActivity());
-		basicFileOperation(info, adapter);
-
-		String[] values = adapter.getItemNames();
-		builder.setItems(values, new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				OnContextMenuClick clk = adapter.getClickAdapter(which);
-				if (clk != null) {
-					clk.onContextMenuClick(null, adapter.getElementId(which), which, false);
-				}
-			}
-
-		});
-		builder.show();
-	}
-
-
 	public class LoadGpxTask extends AsyncTask<Activity, GpxInfo, List<GpxInfo>> {
 
 		private List<GpxInfo> result;
@@ -915,8 +920,13 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		boolean light = getMyApplication().getSettings().isLightContent();
 		final PopupMenu optionsMenu = new PopupMenu(getActivity(), v);
 		DirectionsDialogs.setupPopUpMenuIcon(optionsMenu);
+		Drawable showIcon = getResources().getDrawable(R.drawable.ic_show_on_map);
+		if (light) {
+			showIcon.mutate();
+			showIcon.setColorFilter(getResources().getColor(R.color.icon_color_light), PorterDuff.Mode.MULTIPLY);
+		}
 		MenuItem item = optionsMenu.getMenu().add(R.string.show_gpx_route)
-				.setIcon(light ? R.drawable.ic_action_map_marker_light : R.drawable.ic_action_map_marker_dark);
+				.setIcon(showIcon);
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesActivity.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesActivity.java
index db2fe17f19..837d5169d4 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesActivity.java
@@ -38,10 +38,12 @@ public class FavoritesActivity extends TabActivity {
 //	private static final String FAVOURITES_INFO = "FAVOURITES_INFO";
 	private static final String TRACKS = "TRACKS";
 //	private static final String SELECTED_TRACK = "SELECTED_TRACK";
-//	public static int FAVORITES_TAB = 0;
-//	public static int GPX_TAB = 1;
-//	public static int SELECTED_GPX_TAB = 2;
-//	public static String TAB_PARAM = "TAB_PARAM";
+	public static int FAVORITES_TAB = 0;
+	public static int GPX_TAB = 1;
+	public static int SELECTED_GPX_TAB = 2;
+	public static int NOTES_TAB = 3;
+	public static int OSM_EDITS_TAB = 4;
+	public static String TAB_PARAM = "TAB_PARAM";
 	protected List<WeakReference<Fragment>> fragList = new ArrayList<WeakReference<Fragment>>();
 
 	@Override
@@ -78,10 +80,18 @@ public class FavoritesActivity extends TabActivity {
 		OsmandPlugin.addMyPlacesTabPlugins(this, mTabs, getIntent());
 		
 		Integer tab = settings.FAVORITES_TAB.get();
+		if (tab == NOTES_TAB) {
+			tab = mTabs.size() -1;
+		} else if (tab == OSM_EDITS_TAB) {
+			//TODO implement method of counting position for other plugins
+		}
 		
 		setViewPagerAdapter(mViewPager, mTabs);
 		mSlidingTabLayout.setViewPager(mViewPager);
 
+		if (tab > mTabs.size() - 1){
+			tab = 0;
+		}
 		mViewPager.setCurrentItem(tab);
 		updateSelectedTracks();
 		// setupHomeButton();
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index ce6f940b60..d2d1abaf01 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -947,7 +947,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		if (getAllRecordings().size() > 0) {
 			mTabs.add(favoritesActivity.getTabIndicator(R.string.notes, NotesFragment.class));
 			if (intent != null && "AUDIO".equals(intent.getStringExtra("TAB"))) {
-				app.getSettings().FAVORITES_TAB.set(mTabs.size() - 1);
+				app.getSettings().FAVORITES_TAB.set(FavoritesActivity.NOTES_TAB);
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
index 109d42cdee..47f1381a27 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
@@ -49,6 +49,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 				final Intent favorites = new Intent(activity, fa);
 				favorites.putExtra("TAB", "AUDIO");
 				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().FAVORITES_TAB.set(FavoritesActivity.NOTES_TAB);
 				activity.startActivity(favorites);
 			}
 		});
@@ -104,6 +105,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 				}
 			});
 			view.findViewById(R.id.options).setVisibility(View.GONE);
+			view.findViewById(R.id.divider).setVisibility(View.VISIBLE);
 			view.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
index 63dde7ac8b..557821611b 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
@@ -13,6 +13,7 @@ import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.OsmAndAppCustomization;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.R;
+import net.osmand.plus.activities.FavoritesActivity;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.dialogs.DirectionsDialogs;
@@ -56,6 +57,7 @@ public class DashFavoritesFragment extends DashLocationFragment implements Favou
 				OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
 				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
 				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().FAVORITES_TAB.set(FavoritesActivity.FAVORITES_TAB);
 				activity.startActivity(favorites);
 			}
 		});
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
index d29388e34b..223e00f192 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
@@ -4,15 +4,23 @@ import java.io.File;
 import java.util.List;
 
 import net.osmand.IndexConstants;
+import net.osmand.access.AccessibleToast;
 import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.OsmAndAppCustomization;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.activities.FavoritesActivity;
+import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dashboard.DashBaseFragment;
 import net.osmand.plus.helpers.FontCache;
 import net.osmand.plus.helpers.GpxUiHelper;
+
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.PorterDuff;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -21,6 +29,7 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 /**
  * Created by Denis
@@ -43,6 +52,7 @@ public class DashTrackFragment extends DashBaseFragment {
 				Activity activity = getActivity();
 				OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
 				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
+				getMyApplication().getSettings().FAVORITES_TAB.set(FavoritesActivity.GPX_TAB);
 				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
 				activity.startActivity(favorites);
 			}
@@ -62,7 +72,7 @@ public class DashTrackFragment extends DashBaseFragment {
 		final List<String> list = GpxUiHelper.getSortedGPXFilenames(dir);
 
 
-		if (list.size() == 0){
+		if (list.size() == 0) {
 			(mainView.findViewById(R.id.main_fav)).setVisibility(View.GONE);
 			return;
 		} else {
@@ -71,32 +81,69 @@ public class DashTrackFragment extends DashBaseFragment {
 
 		LinearLayout tracks = (LinearLayout) mainView.findViewById(R.id.items);
 		tracks.removeAllViews();
-		if (list.size() > 3){
-			while (list.size() != 3){
+		if (list.size() > 3) {
+			while (list.size() != 3) {
 				list.remove(3);
 			}
 		}
 
-		for (String filename : list){
+		for (String filename : list) {
 			final File f = new File(dir, filename);
-			GPXUtilities.GPXFile res = GPXUtilities.loadGPXFile(getMyApplication(), f);
+			final GPXUtilities.GPXFile res = GPXUtilities.loadGPXFile(getMyApplication(), f);
 			LayoutInflater inflater = getActivity().getLayoutInflater();
 			View view = inflater.inflate(R.layout.dash_gpx_track_item, null, false);
-			((TextView)view.findViewById(R.id.name)).setText(filename);
-			((TextView)view.findViewById(R.id.points_count)).
+			((TextView) view.findViewById(R.id.name)).setText(filename);
+			((TextView) view.findViewById(R.id.points_count)).
 					setText(res.points.size() + " " + getActivity().getString(R.string.points));
 			String description = GpxUiHelper.getDescription(getMyApplication(), res, f, true);
 			int startindex = description.indexOf(">");
 			int endindex = description.indexOf("</font>");
 			String distnace = description.substring(startindex + 1, endindex);
-			((TextView)view.findViewById(R.id.distance)).
+			((TextView) view.findViewById(R.id.distance)).
 					setText(distnace);
 			view.findViewById(R.id.time_icon).setVisibility(View.GONE);
+
+			boolean light = getMyApplication().getSettings().isLightContent();
+			Drawable icon = getResources().getDrawable(R.drawable.ic_show_on_map);
+			GpxSelectionHelper gpxSelectionHelper = getMyApplication().getSelectedGpxHelper();
+			boolean isShowingOnMap = gpxSelectionHelper.getSelectedFileByName(filename) != null;
+			//setting proper icon color
+			if (isShowingOnMap) {
+				icon.mutate();
+				if (light) {
+					icon.setColorFilter(getResources().getColor(R.color.dashboard_gpx_on_map), PorterDuff.Mode.MULTIPLY);
+				} else {
+					icon.setColorFilter(getResources().getColor(R.color.color_distance), PorterDuff.Mode.MULTIPLY);
+				}
+			} else if (light) {
+				icon.mutate();
+				icon.setColorFilter(getResources().getColor(R.color.icon_color_light), PorterDuff.Mode.MULTIPLY);
+
+			}
+			final ImageButton showOnMap = (ImageButton) view.findViewById(R.id.show_on_map);
+			showOnMap.setImageDrawable(icon);
+			showOnMap.setVisibility(View.VISIBLE);
 			//view.findViewById(R.id.distance_icon).setVisibility(View.GONE);
 			view.findViewById(R.id.stop).setVisibility(View.GONE);
-			((ImageButton)view.findViewById(R.id.show_on_map)).
-					setImageDrawable(getResources().getDrawable(R.drawable.ic_action_map));
+			view.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					showOnMap(res);
+				}
+			});
 			tracks.addView(view);
 		}
 	}
+
+	private void showOnMap(GPXUtilities.GPXFile file){
+		if (file.isEmpty()) {
+			AccessibleToast.makeText(getActivity(), R.string.gpx_file_is_empty, Toast.LENGTH_LONG).show();
+			return;
+		}
+
+		OsmandSettings settings = getMyApplication().getSettings();
+		settings.setMapLocationToShow(file.getLastPoint().lat, file.getLastPoint().lon, settings.getLastKnownMapZoom());
+		getMyApplication().getSelectedGpxHelper().setGpxFileToDisplay(file);
+		MapActivity.launchMapActivityMoveToTop(getActivity());
+	}
 }

From ae33cac5bdbcde2748a85bee4abb91e1022da6fd Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 25 Feb 2015 13:21:22 +0200
Subject: [PATCH 6/6] Updated current tracks

---
 .../plus/activities/AvailableGPXFragment.java | 117 ++++++++++++------
 .../plus/monitoring/DashTrackFragment.java    |  25 ++++
 .../monitoring/OsmandMonitoringPlugin.java    |  49 +++++---
 3 files changed, 135 insertions(+), 56 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index 11092c71b2..baad047575 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -20,6 +20,8 @@ import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper;
+import net.osmand.plus.NavigationService;
+import net.osmand.plus.OsmAndTaskManager;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
@@ -30,6 +32,7 @@ import net.osmand.plus.helpers.ScreenOrientationHelper;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.util.Algorithms;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -73,7 +76,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 
 	public static final int SEARCH_ID = -1;
-//	public static final int ACTION_ID = 0;
+	//	public static final int ACTION_ID = 0;
 //	protected static final int DELETE_ACTION_ID = 1;
 	private boolean selectionMode = false;
 	private List<GpxInfo> selectedItems = new ArrayList<GpxInfo>();
@@ -126,20 +129,21 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 	}
 
-	private void updateCurrentTrack(View v){
-		if (v == null){
+	private void updateCurrentTrack(View v) {
+		if (v == null) {
 			return;
 		}
-		OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
 
-		GpxSelectionHelper.SelectedGpxFile currentTrack = savingTrackHelper.getCurrentTrack();
-		if (plugin != null && savingTrackHelper.getCurrentGpx() != null) {
+		if (app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get()) {
+			GpxSelectionHelper.SelectedGpxFile currentTrack = savingTrackHelper.getCurrentTrack();
 			v.findViewById(R.id.current_track).setVisibility(View.VISIBLE);
 			String description = GpxUiHelper.getDescription(getMyApplication(), currentTrack.getGpxFile(), null, true);
 			int startindex = description.indexOf(">");
 			int endindex = description.indexOf("</font>");
 			String distance = description.substring(startindex + 1, endindex);
-			((TextView)v.findViewById(R.id.distance)).setText(distance);
+			String points = String.valueOf(currentTrack.getGpxFile().points.size());
+			((TextView) v.findViewById(R.id.points_count)).setText(points);
+			((TextView) v.findViewById(R.id.distance)).setText(distance);
 		} else {
 			v.findViewById(R.id.current_track).setVisibility(View.GONE);
 		}
@@ -148,34 +152,76 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.available_gpx, container, false);
-		listView =(ExpandableListView) v.findViewById(android.R.id.list);
-		if(this.adapter != null) {
+		listView = (ExpandableListView) v.findViewById(android.R.id.list);
+		if (this.adapter != null) {
 			listView.setAdapter(this.adapter);
 		}
 
-		((TextView)v.findViewById(R.id.name)).setText(R.string.currently_recording_track);
+		((TextView) v.findViewById(R.id.name)).setText(R.string.currently_recording_track);
 		v.findViewById(R.id.time_icon).setVisibility(View.GONE);
 
-		Drawable icon = getResources().getDrawable(R.drawable.ic_action_rec_stop);
+		createCurrentTrackView(v, getMyApplication());
+
+		v.findViewById(R.id.map_btn).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				MapActivity.launchMapActivityMoveToTop(getActivity());
+			}
+		});
+		return v;
+	}
+
+	public static void createCurrentTrackView(View v, final OsmandApplication app) {
+		Drawable icon = app.getResources().getDrawable(R.drawable.ic_action_rec_stop);
 		icon.mutate();
-		boolean light = getMyApplication().getSettings().isLightContent();
-		if (light){
+		boolean light = app.getSettings().isLightContent();
+		if (light) {
 			icon.setColorFilter(0xff727272, PorterDuff.Mode.MULTIPLY);
 		}
-		ImageButton stop = ((ImageButton)v.findViewById(R.id.stop));
+		ImageButton stop = ((ImageButton) v.findViewById(R.id.stop));
 		stop.setImageDrawable(icon);
+		stop.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Runnable run = new Runnable() {
+					@Override
+					public void run() {
+						final OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
+						plugin.stopRecording();
+					}
+				};
+				run.run();
+			}
+		});
 		stop.setVisibility(View.VISIBLE);
 
-		icon = getResources().getDrawable(R.drawable.ic_action_gsave_dark);
+		icon = app.getResources().getDrawable(R.drawable.ic_action_gsave_dark);
 		icon.mutate();
-		if  (light) {
+		if (light) {
 			icon.setColorFilter(0xff727272, PorterDuff.Mode.MULTIPLY);
 		}
-		ImageButton save = ((ImageButton)v.findViewById(R.id.show_on_map));
+		ImageButton save = ((ImageButton) v.findViewById(R.id.show_on_map));
+		save.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+
+			}
+		});
+		save.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Runnable run = new Runnable() {
+					@Override
+					public void run() {
+						final OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
+						plugin.saveCurrentTrack();
+					}
+				};
+				run.run();
+			}
+		});
 		v.findViewById(R.id.divider).setVisibility(View.GONE);
 		save.setImageDrawable(icon);
-		updateCurrentTrack(v);
-		return v;
 	}
 
 	@Override
@@ -210,7 +256,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			@Override
 			public boolean onMenuItemActionCollapse(MenuItem item) {
 				// Needed to hide intermediate progress bar after closing action mode
-				 new Handler().postDelayed(new Runnable() {
+				new Handler().postDelayed(new Runnable() {
 					public void run() {
 						hideProgressBar();
 					}
@@ -226,7 +272,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 
 
-
 		optionsMenuAdapter = new ContextMenuAdapter(getActivity());
 		OnContextMenuClick listener = new OnContextMenuClick() {
 			@Override
@@ -260,7 +305,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			final MenuItem item;
 			item = menu.add(0, optionsMenuAdapter.getElementId(j), j + 1, optionsMenuAdapter.getItemName(j));
 			MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-			if (ScreenOrientationHelper.isOrientationPortrait(getActivity())){
+			if (ScreenOrientationHelper.isOrientationPortrait(getActivity())) {
 				item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 					@Override
 					public boolean onMenuItemClick(MenuItem menuItem) {
@@ -302,12 +347,12 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	}
 
 	public void showProgressBar() {
-		((FavoritesActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(true);
+		((FavoritesActivity) getActivity()).setSupportProgressBarIndeterminateVisibility(true);
 	}
 
 	public void hideProgressBar() {
-		if (getActivity() != null){
-			((FavoritesActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(false);
+		if (getActivity() != null) {
+			((FavoritesActivity) getActivity()).setSupportProgressBarIndeterminateVisibility(false);
 		}
 	}
 
@@ -322,7 +367,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	private void enableSelectionMode(boolean selectionMode) {
 		this.selectionMode = selectionMode;
 		if (ScreenOrientationHelper.isOrientationPortrait(getActivity())) {
-			((FavoritesActivity)getActivity()).setToolbarVisibility(!selectionMode);
+			((FavoritesActivity) getActivity()).setToolbarVisibility(!selectionMode);
 		}
 	}
 
@@ -578,7 +623,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 		@Override
 		protected void onPreExecute() {
-			((ActionBarActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(true);
+			((ActionBarActivity) getActivity()).setSupportProgressBarIndeterminateVisibility(true);
 			listAdapter.clear();
 		}
 
@@ -605,10 +650,10 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		@Override
 		protected void onPostExecute(List<GpxInfo> result) {
 			this.result = result;
-			if(getActivity() != null) {
-				((ActionBarActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(false);
+			if (getActivity() != null) {
+				((ActionBarActivity) getActivity()).setSupportProgressBarIndeterminateVisibility(false);
 			}
-			if (listAdapter.getGroupCount() > 0){
+			if (listAdapter.getGroupCount() > 0) {
 				getExpandableListView().expandGroup(0);
 			}
 		}
@@ -946,7 +991,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		});
 
 		final OsmEditingPlugin osmEditingPlugin = OsmandPlugin.getEnabledPlugin(OsmEditingPlugin.class);
-		if (osmEditingPlugin != null && osmEditingPlugin.isActive()){
+		if (osmEditingPlugin != null && osmEditingPlugin.isActive()) {
 			item = optionsMenu.getMenu().add(R.string.export)
 					.setIcon(light ? R.drawable.ic_action_gup_light : R.drawable.ic_action_gup_dark);
 			item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@@ -1088,7 +1133,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 		@Override
 		protected void onPreExecute() {
-			((ActionBarActivity)getActivity()).setProgressBarIndeterminateVisibility(true);
+			((ActionBarActivity) getActivity()).setProgressBarIndeterminateVisibility(true);
 		}
 
 		@Override
@@ -1103,14 +1148,14 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 	}
 
-	private void loadGpxAsync(GpxInfo info, boolean isSelected){
+	private void loadGpxAsync(GpxInfo info, boolean isSelected) {
 		final boolean selected = isSelected;
 		new AsyncTask<GpxInfo, Void, Void>() {
 			GpxInfo info;
 
 			@Override
 			protected Void doInBackground(GpxInfo... params) {
-				if (params == null){
+				if (params == null) {
 					return null;
 				}
 				info = params[0];
@@ -1130,10 +1175,10 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 			@Override
 			protected void onPostExecute(Void result) {
-				if (getActivity() != null){
+				if (getActivity() != null) {
 					getActivity().setProgressBarIndeterminateVisibility(false);
 				}
-				if (info.gpx != null){
+				if (info.gpx != null) {
 					getMyApplication().getSelectedGpxHelper().selectGpxFile(info.gpx, selected, true);
 					listAdapter.notifyDataSetChanged();
 					selectedGpxHelper.runUiListeners();
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
index 223e00f192..d0dbb1f154 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
@@ -8,10 +8,13 @@ import net.osmand.access.AccessibleToast;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.OsmAndAppCustomization;
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.activities.AvailableGPXFragment;
 import net.osmand.plus.activities.FavoritesActivity;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.dashboard.DashBaseFragment;
 import net.osmand.plus.helpers.FontCache;
 import net.osmand.plus.helpers.GpxUiHelper;
@@ -87,6 +90,28 @@ public class DashTrackFragment extends DashBaseFragment {
 			}
 		}
 
+		OsmandApplication app = getMyApplication();
+		SavingTrackHelper savingTrackHelper = app.getSavingTrackHelper();
+		if (app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get()) {
+			list.remove(2);
+			LayoutInflater inflater = getActivity().getLayoutInflater();
+			View view = inflater.inflate(R.layout.dash_gpx_track_item, null, false);
+
+			AvailableGPXFragment.createCurrentTrackView(view, app);
+
+			GpxSelectionHelper.SelectedGpxFile currentTrack = savingTrackHelper.getCurrentTrack();
+			((TextView)view.findViewById(R.id.name)).setText(R.string.currently_recording_track);
+			String description = GpxUiHelper.getDescription(getMyApplication(), currentTrack.getGpxFile(), null, true);
+			int startindex = description.indexOf(">");
+			int endindex = description.indexOf("</font>");
+			String distance = description.substring(startindex + 1, endindex);
+			String points = String.valueOf(currentTrack.getGpxFile().points.size());
+
+			((TextView) view.findViewById(R.id.points_count)).setText(points);
+			((TextView)view.findViewById(R.id.distance)).setText(distance);
+			tracks.addView(view);
+		}
+
 		for (String filename : list) {
 			final File f = new File(dir, filename);
 			final GPXUtilities.GPXFile res = GPXUtilities.loadGPXFile(getMyApplication(), f);
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index dec854ac18..95e0297c77 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -10,6 +10,7 @@ import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
 import net.osmand.plus.NavigationService;
 import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.OsmAndTaskManager;
 import net.osmand.plus.OsmAndTaskManager.OsmAndTaskRunnable;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
@@ -256,29 +257,11 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 				int which = holder[0];
 				int item = items.get(which);
 				if(item == R.string.save_current_track){
-					app.getTaskManager().runInBackground(new OsmAndTaskRunnable<Void, Void, Void>() {
-						
-						@Override
-						protected Void doInBackground(Void... params) {
-							isSaving = true;
-							try {
-								SavingTrackHelper helper = app.getSavingTrackHelper();
-								helper.saveDataToGpx(app.getAppCustomization().getTracksDir());
-								helper.close();
-							} finally {
-								isSaving = false;
-							}
-							return null;
-						}
-
-					}, (Void) null);
+					saveCurrentTrack();
 				} else if(item == R.string.gpx_monitoring_start) {
 					startGPXMonitoring(map);
 				} else if(item == R.string.gpx_monitoring_stop) {
-					settings.SAVE_GLOBAL_TRACK_TO_GPX.set(false);
-					if (app.getNavigationService() != null) {
-						app.getNavigationService().stopIfNeeded(app, NavigationService.USED_BY_GPX);
-					}
+					stopRecording();
 				} else if(item == R.string.gpx_start_new_segment) {
 					app.getSavingTrackHelper().startNewSegment();
 				} else if(item == R.string.live_monitoring_stop) {
@@ -313,6 +296,32 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 		}
 	}
 
+	public void saveCurrentTrack() {
+		app.getTaskManager().runInBackground(new OsmAndTaskRunnable<Void, Void, Void>() {
+
+			@Override
+			protected Void doInBackground(Void... params) {
+				isSaving = true;
+				try {
+					SavingTrackHelper helper = app.getSavingTrackHelper();
+					helper.saveDataToGpx(app.getAppCustomization().getTracksDir());
+					helper.close();
+				} finally {
+					isSaving = false;
+				}
+				return null;
+			}
+
+		}, (Void) null);
+	}
+
+	public void stopRecording(){
+		settings.SAVE_GLOBAL_TRACK_TO_GPX.set(false);
+		if (app.getNavigationService() != null) {
+			app.getNavigationService().stopIfNeeded(app, NavigationService.USED_BY_GPX);
+		}
+	}
+
 	private void startGPXMonitoring(MapActivity map) {
 		app.getSavingTrackHelper().startNewSegment();
 		final ValueHolder<Integer> vs = new ValueHolder<Integer>();