From a1d6c8e5557a884b3f6bf5330659fee99d5f0329 Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Wed, 8 May 2019 17:46:37 +0300
Subject: [PATCH] add base profile selection to edit profile screen

---
 .../bottom_sheet_select_type_fragment.xml     |  13 +-
 .../res/layout/fragment_selected_profile.xml  | 715 ++++++++++--------
 .../ProfileBottomSheetDialogFragment.java     |  25 +-
 3 files changed, 415 insertions(+), 338 deletions(-)

diff --git a/OsmAnd/res/layout/bottom_sheet_select_type_fragment.xml b/OsmAnd/res/layout/bottom_sheet_select_type_fragment.xml
index 05e259deee..b5b6b1de29 100644
--- a/OsmAnd/res/layout/bottom_sheet_select_type_fragment.xml
+++ b/OsmAnd/res/layout/bottom_sheet_select_type_fragment.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:background="?attr/bg_color"
-  android:orientation="vertical">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="?attr/bg_color"
+    android:orientation="vertical">
 
   <TextView
     android:id="@+id/dialog_title"
@@ -15,7 +16,7 @@
     android:layout_marginBottom="@dimen/list_content_padding"
     android:layout_marginStart="@dimen/list_content_padding"
     android:layout_marginLeft="@dimen/list_content_padding"
-    android:text="Select navigation type"
+    tools:text="Select navigation type"
     android:textColor="?attr/main_font_color_basic"
     android:textSize="@dimen/default_list_text_size"/>
 
diff --git a/OsmAnd/res/layout/fragment_selected_profile.xml b/OsmAnd/res/layout/fragment_selected_profile.xml
index 409e444cc6..053b5e5ab7 100644
--- a/OsmAnd/res/layout/fragment_selected_profile.xml
+++ b/OsmAnd/res/layout/fragment_selected_profile.xml
@@ -8,346 +8,419 @@
   android:layout_height="match_parent"
   >
   <ScrollView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="top"
-      >
-
-  <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    >
-
+    android:layout_gravity="top">
 
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="?attr/bg_color"
-      android:orientation="vertical">
+      android:orientation="vertical"
+      >
 
-      <FrameLayout
+      <LinearLayout
+        android:id="@+id/type_selection_button"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="?attr/bg_color"
+        android:foreground="?attr/selectableItemBackground"
+        android:clickable="true">
+
+        <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="64dp"
+          android:paddingStart="@dimen/content_padding"
+          android:paddingEnd="@dimen/content_padding_small"
+          android:paddingLeft="@dimen/content_padding"
+          android:paddingRight="@dimen/content_padding_small"
+          android:orientation="horizontal">
+
+          <ImageView
+            android:id="@+id/mode_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"
+            android:layout_gravity="center_vertical"
+            android:tint="?attr/primary_icon_color"
+            tools:src="@drawable/ic_action_coordinates_latitude"/>
+
+          <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginEnd="@dimen/content_padding"
+            android:layout_marginRight="@dimen/content_padding"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+              android:id="@+id/mode_title"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:ellipsize="end"
+              android:maxLines="1"
+              android:textAppearance="@style/TextAppearance.ListItemTitle"
+              android:textColor="?attr/main_font_color_basic"
+              tools:text="Item Title"/>
+
+            <TextView
+              android:id="@+id/mode_subtitle"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:ellipsize="end"
+              android:maxLines="1"
+              tools:text="Item additional desription"/>
+
+          </LinearLayout>
+          <ImageView
+            android:id="@+id/type_down_arrow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/ic_action_arrow_drop_down"/>
+
+        </LinearLayout>
+
+        <ImageView
+          android:id="@+id/bottom_shadow3"
+          android:layout_width="match_parent"
+          android:layout_height="5dp"
+          android:scaleType="fitXY"
+          android:src="@drawable/bg_shadow_list_bottom"/>
+      </LinearLayout>
 
       <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:background="?attr/bg_color"
+        android:orientation="vertical">
+
+        <FrameLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content">
+
+          <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
 
