[android] Edit layouts.

6 files changed, 213 insertions, 56 deletions

diff --git a/android/res/layout-land/activity_map.xml b/android/res/layout-land/activity_map.xml
index ffe74cf59a..2b213cd90d 100644
--- a/android/res/layout-land/activity_map.xml
+++ b/android/res/layout-land/activity_map.xml
@@ -35,11 +35,12 @@
       android:background="@android:color/black"
       android:visibility="gone"/>
 
-  <include android:id="@+id/menu_frame"
-           layout="@layout/menu"
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content"
-           android:layout_alignParentBottom="true"/>
+  <include
+      android:id="@+id/menu_frame"
+      layout="@layout/menu"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"/>
 
   <com.mapswithme.maps.widget.placepage.PlacePageView
       android:id="@+id/info_box"
diff --git a/android/res/layout-land/layout_turn_instructions.xml b/android/res/layout-land/layout_turn_instructions.xml
new file mode 100644
index 0000000000..97b820d430
--- /dev/null
+++ b/android/res/layout-land/layout_turn_instructions.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:paddingTop="@dimen/margin_eighth">
+
+  <com.mapswithme.maps.widget.FlatProgressView
+      android:id="@+id/fp__route_progress"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:headRadius="2dp"
+      app:progressColor="#757575"
+      app:progressThickness="4dp"
+      app:secondaryProgressColor="@color/base_black_divider"
+      app:secondaryProgressThickness="2dp"/>
+
+  <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_marginBottom="@dimen/margin_base_plus"
+      android:layout_marginLeft="@dimen/margin_quarter"
+      android:layout_marginRight="@dimen/margin_base"
+      android:layout_marginTop="@dimen/margin_base_plus"
+      android:background="?attr/selectableItemBackgroundBorderless"
+      android:scaleType="center"
+      android:src="@drawable/ic_close_routing"/>
+
+  <com.mapswithme.maps.widget.ArrowView
+      android:id="@+id/iv__turn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="@dimen/margin_base"
+      android:layout_marginLeft="@dimen/margin_double_plus"
+      android:layout_marginTop="@dimen/margin_base"
+      android:layout_toRightOf="@id/btn__close"
+      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_marginLeft="@dimen/margin_base"
+      android:layout_toRightOf="@id/iv__turn"
+      android:textAppearance="@style/MwmTextAppearance.Display1.Plus"
+      android:textColor="@color/text_turn_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_alignParentRight="true"
+      android:layout_below="@id/tv__turn_distance"
+      android:textAppearance="@style/MwmTextAppearance.Body2"
+      android:textSize="@dimen/text_size_title"
+      tools:text="Oxford str."
+      tools:visibility="visible"/>
+
+  <TextView
+      android:id="@+id/tv__arrival_time"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignBottom="@id/tv__turn_distance"
+      android:layout_alignParentRight="true"
+      android:layout_marginRight="@dimen/margin_double"
+      android:gravity="center_vertical"
+      android:textAppearance="@style/MwmTextAppearance.Body2"
+      tools:text="1:00"/>
+
+  <TextView
+      android:id="@+id/tv__total_distance"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignBottom="@id/tv__arrival_time"
+      android:layout_marginRight="@dimen/margin_base"
+      android:layout_toLeftOf="@id/tv__arrival_time"
+      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="wrap_content"
+      android:layout_above="@id/tv__arrival_time"
+      android:layout_alignParentRight="true"
+      android:layout_marginRight="@dimen/margin_double"
+      android:gravity="center_vertical"
+      android:textAppearance="@style/MwmTextAppearance.Body2"
+      tools:text="1,5 min"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout-sw600dp/download_item_placeholder.xml b/android/res/layout-sw600dp/download_item_placeholder.xml
deleted file mode 100644
index 3178cc7ca8..0000000000
--- a/android/res/layout-sw600dp/download_item_placeholder.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<View xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/margin_base"
-      android:background="@color/downloader_gray_bg"/>
diff --git a/android/res/layout-sw600dp/fragment_downloader.xml b/android/res/layout-sw600dp/fragment_downloader.xml
deleted file mode 100644
index f93df85576..0000000000
--- a/android/res/layout-sw600dp/fragment_downloader.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              style="@style/MwmWidget.Floating"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
-              android:background="@android:color/white">
-
-  <android.support.v7.widget.Toolbar
-      android:id="@+id/toolbar"
-      style="@style/MwmWidget.ToolbarStyle"
-      android:layout_width="match_parent"
-      android:layout_height="?attr/actionBarSize"
-      android:gravity="center_vertical"
-      android:theme="@style/MwmWidget.ToolbarTheme">
-
-    <TextView
-        android:id="@+id/tv__update_all"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical|right"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:clickable="true"
-        android:gravity="center_vertical"
-        android:padding="@dimen/margin_half"
-        android:text="@string/downloader_update_all"
-        android:textAppearance="@style/MwmTextAppearance.Toolbar.Button"/>
-  </android.support.v7.widget.Toolbar>
-
-  <FrameLayout
-      style="@style/MwmWidget.FrameLayout.Elevation"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent">
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-  </FrameLayout>
-
-</LinearLayout>
diff --git a/android/res/layout-w416dp/layout_turn_instructions.xml b/android/res/layout-w416dp/layout_turn_instructions.xml
new file mode 100644
index 0000000000..28cec47729
--- /dev/null
+++ b/android/res/layout-w416dp/layout_turn_instructions.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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">
+
+  <LinearLayout
+      android:id="@+id/time_distance"
+      android:layout_width="match_parent"
+      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:layout_weight="0"
+        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="wrap_content"
+        android:layout_marginRight="@dimen/margin_base"
+        android:layout_weight="1"
+        android:gravity="center"
+        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="wrap_content"
+        android:layout_marginRight="@dimen/margin_base"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:textAppearance="@style/MwmTextAppearance.Body2"
+        tools:text="1,5 min"/>
+
+    <TextView
+        android:id="@+id/tv__arrival_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/margin_base_plus"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:textAppearance="@style/MwmTextAppearance.Body2"
+        tools:text="1:00"/>
+
+  </LinearLayout>
+
+  <RelativeLayout
+      android:id="@+id/turns"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/time_distance"
+      android:layout_centerHorizontal="true"
+      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"
+        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_marginLeft="@dimen/margin_base"
+        android:layout_toRightOf="@id/iv__turn"
+        android:textAppearance="@style/MwmTextAppearance.Display1.Plus"
+        android:textColor="@color/text_turn_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:textAppearance="@style/MwmTextAppearance.Body2"
+        android:textSize="@dimen/text_size_title"
+        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_below="@id/time_distance"
+      app:headRadius="2dp"
+      app:progressColor="#757575"
+      app:progressThickness="4dp"
+      app:secondaryProgressColor="@color/base_black_divider"
+      app:secondaryProgressThickness="2dp"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/layout_turn_instructions.xml b/android/res/layout/layout_turn_instructions.xml
index 1e338ee0da..527c4ab50b 100644
--- a/android/res/layout/layout_turn_instructions.xml
+++ b/android/res/layout/layout_turn_instructions.xml
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/margin_base"
         android:layout_weight="1"
-        android:gravity="center_vertical"
+        android:gravity="center"
         android:textAppearance="@style/MwmTextAppearance.Body2"
         tools:text="1.4 km"/>
 
@@ -41,7 +41,7 @@
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/margin_base"
         android:layout_weight="1"
-        android:gravity="center_vertical"
+        android:gravity="center"
         android:textAppearance="@style/MwmTextAppearance.Body2"
         tools:text="1,5 min"/>
 
@@ -51,7 +51,7 @@
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/margin_base_plus"
         android:layout_weight="1"
-        android:gravity="center_vertical"
+        android:gravity="center"
         android:textAppearance="@style/MwmTextAppearance.Body2"
         tools:text="1:00"/>
 
@@ -98,7 +98,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_below="@id/time_distance"
-      app:headRadius="0dp"
+      app:headRadius="2dp"
       app:progressColor="#757575"
       app:progressThickness="4dp"
       app:secondaryProgressColor="@color/base_black_divider"