diff --git a/android/res/drawable-v21/menu_button_right.xml b/android/res/drawable-v21/menu_button_right.xml
deleted file mode 100644
index 200c32466f..0000000000
--- a/android/res/drawable-v21/menu_button_right.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- -
-
-
-
\ No newline at end of file
diff --git a/android/res/drawable/bottom_sheet_handle.xml b/android/res/drawable/bottom_sheet_handle.xml
new file mode 100644
index 0000000000..4018125665
--- /dev/null
+++ b/android/res/drawable/bottom_sheet_handle.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/android/res/drawable/ic_menu_close.xml b/android/res/drawable/ic_menu_close.xml
deleted file mode 100644
index 56f97bd469..0000000000
--- a/android/res/drawable/ic_menu_close.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
diff --git a/android/res/drawable/menu_button_right.xml b/android/res/drawable/menu_button_right.xml
deleted file mode 100644
index 7f6bd90201..0000000000
--- a/android/res/drawable/menu_button_right.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/android/res/layout-land/layout_nav.xml b/android/res/layout-land/layout_nav.xml
new file mode 100644
index 0000000000..7f1c6fbb89
--- /dev/null
+++ b/android/res/layout-land/layout_nav.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/res/layout-land/layout_nav_bottom_numbers.xml b/android/res/layout-land/layout_nav_bottom_numbers.xml
deleted file mode 100644
index 4865cf5f39..0000000000
--- a/android/res/layout-land/layout_nav_bottom_numbers.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/res/layout-land/layout_nav_search.xml b/android/res/layout-land/layout_nav_search.xml
index a5971a6efa..f42a08c569 100644
--- a/android/res/layout-land/layout_nav_search.xml
+++ b/android/res/layout-land/layout_nav_search.xml
@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="?navButtonsTheme"
- android:layout_marginBottom="@dimen/nav_menu_height"
+ android:layout_marginBottom="@dimen/nav_numbers_height"
android:padding="@dimen/nav_frame_padding"
android:layoutDirection="ltr"
tools:background="@color/bg_primary">
diff --git a/android/res/layout-land/map_navigation_buttons.xml b/android/res/layout-land/map_navigation_buttons.xml
index 187b5bdaf4..f0d5ccdc10 100644
--- a/android/res/layout-land/map_navigation_buttons.xml
+++ b/android/res/layout-land/map_navigation_buttons.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginBottom="@dimen/nav_menu_height"
+ android:layout_marginBottom="@dimen/menu_line_height"
android:layoutDirection="ltr"
android:padding="@dimen/nav_frame_padding"
android:theme="?navButtonsTheme">
diff --git a/android/res/layout/activity_map.xml b/android/res/layout/activity_map.xml
index e4bf79969f..249bab0cde 100644
--- a/android/res/layout/activity_map.xml
+++ b/android/res/layout/activity_map.xml
@@ -55,7 +55,6 @@
android:visibility="invisible"/>
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/layout/layout_nav.xml b/android/res/layout/layout_nav.xml
index 0e79aad621..5b28d2ec59 100644
--- a/android/res/layout/layout_nav.xml
+++ b/android/res/layout/layout_nav.xml
@@ -1,13 +1,38 @@
-
+ android:layout_height="match_parent">
-
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/android/res/layout/layout_nav_bottom.xml b/android/res/layout/layout_nav_bottom.xml
index fd93930ebe..2e08ad8aa7 100644
--- a/android/res/layout/layout_nav_bottom.xml
+++ b/android/res/layout/layout_nav_bottom.xml
@@ -1,105 +1,77 @@
-
-
-
-
-
-
-
-
+ android:clickable="true"
+ android:focusable="true">
+
+
+
+
+
+
-
-
-
-
+ android:src="@drawable/ic_voice_on" />
+ android:id="@+id/stop"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/nav_button_height"
+ android:layout_weight="0.4"
+ android:background="?redButtonBackground"
+ android:fontFamily="@string/robotoMedium"
+ android:minWidth="@dimen/start_button_width"
+ android:text="@string/current_location_unknown_stop_button"
+ android:textAppearance="@style/MwmTextAppearance.Button.Red"
+ tools:ignore="UnusedAttribute" />
diff --git a/android/res/layout/layout_nav_bottom_numbers.xml b/android/res/layout/layout_nav_bottom_numbers.xml
index 6c4474377a..5434b77e19 100644
--- a/android/res/layout/layout_nav_bottom_numbers.xml
+++ b/android/res/layout/layout_nav_bottom_numbers.xml
@@ -1,165 +1,149 @@
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+ android:lines="1"
+ android:textAppearance="@style/MwmTextAppearance.NavMenu.Time"
+ tools:text="999" />
-
-
+ android:lines="1"
+ android:textAppearance="@style/MwmTextAppearance.NavMenu.Time.Dimension"
+ tools:text="h" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:lines="1"
+ android:textAlignment="center"
+ android:textAppearance="@style/MwmTextAppearance.NavMenu.Time"
+ tools:text="99" />
+
-
-
+ android:lines="1"
+ android:textAppearance="@style/MwmTextAppearance.NavMenu.Time.Dimension"
+ tools:text="m" />
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/res/layout/menu.xml b/android/res/layout/menu.xml
index 36c42eac1a..b2d745e286 100644
--- a/android/res/layout/menu.xml
+++ b/android/res/layout/menu.xml
@@ -1,46 +1,30 @@
-
-
-
+
-
+
-
-
-
-
-
-
-
-
+
+
diff --git a/android/res/layout/menu_buttons_line.xml b/android/res/layout/menu_buttons_line.xml
index 8498017565..b26aec09c0 100644
--- a/android/res/layout/menu_buttons_line.xml
+++ b/android/res/layout/menu_buttons_line.xml
@@ -1,9 +1,10 @@
-
-
-
+
-
-
-
+
diff --git a/android/res/layout/menu_news_marker.xml b/android/res/layout/menu_news_marker.xml
deleted file mode 100644
index a9fadc1189..0000000000
--- a/android/res/layout/menu_news_marker.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/android/res/values-land/dimens.xml b/android/res/values-land/dimens.xml
index 60f80f4878..4cf2be24b3 100644
--- a/android/res/values-land/dimens.xml
+++ b/android/res/values-land/dimens.xml
@@ -7,10 +7,8 @@
88dp
- 36dp
48dp
80dp
- 16dp
16dp
24dp
diff --git a/android/res/values-sw720dp-land/dimens.xml b/android/res/values-sw720dp-land/dimens.xml
index 844dfc1f1f..6c9866c195 100644
--- a/android/res/values-sw720dp-land/dimens.xml
+++ b/android/res/values-sw720dp-land/dimens.xml
@@ -1,7 +1,6 @@
- 40dp
64dp
8dp
32dp
diff --git a/android/res/values-sw720dp/dimens.xml b/android/res/values-sw720dp/dimens.xml
index 595939a260..a33653442b 100644
--- a/android/res/values-sw720dp/dimens.xml
+++ b/android/res/values-sw720dp/dimens.xml
@@ -1,7 +1,6 @@
600dp
- 40dp
64dp
56dp
152dp
@@ -14,8 +13,6 @@
@dimen/margin_base
250dp
- 16dp
- 16dp
-6dp
diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml
index 1ad80c4e92..83c45dc37a 100644
--- a/android/res/values/colors.xml
+++ b/android/res/values/colors.xml
@@ -85,8 +85,6 @@
#CCFFFFFF
#CC2D3237
- #FFFFFFFF
- #FF2D3237
#197841
#14181C
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index 14768d362c..e5f4beebcc 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -124,20 +124,19 @@
6dp
64dp
32dp
- 48dp
- 64dp
8dp
90dp
130dp
- 4dp
+ 4sp
2dp
- 40dp
- 8dp
200dp
@dimen/primary_button_min_height
48dp
12dp
0dp
+ 54sp
+ 64dp
+ 360dp
@dimen/margin_eighth
28dp
diff --git a/android/res/values/font_sizes.xml b/android/res/values/font_sizes.xml
index 841fb0dc23..da918e06cb 100644
--- a/android/res/values/font_sizes.xml
+++ b/android/res/values/font_sizes.xml
@@ -58,6 +58,8 @@
12sp
24sp
20sp
+ 28sp
+ 16sp
8sp
2sp
diff --git a/android/res/values/styles-menu.xml b/android/res/values/styles-menu.xml
index 2512018dfc..7822007e1a 100644
--- a/android/res/values/styles-menu.xml
+++ b/android/res/values/styles-menu.xml
@@ -12,17 +12,6 @@
- ?iconTint
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml
index a0ce332a0e..7b13d7ff95 100644
--- a/android/res/values/themes-attrs.xml
+++ b/android/res/values/themes-attrs.xml
@@ -43,7 +43,6 @@
-
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index a934cfc62e..0c59926afc 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -71,7 +71,6 @@
- @drawable/circle_accent
- @color/bg_menu
- - @color/bg_menu_open
- @drawable/anim_myposition_pending
- @drawable/anim_spinner_pending
@@ -175,6 +174,8 @@
- @color/extended_green
- @color/bg_primary
- @style/PopupMenu
+
+ - @style/MwmWidget.BottomSheet
@@ -250,7 +251,6 @@
- @drawable/circle_accent_night
- @color/bg_menu_night
- - @color/bg_menu_open_night
- @drawable/anim_myposition_pending_night
- @drawable/anim_spinner_pending
@@ -345,5 +345,7 @@
- @color/white_lightest
- @color/white_secondary
- @style/PopupMenu.Dark
+
+ - @style/MwmWidget.BottomSheet
diff --git a/android/res/values/themes.xml b/android/res/values/themes.xml
index 548e9340a8..482183fabf 100644
--- a/android/res/values/themes.xml
+++ b/android/res/values/themes.xml
@@ -144,14 +144,6 @@
-
-
-
-