-        <net.osmand.plus.widgets.OsmandTextFieldBoxes
-          android:id="@+id/profile_name_otfb"
-          android:layout_width="0dp"
+            <net.osmand.plus.widgets.OsmandTextFieldBoxes
+              android:id="@+id/profile_name_otfb"
+              android:layout_width="0dp"
+              android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:layout_marginTop="@dimen/list_content_padding"
+              android:layout_marginBottom="@dimen/list_content_padding"
+              android:layout_marginStart="@dimen/list_content_padding"
+              android:layout_marginEnd="@dimen/list_content_padding"
+              android:layout_marginLeft="@dimen/list_content_padding"
+              android:layout_marginRight="@dimen/list_content_padding"
+              app:labelText="Profile Name">
+
+              <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+                android:id="@+id/profile_name_et"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+
+                tools:text="@string/lorem_ipsum"/>
+
+            </net.osmand.plus.widgets.OsmandTextFieldBoxes>
+
+
+            <LinearLayout
+              android:id="@+id/profile_icon_layout"
+              android:layout_width="68dp"
+              android:layout_height="68dp"
+              android:layout_marginEnd="@dimen/list_content_padding"
+              android:layout_marginRight="@dimen/list_content_padding"
+              android:clickable="true"
+              android:focusable="true"
+              android:gravity="center"
+              android:orientation="vertical"
+              >
+
+              <TextView
+                android:id="@+id/select_icon_btn_txt"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingBottom="8dp"
+                android:text="Icon"/>
+
+              <ImageView
+                android:id="@+id/select_icon_btn_img"
+                android:layout_width="@dimen/standard_icon_size"
+                android:layout_height="@dimen/standard_icon_size"
+                tools:src="@drawable/ic_action_car_dark"
+
+                />
+
+            </LinearLayout>
+
+          </LinearLayout>
+          <FrameLayout
+            android:id="@+id/click_block_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clickable="false"/>
+
+        </FrameLayout>
+
+        <FrameLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="@dimen/list_content_padding"
+          android:layout_marginStart="@dimen/list_content_padding"
+          android:layout_marginEnd="@dimen/list_content_padding"
+          android:layout_marginLeft="@dimen/list_content_padding"
+          android:layout_marginRight="@dimen/list_content_padding">
+          <net.osmand.plus.widgets.OsmandTextFieldBoxes
+            android:id="@+id/navigation_type_otfb"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            app:labelText="Navigation Type">
+
+            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+              android:id="@+id/navigation_type_et"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:drawableEnd="@drawable/ic_action_arrow_drop_down"
+              android:drawableRight="@drawable/ic_action_arrow_drop_down"
+              android:focusable="false"
+              android:maxLines="1"
+              android:textSize="@dimen/default_list_text_size"
+              tools:text="Car"/>
+
+          </net.osmand.plus.widgets.OsmandTextFieldBoxes>
+
+          <FrameLayout
+            android:id="@+id/select_nav_type_btn"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clickable="true"
+            android:focusable="true"/>
+
+        </FrameLayout>
+
+        <TextView
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_marginTop="@dimen/list_content_padding"
           android:layout_marginBottom="@dimen/list_content_padding"
           android:layout_marginStart="@dimen/list_content_padding"
           android:layout_marginEnd="@dimen/list_content_padding"
           android:layout_marginLeft="@dimen/list_content_padding"
           android:layout_marginRight="@dimen/list_content_padding"
-          android:layout_weight="1"
-          app:labelText="Profile Name">
-
-          <studio.carbonylgroup.textfieldboxes.ExtendedEditText
-            android:id="@+id/profile_name_et"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-
-            tools:text="@string/lorem_ipsum"/>
-
-        </net.osmand.plus.widgets.OsmandTextFieldBoxes>
-
-
-        <LinearLayout
-          android:id="@+id/profile_icon_layout"
-          android:layout_width="68dp"
-          android:layout_height="68dp"
-          android:layout_marginEnd="@dimen/list_content_padding"
-          android:layout_marginRight="@dimen/list_content_padding"
-          android:clickable="true"
-          android:focusable="true"
-          android:gravity="center"
-          android:orientation="vertical"
-          >
-
-          <TextView
-            android:id="@+id/select_icon_btn_txt"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="8dp"
-            android:text="Icon"/>
-
-          <ImageView
-            android:id="@+id/select_icon_btn_img"
-            android:layout_width="@dimen/standard_icon_size"
-            android:layout_height="@dimen/standard_icon_size"
-            tools:src="@drawable/ic_action_car_dark"
-
-            />
-
-        </LinearLayout>
+          android:text="You can add own modified version of routing.xml to ..osmand/files/routing/"/>
 
       </LinearLayout>
