From 0dc09e1554463eaf3ee80bc4953e5d8f6391dfaa Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sat, 13 Feb 2016 15:47:38 +0300
Subject: [PATCH] Small markers widget UI fix

---
 OsmAnd/res/layout/map_hud_top.xml             | 23 ++++++++++---------
 .../views/mapwidgets/MapMarkersWidget.java    |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 1139a1e1d9..14dc1ee96f 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -257,7 +257,7 @@
                         android:layout_height="30dp"
                         android:src="@drawable/map_arrow_to_destination"/>
 
-                    <LinearLayout
+                    <RelativeLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -270,24 +270,25 @@
                             android:id="@+id/map_marker_dist_2nd"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textStyle="bold"
-                            android:textSize="@dimen/default_list_text_size_large"
+                            android:text="500 m"
                             android:textColor="@color/color_white"
-                            android:text="500 m"/>
+                            android:textSize="@dimen/default_list_text_size_large"
+                            android:textStyle="bold"/>
 
                         <TextView
                             android:id="@+id/map_marker_address_2nd"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/marker_top_2nd_line_color"
-                            android:maxLines="1"
-                            android:layout_marginTop="2dp"
+                            android:layout_alignBaseline="@+id/map_marker_dist_2nd"
+                            android:layout_toRightOf="@+id/map_marker_dist_2nd"
                             android:ellipsize="end"
-                            android:textStyle="bold"
-                            android:textSize="@dimen/default_desc_text_size"
-                            android:text=" - Dmitrievskaya st., 45"/>
+                            android:maxLines="1"
+                            android:text="  •  Dmitr"
+                            android:textColor="@color/marker_top_2nd_line_color"
+                            android:textSize="@dimen/default_list_text_size"
+                            android:textStyle="bold"/>
 
-                    </LinearLayout>
+                    </RelativeLayout>
 
                     <ImageButton
                         android:id="@+id/marker_btn_ok_2dn"
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
index 3b32d620cf..94b662084d 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidget.java
@@ -195,7 +195,7 @@ public class MapMarkersWidget {
 			descr = pd.getName();
 		}
 		if (!firstLine && !isLandscapeLayout()) {
-			descr = " — " + descr;
+			descr = "  •  " + descr;
 		}
 
 		addressText.setText(descr);