From aed1c8ee42f038953de6779581f2f6b085ed9e1b Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Thu, 19 Oct 2017 17:41:57 +0300
Subject: [PATCH] Extract general stuff from portrait and landscape layouts

---
 .../fragment_marker_menu_on_map.xml           | 152 +----------------
 .../layout/fragment_marker_menu_on_map.xml    | 152 +----------------
 .../res/layout/marker_menu_on_map_content.xml | 160 ++++++++++++++++++
 3 files changed, 162 insertions(+), 302 deletions(-)
 create mode 100644 OsmAnd/res/layout/marker_menu_on_map_content.xml

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 e3ac0a91b1..3ca520dc96 100644
--- a/OsmAnd/res/layout-land/fragment_marker_menu_on_map.xml
+++ b/OsmAnd/res/layout-land/fragment_marker_menu_on_map.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_transparent">
@@ -13,156 +12,7 @@
         android:clickable="true"
         android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
-            android:gravity="center_vertical">
-
-            <ImageView
-                android:id="@+id/marker_icon"
-                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_marginRight="@dimen/bottom_sheet_icon_margin"
-                android:layout_marginStart="@dimen/bottom_sheet_content_padding"
-                tools:src="@drawable/ic_action_flag_dark"/>
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:orientation="vertical">
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:id="@+id/marker_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="@dimen/default_list_text_size"
-                    tools:text="Van Gogh Museum"/>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical">
-
-                    <ImageView
-                        android:id="@+id/marker_direction_icon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="4dp"
-                        android:layout_marginRight="4dp"
-                        android:layout_marginTop="1sp"
-                        tools:src="@drawable/ic_direction_arrow"/>
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:id="@+id/marker_distance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="1"
-                        android:textSize="@dimen/default_desc_text_size"
-                        tools:text="213 m"/>
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:id="@+id/marker_divider_point"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text=" • "
-                        android:textColor="?android:textColorSecondary"
-                        android:textSize="@dimen/default_desc_text_size"/>
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:id="@+id/marker_description"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:maxLines="1"
-                        android:textColor="?android:textColorSecondary"
-                        android:textSize="@dimen/default_desc_text_size"
-                        tools:text="Amsterdam Weekend"/>
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <ImageButton
-                android:id="@+id/marker_visited_button"
-                android:layout_width="56dp"
-                android:layout_height="56dp"
-                tools:background="@drawable/marker_circle_background_dark_with_inset"
-                tools:src="@drawable/ic_action_marker_passed"/>
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="@dimen/measurement_tool_bottom_divider_margin_bottom"
-            android:background="?attr/dashboard_divider"/>
-
-        <LinearLayout
-            android:id="@+id/rename_row"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/bottom_sheet_list_item_height"
-            android:background="?attr/selectableItemBackground"
-            android:gravity="center_vertical">
-
-            <ImageView
-                android:id="@+id/rename_icon"
-                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_marginRight="@dimen/bottom_sheet_icon_margin"
-                android:layout_marginStart="@dimen/bottom_sheet_content_padding"
-                tools:src="@drawable/ic_action_edit_dark"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="@string/shared_string_rename"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"/>
-        </LinearLayout>
-
-        <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:background="?attr/dashboard_divider"/>
-
-        <LinearLayout
-            android:id="@+id/delete_row"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/bottom_sheet_list_item_height"
-            android:background="?attr/selectableItemBackground"
-            android:gravity="center_vertical">
-
-            <ImageView
-                android:id="@+id/delete_icon"
-                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_marginRight="@dimen/bottom_sheet_icon_margin"
-                android:layout_marginStart="@dimen/bottom_sheet_content_padding"
-                tools:src="@drawable/ic_action_delete_dark"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="@string/shared_string_delete"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"/>
-        </LinearLayout>
+        <include layout="@layout/marker_menu_on_map_content"/>
 
         <Space
             android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/fragment_marker_menu_on_map.xml b/OsmAnd/res/layout/fragment_marker_menu_on_map.xml
index 0a157e20bc..ee99a47bc6 100644
--- a/OsmAnd/res/layout/fragment_marker_menu_on_map.xml
+++ b/OsmAnd/res/layout/fragment_marker_menu_on_map.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_transparent">
@@ -14,156 +13,7 @@
         android:clickable="true"
         android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