-        <FrameLayout
-          android:id="@+id/click_block_layout"
-          android:clickable="false"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"/>
 
-      </FrameLayout>
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/list_content_padding">
+
+        <ImageView
+          android:id="@+id/bottom_shadow1"
+          android:layout_width="match_parent"
+          android:layout_height="5dp"
+          android:scaleType="fitXY"
+          android:src="@drawable/bg_shadow_list_bottom"/>
+
+      </LinearLayout>
+
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/bg_color"
+        android:orientation="vertical">
+
+        <TextView
+          android:textStyle="bold"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="@dimen/list_content_padding"
+          android:layout_marginStart="@dimen/list_content_padding"
+          android:layout_marginEnd="@dimen/list_content_padding"
+          android:layout_marginLeft="@dimen/list_content_padding"
+          android:layout_marginRight="@dimen/list_content_padding"
+          android:text="Setup Profile"
+          android:textColor="?attr/main_font_color_basic"
+          android:textSize="@dimen/default_list_text_size"/>
+
+        <TextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="@dimen/list_content_padding"
+          android:layout_marginStart="@dimen/list_content_padding"
+          android:layout_marginEnd="@dimen/list_content_padding"
+          android:layout_marginLeft="@dimen/list_content_padding"
+          android:layout_marginRight="@dimen/list_content_padding"
+          android:text="Profile keeps its own settings"
+          android:textColor="@color/description_font_and_bottom_sheet_icons"/>
+
+        <LinearLayout
+          android:id="@+id/map_config_btn"
+          android:layout_width="match_parent"
+          android:layout_height="65dp"
+          android:gravity="center_vertical"
+          android:orientation="horizontal">
+
+          <ImageView
+            android:id="@+id/map_config_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="@dimen/list_content_padding"
+            android:layout_marginLeft="@dimen/list_content_padding"
+            android:src="@drawable/ic_action_layers_dark"
+            android:tint="?attr/primary_icon_color"/>
+
+          <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="@dimen/list_content_padding"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="@dimen/list_content_padding"
+            android:orientation="vertical">
+
+            <TextView
+              android:textStyle="bold"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="Configure map"
+              android:textColor="?attr/main_font_color_basic"
+              android:textSize="@dimen/default_list_text_size"/>
+
+            <TextView
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="Select default map options for profile"
+              android:textColor="@color/description_font_and_bottom_sheet_icons"/>
+          </LinearLayout>
+        </LinearLayout>
+
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="1dp"
+          android:layout_marginStart="64dp"
+          android:layout_marginLeft="64dp"
+          android:background="?android:attr/listDivider"/>
+
+        <LinearLayout
+          android:id="@+id/screen_config_btn"
+          android:layout_width="match_parent"
+          android:layout_height="64dp"
+          android:gravity="center_vertical"
+          android:orientation="horizontal">
+
+          <ImageView
+            android:id="@+id/screen_config_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="@dimen/list_content_padding"
+            android:layout_marginLeft="@dimen/list_content_padding"
+            android:src="@drawable/ic_configure_screen_dark"
+            android:tint="?attr/primary_icon_color"/>
+
+          <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="@dimen/list_content_padding"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="@dimen/list_content_padding"
+            android:orientation="vertical">
+
+            <TextView
+              android:textStyle="bold"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="Configure screen"
+              android:textColor="?attr/main_font_color_basic"
+              android:textSize="@dimen/default_list_text_size"/>
+
+            <TextView
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="Select default screen options for profile"
+              android:textColor="@color/description_font_and_bottom_sheet_icons"/>
+
+          </LinearLayout>
+        </LinearLayout>
+
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="1dp"
+          android:layout_marginStart="64dp"
+          android:layout_marginLeft="64dp"
+          android:background="?android:attr/listDivider"
+          />
+
+        <LinearLayout
+          android:id="@+id/nav_settings_btn"
+          android:layout_width="match_parent"
+          android:layout_height="64dp"
+          android:gravity="center_vertical"
+          android:orientation="horizontal">
+
+          <ImageView
+            android:id="@+id/nav_settings_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="@dimen/list_content_padding"
+            android:layout_marginLeft="@dimen/list_content_padding"
+            android:src="@drawable/ic_action_start_navigation"
+            android:tint="?attr/primary_icon_color"/>
+
+          <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="@dimen/list_content_padding"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="@dimen/list_content_padding"
+            android:orientation="vertical">
+
+            <TextView
+              android:textStyle="bold"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="Navigation settings"
+              android:textColor="?attr/main_font_color_basic"
+              android:textSize="@dimen/default_list_text_size"/>
+
+            <TextView
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="Select default navigation settings for profile"
+              android:textColor="@color/description_font_and_bottom_sheet_icons"/>
+
+          </LinearLayout>
+        </LinearLayout>
+      </LinearLayout>
+
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/list_content_padding">
+
+        <ImageView
+          android:id="@+id/bottom_shadow2"
+          android:layout_width="match_parent"
+          android:layout_height="5dp"
+          android:scaleType="fitXY"
+          android:src="@drawable/bg_shadow_list_bottom"/>
+      </LinearLayout>
 
       <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/list_content_padding"
