From 017aa48a21f8105630d1ae195e10c3b858249a61 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 17 Oct 2017 13:14:14 +0300
Subject: [PATCH 1/3] Fix history menu

---
 ...fragment_marker_history_bottom_sheet_dialog.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
index c3d82544c8..daf7ff4969 100644
--- a/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
@@ -52,8 +52,7 @@
                         android:layout_height="wrap_content"
                         android:maxLines="1"
                         android:ellipsize="end"
-                        android:textSize="@dimen/default_list_text_size"
-						android:textColor="?android:textColorPrimary"
+                        android:textAppearance="@style/TextAppearance.ListItemTitle"
                         tools:text="Bloemstraat 179"/>
 
                     <net.osmand.plus.widgets.TextViewEx
@@ -62,9 +61,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:maxLines="1"
-						android:ellipsize="end"
-						android:textSize="@dimen/default_list_text_size"
-                        android:textColor="?android:textColorSecondary"
+                        android:ellipsize="end"
+                        android:textAppearance="@style/TextAppearance.ListItemTitle"
                         tools:text="Passed: July 28"/>
 
                 </LinearLayout>
@@ -97,7 +95,8 @@
                     android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
                     tools:src="@drawable/ic_action_reset_to_default_dark"/>
 
-                <TextView
+                <net.osmand.plus.widgets.TextViewEx
+                    osmand:typeface="@string/font_roboto_regular"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:maxLines="1"
@@ -125,7 +124,8 @@
                     android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
                     tools:src="@drawable/ic_action_delete_dark"/>
 
-                <TextView
+                <net.osmand.plus.widgets.TextViewEx
+                    osmand:typeface="@string/font_roboto_regular"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:maxLines="1"

From c30674350fa2c6069001d9c6a388f4f4f2dc691b Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 17 Oct 2017 17:19:23 +0300
Subject: [PATCH 2/3] Fix history menu

---
 ...ment_marker_history_bottom_sheet_dialog.xml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
index daf7ff4969..440dc8bf98 100644
--- a/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
@@ -45,24 +45,24 @@
                     android:gravity="center_vertical"
                     android:orientation="vertical">
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        osmand:typeface="@string/font_roboto_regular"
+                    <android.support.v7.widget.AppCompatTextView
                         android:id="@+id/map_marker_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:maxLines="1"
                         android:ellipsize="end"
-                        android:textAppearance="@style/TextAppearance.ListItemTitle"
+                        android:textColor="?android:textColorPrimary"
+                        android:textSize="@dimen/default_list_text_size"
                         tools:text="Bloemstraat 179"/>
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        osmand:typeface="@string/font_roboto_regular"
+                    <android.support.v7.widget.AppCompatTextView
                         android:id="@+id/map_marker_passed_info"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:maxLines="1"
                         android:ellipsize="end"
-                        android:textAppearance="@style/TextAppearance.ListItemTitle"
+                        android:textColor="?android:textColorSecondary"
+                        android:textSize="@dimen/default_desc_text_size"
                         tools:text="Passed: July 28"/>
 
                 </LinearLayout>
@@ -95,8 +95,7 @@
                     android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
                     tools:src="@drawable/ic_action_reset_to_default_dark"/>
 
-                <net.osmand.plus.widgets.TextViewEx
-                    osmand:typeface="@string/font_roboto_regular"
+                <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:maxLines="1"
@@ -124,8 +123,7 @@
                     android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
                     tools:src="@drawable/ic_action_delete_dark"/>
 
-                <net.osmand.plus.widgets.TextViewEx
-                    osmand:typeface="@string/font_roboto_regular"
+                <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:maxLines="1"

From d396c758504ce35df4505b2a9a2fcda4cc6efefd Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 17 Oct 2017 17:20:26 +0300
Subject: [PATCH 3/3] Reformat code

---
 ...ent_marker_history_bottom_sheet_dialog.xml | 272 +++++++++---------
 1 file changed, 136 insertions(+), 136 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
index 440dc8bf98..b89be37e6b 100644
--- a/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
@@ -1,161 +1,161 @@
 <?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"
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
-    android:background="?attr/bg_color"
-    android:orientation="vertical">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="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:background="?attr/bg_color"
+	android:orientation="vertical">
 
-    <ScrollView
-        android:id="@+id/history_marker_scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+	<ScrollView
+		android:id="@+id/history_marker_scroll_view"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingBottom="8dp">
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:paddingBottom="8dp">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
-                android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                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">
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
+				android:gravity="center_vertical"
+				android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+				android:orientation="horizontal"
+				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">
 
