From a36c2bf1dc41493695edf06f9bc84cfd857dcd5b Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Tue, 9 Apr 2019 17:27:45 +0300
Subject: [PATCH] fixing measurement tool textview formatting

---
 OsmAnd/res/layout/fragment_measurement_tool.xml           | 4 +++-
 .../plus/measurementtool/MeasurementToolFragment.java     | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index ec18d52894..a35a333b34 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -87,7 +87,7 @@
 
             <TextView
                 android:id="@+id/distance_to_center_text_view"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toEndOf="@id/measurement_points_text_view"
@@ -96,6 +96,8 @@
                 android:layout_toStartOf="@id/up_down_button"
                 android:textColor="@color/color_distance"
                 android:textSize="@dimen/default_list_text_size"
+                android:maxLines="1"
+                osmand:autoSizeTextType="uniform"
                 tools:text=" – 700 m"/>
 
             <TextView
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 88aaf4e729..9a3f236201 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -14,6 +14,7 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.widget.TextViewCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -21,6 +22,7 @@ import android.support.v7.widget.SwitchCompat;
 import android.support.v7.widget.helper.ItemTouchHelper;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -363,7 +365,11 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 			public void onMeasure(float distance, float bearing) {
 				String distStr = OsmAndFormatter.getFormattedDistance(distance, mapActivity.getMyApplication());
 				String azimuthStr = OsmAndFormatter.getFormattedAzimuth(bearing, getMyApplication());
-				distanceToCenterTv.setText(String.format(" – %s • %s", distStr, azimuthStr));
+				TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(
+					distanceToCenterTv, 14, 18, 2, TypedValue.COMPLEX_UNIT_SP
+				);
+				distanceToCenterTv.setText(String.format(" – %1$s • %2$s", distStr, azimuthStr));
+
 			}
 		});