From 2ff9954942fb1c5908c46a897bd83ad09851cbed Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 20 Oct 2017 16:25:22 +0300
Subject: [PATCH] Fix build

---
 .../fragment_marker_menu_on_map.xml           |  2 +-
 .../layout/fragment_marker_menu_on_map.xml    |  2 +-
 ...ment_rename_marker_bottom_sheet_dialog.xml |  8 +++----
 .../res/layout/marker_menu_on_map_content.xml | 22 +++++++++----------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/res/layout-land/fragment_marker_menu_on_map.xml b/OsmAnd/res/layout-land/fragment_marker_menu_on_map.xml
index 3ca520dc96..6bce2a039d 100644
--- a/OsmAnd/res/layout-land/fragment_marker_menu_on_map.xml
+++ b/OsmAnd/res/layout-land/fragment_marker_menu_on_map.xml
@@ -22,7 +22,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="@dimen/measurement_tool_bottom_divider_margin_top"
+            android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
             android:background="?attr/dashboard_divider"/>
 
         <FrameLayout
diff --git a/OsmAnd/res/layout/fragment_marker_menu_on_map.xml b/OsmAnd/res/layout/fragment_marker_menu_on_map.xml
index ee99a47bc6..1ade1d6567 100644
--- a/OsmAnd/res/layout/fragment_marker_menu_on_map.xml
+++ b/OsmAnd/res/layout/fragment_marker_menu_on_map.xml
@@ -18,7 +18,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="@dimen/measurement_tool_bottom_divider_margin_top"
+            android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
             android:background="?attr/dashboard_divider"/>
 
         <FrameLayout
diff --git a/OsmAnd/res/layout/fragment_rename_marker_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_rename_marker_bottom_sheet_dialog.xml
index 8e91d69c52..96a7c2a0df 100644
--- a/OsmAnd/res/layout/fragment_rename_marker_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_rename_marker_bottom_sheet_dialog.xml
@@ -23,10 +23,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_title_height"
                 android:gravity="center_vertical"
-                android:paddingEnd="@dimen/bottom_sheet_content_padding"
-                android:paddingLeft="@dimen/bottom_sheet_content_padding"
-                android:paddingRight="@dimen/bottom_sheet_content_padding"
-                android:paddingStart="@dimen/bottom_sheet_content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingLeft="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding"
                 android:text="@string/enter_new_name"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 osmand:typeface="@string/font_roboto_medium"/>
diff --git a/OsmAnd/res/layout/marker_menu_on_map_content.xml b/OsmAnd/res/layout/marker_menu_on_map_content.xml
index fef10c9dbf..2a3f3e760a 100644
--- a/OsmAnd/res/layout/marker_menu_on_map_content.xml
+++ b/OsmAnd/res/layout/marker_menu_on_map_content.xml
@@ -16,9 +16,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
-            android:layout_marginLeft="@dimen/bottom_sheet_content_padding"
+            android:layout_marginLeft="@dimen/content_padding"
             android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
-            android:layout_marginStart="@dimen/bottom_sheet_content_padding"
+            android:layout_marginStart="@dimen/content_padding"
             tools:src="@drawable/ic_action_flag_dark"/>
 
         <LinearLayout
@@ -93,7 +93,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginBottom="@dimen/measurement_tool_bottom_divider_margin_bottom"
+        android:layout_marginBottom="@dimen/bottom_sheet_divider_margin_bottom"
         android:background="?attr/dashboard_divider"/>
 
     <LinearLayout
@@ -108,9 +108,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
-            android:layout_marginLeft="@dimen/bottom_sheet_content_padding"
+            android:layout_marginLeft="@dimen/content_padding"
             android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
-            android:layout_marginStart="@dimen/bottom_sheet_content_padding"
+            android:layout_marginStart="@dimen/content_padding"
             tools:src="@drawable/ic_action_edit_dark"/>
 
         <TextView
@@ -125,10 +125,10 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginBottom="@dimen/measurement_tool_bottom_divider_margin_bottom"
-        android:layout_marginLeft="@dimen/measurement_tool_bottom_divider_margin_start"
-        android:layout_marginStart="@dimen/measurement_tool_bottom_divider_margin_start"
-        android:layout_marginTop="@dimen/measurement_tool_bottom_divider_margin_top"
+        android:layout_marginBottom="@dimen/bottom_sheet_divider_margin_bottom"
+        android:layout_marginLeft="@dimen/bottom_sheet_divider_margin_start"
+        android:layout_marginStart="@dimen/bottom_sheet_divider_margin_start"
+        android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
         android:background="?attr/dashboard_divider"/>
 
     <LinearLayout
@@ -143,9 +143,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
-            android:layout_marginLeft="@dimen/bottom_sheet_content_padding"
+            android:layout_marginLeft="@dimen/content_padding"
             android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
-            android:layout_marginStart="@dimen/bottom_sheet_content_padding"
+            android:layout_marginStart="@dimen/content_padding"
             tools:src="@drawable/ic_action_delete_dark"/>
 
         <TextView