-        android:layout_marginStart="@dimen/list_content_padding"
-        android:layout_marginEnd="@dimen/list_content_padding"
-        android:layout_marginLeft="@dimen/list_content_padding"
-        android:layout_marginRight="@dimen/list_content_padding">
-      <net.osmand.plus.widgets.OsmandTextFieldBoxes
-        android:id="@+id/navigation_type_otfb"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-
-        app:labelText="Navigation Type">
-
-        <studio.carbonylgroup.textfieldboxes.ExtendedEditText
-          android:id="@+id/navigation_type_et"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:drawableEnd="@drawable/ic_action_arrow_drop_down"
-          android:drawableRight="@drawable/ic_action_arrow_drop_down"
-          android:textSize="@dimen/default_list_text_size"
-          android:maxLines="1"
-          tools:text="Car"
-          android:focusable="false"/>
-
-      </net.osmand.plus.widgets.OsmandTextFieldBoxes>
-
-        <FrameLayout
-          android:id="@+id/select_nav_type_btn"
-          android:clickable="true"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:focusable="true"/>
-
-      </FrameLayout>
-
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/list_content_padding"
-        android:layout_marginStart="@dimen/list_content_padding"
-        android:layout_marginEnd="@dimen/list_content_padding"
-        android:layout_marginLeft="@dimen/list_content_padding"
-        android:layout_marginRight="@dimen/list_content_padding"
-        android:text="You can add own modified version of routing.xml to ..osmand/files/routing/"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/list_content_padding">
-
-      <ImageView
-        android:id="@+id/bottom_shadow1"
-        android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/bg_shadow_list_bottom"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="?attr/bg_color"
-      android:orientation="vertical">
-
-      <TextView
-        android:textStyle="bold"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/list_content_padding"
-        android:layout_marginStart="@dimen/list_content_padding"
-        android:layout_marginEnd="@dimen/list_content_padding"
-        android:layout_marginLeft="@dimen/list_content_padding"
-        android:layout_marginRight="@dimen/list_content_padding"
-        android:text="Setup Profile"
-        android:textColor="?attr/main_font_color_basic"
-        android:textSize="@dimen/default_list_text_size"/>
-
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/list_content_padding"
-        android:layout_marginStart="@dimen/list_content_padding"
-        android:layout_marginEnd="@dimen/list_content_padding"
-        android:layout_marginLeft="@dimen/list_content_padding"
-        android:layout_marginRight="@dimen/list_content_padding"
-        android:text="Profile keeps its own settings"
-        android:textColor="@color/description_font_and_bottom_sheet_icons"/>
-
-      <LinearLayout
-        android:id="@+id/map_config_btn"
-        android:layout_width="match_parent"
-        android:layout_height="65dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-          android:id="@+id/map_config_icon"
-          android:layout_width="24dp"
-          android:layout_height="24dp"
-          android:layout_marginStart="@dimen/list_content_padding"
-          android:layout_marginLeft="@dimen/list_content_padding"
-          android:src="@drawable/ic_action_layers_dark"
-          android:tint="?attr/primary_icon_color"/>
-
-        <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginStart="24dp"
-          android:layout_marginEnd="@dimen/list_content_padding"
-          android:layout_marginLeft="24dp"
-          android:layout_marginRight="@dimen/list_content_padding"
-          android:orientation="vertical">
-
-          <TextView
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Configure map"
-            android:textColor="?attr/main_font_color_basic"
-            android:textSize="@dimen/default_list_text_size"/>
-
-          <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Select default map options for profile"
-            android:textColor="@color/description_font_and_bottom_sheet_icons"/>
-        </LinearLayout>
-      </LinearLayout>
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="64dp"
-        android:layout_marginLeft="64dp"
-        android:background="?android:attr/listDivider"/>
-
-      <LinearLayout
-        android:id="@+id/screen_config_btn"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-          android:id="@+id/screen_config_icon"
-          android:layout_width="24dp"
-          android:layout_height="24dp"
-          android:layout_marginStart="@dimen/list_content_padding"
-          android:layout_marginLeft="@dimen/list_content_padding"
-          android:src="@drawable/ic_configure_screen_dark"
-          android:tint="?attr/primary_icon_color"/>
-
-        <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginStart="24dp"
-          android:layout_marginEnd="@dimen/list_content_padding"
-          android:layout_marginLeft="24dp"
-          android:layout_marginRight="@dimen/list_content_padding"
-          android:orientation="vertical">
-
-          <TextView
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Configure screen"
-            android:textColor="?attr/main_font_color_basic"
-            android:textSize="@dimen/default_list_text_size"/>
-
-          <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Select default screen options for profile"
-            android:textColor="@color/description_font_and_bottom_sheet_icons"/>
-
-        </LinearLayout>
-      </LinearLayout>
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="64dp"
-        android:layout_marginLeft="64dp"
-        android:background="?android:attr/listDivider"
-        />
-
-      <LinearLayout
-        android:id="@+id/nav_settings_btn"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-          android:id="@+id/nav_settings_icon"
-          android:layout_width="24dp"
-          android:layout_height="24dp"
-          android:layout_marginStart="@dimen/list_content_padding"
-          android:layout_marginLeft="@dimen/list_content_padding"
-          android:src="@drawable/ic_action_start_navigation"
-          android:tint="?attr/primary_icon_color"/>
-
-        <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginStart="24dp"
-          android:layout_marginEnd="@dimen/list_content_padding"
-          android:layout_marginLeft="24dp"
-          android:layout_marginRight="@dimen/list_content_padding"
-          android:orientation="vertical">
-
-          <TextView
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Navigation settings"
-            android:textColor="?attr/main_font_color_basic"
-            android:textSize="@dimen/default_list_text_size"/>
-
-          <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Select default navigation settings for profile"
-            android:textColor="@color/description_font_and_bottom_sheet_icons"/>
-
-        </LinearLayout>
-      </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/list_content_padding">
-
-      <ImageView
-        android:id="@+id/bottom_shadow2"
-        android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/bg_shadow_list_bottom"/>
-    </LinearLayout>
-
-    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="64dp"/>
-  </LinearLayout>
+    </LinearLayout>
 
   </ScrollView>
 