-            android:gravity="center_vertical">
-
-            <ImageView
-                android:id="@+id/marker_icon"
-                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_marginRight="@dimen/bottom_sheet_icon_margin"
-                android:layout_marginStart="@dimen/bottom_sheet_content_padding"
-                tools:src="@drawable/ic_action_flag_dark"/>
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:orientation="vertical">
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:id="@+id/marker_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="@dimen/default_list_text_size"
-                    tools:text="Van Gogh Museum"/>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical">
-
-                    <ImageView
-                        android:id="@+id/marker_direction_icon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="4dp"
-                        android:layout_marginRight="4dp"
-                        android:layout_marginTop="1sp"
-                        tools:src="@drawable/ic_direction_arrow"/>
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:id="@+id/marker_distance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="1"
-                        android:textSize="@dimen/default_desc_text_size"
-                        tools:text="213 m"/>
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:id="@+id/marker_divider_point"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text=" • "
-                        android:textColor="?android:textColorSecondary"
-                        android:textSize="@dimen/default_desc_text_size"/>
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:id="@+id/marker_description"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:maxLines="1"
-                        android:textColor="?android:textColorSecondary"
-                        android:textSize="@dimen/default_desc_text_size"
-                        tools:text="Amsterdam Weekend"/>
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <ImageButton
-                android:id="@+id/marker_visited_button"
-                android:layout_width="56dp"
-                android:layout_height="56dp"
-                tools:background="@drawable/marker_circle_background_dark_with_inset"
-                tools:src="@drawable/ic_action_marker_passed"/>
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="@dimen/measurement_tool_bottom_divider_margin_bottom"
-            android:background="?attr/dashboard_divider"/>
-
-        <LinearLayout
-            android:id="@+id/rename_row"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/bottom_sheet_list_item_height"
-            android:background="?attr/selectableItemBackground"
-            android:gravity="center_vertical">
-
-            <ImageView
-                android:id="@+id/rename_icon"
-                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_marginRight="@dimen/bottom_sheet_icon_margin"
-                android:layout_marginStart="@dimen/bottom_sheet_content_padding"
-                tools:src="@drawable/ic_action_edit_dark"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="@string/shared_string_rename"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"/>
-        </LinearLayout>
-
-        <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:background="?attr/dashboard_divider"/>
-
-        <LinearLayout
-            android:id="@+id/delete_row"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/bottom_sheet_list_item_height"
-            android:background="?attr/selectableItemBackground"
-            android:gravity="center_vertical">
-
-            <ImageView
-                android:id="@+id/delete_icon"
-                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_marginRight="@dimen/bottom_sheet_icon_margin"
-                android:layout_marginStart="@dimen/bottom_sheet_content_padding"
-                tools:src="@drawable/ic_action_delete_dark"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="@string/shared_string_delete"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"/>
-        </LinearLayout>
+        <include layout="@layout/marker_menu_on_map_content"/>
 
         <View
             android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/marker_menu_on_map_content.xml b/OsmAnd/res/layout/marker_menu_on_map_content.xml
new file mode 100644
index 0000000000..fef10c9dbf
--- /dev/null
+++ b/OsmAnd/res/layout/marker_menu_on_map_content.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
+        android:gravity="center_vertical">
+
+        <ImageView
+            android:id="@+id/marker_icon"
+            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_marginRight="@dimen/bottom_sheet_icon_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_content_padding"
+            tools:src="@drawable/ic_action_flag_dark"/>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <android.support.v7.widget.AppCompatTextView
+                android:id="@+id/marker_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="@dimen/default_list_text_size"
+                tools:text="Van Gogh Museum"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:id="@+id/marker_direction_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginEnd="4dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_marginTop="1sp"
+                    tools:src="@drawable/ic_direction_arrow"/>
+
+                <android.support.v7.widget.AppCompatTextView
+                    android:id="@+id/marker_distance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:textSize="@dimen/default_desc_text_size"
+                    tools:text="213 m"/>
+
+                <android.support.v7.widget.AppCompatTextView
+                    android:id="@+id/marker_divider_point"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=" • "
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_desc_text_size"/>
+
+                <android.support.v7.widget.AppCompatTextView
+                    android:id="@+id/marker_description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_desc_text_size"
+                    tools:text="Amsterdam Weekend"/>
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <ImageButton
+            android:id="@+id/marker_visited_button"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            tools:background="@drawable/marker_circle_background_dark_with_inset"
+            tools:src="@drawable/ic_action_marker_passed"/>
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginBottom="@dimen/measurement_tool_bottom_divider_margin_bottom"
+        android:background="?attr/dashboard_divider"/>
+
+    <LinearLayout
+        android:id="@+id/rename_row"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_list_item_height"
+        android:background="?attr/selectableItemBackground"
+        android:gravity="center_vertical">
+
+        <ImageView
+            android:id="@+id/rename_icon"
+            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_marginRight="@dimen/bottom_sheet_icon_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_content_padding"
+            tools:src="@drawable/ic_action_edit_dark"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/shared_string_rename"
+            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+    </LinearLayout>
+
+    <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:background="?attr/dashboard_divider"/>
+
+    <LinearLayout
+        android:id="@+id/delete_row"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_list_item_height"
+        android:background="?attr/selectableItemBackground"
+        android:gravity="center_vertical">
+
+        <ImageView
+            android:id="@+id/delete_icon"
+            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_marginRight="@dimen/bottom_sheet_icon_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_content_padding"
+            tools:src="@drawable/ic_action_delete_dark"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/shared_string_delete"
+            android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+    </LinearLayout>
+
+</LinearLayout>