[android] New layout of routing panel.

13 files changed, 90 insertions, 66 deletions

diff --git a/android/res/layout/layout_turn_instructions.xml b/android/res/layout/layout_turn_instructions.xml
index c8835fec83..2b00726487 100644
--- a/android/res/layout/layout_turn_instructions.xml
+++ b/android/res/layout/layout_turn_instructions.xml
@@ -1,82 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
-  <RelativeLayout
+
+  <LinearLayout
+      android:id="@+id/time_distance"
       android:layout_width="match_parent"
-      android:layout_height="@dimen/height_routing_turns">
+      android:layout_height="@dimen/height_item_oneline"
+      android:gravity="center_vertical"
+      android:orientation="horizontal"
+      android:padding="@dimen/margin_quarter">
+
+    <ImageView
+        android:id="@+id/btn__close"
+        android:layout_width="@dimen/base_block_size"
+        android:layout_height="@dimen/base_block_size"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="@dimen/margin_base"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:scaleType="center"
+        android:src="@drawable/ic_close_routing"/>
+
+    <TextView
+        android:id="@+id/tv__total_distance"
+        android:layout_width="wrap_content"
+        android:layout_height="20dp"
+        android:layout_marginRight="@dimen/margin_base"
+        android:gravity="center_vertical"
+        android:textAppearance="@style/MwmTextAppearance.Body2"
+        tools:text="1.4 km"/>
+
     <TextView
         android:id="@+id/tv__total_time"
         android:layout_width="wrap_content"
-        android:layout_height="24dp"
-        android:layout_alignParentRight="true"
+        android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/margin_base"
-        android:layout_marginTop="@dimen/margin_half_plus"
-        android:fontFamily="@string/robotoMedium"
         android:gravity="center_vertical"
-        android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"
+        android:textAppearance="@style/MwmTextAppearance.Body2"
         tools:text="1,5 min"/>
 
     <TextView
-        android:id="@+id/tv__total_distance"
+        android:id="@+id/tv__left_time"
         android:layout_width="wrap_content"
-        android:layout_height="20dp"
-        android:layout_alignParentRight="true"
-        android:layout_below="@id/tv__total_time"
-        android:layout_marginLeft="@dimen/margin_base"
+        android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/margin_base"
-        android:fontFamily="@string/robotoMedium"
         android:gravity="center_vertical"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        tools:text="1.4 km"/>
+        android:textAppearance="@style/MwmTextAppearance.Body2"
+        tools:text="1:00"/>
+
+  </LinearLayout>
+
+  <RelativeLayout
+      android:id="@+id/turns"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/time_distance"
+      android:padding="@dimen/margin_base">
 
     <com.mapswithme.maps.widget.ArrowView
         android:id="@+id/iv__turn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginBottom="@dimen/margin_quarter"
-        android:layout_marginLeft="@dimen/margin_base"
-        android:layout_toRightOf="@+id/btn__close"
+        android:layout_marginLeft="@dimen/margin_base_plus"
         tools:src="@drawable/ic_slight_compact"/>
 
     <TextView
         android:id="@+id/tv__turn_distance"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginBottom="@dimen/margin_quarter"
-        android:layout_marginLeft="@dimen/margin_half"
+        android:layout_marginLeft="@dimen/margin_base"
         android:layout_toRightOf="@id/iv__turn"
-        android:fontFamily="@string/robotoMedium"
-        android:textAppearance="@style/MwmTextAppearance.Title"
+        android:textAppearance="@style/MwmTextAppearance.Display1.Plus"
         android:textColor="@color/text_turn_blue"
         tools:text="300 m"/>
 
-    <ImageView
-        android:id="@+id/btn__close"
-        android:layout_width="@dimen/base_block_size"
-        android:layout_height="@dimen/base_block_size"
-        android:layout_centerVertical="true"
-        android:layout_margin="@dimen/margin_quarter"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:scaleType="center"
-        android:src="@drawable/ic_close_routing"/>
+    <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:visibility="gone"
+        tools:text="Oxford str."
+        tools:visibility="visible"/>
   </RelativeLayout>
 
   <com.mapswithme.maps.widget.FlatProgressView
       android:id="@+id/fp__route_progress"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_gravity="bottom"
+      android:layout_below="@id/time_distance"
       android:visibility="gone"
-      app:headColor="@color/base_light_blue"
-      app:headRadius="4dp"
-      app:progressColor="@color/base_light_blue"
-      app:progressThickness="4dp"
+      app:headRadius="0dp"
       app:progress="40"
+      app:progressColor="#757575"
+      app:progressThickness="4dp"
       tools:visibility="visible"/>