@@ -356,8 +429,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="bottom"
-    android:orientation="horizontal"
-    android:background="?attr/bg_color">
+    android:background="?attr/bg_color"
+    android:orientation="horizontal">
 
     <Button
       android:id="@+id/cancel_button"
@@ -380,14 +453,14 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="1"
+      android:layout_marginTop="@dimen/list_content_padding"
+      android:layout_marginBottom="@dimen/list_content_padding"
+      android:layout_marginStart="8dp"
+      android:layout_marginEnd="@dimen/list_content_padding"
+      android:layout_marginLeft="8dp"
+      android:layout_marginRight="@dimen/list_content_padding"
       android:background="@drawable/btn_round_blue"
       android:text="@string/shared_string_save"
-      android:layout_marginEnd="@dimen/list_content_padding"
-      android:layout_marginRight="@dimen/list_content_padding"
-      android:layout_marginBottom="@dimen/list_content_padding"
-      android:layout_marginTop="@dimen/list_content_padding"
-      android:layout_marginLeft="8dp"
-      android:layout_marginStart="8dp"
       android:textAllCaps="false"
       android:textColor="@color/color_white"/>
 
diff --git a/OsmAnd/src/net/osmand/plus/profiles/ProfileBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/profiles/ProfileBottomSheetDialogFragment.java
index 554099b6e5..405305c07b 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/ProfileBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/ProfileBottomSheetDialogFragment.java
@@ -13,7 +13,6 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.TextView;
-import java.util.ArrayList;
 import java.util.List;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
