Merge pull request #220 from yunikkk/routing_exit_numandroid-release-514

[android] Show exit num.

1 files changed, 43 insertions, 25 deletions

diff --git a/android/res/layout/layout_turn_and_street.xml b/android/res/layout/layout_turn_and_street.xml
index 4117e95c38..e18f2ee1ad 100644
--- a/android/res/layout/layout_turn_and_street.xml
+++ b/android/res/layout/layout_turn_and_street.xml
@@ -1,38 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    android:id="@+id/turns"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/panel_width"
-    android:layout_height="wrap_content"
-    android:layout_centerHorizontal="true"
-    android:padding="@dimen/padding_routing_turns">
+  android:id="@+id/turns"
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="@dimen/panel_width"
+  android:layout_height="wrap_content"
+  android:layout_centerHorizontal="true"
+  android:padding="@dimen/padding_routing_turns">
+
+  <FrameLayout
+    android:id="@+id/turn"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
 
-  <com.mapswithme.maps.widget.ArrowView
+    <com.mapswithme.maps.widget.ArrowView
       android:id="@+id/iv__turn"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      tools:src="@drawable/ic_slight_left_light"/>
+      tools:src="@drawable/ic_round"/>
 
-  <TextView
-      android:id="@+id/tv__turn_distance"
+    <TextView
+      android:id="@+id/tv__exit_num"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="@dimen/margin_base"
-      android:layout_toRightOf="@+id/iv__turn"
-      android:textAppearance="@style/MwmTextAppearance.Display1.Plus"
+      android:layout_gravity="center"
+      android:textAppearance="@style/MwmTextAppearance.Title"
       android:textColor="@color/routing_blue"
-      tools:text="300 m"/>
+      android:visibility="gone"
+      tools:text="2"
+      tools:visibility="visible"/>
+
+  </FrameLayout>
 
   <TextView
-      android:id="@+id/tv__next_street"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignLeft="@id/tv__turn_distance"
-      android:layout_below="@id/tv__turn_distance"
-      android:textAppearance="@style/MwmTextAppearance.Body2"
-      android:textSize="@dimen/text_size_title"
-      android:maxLines="2"
-      tools:text="Oxford str."
-      tools:visibility="visible"/>
+    android:id="@+id/tv__turn_distance"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/margin_base"
+    android:layout_toRightOf="@+id/turn"
+    android:textAppearance="@style/MwmTextAppearance.Display1.Plus"
+    android:textColor="@color/routing_blue"
+    tools:text="300 m"/>
+
+  <TextView
+    android:id="@+id/tv__next_street"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignLeft="@id/tv__turn_distance"
+    android:layout_below="@id/tv__turn_distance"
+    android:maxLines="2"
+    android:textAppearance="@style/MwmTextAppearance.Body2"
+    android:textSize="@dimen/text_size_title"
+    tools:text="Oxford str."
+    tools:visibility="visible"/>
 </RelativeLayout>
\ No newline at end of file