-                <ImageView
-                    android:id="@+id/map_marker_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
-                    android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
-                    tools:src="@drawable/ic_action_flag_dark"/>
+				<ImageView
+					android:id="@+id/map_marker_icon"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
+					android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
+					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">
+				<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/map_marker_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="1"
-                        android:ellipsize="end"
-                        android:textColor="?android:textColorPrimary"
-                        android:textSize="@dimen/default_list_text_size"
-                        tools:text="Bloemstraat 179"/>
+					<android.support.v7.widget.AppCompatTextView
+						android:id="@+id/map_marker_title"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:ellipsize="end"
+						android:maxLines="1"
+						android:textColor="?android:textColorPrimary"
+						android:textSize="@dimen/default_list_text_size"
+						tools:text="Bloemstraat 179"/>
 
-                    <android.support.v7.widget.AppCompatTextView
-                        android:id="@+id/map_marker_passed_info"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="1"
-                        android:ellipsize="end"
-                        android:textColor="?android:textColorSecondary"
-                        android:textSize="@dimen/default_desc_text_size"
-                        tools:text="Passed: July 28"/>
+					<android.support.v7.widget.AppCompatTextView
+						android:id="@+id/map_marker_passed_info"
+						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="Passed: July 28"/>
 
-                </LinearLayout>
+				</LinearLayout>
 
-            </LinearLayout>
+			</LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?attr/dashboard_divider"/>
+			<View
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:background="?attr/dashboard_divider"/>
 
-            <LinearLayout
-                android:id="@+id/make_active_row"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/bottom_sheet_list_item_height"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:minHeight="@dimen/bottom_sheet_list_item_height"
-                android:layout_marginTop="@dimen/bottom_sheet_content_margin_small"
-                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">
+			<LinearLayout
+				android:id="@+id/make_active_row"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/bottom_sheet_list_item_height"
+				android:layout_marginTop="@dimen/bottom_sheet_content_margin_small"
+				android:background="?attr/selectableItemBackground"
+				android:gravity="center_vertical"
+				android:minHeight="@dimen/bottom_sheet_list_item_height"
+				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">
 
-                <ImageView
-                    android:id="@+id/make_active_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
-                    android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
-                    tools:src="@drawable/ic_action_reset_to_default_dark"/>
+				<ImageView
+					android:id="@+id/make_active_icon"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
+					android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
+					tools:src="@drawable/ic_action_reset_to_default_dark"/>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:maxLines="1"
-                    android:text="@string/make_active"
-                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
-            </LinearLayout>
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:maxLines="1"
+					android:text="@string/make_active"
+					android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+			</LinearLayout>
 
-            <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"
-                android:minHeight="@dimen/bottom_sheet_list_item_height"
-                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">
+			<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"
+				android:minHeight="@dimen/bottom_sheet_list_item_height"
+				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">
 
-                <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_marginRight="@dimen/bottom_sheet_icon_margin"
-                    tools:src="@drawable/ic_action_delete_dark"/>
+				<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_marginRight="@dimen/bottom_sheet_icon_margin"
+					tools:src="@drawable/ic_action_delete_dark"/>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:maxLines="1"
-                    android:text="@string/shared_string_delete"
-                    android:textAppearance="@style/TextAppearance.ListItemTitle"/>
-            </LinearLayout>
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:maxLines="1"
+					android:text="@string/shared_string_delete"
+					android:textAppearance="@style/TextAppearance.ListItemTitle"/>
+			</LinearLayout>
 
-        </LinearLayout>
+		</LinearLayout>
 
-    </ScrollView>
+	</ScrollView>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?attr/dashboard_divider"/>
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:background="?attr/dashboard_divider"/>
 
-    <FrameLayout
-        android:id="@+id/cancel_row"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/bottom_sheet_cancel_button_height"
-        android:background="?attr/selectableItemBackground">
+	<FrameLayout
+		android:id="@+id/cancel_row"
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/bottom_sheet_cancel_button_height"
+		android:background="?attr/selectableItemBackground">
 
-        <TextView
-            android:id="@+id/cancel_row_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/shared_string_close"
-            android:textAllCaps="true"
-            android:textColor="?attr/color_dialog_buttons"
-            android:textSize="@dimen/default_desc_text_size"
-            android:textStyle="bold"/>
-    </FrameLayout>
+		<TextView
+			android:id="@+id/cancel_row_text"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:text="@string/shared_string_close"
+			android:textAllCaps="true"
+			android:textColor="?attr/color_dialog_buttons"
+			android:textSize="@dimen/default_desc_text_size"
+			android:textStyle="bold"/>
+	</FrameLayout>
 
 </LinearLayout>
\ No newline at end of file