@@ -31,6 +30,8 @@ public class ProfileBottomSheetDialogFragment extends BottomSheetDialogFragment
 	private ProfileTypeDialogListener listListener;
 	private RecyclerView recyclerView;
 	private ProfileTypeAdapter adapter;
+	private TextView titleTV;
+	private TextView fragmentDescriptionTV;
 
 
 	public final static String TYPE_APP_PROFILE = "base_profiles";
@@ -66,11 +67,17 @@ public class ProfileBottomSheetDialogFragment extends BottomSheetDialogFragment
 			: R.style.OsmandDarkTheme;
 		View view = View.inflate(new ContextThemeWrapper(getContext(), themeRes),
 			R.layout.bottom_sheet_select_type_fragment, null);
+
+		titleTV = view.findViewById(R.id.dialog_title);
+		fragmentDescriptionTV = view.findViewById(R.id.dialog_description_text);
+
 		if (type.equals(TYPE_APP_PROFILE)) {
-			TextView fragmentDescription = view.findViewById(R.id.dialog_description_text);
-			fragmentDescription.setVisibility(View.VISIBLE);
-			fragmentDescription.setText(
+			titleTV.setText("Select base profile");
+			fragmentDescriptionTV.setVisibility(View.VISIBLE);
+			fragmentDescriptionTV.setText(
 				"The new Application Profile should be based on one of the default App Profiles. Selected Profile defines basic settings: setup of Widgets, units of speed and distance. In string below Profile's name, you could learn which Navigation Profiles are suitable for each Application Profile.");
+		} else if (type.equals(TYPE_NAV_PROFILE)) {
+			titleTV.setText("Select navigation type");
 		}
 		view.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -146,10 +153,6 @@ public class ProfileBottomSheetDialogFragment extends BottomSheetDialogFragment
 				holder.icon.setImageDrawable(getIcon(item.getIconRes(), R.color.icon_color));
 			}
 
-
-
-
-
 			holder.itemView.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
@@ -159,15 +162,15 @@ public class ProfileBottomSheetDialogFragment extends BottomSheetDialogFragment
 					previousSelection = pos;
 
 					if (item instanceof RoutingProfile) {
-						((RoutingProfile) items.get(pos)).setSelected(true);
-						((RoutingProfile) items.get(previousSelection)).setSelected(false);
+						items.get(pos).setSelected(true);
+						items.get(previousSelection).setSelected(false);
 					}
 				}
 			});
 			if (item instanceof RoutingProfile) {
 				holder.descr.setText(Algorithms
 					.capitalizeFirstLetterAndLowercase(item.getDescription()));
-				if (((RoutingProfile) item).isSelected()) {
+				if (item.isSelected()) {
 					holder.radioButton.setChecked(true);
 					previousSelection = position;
 				} else {