-</FrameLayout>
\ No newline at end of file
+
+  <View
+      android:layout_width="match_parent"
+      android:layout_height="2dp"
+      android:layout_gravity="bottom"
+      android:layout_marginBottom="1dp"
+      android:background="@color/base_black_divider"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/place_page_bookmark_details.xml b/android/res/layout/place_page_bookmark_details.xml
index 7119dddf7e..a60e0915ea 100644
--- a/android/res/layout/place_page_bookmark_details.xml
+++ b/android/res/layout/place_page_bookmark_details.xml
@@ -29,7 +29,7 @@
         android:hint="@string/name"
         android:inputType="textCapWords"
         android:singleLine="true"
-        android:textSize="@dimen/place_page_subtitle"/>
+        android:textSize="@dimen/text_size_body_1"/>
   </com.mapswithme.maps.widget.CustomTextInputLayout>
 
   <TextView
@@ -39,8 +39,7 @@
       android:layout_marginTop="@dimen/margin_base_plus"
       android:lineSpacingMultiplier="1.67"
       android:text="@string/set"
-      android:textColor="@color/text_place_page_subtitle"
-      android:textSize="@dimen/place_page_sub_subtitle"/>
+      android:textAppearance="@style/MwmTextAppearance.Caption"/>
 
   <RelativeLayout
       android:layout_width="match_parent"
@@ -58,7 +57,7 @@
         android:paddingRight="@dimen/margin_half"
         android:paddingTop="@dimen/margin_half"
         android:textColor="@color/text_place_page"
-        android:textSize="@dimen/place_page_subtitle"/>
+        android:textSize="@dimen/text_size_body_1"/>
 
     <View
         android:layout_width="match_parent"
diff --git a/android/res/layout/place_page_email.xml b/android/res/layout/place_page_email.xml
index c461ab093e..aff6d9feea 100644
--- a/android/res/layout/place_page_email.xml
+++ b/android/res/layout/place_page_email.xml
@@ -27,6 +27,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:textColor="@color/text_place_page_blue"
-      android:textSize="@dimen/place_page_subtitle"
+      android:textSize="@dimen/text_size_body_1"
       tools:text="email@maps.me"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/place_page_latlon.xml b/android/res/layout/place_page_latlon.xml
index e30223bf1e..ca9481f516 100644
--- a/android/res/layout/place_page_latlon.xml
+++ b/android/res/layout/place_page_latlon.xml
@@ -25,6 +25,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:textColor="@color/text_place_page"
-      android:textSize="@dimen/place_page_subtitle"
+      android:textSize="@dimen/text_size_body_1"
       tools:text="55.747, 37.616"/>
 </LinearLayout>
diff --git a/android/res/layout/place_page_operator.xml b/android/res/layout/place_page_operator.xml
index e40881708e..8b6b919522 100644
--- a/android/res/layout/place_page_operator.xml
+++ b/android/res/layout/place_page_operator.xml
@@ -27,6 +27,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:textColor="@color/text_place_page"
-      android:textSize="@dimen/place_page_subtitle"
+      android:textSize="@dimen/text_size_body_1"
       tools:text="Operator"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/place_page_phone.xml b/android/res/layout/place_page_phone.xml
index a2d8a3c447..a83db4b994 100644
--- a/android/res/layout/place_page_phone.xml
+++ b/android/res/layout/place_page_phone.xml
@@ -27,7 +27,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:textColor="@color/text_place_page_blue"
-      android:textSize="@dimen/place_page_subtitle"
+      android:textSize="@dimen/text_size_body_1"
       tools:text="+1 234 567-89-00"
   />
 
diff --git a/android/res/layout/place_page_placename.xml b/android/res/layout/place_page_placename.xml
index b1c1a83ff5..9bf7db8991 100644
--- a/android/res/layout/place_page_placename.xml
+++ b/android/res/layout/place_page_placename.xml
@@ -26,6 +26,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:textColor="@color/text_place_page"
-      android:textSize="@dimen/place_page_subtitle"
+      android:textSize="@dimen/text_size_body_1"
       tools:text="Sample place"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/place_page_preview_common.xml b/android/res/layout/place_page_preview_common.xml
index e297618e7b..590d2fffdb 100644
--- a/android/res/layout/place_page_preview_common.xml
+++ b/android/res/layout/place_page_preview_common.xml
@@ -22,7 +22,7 @@
         android:layout_below="@id/tv__title"
         android:layout_marginRight="@dimen/margin_base"
         android:textColor="@color/text_place_page_subtitle"
-        android:textSize="@dimen/place_page_subtitle"/>
+        android:textSize="@dimen/text_size_body_1"/>
 
     <TextView
         android:id="@+id/tv__opened_till"
