From 2e4b15a3c43ff9b633207824c6b90ad347eb2735 Mon Sep 17 00:00:00 2001
From: alex <asytnyk0@gmail.com>
Date: Thu, 1 Mar 2018 15:29:02 +0200
Subject: [PATCH] Add some new items; add small refactoring

---
 OsmAnd/res/layout/bottom_sheet_item_subtitle.xml | 16 ++++++++++++++++
 .../layout/bottom_sheet_item_with_radio_btn.xml  |  6 +++---
 .../simpleitems/SubtitleItem.java                | 12 ++++++++++++
 ...CoordinateInputBottomSheetDialogFragment.java |  6 +++---
 ...lanRouteOptionsBottomSheetDialogFragment.java |  4 ++--
 5 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 OsmAnd/res/layout/bottom_sheet_item_subtitle.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/SubtitleItem.java

diff --git a/OsmAnd/res/layout/bottom_sheet_item_subtitle.xml b/OsmAnd/res/layout/bottom_sheet_item_subtitle.xml
new file mode 100644
index 0000000000..e0c850a458
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_subtitle.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/title"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:ellipsize="end"
+	android:maxLines="1"
+	android:paddingBottom="@dimen/content_padding_small"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding"
+	android:paddingTop="@dimen/content_padding_small"
+	android:textColor="?android:textColorSecondary"
+	android:textSize="@dimen/default_desc_text_size"
+	tools:text="Some subtitle"/>
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_radio_btn.xml b/OsmAnd/res/layout/bottom_sheet_item_with_radio_btn.xml
index 5e4a692f66..28aaab9914 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_with_radio_btn.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_radio_btn.xml
@@ -13,7 +13,7 @@
 	android:paddingStart="@dimen/content_padding">
 
 	<ImageView
-		android:id="@+id/icon_iv"
+		android:id="@+id/icon"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
@@ -21,7 +21,7 @@
 		tools:src="@drawable/ic_action_coordinates_latitude"/>
 
 	<TextView
-		android:id="@+id/name_tv"
+		android:id="@+id/title"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginEnd="@dimen/content_padding"
@@ -33,7 +33,7 @@
 		tools:text="@string/dd_mm_mmm_format"/>
 
 	<RadioButton
-		android:id="@+id/radio_button"
+		android:id="@+id/compound_button"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:background="@null"
diff --git a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/SubtitleItem.java b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/SubtitleItem.java
new file mode 100644
index 0000000000..cd87cecf74
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/SubtitleItem.java
@@ -0,0 +1,12 @@
+package net.osmand.plus.base.bottomsheetmenu.simpleitems;
+
+import net.osmand.plus.R;
+import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
+
+public class SubtitleItem extends SimpleBottomSheetItem {
+
+	public SubtitleItem(String title) {
+		this.title = title;
+		this.layoutId = R.layout.bottom_sheet_item_subtitle;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java
index 22a031c0a7..1e5e81cbc5 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java
@@ -125,13 +125,13 @@ public class CoordinateInputBottomSheetDialogFragment extends MenuBottomSheetDia
 			row.setTag(format);
 			row.setOnClickListener(formatsOnClickListener);
 
-			((ImageView) row.findViewById(R.id.icon_iv)).setImageDrawable(selectedRow
+			((ImageView) row.findViewById(R.id.icon)).setImageDrawable(selectedRow
 					? getActiveIcon(R.drawable.ic_action_coordinates_latitude) : formatIcon);
-			TextView nameTv = (TextView) row.findViewById(R.id.name_tv);
+			TextView nameTv = (TextView) row.findViewById(R.id.title);
 			nameTv.setText(CoordinateInputFormats.formatToHumanString(context, format));
 			if (selectedRow) {
 				nameTv.setTextColor(getResolvedActiveColor());
-				RadioButton rb = (RadioButton) row.findViewById(R.id.radio_button);
+				RadioButton rb = (RadioButton) row.findViewById(R.id.compound_button);
 				rb.setChecked(true);
 				CompoundButtonCompat.setButtonTintList(rb, ColorStateList.valueOf(getResolvedActiveColor()));
 			}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java
index 46f647a985..e572378ea0 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java
@@ -10,8 +10,8 @@ import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
 import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
-import net.osmand.plus.base.bottomsheetmenu.simpleitems.DescriptionItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.SubtitleItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
 import net.osmand.plus.helpers.AndroidUiHelper;
 
@@ -87,7 +87,7 @@ public class PlanRouteOptionsBottomSheetDialogFragment extends MenuBottomSheetDi
 
 		items.add(new DividerItem(getContext()));
 
-		items.add(new DescriptionItem(getString(R.string.sort_by)));
+		items.add(new SubtitleItem(getString(R.string.sort_by)));
 
 		BaseBottomSheetItem doorToDoorItem = new SimpleBottomSheetItem.Builder()
 				.setIcon(getContentIcon(R.drawable.ic_action_sort_door_to_door))