From ac1168664694563d470739c428b4dbc49347da42 Mon Sep 17 00:00:00 2001
From: cepprice <super.cepprice@gmail.com>
Date: Tue, 2 Feb 2021 15:56:57 +0500
Subject: [PATCH 1/5] Fix #10540

---
 .../activities/FavoritesTreeFragment.java     | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 866503f477..06e71c1bfd 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -10,6 +10,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Html;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -606,29 +607,34 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 		}
 	}
 
-	private StringBuilder generateHtmlPrint(List<FavoriteGroup> groups) {
+	private String generateHtmlPrint(List<FavoriteGroup> groups) {
 		StringBuilder html = new StringBuilder();
 		html.append("<h1>My Favorites</h1>");
+
+		int MAX_AMOUNT_OF_POINTS = 100;
+		int addedPoints = 0;
 		for (FavoriteGroup group : groups) {
 			html.append("<h3>" + group.getDisplayName(app) + "</h3>");
 			for (FavouritePoint fp : group.getPoints()) {
-				String url = "geo:" + ((float) fp.getLatitude()) + "," + ((float) fp.getLongitude()) + "?m=" + fp.getName();
-				html.append("<p>" + fp.getDisplayName(app) + " - " + "<a href=\"" + url + "\">geo:"
-						+ ((float) fp.getLatitude()) + "," + ((float) fp.getLongitude()) + "</a><br>");
-				if (fp.isAddressSpecified()) {
-					html.append(": " + fp.getAddress());
-					html.append("<br>");
+				if (addedPoints >= MAX_AMOUNT_OF_POINTS) {
+					break;
 				}
-				if (!Algorithms.isEmpty(fp.getDescription())) {
-					html.append(": " + fp.getDescription());
-				}
-				html.append("</p>");
+
+				float lat = (float) fp.getLatitude();
+				float lon = (float) fp.getLongitude();
+				String url = "geo:" + lat + "," + lon + "?m=" + fp.getName();
+				html.append("<p>" + fp.getDisplayName(app) + " - <a href=\"" + url + "\">geo:"
+						+ lat + "," + lon + "</a><br></p>");
+				addedPoints++;
+			}
+			if (addedPoints >= MAX_AMOUNT_OF_POINTS) {
+				html.append("<p>...</p>");
+				break;
 			}
 		}
-		return html;
+		return html.toString();
 	}
 
-
 	private void shareFavourites() {
 		if (favouritesAdapter.isEmpty()) {
 			Toast.makeText(getActivity(), R.string.no_fav_to_save, Toast.LENGTH_LONG).show();
@@ -646,6 +652,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 
 			File src = null;
 			File dst = null;
+			Spanned descriptionOfPoints;
 
 			@Override
 			protected void onPreExecute() {
@@ -662,9 +669,15 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 
 			@Override
 			protected Void doInBackground(Void... params) {
+				List<FavoriteGroup> groups;
 				if (group != null) {
 					helper.saveFile(group.getPoints(), dst);
+					groups = new ArrayList<>();
+					groups.add(group);
+				} else {
+					groups = getMyApplication().getFavorites().getFavoriteGroups();
 				}
+				descriptionOfPoints = Html.fromHtml(generateHtmlPrint(groups));
 				return null;
 			}
 
@@ -680,19 +693,12 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 						Algorithms.fileCopy(src, dst);
 					}
 					final Intent sendIntent = new Intent();
-					sendIntent.setAction(Intent.ACTION_SEND);
-					List<FavoriteGroup> groups;
-					if (group != null) {
-						groups = new ArrayList<>();
-						groups.add(group);
-					} else {
-						groups = getMyApplication().getFavorites().getFavoriteGroups();
-					}
-					sendIntent.putExtra(Intent.EXTRA_TEXT, Html.fromHtml(generateHtmlPrint(groups).toString()));
-					sendIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.share_fav_subject));
-					sendIntent.putExtra(Intent.EXTRA_STREAM, AndroidUtils.getUriForFile(getMyApplication(), dst));
-					sendIntent.setType("text/plain");
-					sendIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+					sendIntent.setAction(Intent.ACTION_SEND)
+							.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.share_fav_subject))
+							.putExtra(Intent.EXTRA_TEXT, descriptionOfPoints)
+							.putExtra(Intent.EXTRA_STREAM, AndroidUtils.getUriForFile(getMyApplication(), dst))
+							.setType("text/plain")
+							.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 					startActivity(sendIntent);
 				} catch (IOException e) {
 					Toast.makeText(getActivity(), "Error sharing favorites: " + e.getMessage(), Toast.LENGTH_SHORT).show();

From bc63b01ad2bd682b399deeba371433022b04651b Mon Sep 17 00:00:00 2001
From: androiddevkotlin <64539346+androiddevkotlin@users.noreply.github.com>
Date: Tue, 2 Feb 2021 14:15:42 +0200
Subject: [PATCH 2/5] toggle hilshade fix

---
 OsmAnd/res/layout/center_button_container.xml |  2 +-
 OsmAnd/res/layout/custom_radio_buttons.xml    |  5 +++--
 OsmAnd/res/layout/left_button_container.xml   |  2 +-
 OsmAnd/res/layout/right_button_container.xml  |  2 +-
 OsmAnd/src/net/osmand/plus/UiUtilities.java   | 21 +++++++++++--------
 .../plus/myplaces/GPXItemPagerAdapter.java    |  6 +++++-
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/res/layout/center_button_container.xml b/OsmAnd/res/layout/center_button_container.xml
index 99858650dc..05fa83eae0 100644
--- a/OsmAnd/res/layout/center_button_container.xml
+++ b/OsmAnd/res/layout/center_button_container.xml
@@ -8,7 +8,7 @@
 	android:layout_weight="1">
 
 	<net.osmand.plus.widgets.TextViewEx
-		android:id="@+id/tab_title"
+		android:id="@+id/center_button"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:background="?attr/selectableItemBackground"
diff --git a/OsmAnd/res/layout/custom_radio_buttons.xml b/OsmAnd/res/layout/custom_radio_buttons.xml
index 2ea2775d62..6ad61aa700 100644
--- a/OsmAnd/res/layout/custom_radio_buttons.xml
+++ b/OsmAnd/res/layout/custom_radio_buttons.xml
@@ -3,12 +3,12 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/custom_radio_buttons"
 	android:layout_width="match_parent"
-	android:minHeight="@dimen/dialog_button_height"
 	android:layout_height="wrap_content"
 	android:layout_marginStart="@dimen/content_padding"
 	android:layout_marginEnd="@dimen/content_padding"
 	android:background="?attr/btn_bg_border_inactive"
 	android:baselineAligned="false"
+	android:minHeight="@dimen/dialog_button_height"
 	android:orientation="horizontal"
 	tools:showIn="@layout/fragment_route_between_points_bottom_sheet_dialog">
 
@@ -22,7 +22,8 @@
 		layout="@layout/center_button_container"
 		android:layout_width="0dp"
 		android:layout_height="match_parent"
-		android:layout_weight="1" />
+		android:layout_weight="1"
+		android:visibility="gone" />
 
 	<include
 		layout="@layout/right_button_container"
diff --git a/OsmAnd/res/layout/left_button_container.xml b/OsmAnd/res/layout/left_button_container.xml
index 3370e554aa..c30305819c 100644
--- a/OsmAnd/res/layout/left_button_container.xml
+++ b/OsmAnd/res/layout/left_button_container.xml
@@ -8,7 +8,7 @@
 	android:layout_weight="1">
 
 	<net.osmand.plus.widgets.TextViewEx
-		android:id="@+id/tab_title"
+		android:id="@+id/left_button"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:background="?attr/selectableItemBackground"
diff --git a/OsmAnd/res/layout/right_button_container.xml b/OsmAnd/res/layout/right_button_container.xml
index ab24bdfcc9..98a99f991a 100644
--- a/OsmAnd/res/layout/right_button_container.xml
+++ b/OsmAnd/res/layout/right_button_container.xml
@@ -8,7 +8,7 @@
 	android:layout_weight="1">
 
 	<net.osmand.plus.widgets.TextViewEx
-		android:id="@+id/tab_title"
+		android:id="@+id/right_button"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:background="?attr/selectableItemBackground"
diff --git a/OsmAnd/src/net/osmand/plus/UiUtilities.java b/OsmAnd/src/net/osmand/plus/UiUtilities.java
index 5e5dc0db1e..aaa9d01f8b 100644
--- a/OsmAnd/src/net/osmand/plus/UiUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/UiUtilities.java
@@ -51,6 +51,7 @@ import net.osmand.AndroidUtils;
 import net.osmand.Location;
 import net.osmand.PlatformUtil;
 import net.osmand.data.LatLon;
+import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.views.DirectionDrawable;
 import net.osmand.plus.widgets.TextViewEx;
@@ -468,8 +469,8 @@ public class UiUtilities {
 			} else {
 				background.setCornerRadii(new float[]{radius, radius, 0, 0, 0, 0, radius, radius});
 			}
-			TextView startButtonText = startButtonContainer.findViewById(R.id.tab_title);
-			TextView endButtonText = endButtonContainer.findViewById(R.id.tab_title);
+			TextView startButtonText = startButtonContainer.findViewById(R.id.left_button);
+			TextView endButtonText = endButtonContainer.findViewById(R.id.right_button);
 
 			endButtonContainer.setBackgroundColor(Color.TRANSPARENT);
 			endButtonText.setTextColor(activeColor);
@@ -477,23 +478,25 @@ public class UiUtilities {
 			startButtonText.setTextColor(textColor);
 
 			if (centerButtonContainer != null) {
-				TextView centerButtonText = centerButtonContainer.findViewById(R.id.tab_title);
+				TextView centerButtonText = centerButtonContainer.findViewById(R.id.center_button);
 				centerButtonText.setTextColor(activeColor);
 				centerButtonContainer.setBackgroundColor(Color.TRANSPARENT);
 			}
 		} else if (buttonType == CustomRadioButtonType.CENTER) {
 			background.setCornerRadii(new float[] {0, 0, 0, 0, 0, 0, 0, 0});
 			centerButtonContainer.setBackgroundDrawable(background);
-			TextView centerButtonText = centerButtonContainer.findViewById(R.id.tab_title);
+			AndroidUiHelper.updateVisibility(centerButtonContainer, true);
+
+			TextView centerButtonText = centerButtonContainer.findViewById(R.id.center_button);
 			centerButtonText.setTextColor(textColor);
 
 			if (endButtonContainer != null) {
-				TextView endButtonText = endButtonContainer.findViewById(R.id.tab_title);
+				TextView endButtonText = endButtonContainer.findViewById(R.id.right_button);
 				endButtonText.setTextColor(activeColor);
 				endButtonContainer.setBackgroundColor(Color.TRANSPARENT);
 			}
 			if (startButtonContainer != null) {
-				TextView startButtonText = startButtonContainer.findViewById(R.id.tab_title);
+				TextView startButtonText = startButtonContainer.findViewById(R.id.left_button);
 				startButtonText.setTextColor(activeColor);
 				startButtonContainer.setBackgroundColor(Color.TRANSPARENT);
 			}
@@ -503,8 +506,8 @@ public class UiUtilities {
 			} else {
 				background.setCornerRadii(new float[]{0, 0, radius, radius, radius, radius, 0, 0});
 			}
-			TextView startButtonText = startButtonContainer.findViewById(R.id.tab_title);
-			TextView endButtonText = endButtonContainer.findViewById(R.id.tab_title);
+			TextView startButtonText = startButtonContainer.findViewById(R.id.left_button);
+			TextView endButtonText = endButtonContainer.findViewById(R.id.right_button);
 
 			endButtonContainer.setBackgroundDrawable(background);
 			endButtonText.setTextColor(textColor);
@@ -512,7 +515,7 @@ public class UiUtilities {
 			startButtonText.setTextColor(activeColor);
 
 			if (centerButtonContainer != null) {
-				TextView centerButtonText = centerButtonContainer.findViewById(R.id.tab_title);
+				TextView centerButtonText = centerButtonContainer.findViewById(R.id.center_button);
 				centerButtonText.setTextColor(activeColor);
 				centerButtonContainer.setBackgroundColor(Color.TRANSPARENT);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/GPXItemPagerAdapter.java b/OsmAnd/src/net/osmand/plus/myplaces/GPXItemPagerAdapter.java
index 0b167e4c97..4aad0a0951 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/GPXItemPagerAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/GPXItemPagerAdapter.java
@@ -573,8 +573,12 @@ public class GPXItemPagerAdapter extends PagerAdapter implements CustomTabProvid
 		} else {
 			layoutId = tripleTabsLayoutIds[position];
 		}
-		View tab = LayoutInflater.from(parent.getContext()).inflate(layoutId, parent, false);
+		ViewGroup tab = (ViewGroup) UiUtilities.getInflater(parent.getContext(), nightMode).inflate(layoutId, parent, false);
 		tab.setTag(tabTypes[position].name());
+		TextView title = (TextView) tab.getChildAt(0);
+		if (title != null) {
+			title.setText(getPageTitle(position));
+		}
 		return tab;
 	}
 

From 9c08af0ecb4b4e59bb36de9a60b0a7d906b743ca Mon Sep 17 00:00:00 2001
From: Skalii <skaliy.d@gmail.com>
Date: Tue, 2 Feb 2021 14:55:41 +0200
Subject: [PATCH 3/5] fix speed unit setting for "min/km" to show seconds
 instead of fractional minutes

---
 OsmAnd/src/net/osmand/plus/OsmAndFormatter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
index 11267b0286..6a52fe9804 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
@@ -344,8 +344,8 @@ public class OsmAndFormatter {
 			if (minperkm >= 10) {
 				return ((int) Math.round(minperkm)) + " " + mc.toShortString(ctx);
 			} else {
-				int mph10 = (int) Math.round(minperkm * 10f);
-				return (mph10 / 10f) + " " + mc.toShortString(ctx);
+				int seconds = Math.round(minperkm * 60);
+				return Algorithms.formatDuration(seconds, false) + " " + mc.toShortString(ctx);
 			}
 		} else if (mc == SpeedConstants.MINUTES_PER_MILE) {
 			if (metersperseconds < 0.111111111) {

From 31d31f10235ea674cccdb8a5ecf1aea76a7af1ce Mon Sep 17 00:00:00 2001
From: cepprice <super.cepprice@gmail.com>
Date: Tue, 2 Feb 2021 18:41:11 +0500
Subject: [PATCH 4/5] Small edit

---
 .../activities/FavoritesTreeFragment.java     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 06e71c1bfd..823cb4b740 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -89,6 +89,8 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 	public static final int IMPORT_FAVOURITES_ID = 7;
 	public static final String GROUP_EXPANDED_POSTFIX = "_group_expanded";
 
+	private static final int MAX_POINTS_IN_DESCRIPTION = 100;
+
 	private FavouritesAdapter favouritesAdapter;
 	private FavouritesDbHelper helper;
 
@@ -611,23 +613,28 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 		StringBuilder html = new StringBuilder();
 		html.append("<h1>My Favorites</h1>");
 
-		int MAX_AMOUNT_OF_POINTS = 100;
 		int addedPoints = 0;
 		for (FavoriteGroup group : groups) {
-			html.append("<h3>" + group.getDisplayName(app) + "</h3>");
+			html.append("<h3>").append(group.getDisplayName(app)).append("</h3>");
 			for (FavouritePoint fp : group.getPoints()) {
-				if (addedPoints >= MAX_AMOUNT_OF_POINTS) {
+				if (addedPoints >= MAX_POINTS_IN_DESCRIPTION) {
 					break;
 				}
 
 				float lat = (float) fp.getLatitude();
 				float lon = (float) fp.getLongitude();
 				String url = "geo:" + lat + "," + lon + "?m=" + fp.getName();
-				html.append("<p>" + fp.getDisplayName(app) + " - <a href=\"" + url + "\">geo:"
-						+ lat + "," + lon + "</a><br></p>");
+				html.append("<p>")
+						.append(fp.getDisplayName(app))
+						.append(" - <a href=\"")
+						.append(url)
+						.append("\">geo:")
+						.append(lat).append(",").append(lon)
+						.append("</a><br></p>");
 				addedPoints++;
 			}
-			if (addedPoints >= MAX_AMOUNT_OF_POINTS) {
+
+			if (addedPoints >= MAX_POINTS_IN_DESCRIPTION) {
 				html.append("<p>...</p>");
 				break;
 			}

From e57404470dde5d2e7106f5dfaa59ad9f192e6258 Mon Sep 17 00:00:00 2001
From: nnngrach <nnngrach@gmail.com>
Date: Tue, 2 Feb 2021 18:40:12 +0300
Subject: [PATCH 5/5] add default profile name for unnamed or missing improted
 profiles.

---
 .../plus/settings/backend/backup/ProfileSettingsItem.java  | 2 +-
 .../plus/settings/fragments/DuplicatesSettingsAdapter.java | 7 ++++++-
 .../plus/settings/fragments/ExportItemsBottomSheet.java    | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/backup/ProfileSettingsItem.java b/OsmAnd/src/net/osmand/plus/settings/backend/backup/ProfileSettingsItem.java
index b0bfd5be61..88405fd010 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/backup/ProfileSettingsItem.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/backup/ProfileSettingsItem.java
@@ -124,7 +124,7 @@ public class ProfileSettingsItem extends OsmandSettingsItem {
 		if (Algorithms.isEmpty(modeBean.userProfileName)) {
 			ApplicationMode appMode = ApplicationMode.valueOfStringKey(modeBean.stringKey, null);
 			if (appMode != null) {
-				modeBean.userProfileName = app.getString(appMode.getNameKeyResource());
+				modeBean.userProfileName = appMode.toHumanString();
 			}
 		}
 		int number = 0;
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java
index 5d9e3af28a..078197da4f 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java
@@ -34,6 +34,7 @@ import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.util.List;
@@ -91,7 +92,11 @@ public class DuplicatesSettingsAdapter extends RecyclerView.Adapter<RecyclerView
 				String profileName = modeBean.userProfileName;
 				if (Algorithms.isEmpty(profileName)) {
 					ApplicationMode appMode = ApplicationMode.valueOfStringKey(modeBean.stringKey, null);
-					profileName = app.getString(appMode.getNameKeyResource());
+					if (appMode != null) {
+						profileName = appMode.toHumanString();
+					} else {
+						profileName = StringUtils.capitalize(modeBean.stringKey);
+					}
 				}
 				itemHolder.title.setText(profileName);
 				String routingProfile = "";
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java
index 3ba5f9574e..2eda2a64d7 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java
@@ -62,6 +62,7 @@ import net.osmand.util.Algorithms;
 import net.osmand.view.ThreeStateCheckbox;
 
 import org.apache.commons.logging.Log;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -279,7 +280,11 @@ public class ExportItemsBottomSheet extends MenuBottomSheetDialogFragment {
 			String profileName = modeBean.userProfileName;
 			if (Algorithms.isEmpty(profileName)) {
 				ApplicationMode appMode = ApplicationMode.valueOfStringKey(modeBean.stringKey, null);
-				profileName = appMode.toHumanString();
+				if (appMode != null) {
+					profileName = appMode.toHumanString();
+				} else {
+					profileName = StringUtils.capitalize(modeBean.stringKey);
+				}
 			}
 			builder.setTitle(profileName);