@@ -31,7 +31,7 @@
         android:layout_below="@id/tv__subtitle"
         android:gravity="center_vertical"
         android:textColor="@color/text_place_page_subtitle"
-        android:textSize="@dimen/place_page_subtitle"
+        android:textSize="@dimen/text_size_body_1"
         android:visibility="gone"/>
 
     <RatingBar
@@ -55,7 +55,7 @@
         android:layout_toRightOf="@id/tv__subtitle"
         android:drawableLeft="@drawable/ic_high_mountain"
         android:textColor="@color/text_place_page_subtitle"
-        android:textSize="@dimen/place_page_subtitle"
+        android:textSize="@dimen/text_size_body_1"
         android:visibility="gone"/>
 
   </RelativeLayout>
@@ -66,7 +66,7 @@
       android:layout_height="wrap_content"
       android:gravity="right"
       android:textColor="@color/text_place_page"
-      android:textSize="@dimen/place_page_subtitle"/>
+      android:textSize="@dimen/text_size_body_1"/>
 
   <com.mapswithme.maps.widget.ArrowView
       android:id="@+id/av__direction"
diff --git a/android/res/layout/place_page_schedule.xml b/android/res/layout/place_page_schedule.xml
index 3160168cde..829558ecc0 100644
--- a/android/res/layout/place_page_schedule.xml
+++ b/android/res/layout/place_page_schedule.xml
@@ -24,5 +24,5 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:textColor="@color/text_place_page"
-      android:textSize="@dimen/place_page_subtitle"/>
+      android:textSize="@dimen/text_size_body_1"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/place_page_website.xml b/android/res/layout/place_page_website.xml
index fe14ba91a1..9aa73edb1a 100644
--- a/android/res/layout/place_page_website.xml
+++ b/android/res/layout/place_page_website.xml
@@ -27,6 +27,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:textColor="@color/text_place_page_blue"
-      android:textSize="@dimen/place_page_subtitle"
+      android:textSize="@dimen/text_size_body_1"
       tools:text="Sample website"/>
 </LinearLayout>
diff --git a/android/res/layout/place_page_wifi.xml b/android/res/layout/place_page_wifi.xml
index c1652baa6c..7b456f4b53 100644
--- a/android/res/layout/place_page_wifi.xml
+++ b/android/res/layout/place_page_wifi.xml
@@ -26,6 +26,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:textColor="@color/text_place_page"
-      android:textSize="@dimen/place_page_subtitle"
+      android:textSize="@dimen/text_size_body_1"
       tools:text="Wi-Fi"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/values/font_sizes.xml b/android/res/values/font_sizes.xml
index 253f491619..efd6857593 100644
--- a/android/res/values/font_sizes.xml
+++ b/android/res/values/font_sizes.xml
@@ -6,6 +6,7 @@
   <!-- we use slightly greater font sizes, then in default material styles -->
   <dimen name="text_size_display_3">64sp</dimen>
   <dimen name="text_size_display_2">48sp</dimen>
+  <dimen name="text_size_display_1_plus">40sp</dimen>
   <dimen name="text_size_display_1">36sp</dimen>
   <dimen name="text_size_headline">28sp</dimen>
   <dimen name="text_size_title">24sp</dimen>
@@ -31,13 +32,4 @@
 
   <!-- -->
 
-  <!-- TODO remove all that dimens -->
-  <dimen name="sp_x_1">5sp</dimen>
-  <dimen name="sp_x_2">10sp</dimen>
-  <dimen name="sp_x_3">15sp</dimen>
-  <dimen name="sp_x_4">20sp</dimen>
-  <dimen name="sp_x_5">25sp</dimen>
-  <dimen name="place_page_subtitle">16sp</dimen>
-  <dimen name="place_page_sub_subtitle">12sp</dimen>
-
 </resources>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 436b76f90a..fb377b6111 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -203,7 +203,7 @@
 
   <style name="MwmTextAppearance">
     <item name="android:textStyle">normal</item>
-    <item name="android:fontFamily">@string/robotoRegular</item>
+    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
   </style>
 
   <style name="MwmTextAppearance.Display3">
@@ -222,6 +222,10 @@
     <item name="android:textColor">@color/text_dark</item>
   </style>
 
+  <style name="MwmTextAppearance.Display1.Plus">
+    <item name="android:textSize">@dimen/text_size_display_1_plus</item>
+  </style>
+
   <style name="MwmTextAppearance.Headline">
     <item name="android:textSize">@dimen/text_size_headline</item>
     <item name="android:textColor">@color/text_dark</item>