From 41c9b3e7a3b3c3deae3ecdd76cf3ea5fa9ee0d89 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Thu, 23 Jan 2020 19:02:02 +0200
Subject: [PATCH 01/24] Remove old app modes settings screens

---
 OsmAnd/AndroidManifest.xml                    |  10 -
 .../res/layout/fragment_selected_profile.xml  | 576 -----------
 OsmAnd/res/layout/profiles_list_fragment.xml  |  66 --
 OsmAnd/res/xml/settings_pref.xml              |   1 -
 .../osmand/plus/activities/MapActivity.java   |  30 +-
 .../plus/activities/SettingsActivity.java     |   7 -
 .../SettingsMonitoringActivity.java           |   5 +-
 .../plus/profiles/EditProfileActivity.java    |  72 --
 .../plus/profiles/EditProfileFragment.java    | 968 ------------------
 ...electProfileBottomSheetDialogFragment.java |   7 +-
 .../profiles/SettingsProfileActivity.java     |  43 -
 .../profiles/SettingsProfileFragment.java     | 213 ----
 .../SettingsRasterMapsActivity.java           | 219 ----
 .../plus/settings/BaseSettingsFragment.java   |   8 +-
 .../settings/ConfigureProfileFragment.java    |   8 +-
 .../plus/settings/NavigationFragment.java     |  15 +
 16 files changed, 38 insertions(+), 2210 deletions(-)
 delete mode 100644 OsmAnd/res/layout/fragment_selected_profile.xml
 delete mode 100644 OsmAnd/res/layout/profiles_list_fragment.xml
 delete mode 100644 OsmAnd/src/net/osmand/plus/profiles/EditProfileActivity.java
 delete mode 100644 OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java
 delete mode 100644 OsmAnd/src/net/osmand/plus/profiles/SettingsProfileActivity.java
 delete mode 100644 OsmAnd/src/net/osmand/plus/profiles/SettingsProfileFragment.java
 delete mode 100644 OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 5dbe852c0b..7b8320cb81 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -391,7 +391,6 @@
 		<activity android:name="net.osmand.plus.activities.SettingsGeneralActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name="net.osmand.plus.activities.SettingsNavigationActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name="net.osmand.plus.monitoring.SettingsMonitoringActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name="net.osmand.plus.rastermaps.SettingsRasterMapsActivity" android:configChanges="keyboardHidden|orientation" />
 
 		<activity android:name="net.osmand.plus.osmedit.SettingsOsmEditingActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name="net.osmand.plus.development.SettingsDevelopmentActivity" android:configChanges="keyboardHidden|orientation" />
@@ -986,15 +985,6 @@
 
         <receiver android:name="net.osmand.plus.liveupdates.LiveUpdatesAlarmReceiver"/>
 
-		<activity
-			android:configChanges="keyboardHidden|orientation"
-			android:label="Application profiles"
-			android:name=".profiles.SettingsProfileActivity"/>
-
-		<activity
-			android:name=".profiles.EditProfileActivity"
-			android:label="Application profiles"/>
-
 		<activity android:name=".activities.PrivacyAndSecurityActivity"
 			android:configChanges="keyboardHidden|orientation" />
 
diff --git a/OsmAnd/res/layout/fragment_selected_profile.xml b/OsmAnd/res/layout/fragment_selected_profile.xml
deleted file mode 100644
index 55632e3d5f..0000000000
--- a/OsmAnd/res/layout/fragment_selected_profile.xml
+++ /dev/null
@@ -1,576 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:background="?attr/activity_background_color"
-	android:orientation="vertical">
-
-	<android.support.design.widget.AppBarLayout
-		android:id="@+id/appbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<android.support.v7.widget.Toolbar
-			android:id="@+id/toolbar"
-			android:layout_width="match_parent"
-			android:layout_height="@dimen/toolbar_height"
-			android:background="?attr/actionModeBackground"
-			app:contentInsetLeft="0dp"
-			app:contentInsetStart="0dp">
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
-				<ImageButton
-					android:id="@+id/close_button"
-					style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
-					android:layout_width="@dimen/toolbar_height"
-					android:layout_height="@dimen/toolbar_height"
-					android:contentDescription="@string/access_shared_string_navigate_up"
-					android:src="@drawable/ic_action_mode_back" />
-
-				<net.osmand.plus.widgets.TextViewEx
-					android:id="@+id/toolbar_title"
-					android:layout_width="0dp"
-					android:layout_height="match_parent"
-					android:layout_weight="1"
-					android:gravity="center_vertical"
-					android:paddingLeft="@dimen/content_padding"
-					android:paddingRight="@dimen/content_padding"
-					android:textColor="?attr/app_bar_primary_item_color"
-					android:textSize="@dimen/dialog_header_text_size"
-					app:typeface="@string/font_roboto_medium"
-					tools:text="@string/routing_settings_2" />
-
-				<ImageButton
-					android:id="@+id/delete_button"
-					style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
-					android:layout_width="@dimen/toolbar_height"
-					android:layout_height="@dimen/toolbar_height"
-					android:contentDescription="@string/shared_string_delete"
-					android:src="@drawable/ic_action_delete_dark" />
-
-			</LinearLayout>
-
-		</android.support.v7.widget.Toolbar>
-
-	</android.support.design.widget.AppBarLayout>
-
-<FrameLayout
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:background="?attr/activity_background_color">
-
-	<ScrollView
-		android:id="@+id/scroll_view_container"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/setting_profile_item_height"
-		android:layout_gravity="top"
-		android:focusable="true"
-		android:focusableInTouchMode="true">
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical">
-
-			<LinearLayout
-				android:id="@+id/type_selection_button"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:background="?attr/bg_color"
-				android:clickable="true"
-				android:focusable="true"
-				android:foreground="?attr/selectableItemBackground"
-				android:orientation="vertical">
-
-				<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/default_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:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:textColor="?android:textColorPrimary"
-							android:ellipsize="end"
-							android:maxLines="1"
-							android:text="@string/profile_type_base_string"/>
-
-						<TextView
-							android:id="@+id/mode_title"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:ellipsize="end"
-							android:maxLines="1"
-							android:textColor="?android:textColorPrimary"
-							android:textSize="18sp"
-							tools:text="Item additional description"/>
-
-					</LinearLayout>
-
-					<ImageView
-						android:id="@+id/type_down_arrow2"
-						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"
-						android:tint="@color/settings_divider"/>
-
-				</LinearLayout>
-
-			</LinearLayout>
-
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:background="?attr/activity_background_color"
-				android:orientation="vertical">
-
-				<ImageView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:scaleType="fitXY"
-					android:src="@drawable/bg_shadow_list_bottom"/>
-
-				<View
-					android:layout_width="match_parent"
-					android:layout_height="10dp"/>
-
-				<ImageView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:scaleType="fitXY"
-					android:src="@drawable/bg_shadow_list_top"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				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"
-							android:layout_height="60dp"
-							android:layout_weight="1"
-							android:layout_margin="@dimen/list_content_padding"
-							app:primaryColor="@color/active_color_primary_dark"
-							app:secondaryColor="?android:textColorSecondary"
-							app:labelText="@string/profile_name_hint">
-
-							<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>
-
-
-
-				</FrameLayout>
-
-				<FrameLayout
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="8dp"
-					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">
-
-					<ImageView
-						android:id="@+id/type_down_arrow"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_gravity="center_vertical|right"
-						android:paddingRight="@dimen/content_padding"
-						android:src="@drawable/ic_action_arrow_drop_down"
-						android:tint="@color/settings_divider"/>
-
-					<net.osmand.plus.widgets.OsmandTextFieldBoxes
-						android:id="@+id/master_profile_otfb"
-						android:layout_width="match_parent"
-						android:layout_height="60dp"
-						app:primaryColor="@color/active_color_primary_dark"
-						app:secondaryColor="?android:textColorSecondary"
-						app:labelText="@string/nav_type_hint">
-
-						<studio.carbonylgroup.textfieldboxes.ExtendedEditText
-							android:id="@+id/master_profile_et"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:focusable="false"
-							android:maxLines="1"
-
-							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>
-
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="@dimen/context_menu_action_buttons_h"
-					android:layout_marginTop="8dp"
-					android:layout_marginBottom="@dimen/list_content_padding"
-					android:layout_marginLeft="@dimen/list_content_padding"
-					android:layout_marginRight="@dimen/list_content_padding"
-					android:orientation="vertical">
-					<View
-						android:layout_width="match_parent"
-						android:layout_height="1dp"
-						android:background="?attr/divider_color"/>
-
-
-					<LinearLayout
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:orientation="horizontal"
-						android:layout_gravity="center_vertical">
-
-						<LinearLayout
-							android:id="@+id/select_icon_button"
-							android:layout_width="0dp"
-							android:layout_height="match_parent"
-							android:background="?attr/selectableItemBackground"
-							android:layout_weight="1"
-							android:clickable="true"
-							android:focusable="true"
-							android:orientation="horizontal">
-
-							<TextView
-								android:layout_width="0dp"
-								android:layout_height="match_parent"
-								android:gravity="center_vertical"
-								android:layout_weight="1"
-								android:textSize="@dimen/default_list_text_size"
-								android:text="@string/shared_string_icon"
-								android:textColor="?android:textColorPrimary"/>
-
-							<ImageView
-								android:id="@+id/profile_icon_img"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:padding="@dimen/list_content_padding"
-								tools:src="@drawable/ic_action_horse"
-								tools:tint="@color/A400red"/>
-
-						</LinearLayout>
-
-						<View
-							android:layout_width="1dp"
-							android:layout_height="36dp"
-							android:layout_gravity="center_vertical"
-							android:background="?attr/divider_color"/>
-
-						<LinearLayout
-							android:id="@+id/select_icon_color_button"
-							android:layout_width="0dp"
-							android:layout_height="match_parent"
-							android:layout_weight="1"
-							android:background="?attr/selectableItemBackground"
-							android:clickable="true"
-							android:focusable="true"
-							android:orientation="horizontal">
-
-							<TextView
-								android:layout_width="0dp"
-								android:paddingLeft="@dimen/list_content_padding"
-								android:layout_height="match_parent"
-								android:layout_weight="1"
-								android:gravity="center_vertical"
-								android:textSize="@dimen/default_list_text_size"
-								android:text="@string/shared_string_color"
-								android:textColor="?android:textColorPrimary"/>
-
-							<ImageView
-								android:id="@+id/color_sample_img"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:padding="@dimen/list_content_padding"
-								tools:src = "@drawable/ic_action_circle"
-								tools:tint="@color/A400red"/>
-
-						</LinearLayout>
-
-					</LinearLayout>
-
-					<View
-						android:layout_width="match_parent"
-						android:layout_height="1dp"
-						android:background="?attr/divider_color"/>
-
-				</LinearLayout>
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="12dp"
-					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="@string/osmand_routing_promo"/>
-
-				<FrameLayout
-					android:id="@+id/click_block_layout"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:clickable="false"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:background="?attr/activity_background_color"
-				android:orientation="vertical">
-
-				<ImageView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:scaleType="fitXY"
-					android:src="@drawable/bg_shadow_list_bottom"/>
-
-				<View
-					android:layout_width="match_parent"
-					android:layout_height="10dp"/>
-
-				<ImageView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:scaleType="fitXY"
-					android:src="@drawable/bg_shadow_list_top"/>
-
-			</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="@string/edit_profile_setup_title"
-					android:textColor="?android:textColorPrimary"
-					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="@string/edit_profile_setup_subtitle"
-					android:textColor="@color/description_font_and_bottom_sheet_icons"/>
-
-				<LinearLayout
-					android:id="@+id/profile_config_btn"
-					android:layout_width="match_parent"
-					android:layout_height="65dp"
-					android:background="?android:attr/selectableItemBackground"
-					android:gravity="center_vertical"
-					android:orientation="horizontal">
-
-					<ImageView
-						android:id="@+id/profile_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_settings"
-						android:tint="?attr/default_icon_color"/>
-
-					<LinearLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginStart="24dp"
-						android:layout_marginLeft="24dp"
-						android:layout_marginEnd="@dimen/list_content_padding"
-						android:layout_marginRight="@dimen/list_content_padding"
-						android:orientation="vertical">
-
-						<TextView
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:text="@string/configure_profile"
-							android:textColor="?android:textColorPrimary"
-							android:textSize="@dimen/default_list_text_size"/>
-
-						<TextView
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:textColor="@color/description_font_and_bottom_sheet_icons"
-							android:visibility="gone"
-							tools:text="@string/configure_profile_info"
-							tools:visibility="visible" />
-
-					</LinearLayout>
-				</LinearLayout>
-			</LinearLayout>
-
-
-			<include layout="@layout/list_shadow_footer"/>
-
-
-			<LinearLayout
-				android:id="@+id/buttons_layout_sv"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_gravity="bottom"
-				android:background="?attr/bg_color"
-				android:orientation="horizontal"
-				android:visibility="gone">
-
-				<Button
-					android:id="@+id/cancel_button_sv"
-					android:layout_width="0dp"
-					android:layout_height="42dp"
-					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="8dp"
-					android:layout_marginLeft="@dimen/list_content_padding"
-					android:layout_marginRight="8dp"
-					android:background="?attr/profile_cancel_btn"
-					android:text="@string/shared_string_cancel"
-					android:textAllCaps="false"
-					android:textColor="@color/map_widget_blue"/>
-
-				<Button
-					android:id="@+id/save_profile_btn_sv"
-					android:layout_width="0dp"
-					android:layout_height="42dp"
-					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="?attr/profile_save_btn"
-					android:text="@string/shared_string_save"
-					android:textAllCaps="false"
-					android:textColor="@color/color_white"/>
-
-			</LinearLayout>
-
-		</LinearLayout>
-
-	</ScrollView>
-
-	<LinearLayout
-		android:id="@+id/buttons_layout"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		android:background="?attr/bg_color"
-		android:orientation="horizontal">
-
-		<Button
-			android:id="@+id/cancel_button"
-			android:layout_width="0dp"
-			android:layout_height="42dp"
-			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="8dp"
-			android:layout_marginLeft="@dimen/list_content_padding"
-			android:layout_marginRight="8dp"
-			android:background="?attr/profile_cancel_btn"
-			android:text="@string/shared_string_cancel"
-			android:textAllCaps="false"
-			android:textColor="?attr/active_color_basic"/>
-
-		<Button
-			android:id="@+id/save_profile_btn"
-			android:layout_width="0dp"
-			android:layout_height="42dp"
-			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="?attr/profile_save_btn"
-			android:text="@string/shared_string_save"
-			android:textAllCaps="false"
-			android:textColor="@color/color_white"/>
-
-	</LinearLayout>
-
-</FrameLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/profiles_list_fragment.xml b/OsmAnd/res/layout/profiles_list_fragment.xml
deleted file mode 100644
index c09d5552bd..0000000000
--- a/OsmAnd/res/layout/profiles_list_fragment.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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="match_parent"
-	android:background="?attr/activity_background_color"
-	android:orientation="vertical">
-
-	<android.support.design.widget.AppBarLayout
-		android:id="@+id/appbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<include layout="@layout/global_preference_toolbar" />
-
-	</android.support.design.widget.AppBarLayout>
-
-<RelativeLayout
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="?attr/list_background_color"
-  android:orientation="vertical">
-
-  <android.support.v7.widget.RecyclerView
-    android:id="@+id/profiles_list"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-
-    android:clipToPadding="false"
-    android:paddingBottom="72dp"/>
-
-  <LinearLayout
-    android:id="@+id/add_profile_btn"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentRight="true"
-    android:layout_alignParentEnd="true"
-    android:clickable="true"
-    android:focusable="true"
-    android:layout_gravity="bottom|center_horizontal"
-    android:background="@drawable/fab_extended_drawable"
-    android:orientation="horizontal"
-    android:gravity="center_vertical">
-
-    <android.support.v7.widget.AppCompatImageView
-      android:layout_gravity="center_vertical"
-      android:layout_width="24dp"
-      android:layout_height="24dp"
-      android:layout_marginLeft="14dp"
-      android:layout_marginStart="14dp"
-      android:src="@drawable/ic_action_plus"/>
-
-    <android.support.v7.widget.AppCompatTextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/shared_string_add"
-      android:textColor="@color/color_white"
-      android:layout_marginRight="20dp"
-      android:layout_marginEnd="20dp"
-      />
-
-  </LinearLayout>
-
-</RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/xml/settings_pref.xml b/OsmAnd/res/xml/settings_pref.xml
index 22e47e3773..e3c286d319 100644
--- a/OsmAnd/res/xml/settings_pref.xml
+++ b/OsmAnd/res/xml/settings_pref.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 	<Preference android:key="general_settings" android:title="@string/general_settings_2" android:summary="@string/general_settings_descr"/>
-	<Preference android:key="application_profiles" android:title="@string/application_profiles" android:summary="@string/application_profiles_descr"/>
 	<Preference android:key="routing_settings" android:title="@string/routing_settings_2" android:summary="@string/routing_settings_descr"/>
 	<Preference android:key="subscription_settings" android:title="@string/osm_live_subscription" android:summary="@string/osm_live_subscription_desc"/>
 	<Preference android:key="privacy_and_security" android:title="@string/settings_privacy_and_security" android:summary="@string/settings_privacy_and_security_desc"/>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 6449751c41..3848262de8 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -116,7 +116,6 @@ import net.osmand.plus.mapmarkers.PlanRouteFragment;
 import net.osmand.plus.measurementtool.MeasurementEditingContext;
 import net.osmand.plus.measurementtool.MeasurementToolFragment;
 import net.osmand.plus.measurementtool.NewGpxData;
-import net.osmand.plus.profiles.EditProfileFragment;
 import net.osmand.plus.quickaction.QuickActionListFragment;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.resources.ResourceManager;
@@ -675,13 +674,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 			chooseRouteFragment.dismiss(true);
 			return;
 		}
-		EditProfileFragment editProfileFragment = getEditProfileFragment();
-		if (editProfileFragment != null) {
-			if (!editProfileFragment.onBackPressedAllowed()) {
-				editProfileFragment.confirmCancelDialog(this);
-				return;
-			}
-		}
 		ProfileAppearanceFragment profileAppearanceFragment = getProfileAppearanceFragment();
 		if (profileAppearanceFragment != null) {
 			if (profileAppearanceFragment.isProfileAppearanceChanged(this)) {
@@ -859,21 +851,21 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 				}
 				setIntent(null);
 			}
-			if (intent.hasExtra(EditProfileFragment.OPEN_SETTINGS)) {
-				String settingsType = intent.getStringExtra(EditProfileFragment.OPEN_SETTINGS);
-				String appMode = intent.getStringExtra(EditProfileFragment.SELECTED_ITEM);
-				if (EditProfileFragment.OPEN_CONFIG_PROFILE.equals(settingsType)) {
+			if (intent.hasExtra(BaseSettingsFragment.OPEN_SETTINGS)) {
+				String settingsType = intent.getStringExtra(BaseSettingsFragment.OPEN_SETTINGS);
+				String appMode = intent.getStringExtra(BaseSettingsFragment.APP_MODE_KEY);
+				if (BaseSettingsFragment.OPEN_CONFIG_PROFILE.equals(settingsType)) {
 					BaseSettingsFragment.showInstance(this, SettingsScreenType.CONFIGURE_PROFILE, ApplicationMode.valueOfStringKey(appMode, null));
 				}
 				setIntent(null);
 			}
-			if (intent.hasExtra(EditProfileFragment.OPEN_CONFIG_ON_MAP)) {
-				switch (intent.getStringExtra(EditProfileFragment.OPEN_CONFIG_ON_MAP)) {
-					case EditProfileFragment.MAP_CONFIG:
+			if (intent.hasExtra(BaseSettingsFragment.OPEN_CONFIG_ON_MAP)) {
+				switch (intent.getStringExtra(BaseSettingsFragment.OPEN_CONFIG_ON_MAP)) {
+					case BaseSettingsFragment.MAP_CONFIG:
 						this.getDashboard().setDashboardVisibility(true, DashboardType.CONFIGURE_MAP, null);
 						break;
 
-					case EditProfileFragment.SCREEN_CONFIG:
+					case BaseSettingsFragment.SCREEN_CONFIG:
 						this.getDashboard().setDashboardVisibility(true, DashboardType.CONFIGURE_SCREEN, null);
 						break;
 				}
@@ -1655,7 +1647,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		}
 		return super.onKeyUp(keyCode, event);
 	}
-	
+
 	private void scrollMap(int dx, int dy) {
 		final RotatedTileBox tb = mapView.getCurrentRotatedTileBox();
 		final QuadPoint cp = tb.getCenterPixelPoint();
@@ -2409,10 +2401,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		return getFragment(ChooseRouteFragment.TAG);
 	}
 
-	public EditProfileFragment getEditProfileFragment() {
-		return getFragment(EditProfileFragment.TAG);
-	}
-
 	public ProfileAppearanceFragment getProfileAppearanceFragment() {
 		return getFragment(ProfileAppearanceFragment.TAG);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
index 7fc3caab0b..17559f0e9d 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
@@ -14,7 +14,6 @@ import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.liveupdates.OsmLiveActivity;
-import net.osmand.plus.profiles.SettingsProfileActivity;
 
 public class SettingsActivity extends SettingsBaseActivity {
 
@@ -29,7 +28,6 @@ public class SettingsActivity extends SettingsBaseActivity {
 	private Preference general;
 	private Preference routing;
 	private Preference subscription;
-	private Preference profiles;
 	private Preference privacy;
 
 
@@ -43,8 +41,6 @@ public class SettingsActivity extends SettingsBaseActivity {
 		general.setOnPreferenceClickListener(this);
 		routing = (Preference) screen.findPreference("routing_settings");
 		routing.setOnPreferenceClickListener(this);
-		profiles = (Preference) screen.findPreference("application_profiles");
-		profiles.setOnPreferenceClickListener(this);
 		subscription = (Preference) screen.findPreference("subscription_settings");
 		subscription.setOnPreferenceClickListener(this);
 		privacy = (Preference) screen.findPreference("privacy_and_security");
@@ -95,9 +91,6 @@ public class SettingsActivity extends SettingsBaseActivity {
 		if (preference == general) {
 			startActivity(new Intent(this, SettingsGeneralActivity.class));
 			return true;
-		} else if (preference == profiles){
-			startActivity(new Intent(this, SettingsProfileActivity.class));
-			return true;
 		} else if (preference == routing) {
 			startActivity(new Intent(this, SettingsNavigationActivity.class));
 			return true;
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java b/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
index 20a023a30e..12b84adbc4 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
@@ -40,10 +40,11 @@ import java.util.Map;
 import static net.osmand.plus.OsmandSettings.DAILY_DIRECTORY;
 import static net.osmand.plus.OsmandSettings.MONTHLY_DIRECTORY;
 import static net.osmand.plus.OsmandSettings.REC_DIRECTORY;
-import static net.osmand.plus.profiles.SettingsProfileFragment.PROFILE_STRING_KEY;
-
 
 public class SettingsMonitoringActivity extends SettingsBaseActivity {
+
+	public static final String PROFILE_STRING_KEY = "string_key";
+
 	private CheckBoxPreference routeServiceEnabled;
 	private BroadcastReceiver broadcastReceiver;
 
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfileActivity.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfileActivity.java
deleted file mode 100644
index 0399b06932..0000000000
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfileActivity.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package net.osmand.plus.profiles;
-
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-
-import android.support.v4.view.MenuItemCompat;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import net.osmand.plus.R;
-import net.osmand.plus.activities.OsmandActionBarActivity;
-
-public class EditProfileActivity extends OsmandActionBarActivity {
-
-	public static final int DELETE_ID = 1010;
-
-	@Override
-	protected void onCreate(@Nullable Bundle savedInstanceState) {
-		getMyApplication().applyTheme(this);
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.single_fragment_layout);
-
-		if (savedInstanceState == null) {
-			EditProfileFragment editProfileFragment = new EditProfileFragment();
-			editProfileFragment.setArguments(getIntent().getExtras());
-			getSupportFragmentManager().beginTransaction().add(android.R.id.content,
-					editProfileFragment, EditProfileFragment.TAG).commit();
-		}
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		int activeButtonsAndLinksTextResId = getMyApplication().getSettings().isLightContent() ?
-				R.color.active_buttons_and_links_text_light : R.color.active_buttons_and_links_text_dark;
-		Drawable icDelete = getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_delete_dark, activeButtonsAndLinksTextResId);
-		MenuItem m = menu.add(0, DELETE_ID, 0, R.string.action_delete)
-			.setIcon(icDelete);
-		MenuItemCompat.setShowAsAction(m, MenuItem.SHOW_AS_ACTION_ALWAYS);
-		super.onCreateOptionsMenu(menu);
-		return true;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-
-		int itemId = item.getItemId();
-		switch (itemId) {
-			case android.R.id.home:
-				onBackPressed();
-				return true;
-			case DELETE_ID:
-				((EditProfileFragment) getSupportFragmentManager().findFragmentByTag(
-						EditProfileFragment.TAG)).onDeleteProfileClick();
-				return true;
-
-		}
-		return false;
-	}
-
-	@Override
-	public void onBackPressed() {
-		final EditProfileFragment epf = (EditProfileFragment) getSupportFragmentManager()
-			.findFragmentByTag(EditProfileFragment.TAG);
-		if (epf.onBackPressedAllowed()) {
-			super.onBackPressed();
-		} else {
-			epf.confirmCancelDialog(this);
-		}
-
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java
deleted file mode 100644
index bf72dc83e6..0000000000
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java
+++ /dev/null
@@ -1,968 +0,0 @@
-package net.osmand.plus.profiles;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnDismissListener;
-import android.content.Intent;
-import android.graphics.Rect;
-import android.os.Build;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AlertDialog.Builder;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.ContextThemeWrapper;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ListPopupWindow;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import net.osmand.AndroidUtils;
-import net.osmand.PlatformUtil;
-import net.osmand.plus.ApplicationMode;
-import net.osmand.plus.ApplicationMode.ProfileIconColors;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.base.BaseOsmAndFragment;
-import net.osmand.plus.helpers.AndroidUiHelper;
-import net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.SelectProfileListener;
-import net.osmand.plus.routing.RouteProvider.RouteService;
-import net.osmand.plus.settings.BaseSettingsFragment;
-import net.osmand.plus.settings.BaseSettingsFragment.SettingsScreenType;
-import net.osmand.plus.widgets.OsmandTextFieldBoxes;
-import net.osmand.router.GeneralRouter;
-import net.osmand.util.Algorithms;
-
-import org.apache.commons.logging.Log;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import studio.carbonylgroup.textfieldboxes.ExtendedEditText;
-
-import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID;
-import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.DIALOG_TYPE;
-import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.PROFILE_KEY_ARG;
-import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.SELECTED_KEY;
-import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.TYPE_BASE_APP_PROFILE;
-import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.TYPE_NAV_PROFILE;
-import static net.osmand.plus.profiles.SettingsProfileFragment.IS_NEW_PROFILE;
-import static net.osmand.plus.profiles.SettingsProfileFragment.IS_USER_PROFILE;
-import static net.osmand.plus.profiles.SettingsProfileFragment.PROFILE_STRING_KEY;
-
-public class EditProfileFragment extends BaseOsmAndFragment {
-
-	private static final Log LOG = PlatformUtil.getLog(EditProfileFragment.class);
-
-	public static final String TAG = EditProfileFragment.class.getSimpleName();
-
-	public static final String OPEN_CONFIG_PROFILE = "openConfigProfile";
-	public static final String OPEN_SETTINGS = "openSettings";
-	public static final String OPEN_CONFIG_ON_MAP = "openConfigOnMap";
-	public static final String MAP_CONFIG = "openMapConfigMenu";
-	public static final String NAV_CONFIG = "openNavConfigMenu";
-	public static final String SCREEN_CONFIG = "openScreenConfigMenu";
-	public static final String SELECTED_ITEM = "editedProfile";
-	public static final String SELECTED_ICON = "selectedIcon";
-
-	OsmandApplication app;
-
-	ApplicationMode mode = null;
-	ApplicationProfileObject profile = null;
-	List<RoutingProfileDataObject> routingProfileDataObjects;
-	RoutingProfileDataObject selectedRoutingProfileDataObject = null;
-
-	private boolean isNew = false;
-	private boolean isUserProfile = false;
-	private boolean dataChanged = false;
-	private boolean nightMode;
-
-	private SelectProfileListener navTypeListener = null;
-	private SelectProfileListener iconIdListener = null;
-	private SelectProfileListener baseTypeListener = null;
-
-	private TextView toolbarTitle;
-	private ImageView profileIcon;
-	private LinearLayout profileIconBtn;
-	private ImageView colorSample;
-	private LinearLayout selectColorBtn;
-	private ExtendedEditText profileNameEt;
-	private OsmandTextFieldBoxes profileNameTextBox;
-	private ExtendedEditText navTypeEt;
-	private OsmandTextFieldBoxes navTypeTextBox;
-	private FrameLayout selectNavTypeBtn;
-	private Button cancelBtn;
-	private Button saveButton;
-	private View profileConfigBtn;
-	private LinearLayout buttonsLayout;
-	private FrameLayout clickBlockLayout;
-	private LinearLayout typeSelectionBtn;
-	private ImageView baseModeIcon;
-	private TextView baseModeTitle;
-	private ScrollView scrollContainer;
-	private LinearLayout buttonsLayoutSV;
-	private Button cancelBtnSV;
-	private Button saveButtonSV;
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		app = getMyApplication();
-		if (getArguments() != null) {
-			String modeName = getArguments().getString(PROFILE_STRING_KEY, "car");
-			isNew = getArguments().getBoolean(IS_NEW_PROFILE, false);
-			isUserProfile = getArguments().getBoolean(IS_USER_PROFILE, false);
-			mode = ApplicationMode.valueOfStringKey(modeName, ApplicationMode.DEFAULT);
-			profile = new ApplicationProfileObject(mode, isNew, isUserProfile);
-		}
-		nightMode = !app.getSettings().isLightContent();
-		routingProfileDataObjects = getRoutingProfiles(app);
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-	                         @Nullable Bundle savedInstanceState) {
-		final FragmentActivity activity = getActivity();
-
-		int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
-		Context themedContext = new ContextThemeWrapper(getContext(), themeRes);
-		final View view = inflater.cloneInContext(themedContext).inflate(R.layout.fragment_selected_profile, container, false);
-
-		setupToolbar(view);
-
-		toolbarTitle = view.findViewById(R.id.toolbar_title);
-		profileIcon = view.findViewById(R.id.profile_icon_img);
-		profileIconBtn = view.findViewById(R.id.select_icon_button);
-		colorSample = view.findViewById(R.id.color_sample_img);
-		selectColorBtn = view.findViewById(R.id.select_icon_color_button);
-		profileNameEt = view.findViewById(R.id.profile_name_et);
-		profileNameTextBox = view.findViewById(R.id.profile_name_otfb);
-		navTypeEt = view.findViewById(R.id.master_profile_et);
-		navTypeTextBox = view.findViewById(R.id.master_profile_otfb);
-		selectNavTypeBtn = view.findViewById(R.id.select_nav_type_btn);
-		cancelBtn = view.findViewById(R.id.cancel_button);
-		saveButton = view.findViewById(R.id.save_profile_btn);
-		profileConfigBtn = view.findViewById(R.id.profile_config_btn);
-		buttonsLayout = view.findViewById(R.id.buttons_layout);
-		clickBlockLayout = view.findViewById(R.id.click_block_layout);
-		typeSelectionBtn = view.findViewById(R.id.type_selection_button);
-		baseModeIcon = view.findViewById(R.id.mode_icon);
-		baseModeTitle = view.findViewById(R.id.mode_title);
-		scrollContainer = view.findViewById(R.id.scroll_view_container);
-		buttonsLayoutSV = view.findViewById(R.id.buttons_layout_sv);
-		cancelBtnSV = view.findViewById(R.id.cancel_button_sv);
-		saveButtonSV = view.findViewById(R.id.save_profile_btn_sv);
-
-		profileNameEt.setFocusable(true);
-		profileNameTextBox.getEditText().setSelection(profileNameEt.getText().length());
-
-		String title = getResources().getString(R.string.new_profile);
-
-		int startIconId = profile.iconId;
-
-		if (isNew) {
-			dataChanged = true;
-			startIconId = profile.parent.getIconRes();
-			profile.iconId = startIconId;
-			profile.iconStringName = profile.parent.getIconName();
-		} else if (isUserProfile) {
-			title = profile.userProfileTitle;
-			profileNameEt.setText(title);
-			dataChanged = false;
-		} else if (profile.stringKeyName != -1) {
-			title = getResources().getString(profile.stringKeyName);
-			profileNameEt.setText(title);
-			clickBlockLayout.setClickable(true);
-		}
-		profile.userProfileTitle = title;
-
-		if (profile.parent != null) {
-			setupBaseProfileView(profile.parent.getStringKey());
-		} else if (profile.stringKeyName != -1) {
-			baseModeTitle.setText(profile.stringKeyName);
-			baseModeIcon.setImageDrawable(
-				app.getUIUtilities().getIcon(profile.iconId, R.color.icon_color_default_light));
-		}
-		if (isUserProfile || isNew) {
-			typeSelectionBtn.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					final SelectProfileBottomSheetDialogFragment dialog = new SelectProfileBottomSheetDialogFragment();
-					Bundle bundle = new Bundle();
-					if (profile.parent != null) {
-						bundle.putString(SELECTED_KEY, profile.parent.getStringKey());
-					}
-					bundle.putString(DIALOG_TYPE, TYPE_BASE_APP_PROFILE);
-					dialog.setArguments(bundle);
-					if (getActivity() != null) {
-						getActivity().getSupportFragmentManager().beginTransaction()
-							.add(dialog, "select_base_type").commitAllowingStateLoss();
-					}
-				}
-			});
-		} else {
-			typeSelectionBtn.setClickable(false);
-		}
-
-		if (!Algorithms.isEmpty(mode.getRoutingProfile()) || mode.getRouteService() != RouteService.OSMAND) {
-			for (RoutingProfileDataObject r : routingProfileDataObjects) {
-				if (mode.getRoutingProfile() != null && mode.getRoutingProfile().equals(r.getStringKey()) 
-					|| (mode.getRouteService() == RouteService.BROUTER
-					&& r.getStringKey().equals(RoutingProfilesResources.BROUTER_MODE.name())) 
-					|| (mode.getRouteService() == RouteService.STRAIGHT
-					&& r.getStringKey().equals(RoutingProfilesResources.STRAIGHT_LINE_MODE.name()))) {
-					profile.routingProfileDataObject = r;
-					r.setSelected(true);
-					navTypeEt.setText(r.getName());
-					navTypeEt.clearFocus();
-				}
-			}
-		} else {
-			for (RoutingProfileDataObject rp : routingProfileDataObjects) {
-				if (profile.stringKey.equals(rp.getStringKey())) {
-					navTypeEt.setText(
-						RoutingProfilesResources.valueOf(rp.getStringKey().toUpperCase())
-							.getStringRes());
-				}
-			}
-			navTypeEt.clearFocus();
-		}
-		profileNameEt.clearFocus();
-
-		updateToolbar(title);
-
-		int iconColor = profile.iconColor.getColor(nightMode);
-
-		profileIcon.setImageDrawable(app.getUIUtilities().getIcon(startIconId, iconColor));
-		colorSample.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_circle, iconColor));
-
-		profileNameEt.addTextChangedListener(new TextWatcher() {
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-			}
-
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count) {
-			}
-
-			@Override
-			public void afterTextChanged(Editable s) {
-				profile.userProfileTitle = s.toString();
-				dataChanged = true;
-
-				updateToolbar(s.toString());
-			}
-		});
-
-		selectNavTypeBtn.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (isNew || isUserProfile) {
-					hideKeyboard();
-					final SelectProfileBottomSheetDialogFragment fragment = new SelectProfileBottomSheetDialogFragment();
-					Bundle bundle = new Bundle();
-					if (profile.routingProfileDataObject != null) {
-						bundle.putString(SELECTED_KEY,
-							profile.routingProfileDataObject.getStringKey());
-					}
-					bundle.putString(DIALOG_TYPE, TYPE_NAV_PROFILE);
-					fragment.setArguments(bundle);
-					if (getActivity() != null) {
-						getActivity().getSupportFragmentManager().beginTransaction()
-							.add(fragment, "select_nav_type").commitAllowingStateLoss();
-					}
-					navTypeEt.setCursorVisible(false);
-					navTypeEt.setTextIsSelectable(false);
-					navTypeEt.clearFocus();
-					navTypeEt.requestFocus(ExtendedEditText.FOCUS_UP);
-				}
-			}
-		});
-
-		if (isUserProfile || isNew) {
-			profileIconBtn.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					final SelectProfileBottomSheetDialogFragment iconSelectDialog = new SelectProfileBottomSheetDialogFragment();
-					Bundle bundle = new Bundle();
-//					bundle.putString(DIALOG_TYPE, TYPE_ICON);
-					bundle.putString(SELECTED_ICON, profile.iconStringName);
-					iconSelectDialog.setArguments(bundle);
-					hideKeyboard();
-					if (getActivity() != null) {
-						getActivity().getSupportFragmentManager().beginTransaction()
-							.add(iconSelectDialog, "select_icon")
-							.commitAllowingStateLoss();
-					}
-				}
-			});
-
-			selectColorBtn.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					final ListPopupWindow popupWindow = new ListPopupWindow(activity);
-					popupWindow.setAnchorView(selectColorBtn);
-					popupWindow.setContentWidth(AndroidUtils.dpToPx(activity, 200f));
-					popupWindow.setModal(true);
-					if (Build.VERSION.SDK_INT >= VERSION_CODES.KITKAT) {
-						popupWindow.setDropDownGravity(Gravity.TOP | Gravity.RIGHT);
-					}
-					popupWindow.setVerticalOffset(AndroidUtils.dpToPx(activity, -48f));
-					popupWindow.setHorizontalOffset(AndroidUtils.dpToPx(activity, -6f));
-					final ProfileColorAdapter profileColorAdapter = new ProfileColorAdapter(activity, mode.getIconColorInfo());
-					popupWindow.setAdapter(profileColorAdapter);
-					popupWindow.setOnItemClickListener(new OnItemClickListener() {
-						@Override
-						public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-							dataChanged = true;
-							profile.iconColor = ProfileIconColors.values()[position];
-							profileIcon.setImageDrawable(app.getUIUtilities().getIcon(profile.iconId, profile.iconColor.getColor(nightMode)));
-							colorSample.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_circle, profile.iconColor.getColor(nightMode)));
-							popupWindow.dismiss();
-						}
-					});
-					popupWindow.show();
-				}
-			});
-		} else {
-			if (VERSION.SDK_INT > VERSION_CODES.LOLLIPOP) {
-				selectColorBtn.setBackground(null);
-				profileIconBtn.setBackground(null);
-			} else {
-				selectColorBtn.setBackgroundDrawable(null);
-				profileIconBtn.setBackgroundDrawable(null);
-			}
-
-		}
-
-
-		profileConfigBtn.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (dataChanged) {
-					needSaveDialog();
-				} else if (getSettings() != null) {
-					if (activity instanceof EditProfileActivity) {
-						Intent i = new Intent(getActivity(), MapActivity.class);
-						i.putExtra(OPEN_SETTINGS, OPEN_CONFIG_PROFILE);
-						i.putExtra(SELECTED_ITEM, profile.stringKey);
-						startActivity(i);
-					} else {
-						BaseSettingsFragment.showInstance(activity, SettingsScreenType.CONFIGURE_PROFILE, ApplicationMode.valueOfStringKey(profile.stringKey, null));
-					}
-				}
-			}
-		});
-
-		cancelBtn.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (getActivity() != null) {
-					getActivity().onBackPressed();
-				}
-			}
-		});
-
-		cancelBtnSV.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (getActivity() != null) {
-					getActivity().onBackPressed();
-				}
-			}
-		});
-
-		if (!isNew && !isUserProfile) {
-			saveButtonSV.setEnabled(false);
-			saveButton.setEnabled(false);
-		} else {
-			saveButton.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					if (saveNewProfile()) {
-						activateMode(mode);
-						getActivity().onBackPressed();
-					}
-				}
-			});
-
-			saveButtonSV.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					if (saveNewProfile()) {
-						activateMode(mode);
-						getActivity().onBackPressed();
-					}
-				}
-			});
-		}
-
-		final float d = getResources().getDisplayMetrics().density;
-		view.getViewTreeObserver().addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
-			@Override
-			public void onGlobalLayout() {
-				int marginShow = 66;
-				int marginHide = 0;
-
-				Rect r = new Rect();
-				view.getWindowVisibleDisplayFrame(r);
-				int screenHeight = view.getRootView().getHeight();
-				int keypadHeight = screenHeight - r.bottom;
-				if (keypadHeight > screenHeight * 0.15) {
-					buttonsLayout.setVisibility(View.GONE);
-					buttonsLayoutSV.setVisibility(View.VISIBLE);
-					setMargins(scrollContainer, 0, 0, 0, (int) (marginHide * d));
-				} else {
-					buttonsLayoutSV.setVisibility(View.GONE);
-					buttonsLayout.setVisibility(View.VISIBLE);
-					setMargins(scrollContainer, 0, 0, 0, (int) (marginShow * d));
-				}
-			}
-		});
-		return view;
-	}
-
-	@Override
-	public void onResume() {
-		getBaseProfileListener();
-		getNavProfileListener();
-		getIconListener();
-		super.onResume();
-	}
-
-	@Override
-	public int getStatusBarColorId() {
-		return nightMode ? R.color.status_bar_color_dark : R.color.status_bar_color_light;
-	}
-
-	public boolean onBackPressedAllowed() {
-		return !dataChanged;
-	}
-
-	SelectProfileListener getIconListener() {
-		if (iconIdListener == null) {
-			iconIdListener = new SelectProfileListener() {
-				@Override
-				public void onSelectedType(Bundle bundle) {
-					int pos = -1;
-					dataChanged = true;
-					profile.iconId = pos;
-					profile.iconStringName = null;
-					profileIcon.setImageDrawable(app.getUIUtilities().getIcon(pos,
-						profile.iconColor.getColor(nightMode)));
-
-				}
-			};
-		}
-		return iconIdListener;
-	}
-
-	SelectProfileListener getBaseProfileListener() {
-		if (baseTypeListener == null) {
-			baseTypeListener = new SelectProfileListener() {
-				@Override
-				public void onSelectedType(Bundle args) {
-					String profileKey = args.getString(PROFILE_KEY_ARG);
-					setupBaseProfileView(profileKey);
-					profile.parent = ApplicationMode.valueOfStringKey(profileKey, ApplicationMode.DEFAULT);
-					dataChanged = true;
-				}
-			};
-		}
-		return baseTypeListener;
-	}
-
-	SelectProfileListener getNavProfileListener() {
-		if (navTypeListener == null) {
-			navTypeListener = new SelectProfileListener() {
-				@Override
-				public void onSelectedType(Bundle args) {
-					int pos = -1;
-					updateRoutingProfile(pos);
-				}
-			};
-		}
-		return navTypeListener;
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		super.onViewCreated(view, savedInstanceState);
-		if (!isUserProfile && !isNew) {
-			profileNameEt.setFocusable(false);
-			navTypeEt.setFocusable(false);
-		}
-
-		if (isNew) {
-			profileNameEt.requestFocus();
-		} else {
-			scrollContainer.requestFocus();
-		}
-
-	}
-
-	void updateRoutingProfile(int pos) {
-		dataChanged = true;
-		for (int i = 0; i < routingProfileDataObjects.size(); i++) {
-			if (i == pos) {
-				routingProfileDataObjects.get(i).setSelected(true);
-			} else {
-				routingProfileDataObjects.get(i).setSelected(false);
-			}
-		}
-		selectedRoutingProfileDataObject = routingProfileDataObjects.get(pos);
-		navTypeEt.setText(selectedRoutingProfileDataObject.getName());
-		profile.routingProfileDataObject = selectedRoutingProfileDataObject;
-	}
-
-	void activateMode(ApplicationMode mode) {
-		if (!ApplicationMode.values(app).contains(mode)) {
-			ApplicationMode.changeProfileAvailability(mode, true, getMyApplication());
-		}
-	}
-
-	private void setupToolbar(View view) {
-		FragmentActivity activity = getActivity();
-		AppBarLayout appBar = (AppBarLayout) view.findViewById(R.id.appbar);
-
-		if ((activity instanceof EditProfileActivity)) {
-			EditProfileActivity editProfileActivity = (EditProfileActivity) activity;
-			if (editProfileActivity.getSupportActionBar() != null) {
-				editProfileActivity.getSupportActionBar().setElevation(5.0f);
-			}
-			AndroidUiHelper.updateVisibility(appBar, false);
-		} else {
-			AndroidUtils.addStatusBarPadding21v(activity, view);
-			ViewCompat.setElevation(appBar, 5.0f);
-
-			View closeButton = view.findViewById(R.id.close_button);
-			closeButton.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					FragmentActivity fragmentActivity = getActivity();
-					if (fragmentActivity != null) {
-						fragmentActivity.onBackPressed();
-					}
-				}
-			});
-
-			View deleteBtn = view.findViewById(R.id.delete_button);
-			deleteBtn.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					onDeleteProfileClick();
-				}
-			});
-		}
-	}
-
-	private void updateToolbar(String title) {
-		FragmentActivity activity = getActivity();
-		if (activity instanceof EditProfileActivity) {
-			EditProfileActivity editProfileActivity = (EditProfileActivity) activity;
-			if (editProfileActivity.getSupportActionBar() != null) {
-				editProfileActivity.getSupportActionBar().setTitle(title);
-			}
-		} else {
-			toolbarTitle.setText(title);
-		}
-	}
-
-	private void setupBaseProfileView(String stringKey) {
-		for (ApplicationMode am : ApplicationMode.getDefaultValues()) {
-			if (am.getStringKey().equals(stringKey)) {
-				baseModeIcon.setImageDrawable(
-					app.getUIUtilities().getIcon(am.getIconRes(), R.color.icon_color_default_light));
-				baseModeTitle.setText(Algorithms.capitalizeFirstLetter(am.toHumanString(app)));
-				dataChanged = false;
-			}
-		}
-	}
-
-	private void setMargins(View v, int l, int t, int r, int b) {
-		if (v.getLayoutParams() instanceof ViewGroup.MarginLayoutParams) {
-			ViewGroup.MarginLayoutParams p = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
-			p.setMargins(l, t, r, b);
-			v.requestLayout();
-		}
-	}
-
-	private boolean saveNewProfile() {
-		if (profile.routingProfileDataObject == null) {
-			showSaveWarningDialog(
-				getString(R.string.profile_alert_need_routing_type_title),
-				getString(R.string.profile_alert_need_routing_type_msg),
-				getActivity());
-			return false;
-		}
-
-		if (profile.userProfileTitle.isEmpty()
-			|| profile.userProfileTitle.replace(" ", "").length() < 1 
-			|| profileNameEt.getText().toString().replace(" ", "").length() < 1) {
-			showSaveWarningDialog(
-				getString(R.string.profile_alert_need_profile_name_title),
-				getString(R.string.profile_alert_need_profile_name_msg),
-				getActivity()
-			);
-			return false;
-		}
-
-		for (ApplicationMode m : ApplicationMode.allPossibleValues()) {
-			if (m.getCustomProfileName() != null && getActivity() != null &&
-					m.getCustomProfileName().equals(profile.userProfileTitle) && isNew) {
-				AlertDialog.Builder bld = new AlertDialog.Builder(getActivity());
-				bld.setTitle(R.string.profile_alert_duplicate_name_title);
-				bld.setMessage(R.string.profile_alert_duplicate_name_msg);
-				bld.setNegativeButton(R.string.shared_string_dismiss, null);
-				bld.show();
-				bld.setOnDismissListener(new OnDismissListener() {
-					@Override
-					public void onDismiss(DialogInterface dialog) {
-						profileNameEt.requestFocus();
-					}
-				});
-				return false;
-			}
-		}
-		String customStringKey = profile.stringKey;
-		if (isNew) {
-			customStringKey =
-				profile.parent.getStringKey() + "_" + System.currentTimeMillis();
-		}
-
-		ApplicationMode.ApplicationModeBuilder builder = ApplicationMode
-			.createCustomMode(profile.parent, profile.userProfileTitle.trim(), customStringKey)
-			.icon(app, profile.iconStringName);
-
-		if(profile.routingProfileDataObject.getStringKey().equals(
-				RoutingProfilesResources.STRAIGHT_LINE_MODE.name())) {
-			builder.setRouteService(RouteService.STRAIGHT);
-		} else if(profile.routingProfileDataObject.getStringKey().equals(
-				RoutingProfilesResources.BROUTER_MODE.name())) {
-			builder.setRouteService(RouteService.BROUTER);
-		} else if (profile.routingProfileDataObject != null) {
-			builder.setRoutingProfile(profile.routingProfileDataObject.getStringKey());
-		}
-		builder.setColor(profile.iconColor);
-
-		mode = ApplicationMode.saveProfile(builder, getMyApplication());
-		if (!ApplicationMode.values(app).contains(mode)) {
-			ApplicationMode.changeProfileAvailability(mode, true, getMyApplication());
-		}
-		dataChanged = false;
-		return true;
-	}
-
-	private void needSaveDialog() {
-		if (getActivity() != null) {
-			AlertDialog.Builder bld = new AlertDialog.Builder(getActivity());
-			bld.setTitle(R.string.profile_alert_need_save_title);
-			bld.setMessage(R.string.profile_alert_need_save_msg);
-			bld.setNegativeButton(R.string.shared_string_ok, null);
-			bld.show();
-		}
-	}
-
-	private void showSaveWarningDialog(String title, String message, Activity activity) {
-		AlertDialog.Builder bld = new AlertDialog.Builder(activity);
-		bld.setTitle(title);
-		bld.setMessage(message);
-		bld.setNegativeButton(R.string.shared_string_dismiss, null);
-		bld.show();
-	}
-
-	public void confirmCancelDialog(final Activity activity) {
-		AlertDialog.Builder bld = new Builder(activity);
-		bld.setTitle(R.string.shared_string_dismiss);
-		bld.setMessage(R.string.exit_without_saving);
-		bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				dataChanged = false;
-				activity.onBackPressed();
-			}
-		});
-		bld.setNegativeButton(R.string.shared_string_cancel, null);
-		bld.show();
-
-	}
-
-	void onDeleteProfileClick() {
-		if (getActivity() != null) {
-			if (isUserProfile) {
-				AlertDialog.Builder bld = new AlertDialog.Builder(getActivity());
-				bld.setTitle(R.string.profile_alert_delete_title);
-				bld.setMessage(String
-					.format(getString(R.string.profile_alert_delete_msg),
-						profile.userProfileTitle));
-				bld.setPositiveButton(R.string.shared_string_delete,
-					new DialogInterface.OnClickListener() {
-						@Override
-						public void onClick(DialogInterface dialog, int which) {
-							OsmandApplication app = getMyApplication();
-							if (app != null) {
-								ApplicationMode.deleteCustomMode(mode, app);
-								app.getSettings().APPLICATION_MODE.set(ApplicationMode.DEFAULT);
-							}
-
-							if (getActivity() != null) {
-								getActivity().onBackPressed();
-							}
-						}
-					});
-				bld.setNegativeButton(R.string.shared_string_dismiss, null);
-				bld.show();
-			} else {
-				Toast.makeText(getActivity(), R.string.profile_alert_cant_delete_base,
-					Toast.LENGTH_SHORT).show();
-			}
-		}
-	}
-	
-	private void hideKeyboard() {
-		View cf = getActivity().getCurrentFocus();
-		if (cf != null) {
-			InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-			if (imm != null) {
-				imm.hideSoftInputFromWindow(cf.getWindowToken(), 0);
-			}
-		}
-	}
-
-	public static boolean showInstance(FragmentManager fragmentManager, boolean newProfile, boolean userProfile, String profileKey) {
-		try {
-			Bundle args = new Bundle();
-			args.putBoolean(IS_NEW_PROFILE, newProfile);
-			args.putBoolean(IS_USER_PROFILE, userProfile);
-			args.putString(PROFILE_STRING_KEY, profileKey);
-
-			EditProfileFragment editProfileFragment = new EditProfileFragment();
-			editProfileFragment.setArguments(args);
-
-			fragmentManager.beginTransaction()
-					.replace(R.id.fragmentContainer, editProfileFragment, TAG)
-					.addToBackStack(DRAWER_SETTINGS_ID + ".new")
-					.commit();
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-	private static List<RoutingProfileDataObject> getRoutingProfiles(OsmandApplication context) {
-		List<RoutingProfileDataObject> profilesObjects = new ArrayList<>();
-		profilesObjects.add(new RoutingProfileDataObject(
-			RoutingProfilesResources.STRAIGHT_LINE_MODE.name(),
-			context.getString(RoutingProfilesResources.STRAIGHT_LINE_MODE.getStringRes()),
-			context.getString(R.string.special_routing_type),
-			RoutingProfilesResources.STRAIGHT_LINE_MODE.getIconRes(),
-			false, null));
-		if (context.getBRouterService() != null) {
-			profilesObjects.add(new RoutingProfileDataObject(
-				RoutingProfilesResources.BROUTER_MODE.name(),
-				context.getString(RoutingProfilesResources.BROUTER_MODE.getStringRes()),
-				context.getString(R.string.third_party_routing_type),
-				RoutingProfilesResources.BROUTER_MODE.getIconRes(),
-				false, null));
-		}
-
-		Map<String, GeneralRouter> inputProfiles = context.getRoutingConfig().getAllRouters();
-		for (Entry<String, GeneralRouter> e : inputProfiles.entrySet()) {
-			if (!e.getKey().equals("geocoding")) {
-				int iconRes = R.drawable.ic_action_gdirections_dark;
-				String name = e.getValue().getProfileName();
-				String description = context.getString(R.string.osmand_default_routing);
-				if (!Algorithms.isEmpty(e.getValue().getFilename())) {
-					description = e.getValue().getFilename();
-				} else if (RoutingProfilesResources.isRpValue(name.toUpperCase())){
-					iconRes = RoutingProfilesResources.valueOf(name.toUpperCase()).getIconRes();
-					name = context
-						.getString(RoutingProfilesResources.valueOf(name.toUpperCase()).getStringRes());
-				}
-				profilesObjects.add(new RoutingProfileDataObject(e.getKey(), name, description,
-					iconRes, false, e.getValue().getFilename()));
-			}
-		}
-		return profilesObjects;
-	}
-
-	private enum RoutingProfilesResources {
-		STRAIGHT_LINE_MODE(R.string.routing_profile_straightline, R.drawable.ic_action_split_interval),
-		BROUTER_MODE(R.string.routing_profile_broutrer, R.drawable.ic_action_split_interval),
-		CAR(R.string.rendering_value_car_name, R.drawable.ic_action_car_dark),
-		PEDESTRIAN(R.string.rendering_value_pedestrian_name, R.drawable.ic_action_pedestrian_dark),
-		BICYCLE(R.string.rendering_value_bicycle_name, R.drawable.ic_action_bicycle_dark),
-		SKI(R.string.routing_profile_ski, R.drawable.ic_action_skiing),
-		PUBLIC_TRANSPORT(R.string.app_mode_public_transport, R.drawable.ic_action_bus_dark),
-		BOAT(R.string.app_mode_boat, R.drawable.ic_action_sail_boat_dark),
-		GEOCODING(R.string.routing_profile_geocoding, R.drawable.ic_action_world_globe);
-
-		int stringRes;
-		int iconRes;
-
-		RoutingProfilesResources(int stringRes, int iconRes) {
-			this.stringRes = stringRes;
-			this.iconRes = iconRes;
-		}
-
-		public int getStringRes() {
-			return stringRes;
-		}
-
-		public int getIconRes() {
-			return iconRes;
-		}
-
-		private static final List<String> rpValues = new ArrayList<>();
-
-		static {
-			for (RoutingProfilesResources rpr : RoutingProfilesResources.values()) {
-				rpValues.add(rpr.name());
-			}
-		}
-
-		public static boolean isRpValue(String value) {
-			return rpValues.contains(value);
-		}
-	}
-
-	 class ApplicationProfileObject {
-
-		int stringKeyName = -1;
-		String stringKey;
-		String userProfileTitle = "";
-		ApplicationMode parent = null;
-		int iconId = R.drawable.ic_world_globe_dark;
-		String iconStringName = "ic_world_globe_dark";
-		ProfileIconColors iconColor = ProfileIconColors.DEFAULT;
-		RoutingProfileDataObject routingProfileDataObject = null;
-
-		ApplicationProfileObject(ApplicationMode mode, boolean isNew, boolean isUserProfile) {
-			if (isNew) {
-				stringKey = mode.getStringKey() + System.currentTimeMillis();
-				parent = mode;
-				iconStringName = parent.getIconName();
-			} else if (isUserProfile) {
-				stringKey = mode.getStringKey();
-				parent = mode.getParent();
-				iconId = mode.getIconRes();
-				iconStringName = mode.getIconName();
-				iconColor = mode.getIconColorInfo() == null ? ProfileIconColors.DEFAULT : mode.getIconColorInfo();
-				userProfileTitle = mode.getCustomProfileName();
-			} else {
-				stringKeyName = mode.getNameKeyResource();
-				stringKey = mode.getStringKey();
-				iconId = mode.getIconRes();
-				iconStringName = mode.getIconName();
-			}
-		}
-	}
-
-	public static class ProfileColorAdapter extends ArrayAdapter<ColorListItem> {
-
-		private OsmandApplication app;
-		private ProfileIconColors currentColorData;
-
-
-		public ProfileColorAdapter(Context context, ProfileIconColors iconColorData) {
-			super(context, R.layout.rendering_prop_menu_item);
-			this.app = (OsmandApplication) getContext().getApplicationContext();
-			this.currentColorData = iconColorData;
-			init();
-		}
-
-		public void init() {
-			boolean nightMode = !app.getSettings().isLightContent();
-			String currentColorName = app.getString(ProfileIconColors.DEFAULT.getName());
-			ColorListItem item = new ColorListItem(currentColorName, currentColorName, ProfileIconColors.DEFAULT.getColor(nightMode));
-			add(item);
-			for (ProfileIconColors pic : ProfileIconColors.values()) {
-				if (pic != ProfileIconColors.DEFAULT) {
-					item = new ColorListItem(currentColorName, app.getString(pic.getName()), pic.getColor(nightMode));
-					add(item);
-				}
-			}
-			item.setLastItem(true);
-		}
-
-		@NonNull
-		@Override
-		public View getView(int position, View convertView, @NonNull ViewGroup parent) {
-			ColorListItem item = getItem(position);
-			View v = convertView;
-			if (v == null) {
-				v = LayoutInflater.from(getContext()).inflate(R.layout.rendering_prop_menu_item, null);
-			}
-			if (item != null) {
-				TextView textView = (TextView) v.findViewById(R.id.text1);
-				textView.setText(item.valueName);
-				if (item.color == -1) {
-					textView.setCompoundDrawablesWithIntrinsicBounds(null, null,
-						app.getUIUtilities().getThemedIcon(R.drawable.ic_action_circle), null);
-				} else {
-					textView.setCompoundDrawablesWithIntrinsicBounds(null, null,
-						app.getUIUtilities().getIcon(R.drawable.ic_action_circle, item.color), null);
-				}
-
-				textView.setCompoundDrawablePadding(AndroidUtils.dpToPx(getContext(), 10f));
-				v.findViewById(R.id.divider).setVisibility(item.lastItem
-					&& position < getCount() - 1 ? View.VISIBLE : View.GONE);
-			}
-			return v;
-		}
-	}
-
-	public static class ColorListItem {
-		private String currentValueName;
-		private String valueName;
-		private int color;
-		private boolean lastItem;
-
-		public ColorListItem(String currentValueName, String valueName, int color) {
-			this.currentValueName = currentValueName;
-			this.valueName = valueName;
-			this.color = color;
-		}
-
-
-
-		public int getColor() {
-			return color;
-		}
-
-		public boolean isLastItem() {
-			return lastItem;
-		}
-
-		public void setLastItem(boolean lastItem) {
-			this.lastItem = lastItem;
-		}
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java
index 4c81a64473..27b7c3eb65 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java
@@ -71,7 +71,7 @@ public class SelectProfileBottomSheetDialogFragment extends MenuBottomSheetDialo
 			if (type.equals(TYPE_NAV_PROFILE)) {
 				profiles.addAll(NavigationFragment.getRoutingProfiles(app).values());
 			} else if (type.equals(TYPE_BASE_APP_PROFILE)) {
-				profiles.addAll(SettingsProfileFragment.getBaseProfiles(app));
+				profiles.addAll(NavigationFragment.getBaseProfiles(app));
 			} else {
 				LOG.error("Check intent data!");
 				dismiss();
@@ -267,14 +267,11 @@ public class SelectProfileBottomSheetDialogFragment extends MenuBottomSheetDialo
 		FragmentActivity activity = getActivity();
 		if (activity != null) {
 			FragmentManager fragmentManager = activity.getSupportFragmentManager();
-			SettingsProfileFragment settingsProfileFragment = (SettingsProfileFragment) fragmentManager.findFragmentByTag(SettingsProfileFragment.class.getName());
 			NavigationFragment navigationFragment = (NavigationFragment) fragmentManager.findFragmentByTag(NavigationFragment.class.getName());
 			ProfileAppearanceFragment profileAppearanceFragment = (ProfileAppearanceFragment) fragmentManager.findFragmentByTag(ProfileAppearanceFragment.TAG);
 			MainSettingsFragment mainSettingsFragment = (MainSettingsFragment) fragmentManager.findFragmentByTag(MainSettingsFragment.TAG);
 
-			if (settingsProfileFragment != null) {
-				listener = settingsProfileFragment.getBaseProfileListener();
-			} else if (navigationFragment != null) {
+			if (navigationFragment != null) {
 				listener = navigationFragment.getNavProfileListener();
 			} else if (profileAppearanceFragment != null) {
 				listener = profileAppearanceFragment.getParentProfileListener();
diff --git a/OsmAnd/src/net/osmand/plus/profiles/SettingsProfileActivity.java b/OsmAnd/src/net/osmand/plus/profiles/SettingsProfileActivity.java
deleted file mode 100644
index accce83d45..0000000000
--- a/OsmAnd/src/net/osmand/plus/profiles/SettingsProfileActivity.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package net.osmand.plus.profiles;
-
-import android.os.Bundle;
-import android.view.MenuItem;
-
-import net.osmand.plus.R;
-import net.osmand.plus.activities.OsmandActionBarActivity;
-
-public class SettingsProfileActivity extends OsmandActionBarActivity {
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		getMyApplication().applyTheme(this);
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.single_fragment_layout);
-		getSupportActionBar().setElevation(5.0f);
-		getSupportActionBar().setTitle(R.string.application_profiles);
-		if (savedInstanceState == null) {
-			SettingsProfileFragment profileFragment = new SettingsProfileFragment();
-			profileFragment.setArguments(getIntent().getExtras());
-			getSupportFragmentManager().beginTransaction()
-					.add(android.R.id.content, profileFragment, SettingsProfileFragment.class.getName()).commit();
-		}
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		int itemId = item.getItemId();
-		switch (itemId) {
-			case android.R.id.home:
-				finish();
-				return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-	}
-
-
-}
diff --git a/OsmAnd/src/net/osmand/plus/profiles/SettingsProfileFragment.java b/OsmAnd/src/net/osmand/plus/profiles/SettingsProfileFragment.java
deleted file mode 100644
index 19b9529246..0000000000
--- a/OsmAnd/src/net/osmand/plus/profiles/SettingsProfileFragment.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package net.osmand.plus.profiles;
-
-
-
-import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.DIALOG_TYPE;
-import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.PROFILE_KEY_ARG;
-import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.TYPE_BASE_APP_PROFILE;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.ContextThemeWrapper;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import net.osmand.AndroidUtils;
-import net.osmand.PlatformUtil;
-import net.osmand.plus.ApplicationMode;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.base.BaseOsmAndFragment;
-import net.osmand.plus.helpers.AndroidUiHelper;
-import net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.SelectProfileListener;
-
-import org.apache.commons.logging.Log;
-
-public class SettingsProfileFragment extends BaseOsmAndFragment 
-		implements ConfigureProfileMenuAdapter.ProfileSelectedListener, AbstractProfileMenuAdapter.ProfilePressedListener{
-
-	private static final Log LOG = PlatformUtil.getLog(SettingsProfileFragment.class);
-
-	public static final String PROFILE_STRING_KEY = "string_key";
-	public static final String IS_NEW_PROFILE = "new_profile";
-	public static final String IS_USER_PROFILE = "user_profile";
-
-
-	private ConfigureProfileMenuAdapter adapter;
-	private	SelectProfileListener typeListener = null;
-
-	private List<ApplicationMode> allAppModes;
-	private Set<ApplicationMode> availableAppModes;
-	private List<ProfileDataObject> baseProfiles;
-
-	private boolean nightMode;
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		allAppModes = new ArrayList<>(ApplicationMode.allPossibleValues());
-		allAppModes.remove(ApplicationMode.DEFAULT);
-		availableAppModes = new LinkedHashSet<>(ApplicationMode.values(getMyApplication()));
-		availableAppModes.remove(ApplicationMode.DEFAULT);
-		baseProfiles = getBaseProfiles(getMyActivity());
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-		@Nullable Bundle savedInstanceState) {
-		nightMode = !requireSettings().isLightContent();
-
-		int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
-		Context themedContext = new ContextThemeWrapper(getContext(), themeRes);
-		View view = inflater.cloneInContext(themedContext).inflate(R.layout.profiles_list_fragment, container, false);
-
-		AppBarLayout appBar = (AppBarLayout) view.findViewById(R.id.appbar);
-		if (!(getActivity() instanceof SettingsProfileActivity)) {
-			AndroidUtils.addStatusBarPadding21v(getContext(), view);
-			ViewCompat.setElevation(appBar, 5.0f);
-
-			TextView toolbarTitle = (TextView) view.findViewById(R.id.toolbar_title);
-			toolbarTitle.setText(R.string.application_profiles);
-
-			View closeButton = view.findViewById(R.id.close_button);
-			closeButton.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					MapActivity mapActivity = (MapActivity) getActivity();
-					if (mapActivity != null) {
-						mapActivity.onBackPressed();
-					}
-				}
-			});
-		} else {
-			AndroidUiHelper.updateVisibility(appBar, false);
-		}
-
-		RecyclerView recyclerView = view.findViewById(R.id.profiles_list);
-		LinearLayout addNewProfileBtn = view.findViewById(R.id.add_profile_btn);
-
-		addNewProfileBtn.setOnClickListener(new OnClickListener() {
-
-
-			@Override
-			public void onClick(View v) {
-				final SelectProfileBottomSheetDialogFragment dialog = new SelectProfileBottomSheetDialogFragment();
-				Bundle bundle = new Bundle();
-				bundle.putString(DIALOG_TYPE, TYPE_BASE_APP_PROFILE);
-				dialog.setArguments(bundle);
-				if (getActivity() != null) {
-					getActivity().getSupportFragmentManager().beginTransaction()
-						.add(dialog, "select_base_type").commitAllowingStateLoss();
-				}
-			}
-		});
-
-		adapter = new ConfigureProfileMenuAdapter(allAppModes, availableAppModes, getMyApplication(), null, !getMyApplication().getSettings().isLightContent());
-		recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-		recyclerView.setAdapter(adapter);
-		return view;
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-		adapter.setProfilePressedListener(this);
-		adapter.setProfileSelectedListener(this);
-		getBaseProfileListener();
-
-		allAppModes = new ArrayList<>(ApplicationMode.allPossibleValues());
-		allAppModes.remove(ApplicationMode.DEFAULT);
-		adapter.updateItemsList(allAppModes, new LinkedHashSet<>(ApplicationMode.values(getMyApplication())));
-	}
-
-	@Override
-	public int getStatusBarColorId() {
-		return nightMode ? R.color.status_bar_color_dark : R.color.status_bar_color_light;
-	}
-
-	SelectProfileListener getBaseProfileListener() {
-		if (typeListener == null) {
-			typeListener = new SelectProfileListener() {
-				@Override
-				public void onSelectedType(Bundle args) {
-					FragmentActivity activity = getActivity();
-					String profileKey = args.getString(PROFILE_KEY_ARG);
-					if (activity != null) {
-						if (activity instanceof SettingsProfileActivity) {
-							Intent intent = new Intent(getActivity(), EditProfileActivity.class);
-							intent.putExtra(IS_NEW_PROFILE, true);
-							intent.putExtra(IS_USER_PROFILE, true);
-							intent.putExtra(PROFILE_STRING_KEY, profileKey);
-							activity.startActivity(intent);
-						} else {
-							FragmentManager fragmentManager = activity.getSupportFragmentManager();
-							if (fragmentManager != null) {
-								EditProfileFragment.showInstance(fragmentManager, true, true, profileKey);
-							}
-						}
-					}
-				}
-			};
-		}
-		return typeListener;
-	}
-
-	public static List<ProfileDataObject> getBaseProfiles(Context ctx) {
-		List<ProfileDataObject> profiles = new ArrayList<>();
-		for (ApplicationMode mode : ApplicationMode.getDefaultValues()) {
-			if (mode != ApplicationMode.DEFAULT) {
-				profiles.add(new ProfileDataObject(mode.toHumanString(ctx), mode.getDescription(ctx),
-					mode.getStringKey(), mode.getIconRes(), false, mode.getIconColorInfo()));
-			}
-		}
-		return profiles;
-	}
-
-	@Override
-	public void onProfilePressed(ApplicationMode item) {
-		FragmentActivity activity = getActivity();
-		if (activity != null) {
-			if (activity instanceof SettingsProfileActivity) {
-				Intent intent = new Intent(getActivity(), EditProfileActivity.class);
-				intent.putExtra(PROFILE_STRING_KEY, item.getStringKey());
-				intent.putExtra(IS_USER_PROFILE, item.isCustomProfile());
-				activity.startActivity(intent);
-			} else {
-				FragmentManager fragmentManager = activity.getSupportFragmentManager();
-				if (fragmentManager != null) {
-					String profileKey = item.getStringKey();
-					EditProfileFragment.showInstance(fragmentManager, false, item.isCustomProfile(), profileKey);
-				}
-			}
-		}
-	}
-
-	@Override
-	public void onProfileSelected(ApplicationMode item, boolean isChecked) {
-		if (isChecked) {
-			availableAppModes.add(item);
-		} else {
-			availableAppModes.remove(item);
-		}
-		ApplicationMode.changeProfileAvailability(item, isChecked, getMyApplication());
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java b/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
deleted file mode 100644
index 617e370910..0000000000
--- a/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package net.osmand.plus.rastermaps;
-
-
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceScreen;
-
-import net.osmand.ResultMatcher;
-import net.osmand.map.TileSourceManager.TileSourceTemplate;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.SettingsBaseActivity;
-import net.osmand.plus.views.SeekBarPreference;
-
-import java.util.Map;
-
-public class SettingsRasterMapsActivity extends SettingsBaseActivity {
-
-	private ListPreference tileSourcePreference;
-	private ListPreference overlayPreference;
-	private ListPreference underlayPreference;
-	public static final String MORE_VALUE = "MORE_VALUE";
-	public static final String DEFINE_EDIT = "DEFINE_EDIT";
-
-
-	@Override
-    public void onCreate(Bundle savedInstanceState) {
-		((OsmandApplication) getApplication()).applyTheme(this);
-		super.onCreate(savedInstanceState);
-		getToolbar().setTitle(R.string.shared_string_online_maps);
-		PreferenceScreen grp = getPreferenceScreen();
-		OnPreferenceChangeListener listener = createPreferenceListener();
-		
-		PreferenceCategory cat = new PreferenceCategory(this);
-		cat.setTitle(R.string.pref_raster_map);
-		grp.addPreference(cat);
-	
-		// present on configure map
-//		addTileSourcePrefs(listener, cat);
-		
-
-//		int startZoom = 1;
-//		int endZoom = 18;
-//		String[] entries = new String[endZoom - startZoom + 1];
-//		Integer[] intValues = new Integer[endZoom - startZoom + 1];
-//		for (int i = startZoom; i <= endZoom; i++) {
-//			entries[i - startZoom] = i + ""; //$NON-NLS-1$
-//			intValues[i - startZoom] = i ;
-//		}
-//		ListPreference lp = createListPreference(settings.LEVEL_TO_SWITCH_VECTOR_RASTER, 
-//				entries, intValues, R.string.level_to_switch_vector_raster, R.string.level_to_switch_vector_raster_descr);
-//		cat.addPreference(lp);
-
-		// present on configure map
-//		addOverlayPrefs(grp, listener);
-		
-    }
-
-
-	@SuppressWarnings("unused")
-	private void addOverlayPrefs(PreferenceScreen grp, OnPreferenceChangeListener listener) {
-		PreferenceCategory cat;
-		cat = new PreferenceCategory(this);
-		cat.setTitle(R.string.pref_overlay);
-		grp.addPreference(cat);
-		
-		overlayPreference = new ListPreference(this);
-		overlayPreference.setSummary(R.string.map_overlay_descr);
-		overlayPreference.setTitle(R.string.map_overlay);
-		overlayPreference.setOnPreferenceChangeListener(listener);
-		cat.addPreference(overlayPreference);
-		underlayPreference = new ListPreference(this);
-		underlayPreference.setSummary(R.string.map_underlay_descr);
-		underlayPreference.setTitle(R.string.map_underlay);
-		underlayPreference.setOnPreferenceChangeListener(listener);
-		cat.addPreference(underlayPreference);
-		
-		SeekBarPreference sp = createSeekBarPreference(settings.MAP_OVERLAY_TRANSPARENCY, R.string.overlay_transparency, R.string.overlay_transparency_descr,
-				R.string.modify_transparency, 0, 255);
-		cat.addPreference(sp);
-		sp = createSeekBarPreference(settings.MAP_TRANSPARENCY, R.string.map_transparency, R.string.map_transparency_descr,
-				R.string.modify_transparency, 0, 255);
-		cat.addPreference(sp);
-	}
-
-
-	@SuppressWarnings("unused")
-	private void addTileSourcePrefs(OnPreferenceChangeListener listener, PreferenceCategory cat) {
-		CheckBoxPreference mapVectorData = createCheckBoxPreference(settings.MAP_ONLINE_DATA,
-				R.string.map_online_data, R.string.map_online_data_descr);
-		cat.addPreference(mapVectorData);
-		
-		tileSourcePreference = new ListPreference(this);
-		tileSourcePreference.setSummary(R.string.map_tile_source_descr);
-		tileSourcePreference.setTitle(R.string.map_tile_source);
-		tileSourcePreference.setOnPreferenceChangeListener(listener);
-		cat.addPreference(tileSourcePreference);
-	}
-
-
-	public void updateAllSettings() {
-		super.updateAllSettings();
-		updateTileSourceSummary();
-	}
-	
-	private void updateTileSourceSummary() {
-		if (tileSourcePreference != null) {
-			fillTileSourcesToPreference(tileSourcePreference, settings.MAP_TILE_SOURCES.get(), false);
-			fillTileSourcesToPreference(overlayPreference, settings.MAP_OVERLAY.get(), true);
-			fillTileSourcesToPreference(underlayPreference, settings.MAP_UNDERLAY.get(), true);
-
-			//		String mapName = " " + osmandSettings.MAP_TILE_SOURCES.get(); //$NON-NLS-1$
-			// String summary = tileSourcePreference.getSummary().toString();
-			// if (summary.lastIndexOf(':') != -1) {
-			// summary = summary.substring(0, summary.lastIndexOf(':') + 1);
-			// }
-			// tileSourcePreference.setSummary(summary + mapName);
-			;
-			tileSourcePreference.setSummary(format(R.string.map_tile_source_descr, settings.MAP_TILE_SOURCES.get()));
-			overlayPreference.setSummary(format(R.string.map_overlay_descr, settings.MAP_OVERLAY.get()) );
-			underlayPreference.setSummary(format(R.string.map_underlay_descr, settings.MAP_UNDERLAY.get()) );
-		}
-	}
-	
-	private String format(int r, String string) {
-		return getString(r) + " [" + (string == null ? "" : string) + "]";
-	}
-
-
-	private void fillTileSourcesToPreference(ListPreference tileSourcePreference, String value, boolean addNone) {
-		Map<String, String> entriesMap = settings.getTileSourceEntries();
-		int add = addNone ? 1 : 0;
-		String[] entries = new String[entriesMap.size() + 2 + add];
-		String[] values = new String[entriesMap.size() + 2 + add];
-		int ki = 0;
-		if (addNone) {
-			entries[ki] = getString(R.string.shared_string_none);
-			values[ki] = "";
-			ki++;
-		}
-		if (value == null) {
-			value = "";
-		}
-
-		for (Map.Entry<String, String> es : entriesMap.entrySet()) {
-			entries[ki] = es.getValue();
-			values[ki] = es.getKey();
-			ki++;
-		}
-		entries[ki] = getMyApplication().getString(R.string.install_more);
-		values[ki] = MORE_VALUE;
-		ki++;
-		entries[ki] = getMyApplication().getString(R.string.maps_define_edit);
-		values[ki] = DEFINE_EDIT;
-		fill(tileSourcePreference, entries, values, value);
-	}
-	
-	private void fill(ListPreference component, String[] list, String[] values, String selected) {
-		component.setEntries(list);
-		component.setEntryValues(values);
-		component.setValue(selected);
-	}
-	
-	private OnPreferenceChangeListener createPreferenceListener() {
-		return new OnPreferenceChangeListener() {
-			@Override
-			public boolean onPreferenceChange(Preference preference, Object newValue) {
-				if (preference == tileSourcePreference || preference == overlayPreference 
-						|| preference == underlayPreference) {
-					if(MORE_VALUE.equals(newValue)){
-						OsmandRasterMapsPlugin.installMapLayers(SettingsRasterMapsActivity.this, new ResultMatcher<TileSourceTemplate>() {
-							@Override
-							public boolean isCancelled() { return false;}
-
-							@Override
-							public boolean publish(TileSourceTemplate object) {
-								if(object == null){
-									updateTileSourceSummary();
-								}
-								return true;
-							}
-						});
-					} else if(DEFINE_EDIT.equals(newValue)){
-						OsmandRasterMapsPlugin.defineNewEditLayer(SettingsRasterMapsActivity.this, new ResultMatcher<TileSourceTemplate>() {
-							@Override
-							public boolean isCancelled() { return false;}
-
-							@Override
-							public boolean publish(TileSourceTemplate object) {
-								updateTileSourceSummary();
-								return true;
-							}
-						});
-					} else if(preference == tileSourcePreference){
-						settings.MAP_TILE_SOURCES.set((String) newValue);
-						updateTileSourceSummary();
-					} else {
-						if(((String) newValue).length() == 0){
-							newValue = null;
-						}
-						if(preference == underlayPreference){
-							settings.MAP_UNDERLAY.set(((String) newValue));
-							underlayPreference.setSummary(getString(R.string.map_underlay_descr) + "  [" + settings.MAP_UNDERLAY.get() + "]");
-						} else if(preference == overlayPreference){
-							settings.MAP_OVERLAY.set(((String) newValue));
-							overlayPreference.setSummary(getString(R.string.map_overlay_descr) + "  [" + settings.MAP_OVERLAY.get() + "]");
-						}
-					}
-				}
-				return true;
-			}
-		};
-	}
-
-}
diff --git a/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java
index 5a8610e9a2..18b66b81ab 100644
--- a/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java
@@ -72,7 +72,13 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
 		OnPreferenceClickListener, AppModeChangedListener {
 
 	private static final Log LOG = PlatformUtil.getLog(BaseSettingsFragment.class);
-	private static final String APP_MODE_KEY = "app_mode_key";
+
+	public static final String APP_MODE_KEY = "app_mode_key";
+	public static final String OPEN_CONFIG_PROFILE = "openConfigProfile";
+	public static final String OPEN_SETTINGS = "openSettings";
+	public static final String OPEN_CONFIG_ON_MAP = "openConfigOnMap";
+	public static final String MAP_CONFIG = "openMapConfigMenu";
+	public static final String SCREEN_CONFIG = "screenConfig";
 
 	protected OsmandApplication app;
 	protected OsmandSettings settings;
diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
index d87f5f4d32..d3d2a2a573 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
@@ -52,10 +52,6 @@ import java.io.File;
 import java.util.List;
 
 import static net.osmand.plus.UiUtilities.CompoundButtonType.TOOLBAR;
-import static net.osmand.plus.profiles.EditProfileFragment.MAP_CONFIG;
-import static net.osmand.plus.profiles.EditProfileFragment.OPEN_CONFIG_ON_MAP;
-import static net.osmand.plus.profiles.EditProfileFragment.SCREEN_CONFIG;
-import static net.osmand.plus.profiles.EditProfileFragment.SELECTED_ITEM;
 
 public class ConfigureProfileFragment extends BaseSettingsFragment implements CopyAppModePrefsListener, ResetAppModePrefsListener {
 
@@ -248,7 +244,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 
 		Intent intent = new Intent(ctx, MapActivity.class);
 		intent.putExtra(OPEN_CONFIG_ON_MAP, MAP_CONFIG);
-		intent.putExtra(SELECTED_ITEM, getSelectedAppMode().getStringKey());
+		intent.putExtra(APP_MODE_KEY, getSelectedAppMode().getStringKey());
 		configureMap.setIntent(intent);
 	}
 
@@ -262,7 +258,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 
 		Intent intent = new Intent(ctx, MapActivity.class);
 		intent.putExtra(OPEN_CONFIG_ON_MAP, SCREEN_CONFIG);
-		intent.putExtra(SELECTED_ITEM, getSelectedAppMode().getStringKey());
+		intent.putExtra(APP_MODE_KEY, getSelectedAppMode().getStringKey());
 		configureMap.setIntent(intent);
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
index 9453385d99..e2c83de23e 100644
--- a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.settings;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.SwitchPreferenceCompat;
@@ -10,6 +11,7 @@ import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.profiles.ProfileDataObject;
 import net.osmand.plus.profiles.RoutingProfileDataObject;
 import net.osmand.plus.profiles.RoutingProfileDataObject.RoutingProfilesResources;
 import net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment;
@@ -18,7 +20,9 @@ import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
 import net.osmand.router.GeneralRouter;
 import net.osmand.util.Algorithms;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.DIALOG_TYPE;
@@ -186,6 +190,17 @@ public class NavigationFragment extends BaseSettingsFragment {
 		return profilesObjects;
 	}
 
+	public static List<ProfileDataObject> getBaseProfiles(Context ctx) {
+		List<ProfileDataObject> profiles = new ArrayList<>();
+		for (ApplicationMode mode : ApplicationMode.getDefaultValues()) {
+			if (mode != ApplicationMode.DEFAULT) {
+				profiles.add(new ProfileDataObject(mode.toHumanString(ctx), mode.getDescription(ctx),
+						mode.getStringKey(), mode.getIconRes(), false, mode.getIconColorInfo()));
+			}
+		}
+		return profiles;
+	}
+
 	private void setupVehicleParametersPref() {
 		Preference vehicleParameters = findPreference("vehicle_parameters");
 		int iconRes = getSelectedAppMode().getIconRes();

From a2facffc5c8d142e9dade12963caf8aea0264d42 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Fri, 24 Jan 2020 17:47:10 +0200
Subject: [PATCH 02/24] Add app mode params to settings

---
 .../src/net/osmand/plus/OsmandSettings.java   | 122 +++++++++++++++++-
 1 file changed, 120 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index bde5832a5c..cb4d06b1f6 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -30,6 +30,9 @@ import net.osmand.map.ITileSource;
 import net.osmand.map.TileSourceManager;
 import net.osmand.map.TileSourceManager.TileSourceTemplate;
 import net.osmand.osm.io.NetworkUtils;
+import net.osmand.plus.ApplicationMode.LocationIcon;
+import net.osmand.plus.ApplicationMode.NavigationIcon;
+import net.osmand.plus.ApplicationMode.ProfileIconColors;
 import net.osmand.plus.access.AccessibilityMode;
 import net.osmand.plus.access.RelativeDirectionStyle;
 import net.osmand.plus.api.SettingsAPI;
@@ -40,6 +43,7 @@ import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.mapillary.MapillaryPlugin;
 import net.osmand.plus.mapmarkers.CoordinateInputFormats.Format;
 import net.osmand.plus.render.RendererRegistry;
+import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.plus.voice.CommandPlayer;
 import net.osmand.render.RenderingRulesStorage;
 import net.osmand.util.Algorithms;
@@ -81,6 +85,8 @@ public class OsmandSettings {
 
 		void resetToDefault();
 
+		void resetModeToDefault(ApplicationMode m);
+
 		void overrideDefaultValue(T newDefaultValue);
 
 		void addListener(StateChangedListener<T> listener);
@@ -474,6 +480,11 @@ public class OsmandSettings {
 			set(ApplicationMode.DEFAULT);
 		}
 
+		@Override
+		public void resetModeToDefault(ApplicationMode m) {
+			throw new UnsupportedOperationException();
+		}
+
 		@Override
 		public boolean isSet() {
 			return true;
@@ -747,6 +758,16 @@ public class OsmandSettings {
 			set(o);
 		}
 
+		@Override
+		public void resetModeToDefault(ApplicationMode mode) {
+			if (global) {
+				resetToDefault();
+			} else {
+				T o = getProfileDefaultValue(mode);
+				setModeValue(mode, o);
+			}
+		}
+
 		@Override
 		public boolean set(T obj) {
 			Object prefs = getPreferences();
@@ -1446,8 +1467,17 @@ public class OsmandSettings {
 	public final OsmandPreference<Float> SPEED_LIMIT_EXCEED =
 			new FloatPreference("speed_limit_exceed", 5f).makeProfile();
 
-	public final OsmandPreference<Float> DEFAULT_SPEED = new FloatPreference(
-			"default_speed", 0f).makeProfile().cache();
+	public final CommonPreference<Float> DEFAULT_SPEED = new FloatPreference("default_speed", 10f).makeProfile().cache();
+
+	{
+		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.DEFAULT, 1.5f);
+		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.CAR, 12.5f);
+		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.BICYCLE, 2.77f);
+		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 1.11f);
+		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.BOAT, 1.38f);
+		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.AIRCRAFT, 40f);
+		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.SKI, 1.38f);
+	}
 
 	public final OsmandPreference<Float> MIN_SPEED = new FloatPreference(
 			"min_speed", 0f).makeProfile().cache();
@@ -1455,6 +1485,94 @@ public class OsmandSettings {
 	public final OsmandPreference<Float> MAX_SPEED = new FloatPreference(
 			"max_speed", 0f).makeProfile().cache();
 
+	public final CommonPreference<String> ICON_RES_NAME = new StringPreference("app_mode_icon_res_name", "ic_world_globe_dark").makeProfile().cache();
+
+	{
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.DEFAULT, "ic_world_globe_dark");
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.CAR, "ic_action_car");
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.BICYCLE, "ic_action_bicycle");
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.PEDESTRIAN, "ic_action_pedestrian");
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.PUBLIC_TRANSPORT, "ic_action_bus");
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.BOAT, "ic_action_sail_boat");
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.AIRCRAFT, "ic_action_aircraft");
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.SKI, "ic_action_skiing");
+	}
+
+	public final CommonPreference<ProfileIconColors> ICON_COLOR = new EnumIntPreference<>("app_mode_icon_color", ProfileIconColors.DEFAULT, ProfileIconColors.values()).makeProfile().cache();
+
+	public final CommonPreference<String> USER_PROFILE_NAME = new StringPreference("user_profile_name", "").makeProfile().cache();
+
+	public final CommonPreference<String> ROUTING_PROFILE = new StringPreference("routing_profile", "").makeProfile().cache();
+
+	{
+		ROUTING_PROFILE.setModeDefaultValue(ApplicationMode.CAR, "car");
+		ROUTING_PROFILE.setModeDefaultValue(ApplicationMode.BICYCLE, "bicycle");
+		ROUTING_PROFILE.setModeDefaultValue(ApplicationMode.PEDESTRIAN, "pedestrian");
+		ROUTING_PROFILE.setModeDefaultValue(ApplicationMode.PUBLIC_TRANSPORT, "public_transport");
+		ROUTING_PROFILE.setModeDefaultValue(ApplicationMode.BOAT, "boat");
+		ROUTING_PROFILE.setModeDefaultValue(ApplicationMode.AIRCRAFT, "STRAIGHT_LINE_MODE");
+		ROUTING_PROFILE.setModeDefaultValue(ApplicationMode.SKI, "ski");
+	}
+
+	public final CommonPreference<RouteService> ROUTE_SERVICE = new EnumIntPreference<>("route_service", RouteService.OSMAND, RouteService.values()).makeProfile().cache();
+
+	{
+		ROUTE_SERVICE.setModeDefaultValue(ApplicationMode.AIRCRAFT, RouteService.STRAIGHT);
+	}
+
+	public final CommonPreference<Integer> MIN_DISTANCE_FOR_TURN = new IntPreference("min_distance_for_turn", 50).makeProfile().cache();
+
+	{
+		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.DEFAULT, 5);
+		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.CAR, 35);
+		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.BICYCLE, 15);
+		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 5);
+		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.BOAT, 20);
+		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.AIRCRAFT, 100);
+		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.SKI, 15);
+	}
+
+	public final CommonPreference<Integer> ARRIVAL_DISTANCE = new IntPreference("arrival_distance", 90).makeProfile().cache();
+
+	{
+		ARRIVAL_DISTANCE.setModeDefaultValue(ApplicationMode.DEFAULT, 90);
+		ARRIVAL_DISTANCE.setModeDefaultValue(ApplicationMode.BICYCLE, 60);
+		ARRIVAL_DISTANCE.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 45);
+		ARRIVAL_DISTANCE.setModeDefaultValue(ApplicationMode.SKI, 60);
+	}
+
+	public final CommonPreference<Integer> OFF_ROUTE_DISTANCE = new IntPreference("off_route_distance", 350).makeProfile().cache();
+
+	{
+		OFF_ROUTE_DISTANCE.setModeDefaultValue(ApplicationMode.BICYCLE, 50);
+		OFF_ROUTE_DISTANCE.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 20);
+		OFF_ROUTE_DISTANCE.setModeDefaultValue(ApplicationMode.SKI, 50);
+	}
+
+	public final CommonPreference<NavigationIcon> NAVIGATION_ICON = new EnumIntPreference<>("navigation_icon", NavigationIcon.DEFAULT, NavigationIcon.values()).makeProfile().cache();
+
+	{
+		NAVIGATION_ICON.setModeDefaultValue(ApplicationMode.DEFAULT, NavigationIcon.DEFAULT);
+		NAVIGATION_ICON.setModeDefaultValue(ApplicationMode.CAR, NavigationIcon.DEFAULT);
+		NAVIGATION_ICON.setModeDefaultValue(ApplicationMode.BICYCLE, NavigationIcon.DEFAULT);
+		NAVIGATION_ICON.setModeDefaultValue(ApplicationMode.BOAT, NavigationIcon.NAUTICAL);
+		NAVIGATION_ICON.setModeDefaultValue(ApplicationMode.AIRCRAFT, NavigationIcon.DEFAULT);
+		NAVIGATION_ICON.setModeDefaultValue(ApplicationMode.SKI, NavigationIcon.DEFAULT);
+	}
+
+	public final CommonPreference<LocationIcon> LOCATION_ICON = new EnumIntPreference<>("location_icon", LocationIcon.DEFAULT, LocationIcon.values()).makeProfile().cache();
+
+	{
+		LOCATION_ICON.setModeDefaultValue(ApplicationMode.DEFAULT, LocationIcon.DEFAULT);
+		LOCATION_ICON.setModeDefaultValue(ApplicationMode.CAR, LocationIcon.CAR);
+		LOCATION_ICON.setModeDefaultValue(ApplicationMode.BICYCLE, LocationIcon.BICYCLE);
+		LOCATION_ICON.setModeDefaultValue(ApplicationMode.BOAT, LocationIcon.DEFAULT);
+		LOCATION_ICON.setModeDefaultValue(ApplicationMode.AIRCRAFT, LocationIcon.CAR);
+		LOCATION_ICON.setModeDefaultValue(ApplicationMode.SKI, LocationIcon.BICYCLE);
+	}
+
+	public final CommonPreference<Integer> APP_MODE_ORDER = new IntPreference("app_mode_order", 0).makeProfile().cache();
+
 	public final OsmandPreference<Float> SWITCH_MAP_DIRECTION_TO_COMPASS =
 			new FloatPreference("speed_for_map_to_direction_of_movement", 0f).makeProfile();
 

From 13b61b061e375f4e51f2a120828762e5b35ac18d Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Sun, 26 Jan 2020 17:57:54 +0200
Subject: [PATCH 03/24] Reset default app mode speed in settings

---
 .../src/net/osmand/plus/ApplicationMode.java  | 34 ++++++++++---------
 .../src/net/osmand/plus/OsmandSettings.java   | 10 +++---
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index f1d500bdb7..31dd67f93a 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -73,7 +73,6 @@ public class ApplicationMode {
 	private RouteService routeService = RouteService.OSMAND;
 
 	private float defaultSpeed = 10f;
-	private float initialDefaultSpeed = defaultSpeed;
 	private int minDistanceForTurn = 50;
 	private int arrivalDistance = 90;
 	private int offRouteDistance = 350;
@@ -223,7 +222,6 @@ public class ApplicationMode {
 		private ApplicationMode customReg() {
 			ApplicationMode m = applicationMode;
 			m.defaultSpeed = m.parentAppMode.defaultSpeed;
-			m.initialDefaultSpeed = m.parentAppMode.initialDefaultSpeed;
 			m.minDistanceForTurn = m.parentAppMode.minDistanceForTurn;
 			m.arrivalDistance = m.parentAppMode.arrivalDistance;
 			m.offRouteDistance = m.parentAppMode.offRouteDistance;
@@ -253,17 +251,7 @@ public class ApplicationMode {
 		}
 
 		public ApplicationModeBuilder icon(Context app, String iconResName) {
-			try {
-				int iconRes = app.getResources().getIdentifier(iconResName, "drawable", app.getPackageName());
-				int iconMapRes = app.getResources().getIdentifier(iconResName.replace("ic_", "map_"), "drawable", app.getPackageName());
-				if (iconRes != 0 && iconMapRes != 0) {
-					applicationMode.iconResName = iconResName;
-					applicationMode.iconRes = iconRes;
-					applicationMode.iconMapRes = iconMapRes;
-				}
-			} catch (Exception e) {
-//				return R.drawable.map_world_globe_dark;
-			}
+			updateAppModeIcon(app, iconResName, applicationMode);
 			return this;
 		}
 
@@ -284,7 +272,6 @@ public class ApplicationMode {
 
 		public ApplicationModeBuilder speed(float defSpeed, int distForTurn) {
 			applicationMode.defaultSpeed = defSpeed;
-			applicationMode.initialDefaultSpeed = defSpeed;
 			applicationMode.minDistanceForTurn = distForTurn;
 			return this;
 		}
@@ -325,6 +312,20 @@ public class ApplicationMode {
 		}
 	}
 
+	private static void updateAppModeIcon(Context app, String iconResName, ApplicationMode mode) {
+		try {
+			int iconRes = app.getResources().getIdentifier(iconResName, "drawable", app.getPackageName());
+			int iconMapRes = app.getResources().getIdentifier(iconResName.replace("ic_", "map_"), "drawable", app.getPackageName());
+			if (iconRes != 0 && iconMapRes != 0) {
+				mode.iconResName = iconResName;
+				mode.iconRes = iconRes;
+				mode.iconMapRes = iconMapRes;
+			}
+		} catch (Exception e) {
+//				return R.drawable.map_world_globe_dark;
+		}
+	}
+
 	private static ApplicationModeBuilder create(ApplicationMode parent, int key, String stringKey) {
 		ApplicationModeBuilder builder = new ApplicationModeBuilder();
 		builder.applicationMode = new ApplicationMode(key, stringKey);
@@ -544,8 +545,9 @@ public class ApplicationMode {
 	}
 
 	public void resetDefaultSpeed(OsmandApplication app) {
-		this.defaultSpeed = initialDefaultSpeed;
-		app.getSettings().DEFAULT_SPEED.setModeValue(this, 0f);
+		OsmandSettings settings = app.getSettings();
+		settings.DEFAULT_SPEED.resetModeToDefault(this);
+		this.defaultSpeed = settings.DEFAULT_SPEED.getModeValue(this);
 	}
 
 	public int getMinDistanceForTurn() {
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index cb4d06b1f6..9243d9fd2e 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1489,11 +1489,11 @@ public class OsmandSettings {
 
 	{
 		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.DEFAULT, "ic_world_globe_dark");
-		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.CAR, "ic_action_car");
-		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.BICYCLE, "ic_action_bicycle");
-		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.PEDESTRIAN, "ic_action_pedestrian");
-		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.PUBLIC_TRANSPORT, "ic_action_bus");
-		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.BOAT, "ic_action_sail_boat");
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.CAR, "ic_action_car_dark");
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.BICYCLE, "ic_action_bicycle_dark");
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.PEDESTRIAN, "ic_action_pedestrian_dark");
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.PUBLIC_TRANSPORT, "ic_action_bus_dark");
+		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.BOAT, "ic_action_sail_boat_dark");
 		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.AIRCRAFT, "ic_action_aircraft");
 		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.SKI, "ic_action_skiing");
 	}

From 6a5cd8ded29231de08cfe4ac704cdcc37967308c Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Mon, 27 Jan 2020 13:54:01 +0200
Subject: [PATCH 04/24] Move app mode UI enums to profiles package

---
 .../src/net/osmand/plus/ApplicationMode.java  | 14 ++--
 .../src/net/osmand/plus/OsmandSettings.java   |  6 +-
 .../osmand/plus/profiles/LocationIcon.java    | 29 +++++++
 .../osmand/plus/profiles/NavigationIcon.java  | 22 +++++
 .../plus/profiles/ProfileDataObject.java      |  1 -
 .../plus/profiles/ProfileIconColors.java      | 37 +++++++++
 .../osmand/plus/profiles/ProfileIcons.java    | 80 +++++++++++++++++++
 .../settings/ProfileAppearanceFragment.java   |  4 +
 8 files changed, 182 insertions(+), 11 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/profiles/LocationIcon.java
 create mode 100644 OsmAnd/src/net/osmand/plus/profiles/NavigationIcon.java
 create mode 100644 OsmAnd/src/net/osmand/plus/profiles/ProfileIconColors.java
 create mode 100644 OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 31dd67f93a..93b1febc7d 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -1,10 +1,7 @@
 package net.osmand.plus;
 
 import android.content.Context;
-import android.support.annotation.ColorRes;
 import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -12,6 +9,9 @@ import com.google.gson.annotations.Expose;
 import com.google.gson.reflect.TypeToken;
 
 import net.osmand.StateChangedListener;
+import net.osmand.plus.profiles.LocationIcon;
+import net.osmand.plus.profiles.NavigationIcon;
+import net.osmand.plus.profiles.ProfileIconColors;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.util.Algorithms;
 
@@ -156,13 +156,13 @@ public class ApplicationMode {
 
 	private static void initRegVisibility() {
 		// DEFAULT, CAR, BICYCLE, PEDESTRIAN, PUBLIC_TRANSPORT, BOAT, AIRCRAFT, SKI
-		ApplicationMode[] exceptDefault = new ApplicationMode[]{CAR, BICYCLE, PEDESTRIAN, PUBLIC_TRANSPORT, BOAT, AIRCRAFT, SKI};
+		ApplicationMode[] exceptDefault = new ApplicationMode[] {CAR, BICYCLE, PEDESTRIAN, PUBLIC_TRANSPORT, BOAT, AIRCRAFT, SKI};
 		ApplicationMode[] all = null;
-		ApplicationMode[] none = new ApplicationMode[]{};
+		ApplicationMode[] none = new ApplicationMode[] {};
 
 		// left
-		ApplicationMode[] navigationSet1 = new ApplicationMode[]{CAR, BICYCLE, BOAT, SKI};
-		ApplicationMode[] navigationSet2 = new ApplicationMode[]{PEDESTRIAN, PUBLIC_TRANSPORT, AIRCRAFT};
+		ApplicationMode[] navigationSet1 = new ApplicationMode[] {CAR, BICYCLE, BOAT, SKI};
+		ApplicationMode[] navigationSet2 = new ApplicationMode[] {PEDESTRIAN, PUBLIC_TRANSPORT, AIRCRAFT};
 
 		regWidgetVisibility(WIDGET_NEXT_TURN, navigationSet1);
 		regWidgetVisibility(WIDGET_NEXT_TURN_SMALL, navigationSet2);
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 9243d9fd2e..fdfb1de9db 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -30,9 +30,9 @@ import net.osmand.map.ITileSource;
 import net.osmand.map.TileSourceManager;
 import net.osmand.map.TileSourceManager.TileSourceTemplate;
 import net.osmand.osm.io.NetworkUtils;
-import net.osmand.plus.ApplicationMode.LocationIcon;
-import net.osmand.plus.ApplicationMode.NavigationIcon;
-import net.osmand.plus.ApplicationMode.ProfileIconColors;
+import net.osmand.plus.profiles.LocationIcon;
+import net.osmand.plus.profiles.NavigationIcon;
+import net.osmand.plus.profiles.ProfileIconColors;
 import net.osmand.plus.access.AccessibilityMode;
 import net.osmand.plus.access.RelativeDirectionStyle;
 import net.osmand.plus.api.SettingsAPI;
diff --git a/OsmAnd/src/net/osmand/plus/profiles/LocationIcon.java b/OsmAnd/src/net/osmand/plus/profiles/LocationIcon.java
new file mode 100644
index 0000000000..7ac87b1554
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/profiles/LocationIcon.java
@@ -0,0 +1,29 @@
+package net.osmand.plus.profiles;
+
+import android.support.annotation.DrawableRes;
+
+import net.osmand.plus.R;
+
+public enum LocationIcon {
+	DEFAULT(R.drawable.map_location_default, R.drawable.map_location_default_view_angle),
+	CAR(R.drawable.map_location_car, R.drawable.map_location_car_view_angle),
+	BICYCLE(R.drawable.map_location_bicycle, R.drawable.map_location_bicycle_view_angle);
+
+	LocationIcon(@DrawableRes int iconId, @DrawableRes int headingIconId) {
+		this.iconId = iconId;
+		this.headingIconId = headingIconId;
+	}
+
+	@DrawableRes
+	private final int iconId;
+	@DrawableRes
+	private final int headingIconId;
+
+	public int getIconId() {
+		return iconId;
+	}
+
+	public int getHeadingIconId() {
+		return headingIconId;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/profiles/NavigationIcon.java b/OsmAnd/src/net/osmand/plus/profiles/NavigationIcon.java
new file mode 100644
index 0000000000..fa636079f4
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/profiles/NavigationIcon.java
@@ -0,0 +1,22 @@
+package net.osmand.plus.profiles;
+
+import android.support.annotation.DrawableRes;
+
+import net.osmand.plus.R;
+
+public enum NavigationIcon {
+	DEFAULT(R.drawable.map_navigation_default),
+	NAUTICAL(R.drawable.map_navigation_nautical),
+	CAR(R.drawable.map_navigation_car);
+
+	NavigationIcon(@DrawableRes int iconId) {
+		this.iconId = iconId;
+	}
+
+	@DrawableRes
+	private final int iconId;
+
+	public int getIconId() {
+		return iconId;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/profiles/ProfileDataObject.java b/OsmAnd/src/net/osmand/plus/profiles/ProfileDataObject.java
index 25083aa7ae..9d0bf40a12 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/ProfileDataObject.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/ProfileDataObject.java
@@ -1,7 +1,6 @@
 package net.osmand.plus.profiles;
 
 import android.support.annotation.ColorRes;
-import net.osmand.plus.ApplicationMode.ProfileIconColors;
 
 public class ProfileDataObject {
 
diff --git a/OsmAnd/src/net/osmand/plus/profiles/ProfileIconColors.java b/OsmAnd/src/net/osmand/plus/profiles/ProfileIconColors.java
new file mode 100644
index 0000000000..d22091119e
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/profiles/ProfileIconColors.java
@@ -0,0 +1,37 @@
+package net.osmand.plus.profiles;
+
+import android.support.annotation.ColorRes;
+import android.support.annotation.StringRes;
+
+import net.osmand.plus.R;
+
+public enum ProfileIconColors {
+	DEFAULT(R.string.rendering_value_default_name, R.color.profile_icon_color_blue_light_default, R.color.profile_icon_color_blue_dark_default),
+	PURPLE(R.string.rendering_value_purple_name, R.color.profile_icon_color_purple_light, R.color.profile_icon_color_purple_dark),
+	GREEN(R.string.rendering_value_green_name, R.color.profile_icon_color_green_light, R.color.profile_icon_color_green_dark),
+	BLUE(R.string.rendering_value_blue_name, R.color.profile_icon_color_blue_light, R.color.profile_icon_color_blue_dark),
+	RED(R.string.rendering_value_red_name, R.color.profile_icon_color_red_light, R.color.profile_icon_color_red_dark),
+	DARK_YELLOW(R.string.rendering_value_darkyellow_name, R.color.profile_icon_color_yellow_light, R.color.profile_icon_color_yellow_dark),
+	MAGENTA(R.string.shared_string_color_magenta, R.color.profile_icon_color_magenta_light, R.color.profile_icon_color_magenta_dark);
+
+	@StringRes
+	private int name;
+	@ColorRes
+	private int dayColor;
+	@ColorRes
+	private int nightColor;
+
+	ProfileIconColors(@StringRes int name, @ColorRes int dayColor, @ColorRes int nightColor) {
+		this.name = name;
+		this.dayColor = dayColor;
+		this.nightColor = nightColor;
+	}
+
+	public int getName() {
+		return name;
+	}
+
+	public int getColor(boolean nightMode) {
+		return nightMode ? nightColor : dayColor;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java b/OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java
new file mode 100644
index 0000000000..8543c21d1d
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java
@@ -0,0 +1,80 @@
+package net.osmand.plus.profiles;
+
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+
+import net.osmand.plus.R;
+
+import java.util.ArrayList;
+
+public enum ProfileIcons {
+	DEFAULT(R.drawable.ic_world_globe_dark, R.string.app_mode_default, "ic_world_globe_dark"),
+	CAR(R.drawable.ic_action_car_dark, R.string.app_mode_car, "ic_action_car_dark"),
+	TAXI(R.drawable.ic_action_taxi, R.string.app_mode_taxi, "ic_action_taxi"),
+	TRUCK(R.drawable.ic_action_truck_dark, R.string.app_mode_truck, "ic_action_truck_dark"),
+	SHUTTLE_BUS(R.drawable.ic_action_shuttle_bus, R.string.app_mode_shuttle_bus, "ic_action_shuttle_bus"),
+	BUS(R.drawable.ic_action_bus_dark, R.string.app_mode_bus, "ic_action_bus_dark"),
+	SUBWAY(R.drawable.ic_action_subway, R.string.app_mode_subway, "ic_action_subway"),
+	MOTORCYCLE(R.drawable.ic_action_motorcycle_dark, R.string.app_mode_motorcycle, "ic_action_motorcycle_dark"),
+	BICYCLE(R.drawable.ic_action_bicycle_dark, R.string.app_mode_bicycle, "ic_action_bicycle_dark"),
+	HORSE(R.drawable.ic_action_horse, R.string.app_mode_horse, "ic_action_horse"),
+	PEDESTRIAN(R.drawable.ic_action_pedestrian_dark, R.string.app_mode_pedestrian, "ic_action_pedestrian_dark"),
+	TREKKING(R.drawable.ic_action_trekking_dark, R.string.app_mode_hiking, "ic_action_trekking_dark"),
+	SKIING(R.drawable.ic_action_skiing, R.string.app_mode_skiing, "ic_action_skiing"),
+	SAIL_BOAT(R.drawable.ic_action_sail_boat_dark, R.string.app_mode_boat, "ic_action_sail_boat_dark"),
+	AIRCRAFT(R.drawable.ic_action_aircraft, R.string.app_mode_aircraft, "ic_action_aircraft"),
+	HELICOPTER(R.drawable.ic_action_helicopter, R.string.app_mode_helicopter, "ic_action_helicopter"),
+	TRANSPORTER(R.drawable.ic_action_personal_transporter, R.string.app_mode_personal_transporter, "ic_action_personal_transporter"),
+	MONOWHEEL(R.drawable.ic_action_monowheel, R.string.app_mode_monowheel, "ic_action_monowheel"),
+	SCOOTER(R.drawable.ic_action_scooter, R.string.app_mode_scooter, "ic_action_scooter"),
+	UFO(R.drawable.ic_action_ufo, R.string.app_mode_ufo, "ic_action_ufo"),
+	OFFROAD(R.drawable.ic_action_offroad, R.string.app_mode_offroad, "ic_action_offroad"),
+	CAMPERVAN(R.drawable.ic_action_campervan, R.string.app_mode_campervan, "ic_action_campervan"),
+	CAMPER(R.drawable.ic_action_camper, R.string.app_mode_camper, "ic_action_camper"),
+	PICKUP_TRUCK(R.drawable.ic_action_pickup_truck, R.string.app_mode_pickup_truck, "ic_action_pickup_truck"),
+	WAGON(R.drawable.ic_action_wagon, R.string.app_mode_wagon, "ic_action_wagon"),
+	UTV(R.drawable.ic_action_utv, R.string.app_mode_utv, "ic_action_utv"),
+	OSM(R.drawable.ic_action_openstreetmap_logo, R.string.app_mode_osm, "ic_action_openstreetmap_logo");
+
+	@DrawableRes
+	private int resId;
+	@StringRes
+	private int titleId;
+	private String resStringId;
+
+	ProfileIcons(@DrawableRes int resId, @StringRes int titleId, @NonNull String resStringId) {
+		this.resId = resId;
+		this.titleId = titleId;
+		this.resStringId = resStringId;
+	}
+
+	public static ArrayList<Integer> getIcons() {
+		ArrayList<Integer> list = new ArrayList<>();
+		for (ProfileIcons pi : values()) {
+			list.add(pi.resId);
+		}
+		return list;
+	}
+
+	public int getResId() {
+		return resId;
+	}
+
+	public int getTitleId() {
+		return titleId;
+	}
+
+	public String getResStringId() {
+		return resStringId;
+	}
+
+	public static String getResStringByResId(int resId) {
+		for (ProfileIcons pi : values()) {
+			if (pi.resId == resId) {
+				return pi.resStringId;
+			}
+		}
+		return DEFAULT.getResStringId();
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
index c2e83bb400..ac7829f37d 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
@@ -36,6 +36,10 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.UiUtilities.DialogButtonType;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.profiles.LocationIcon;
+import net.osmand.plus.profiles.NavigationIcon;
+import net.osmand.plus.profiles.ProfileIconColors;
+import net.osmand.plus.profiles.ProfileIcons;
 import net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment;
 import net.osmand.plus.routing.RouteProvider;
 import net.osmand.plus.widgets.FlowLayout;

From 366c6657b74599de5604c0b5e57f00274942335a Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Mon, 27 Jan 2020 14:14:35 +0200
Subject: [PATCH 05/24] Save app mode params in osmand settings

---
 .../src/net/osmand/plus/ApplicationMode.java  | 395 ++++++------------
 .../src/net/osmand/plus/OsmandSettings.java   |  29 +-
 .../plus/profiles/EditProfilesFragment.java   |  12 +-
 .../settings/ConfigureProfileFragment.java    |   4 +-
 .../plus/settings/NavigationFragment.java     |  18 +-
 .../settings/ProfileAppearanceFragment.java   |  75 ++--
 6 files changed, 200 insertions(+), 333 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 93b1febc7d..dac3900210 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -214,22 +214,15 @@ public class ApplicationMode {
 			values.add(applicationMode);
 			defaultValues.add(applicationMode);
 			if (applicationMode.getOrder() == 0 && !values.isEmpty()) {
-				applicationMode.setOrder(values.size());
+				applicationMode.order = values.size();
 			}
 			return applicationMode;
 		}
 
 		private ApplicationMode customReg() {
-			ApplicationMode m = applicationMode;
-			m.defaultSpeed = m.parentAppMode.defaultSpeed;
-			m.minDistanceForTurn = m.parentAppMode.minDistanceForTurn;
-			m.arrivalDistance = m.parentAppMode.arrivalDistance;
-			m.offRouteDistance = m.parentAppMode.offRouteDistance;
-			m.navigationIcon = m.parentAppMode.navigationIcon;
-			m.locationIcon = m.parentAppMode.locationIcon;
 			values.add(applicationMode);
 			if (applicationMode.getOrder() == 0 && !values.isEmpty()) {
-				applicationMode.setOrder(values.size());
+				applicationMode.order = values.size();
 			}
 			return applicationMode;
 		}
@@ -343,12 +336,6 @@ public class ApplicationMode {
 		return create(parent, -1, stringKey).userProfileTitle(userProfileTitle);
 	}
 
-	public static ApplicationModeBuilder changeBaseMode(ApplicationMode applicationMode) {
-		ApplicationModeBuilder builder = new ApplicationModeBuilder();
-		builder.applicationMode = applicationMode;
-		return builder;
-	}
-
 	public static List<ApplicationMode> values(OsmandApplication app) {
 		if (customizationListener == null) {
 			customizationListener = new OsmAndAppCustomization.OsmAndAppCustomizationListener() {
@@ -539,6 +526,48 @@ public class ApplicationMode {
 		return defaultSpeed;
 	}
 
+	public void setIconResName(OsmandApplication app, String iconResName) {
+		updateAppModeIcon(app, iconResName, this);
+		app.getSettings().ICON_RES_NAME.setModeValue(this, iconResName);
+	}
+
+	public void setIconColor(OsmandApplication app, ProfileIconColors iconColor) {
+		this.iconColor = iconColor;
+		app.getSettings().ICON_COLOR.setModeValue(this, iconColor);
+	}
+
+	public void setUserProfileName(OsmandApplication app, String userProfileName) {
+		this.userProfileName = userProfileName;
+		app.getSettings().USER_PROFILE_NAME.setModeValue(this, userProfileName);
+	}
+
+	public void setParentAppMode(OsmandApplication app, ApplicationMode parentAppMode) {
+		if (isCustomProfile()) {
+			this.parentAppMode = parentAppMode;
+			app.getSettings().PARENT_APP_MODE.setModeValue(this, parentAppMode.getStringKey());
+		}
+	}
+
+	public void setRoutingProfile(OsmandApplication app, String routingProfile) {
+		this.routingProfile = routingProfile;
+		app.getSettings().ROUTING_PROFILE.setModeValue(this, routingProfile);
+	}
+
+	public void setRouteService(OsmandApplication app, RouteService routeService) {
+		this.routeService = routeService;
+		app.getSettings().ROUTE_SERVICE.setModeValue(this, routeService);
+	}
+
+	public void setNavigationIcon(OsmandApplication app, NavigationIcon navigationIcon) {
+		this.navigationIcon = navigationIcon;
+		app.getSettings().NAVIGATION_ICON.setModeValue(this, navigationIcon);
+	}
+
+	public void setLocationIcon(OsmandApplication app, LocationIcon locationIcon) {
+		this.locationIcon = locationIcon;
+		app.getSettings().LOCATION_ICON.setModeValue(this, locationIcon);
+	}
+
 	public void setDefaultSpeed(OsmandApplication app, float defaultSpeed) {
 		this.defaultSpeed = defaultSpeed;
 		app.getSettings().DEFAULT_SPEED.setModeValue(this, defaultSpeed);
@@ -592,30 +621,35 @@ public class ApplicationMode {
 		return order;
 	}
 
-	public void setOrder(int order) {
+	public void setOrder(OsmandApplication app, int order) {
 		this.order = order;
 	}
 
 	public static void onApplicationStart(OsmandApplication app) {
 		// load for default profiles to initialize later custom modes
 		initDefaultModesParams(app);
-		initDefaultSpeed(app);
 		initCustomModes(app);
-		initDefaultSpeed(app);
+		initModesParams(app);
 		initRegVisibility();
-		reorderAppModes();
+		reorderAppModes(app);
 	}
 
-	private static void initDefaultSpeed(OsmandApplication app) {
-		for (ApplicationMode m : values) {
-			float spd = app.getSettings().DEFAULT_SPEED.getModeValue(m);
-			if (spd > 0) {
-				m.defaultSpeed = spd;
-			}
+	private static void initModesParams(OsmandApplication app) {
+		OsmandSettings settings = app.getSettings();
+		for (ApplicationMode mode : allPossibleValues()) {
+			mode.defaultSpeed = settings.DEFAULT_SPEED.getModeValue(mode);
+			updateAppModeIcon(app, settings.ICON_RES_NAME.getModeValue(mode), mode);
+			mode.iconColor = settings.ICON_COLOR.getModeValue(mode);
+			mode.minDistanceForTurn = settings.MIN_DISTANCE_FOR_TURN.getModeValue(mode);
+			mode.arrivalDistance = settings.ARRIVAL_DISTANCE.getModeValue(mode);
+			mode.offRouteDistance = settings.OFF_ROUTE_DISTANCE.getModeValue(mode);
+			mode.navigationIcon = settings.NAVIGATION_ICON.getModeValue(mode);
+			mode.locationIcon = settings.LOCATION_ICON.getModeValue(mode);
+//			mode.order = settings.APP_MODE_ORDER.getModeValue(mode);
 		}
 	}
 
-	public static void reorderAppModes() {
+	public static void reorderAppModes(OsmandApplication app) {
 		Comparator<ApplicationMode> comparator = new Comparator<ApplicationMode>() {
 			@Override
 			public int compare(ApplicationMode mode1, ApplicationMode mode2) {
@@ -625,12 +659,12 @@ public class ApplicationMode {
 		Collections.sort(values, comparator);
 		Collections.sort(defaultValues, comparator);
 		Collections.sort(cachedFilteredValues, comparator);
-		updateAppModesOrder();
+		updateAppModesOrder(app);
 	}
 
-	private static void updateAppModesOrder() {
+	private static void updateAppModesOrder(OsmandApplication app) {
 		for (int i = 0; i < values.size(); i++) {
-			values.get(i).setOrder(i);
+			values.get(i).setOrder(app, i);
 		}
 	}
 
@@ -667,78 +701,68 @@ public class ApplicationMode {
 	}
 
 	private static void initDefaultModesParams(OsmandApplication app) {
-		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-		Type t = new TypeToken<ArrayList<ApplicationModeBean>>() {
-		}.getType();
-		List<ApplicationModeBean> defaultAppModeBeans = gson.fromJson(app.getSettings().DEFAULT_APP_PROFILES.get(), t);
+		OsmandSettings settings = app.getSettings();
+		if (settings.DEFAULT_APP_PROFILES.isSet()) {
+			Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+			Type t = new TypeToken<ArrayList<ApplicationModeBean>>() {
+			}.getType();
+			List<ApplicationModeBean> defaultAppModeBeans = gson.fromJson(settings.DEFAULT_APP_PROFILES.get(), t);
 
-		if (!Algorithms.isEmpty(defaultAppModeBeans)) {
-			for (ApplicationModeBean modeBean : defaultAppModeBeans) {
-				ApplicationMode applicationMode = ApplicationMode.valueOfStringKey(modeBean.stringKey, null);
-				if (applicationMode != null) {
-					applicationMode.userProfileName = modeBean.userProfileName;
-					applicationMode.iconResName = modeBean.iconName;
-					applicationMode.iconColor = modeBean.iconColor;
-					applicationMode.routingProfile = modeBean.routingProfile;
-					applicationMode.routeService = modeBean.routeService;
-					if (modeBean.locIcon != null) {
-						applicationMode.locationIcon = modeBean.locIcon;
+			if (!Algorithms.isEmpty(defaultAppModeBeans)) {
+				for (ApplicationModeBean modeBean : defaultAppModeBeans) {
+					ApplicationMode mode = ApplicationMode.valueOfStringKey(modeBean.stringKey, null);
+					if (mode != null) {
+						settings.ICON_RES_NAME.setModeValue(mode, modeBean.iconName);
+						settings.ICON_COLOR.setModeValue(mode, modeBean.iconColor);
+						settings.USER_PROFILE_NAME.setModeValue(mode, modeBean.userProfileName);
+						settings.ROUTING_PROFILE.setModeValue(mode, modeBean.routingProfile);
+						settings.ROUTE_SERVICE.setModeValue(mode, modeBean.routeService);
+//						settings.APP_MODE_ORDER.setModeValue(mode, modeBean.order);
+						if (modeBean.locIcon != null) {
+							settings.LOCATION_ICON.setModeValue(mode, modeBean.locIcon);
+						}
+						if (modeBean.navIcon != null) {
+							settings.NAVIGATION_ICON.setModeValue(mode, modeBean.navIcon);
+						}
 					}
-					if (modeBean.navIcon != null) {
-						applicationMode.navigationIcon = modeBean.navIcon;
-					}
-					applicationMode.order = modeBean.order;
 				}
 			}
+			settings.DEFAULT_APP_PROFILES.resetToDefault();
 		}
 	}
 
 	private static void initCustomModes(OsmandApplication app) {
-		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-		Type t = new TypeToken<ArrayList<ApplicationModeBean>>() {
-		}.getType();
-		List<ApplicationModeBean> customProfiles = gson.fromJson(app.getSettings().CUSTOM_APP_PROFILES.get(), t);
-
-		if (!Algorithms.isEmpty(customProfiles)) {
-			for (ApplicationModeBean m : customProfiles) {
-				ApplicationMode parentMode = valueOfStringKey(m.parent, CAR);
-				createCustomMode(parentMode, m.userProfileName, m.stringKey)
-						.setRouteService(m.routeService)
-						.setRoutingProfile(m.routingProfile)
-						.icon(app, m.iconName)
-						.setColor(m.iconColor)
-						.locationIcon(m.locIcon)
-						.navigationIcon(m.navIcon)
-						.setOrder(m.order)
-						.customReg();
+		OsmandSettings settings = app.getSettings();
+		if (settings.CUSTOM_APP_PROFILES.isSet()) {
+			Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+			Type t = new TypeToken<ArrayList<ApplicationModeBean>>() {
+			}.getType();
+			List<ApplicationModeBean> customProfiles = gson.fromJson(app.getSettings().CUSTOM_APP_PROFILES.get(), t);
+			List<String> customModesKeys = new ArrayList<>();
+			if (!Algorithms.isEmpty(customProfiles)) {
+				for (ApplicationModeBean m : customProfiles) {
+					customModesKeys.add(m.stringKey);
+					ApplicationMode parentMode = valueOfStringKey(m.parent, CAR);
+					createCustomMode(parentMode, m.userProfileName, m.stringKey)
+							.setRouteService(m.routeService)
+							.setRoutingProfile(m.routingProfile)
+							.icon(app, m.iconName)
+							.setColor(m.iconColor)
+							.locationIcon(m.locIcon)
+							.navigationIcon(m.navIcon)
+							.setOrder(m.order)
+							.customReg();
+				}
 			}
+			settings.CUSTOM_APP_MODES_KEYS.set(gson.toJson(customModesKeys));
+			settings.CUSTOM_APP_PROFILES.resetToDefault();
 		}
 	}
 
-	public static void saveAppModesToSettings(OsmandApplication app) {
+	private static void saveAppModesToSettings(OsmandSettings settings) {
+		List<ApplicationModeBean> modeBeans = createApplicationModeBeans(getCustomValues());
 		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-
-		List<ApplicationModeBean> defaultModeBeans = createApplicationModeBeans(defaultValues);
-		List<ApplicationModeBean> customModeBeans = createApplicationModeBeans(getCustomValues());
-
-		String defaultProfiles = gson.toJson(defaultModeBeans);
-		String customProfiles = gson.toJson(customModeBeans);
-
-		app.getSettings().DEFAULT_APP_PROFILES.set(defaultProfiles);
-		app.getSettings().CUSTOM_APP_PROFILES.set(customProfiles);
-	}
-
-	private static void saveAppModesToSettings(OsmandSettings settings, boolean saveCustomModes) {
-		List<ApplicationMode> appModes = saveCustomModes ? getCustomValues() : defaultValues;
-		List<ApplicationModeBean> modeBeans = createApplicationModeBeans(appModes);
-
-		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-		String profiles = gson.toJson(modeBeans);
-		if (saveCustomModes) {
-			settings.CUSTOM_APP_PROFILES.set(profiles);
-		} else {
-			settings.DEFAULT_APP_PROFILES.set(profiles);
-		}
+		settings.CUSTOM_APP_PROFILES.set(gson.toJson(modeBeans));
 	}
 
 	private static List<ApplicationModeBean> createApplicationModeBeans(List<ApplicationMode> applicationModes) {
@@ -762,36 +786,23 @@ public class ApplicationMode {
 
 	public static ApplicationMode saveProfile(ApplicationModeBuilder builder, OsmandApplication app) {
 		ApplicationMode mode = ApplicationMode.valueOfStringKey(builder.applicationMode.stringKey, null);
-		if (mode != null) {
-			mode.iconResName = builder.applicationMode.iconResName;
-			mode.iconRes = builder.applicationMode.iconRes;
-			mode.iconMapRes = builder.applicationMode.iconMapRes;
-			mode.userProfileName = builder.applicationMode.userProfileName;
-			mode.parentAppMode = builder.applicationMode.parentAppMode;
-			mode.routingProfile = builder.applicationMode.routingProfile;
-			mode.routeService = builder.applicationMode.routeService;
-			mode.iconColor = builder.applicationMode.iconColor;
-			mode.locationIcon = builder.applicationMode.locationIcon;
-			mode.navigationIcon = builder.applicationMode.navigationIcon;
-			mode.order = builder.applicationMode.order;
-		} else {
+		if (mode == null) {
 			mode = builder.customReg();
 			initRegVisibility();
 		}
-		saveAppModesToSettings(app.getSettings(), mode.isCustomProfile());
-		return mode;
-	}
 
-	public static void deleteCustomMode(ApplicationMode md, OsmandApplication app) {
-		Iterator<ApplicationMode> it = values.iterator();
-		while (it.hasNext()) {
-			ApplicationMode m = it.next();
-			if (m == md) {
-				it.remove();
-			}
-		}
-		cachedFilteredValues.remove(md);
-		saveAppModesToSettings(app.getSettings(), md.isCustomProfile());
+		mode.setIconResName(app, builder.applicationMode.iconResName);
+		mode.setUserProfileName(app, builder.applicationMode.userProfileName);
+		mode.setParentAppMode(app, builder.applicationMode.parentAppMode);
+		mode.setRoutingProfile(app, builder.applicationMode.routingProfile);
+		mode.setRouteService(app, builder.applicationMode.routeService);
+		mode.setIconColor(app, builder.applicationMode.iconColor);
+		mode.setLocationIcon(app, builder.applicationMode.locationIcon);
+		mode.setNavigationIcon(app, builder.applicationMode.navigationIcon);
+		mode.setOrder(app, builder.applicationMode.order);
+
+		saveAppModesToSettings(app.getSettings());
+		return mode;
 	}
 
 	public static void deleteCustomModes(List<ApplicationMode> modes, OsmandApplication app) {
@@ -802,171 +813,33 @@ public class ApplicationMode {
 				it.remove();
 			}
 		}
+		OsmandSettings settings = app.getSettings();
+		if (modes.contains(settings.APPLICATION_MODE.get())) {
+			settings.APPLICATION_MODE.resetToDefault();
+		}
 		cachedFilteredValues.removeAll(modes);
-		saveAppModesToSettings(app.getSettings(), true);
+		saveAppModesToSettings(app.getSettings());
 	}
 
 	public static boolean changeProfileAvailability(ApplicationMode mode, boolean isSelected, OsmandApplication app) {
 		Set<ApplicationMode> selectedModes = new LinkedHashSet<>(ApplicationMode.values(app));
 		StringBuilder vls = new StringBuilder(ApplicationMode.DEFAULT.getStringKey() + ",");
 		if (allPossibleValues().contains(mode)) {
+			OsmandSettings settings = app.getSettings();
 			if (isSelected) {
 				selectedModes.add(mode);
 			} else {
 				selectedModes.remove(mode);
-				if (app.getSettings().APPLICATION_MODE.get() == mode) {
-					app.getSettings().APPLICATION_MODE.set(ApplicationMode.DEFAULT);
+				if (settings.APPLICATION_MODE.get() == mode) {
+					settings.APPLICATION_MODE.resetToDefault();
 				}
 			}
 			for (ApplicationMode m : selectedModes) {
 				vls.append(m.getStringKey()).append(",");
 			}
-			app.getSettings().AVAILABLE_APP_MODES.set(vls.toString());
+			settings.AVAILABLE_APP_MODES.set(vls.toString());
 			return true;
 		}
 		return false;
 	}
-
-	public enum ProfileIconColors {
-		DEFAULT(R.string.rendering_value_default_name, R.color.profile_icon_color_blue_light_default, R.color.profile_icon_color_blue_dark_default),
-		PURPLE(R.string.rendering_value_purple_name, R.color.profile_icon_color_purple_light, R.color.profile_icon_color_purple_dark),
-		GREEN(R.string.rendering_value_green_name, R.color.profile_icon_color_green_light, R.color.profile_icon_color_green_dark),
-		BLUE(R.string.rendering_value_blue_name, R.color.profile_icon_color_blue_light, R.color.profile_icon_color_blue_dark),
-		RED(R.string.rendering_value_red_name, R.color.profile_icon_color_red_light, R.color.profile_icon_color_red_dark),
-		DARK_YELLOW(R.string.rendering_value_darkyellow_name, R.color.profile_icon_color_yellow_light, R.color.profile_icon_color_yellow_dark),
-		MAGENTA(R.string.shared_string_color_magenta, R.color.profile_icon_color_magenta_light, R.color.profile_icon_color_magenta_dark);
-
-		@StringRes
-		private int name;
-		@ColorRes
-		private int dayColor;
-		@ColorRes
-		private int nightColor;
-
-		ProfileIconColors(@StringRes int name, @ColorRes int dayColor, @ColorRes int nightColor) {
-			this.name = name;
-			this.dayColor = dayColor;
-			this.nightColor = nightColor;
-		}
-
-		public int getName() {
-			return name;
-		}
-
-		public int getColor(boolean nightMode) {
-			return nightMode ? nightColor : dayColor;
-		}
-	}
-
-	public enum ProfileIcons {
-		DEFAULT(R.drawable.ic_world_globe_dark, R.string.app_mode_default, "ic_world_globe_dark"),
-		CAR(R.drawable.ic_action_car_dark, R.string.app_mode_car, "ic_action_car_dark"),
-		TAXI(R.drawable.ic_action_taxi, R.string.app_mode_taxi, "ic_action_taxi"),
-		TRUCK(R.drawable.ic_action_truck_dark, R.string.app_mode_truck, "ic_action_truck_dark"),
-		SHUTTLE_BUS(R.drawable.ic_action_shuttle_bus, R.string.app_mode_shuttle_bus, "ic_action_shuttle_bus"),
-		BUS(R.drawable.ic_action_bus_dark, R.string.app_mode_bus, "ic_action_bus_dark"),
-		SUBWAY(R.drawable.ic_action_subway, R.string.app_mode_subway, "ic_action_subway"),
-		MOTORCYCLE(R.drawable.ic_action_motorcycle_dark, R.string.app_mode_motorcycle, "ic_action_motorcycle_dark"),
-		BICYCLE(R.drawable.ic_action_bicycle_dark, R.string.app_mode_bicycle, "ic_action_bicycle_dark"),
-		HORSE(R.drawable.ic_action_horse, R.string.app_mode_horse, "ic_action_horse"),
-		PEDESTRIAN(R.drawable.ic_action_pedestrian_dark, R.string.app_mode_pedestrian, "ic_action_pedestrian_dark"),
-		TREKKING(R.drawable.ic_action_trekking_dark, R.string.app_mode_hiking, "ic_action_trekking_dark"),
-		SKIING(R.drawable.ic_action_skiing, R.string.app_mode_skiing, "ic_action_skiing"),
-		SAIL_BOAT(R.drawable.ic_action_sail_boat_dark, R.string.app_mode_boat, "ic_action_sail_boat_dark"),
-		AIRCRAFT(R.drawable.ic_action_aircraft, R.string.app_mode_aircraft, "ic_action_aircraft"),
-		HELICOPTER(R.drawable.ic_action_helicopter, R.string.app_mode_helicopter, "ic_action_helicopter"),
-		TRANSPORTER(R.drawable.ic_action_personal_transporter, R.string.app_mode_personal_transporter, "ic_action_personal_transporter"),
-		MONOWHEEL(R.drawable.ic_action_monowheel, R.string.app_mode_monowheel, "ic_action_monowheel"),
-		SCOOTER(R.drawable.ic_action_scooter, R.string.app_mode_scooter, "ic_action_scooter"),
-		UFO(R.drawable.ic_action_ufo, R.string.app_mode_ufo, "ic_action_ufo"),
-		OFFROAD(R.drawable.ic_action_offroad, R.string.app_mode_offroad, "ic_action_offroad"),
-		CAMPERVAN(R.drawable.ic_action_campervan, R.string.app_mode_campervan, "ic_action_campervan"),
-		CAMPER(R.drawable.ic_action_camper, R.string.app_mode_camper, "ic_action_camper"),
-		PICKUP_TRUCK(R.drawable.ic_action_pickup_truck, R.string.app_mode_pickup_truck, "ic_action_pickup_truck"),
-		WAGON(R.drawable.ic_action_wagon, R.string.app_mode_wagon, "ic_action_wagon"),
-		UTV(R.drawable.ic_action_utv, R.string.app_mode_utv, "ic_action_utv"),
-		OSM(R.drawable.ic_action_openstreetmap_logo, R.string.app_mode_osm, "ic_action_openstreetmap_logo");
-
-		@DrawableRes
-		private int resId;
-		@StringRes
-		private int titleId;
-		private String resStringId;
-
-		ProfileIcons(@DrawableRes int resId, @StringRes int titleId, @NonNull String resStringId) {
-			this.resId = resId;
-			this.titleId = titleId;
-			this.resStringId = resStringId;
-		}
-
-		public static ArrayList<Integer> getIcons() {
-			ArrayList<Integer> list = new ArrayList<>();
-			for (ProfileIcons pi : values()) {
-				list.add(pi.resId);
-			}
-			return list;
-		}
-
-		public int getResId() {
-			return resId;
-		}
-
-		public int getTitleId() {
-			return titleId;
-		}
-
-		public String getResStringId() {
-			return resStringId;
-		}
-
-		public static String getResStringByResId(int resId) {
-			for (ProfileIcons pi : values()) {
-				if (pi.resId == resId) {
-					return pi.resStringId;
-				}
-			}
-			return DEFAULT.getResStringId();
-		}
-	}
-
-	public enum LocationIcon {
-		DEFAULT(R.drawable.map_location_default, R.drawable.map_location_default_view_angle),
-		CAR(R.drawable.map_location_car, R.drawable.map_location_car_view_angle),
-		BICYCLE(R.drawable.map_location_bicycle, R.drawable.map_location_bicycle_view_angle);
-
-		LocationIcon(@DrawableRes int iconId, @DrawableRes int headingIconId) {
-			this.iconId = iconId;
-			this.headingIconId = headingIconId;
-		}
-
-		@DrawableRes
-		private final int iconId;
-		@DrawableRes
-		private final int headingIconId;
-
-		public int getIconId() {
-			return iconId;
-		}
-
-		public int getHeadingIconId() {
-			return headingIconId;
-		}
-	}
-
-	public enum NavigationIcon {
-		DEFAULT(R.drawable.map_navigation_default),
-		NAUTICAL(R.drawable.map_navigation_nautical),
-		CAR(R.drawable.map_navigation_car);
-
-		NavigationIcon(@DrawableRes int iconId) {
-			this.iconId = iconId;
-		}
-
-		@DrawableRes
-		private final int iconId;
-
-		public int getIconId() {
-			return iconId;
-		}
-	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index fdfb1de9db..eed57d6422 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1240,11 +1240,7 @@ public class OsmandSettings {
 
 	public final OsmandPreference<String> LAST_FAV_CATEGORY_ENTERED = new StringPreference("last_fav_category", "").makeGlobal();
 
-
 	public final OsmandPreference<ApplicationMode> DEFAULT_APPLICATION_MODE = new CommonPreference<ApplicationMode>("default_application_mode_string", ApplicationMode.DEFAULT) {
-		{
-			makeGlobal();
-		}
 
 		@Override
 		protected ApplicationMode getValue(Object prefs, ApplicationMode defaultValue) {
@@ -1292,12 +1288,9 @@ public class OsmandSettings {
 		public ApplicationMode parseString(String s) {
 			return appModeFromString(s);
 		}
-	};
+	}.makeGlobal();
 
 	public final OsmandPreference<ApplicationMode> LAST_ROUTE_APPLICATION_MODE = new CommonPreference<ApplicationMode>("last_route_application_mode_backup_string", ApplicationMode.DEFAULT) {
-		{
-			makeGlobal();
-		}
 
 		@Override
 		protected ApplicationMode getValue(Object prefs, ApplicationMode defaultValue) {
@@ -1340,7 +1333,7 @@ public class OsmandSettings {
 		public ApplicationMode parseString(String s) {
 			return appModeFromString(s);
 		}
-	};
+	}.makeGlobal();
 
 	public final OsmandPreference<Boolean> FIRST_MAP_IS_DOWNLOADED = new BooleanPreference(
 			"first_map_is_downloaded", false);
@@ -1355,8 +1348,6 @@ public class OsmandSettings {
 			return super.setValue(prefs, val);
 		}
 
-		;
-
 		protected DrivingRegion getDefaultValue() {
 			Locale df = Locale.getDefault();
 			if (df == null) {
@@ -1441,9 +1432,6 @@ public class OsmandSettings {
 				return SpeedConstants.MILES_PER_HOUR;
 			}
 		}
-
-		;
-
 	}.makeProfile();
 
 
@@ -1461,9 +1449,6 @@ public class OsmandSettings {
 	public final OsmandPreference<Float> SPEECH_RATE =
 			new FloatPreference("speech_rate", 1f).makeProfile();
 
-	public final OsmandPreference<Float> ARRIVAL_DISTANCE_FACTOR =
-			new FloatPreference("arrival_distance_factor", 1f).makeProfile();
-
 	public final OsmandPreference<Float> SPEED_LIMIT_EXCEED =
 			new FloatPreference("speed_limit_exceed", 5f).makeProfile();
 
@@ -1502,6 +1487,8 @@ public class OsmandSettings {
 
 	public final CommonPreference<String> USER_PROFILE_NAME = new StringPreference("user_profile_name", "").makeProfile().cache();
 
+	public final CommonPreference<String> PARENT_APP_MODE = new StringPreference("parent_app_mode", null).makeProfile().cache();
+
 	public final CommonPreference<String> ROUTING_PROFILE = new StringPreference("routing_profile", "").makeProfile().cache();
 
 	{
@@ -1532,6 +1519,8 @@ public class OsmandSettings {
 		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.SKI, 15);
 	}
 
+	public final OsmandPreference<Float> ARRIVAL_DISTANCE_FACTOR = new FloatPreference("arrival_distance_factor", 1f).makeProfile().cache();
+
 	public final CommonPreference<Integer> ARRIVAL_DISTANCE = new IntPreference("arrival_distance", 90).makeProfile().cache();
 
 	{
@@ -1571,7 +1560,7 @@ public class OsmandSettings {
 		LOCATION_ICON.setModeDefaultValue(ApplicationMode.SKI, LocationIcon.BICYCLE);
 	}
 
-	public final CommonPreference<Integer> APP_MODE_ORDER = new IntPreference("app_mode_order", 0).makeProfile().cache();
+//	public final CommonPreference<Integer> APP_MODE_ORDER = new IntPreference("app_mode_order", 0).makeProfile().cache();
 
 	public final OsmandPreference<Float> SWITCH_MAP_DIRECTION_TO_COMPASS =
 			new FloatPreference("speed_for_map_to_direction_of_movement", 0f).makeProfile();
@@ -1728,8 +1717,6 @@ public class OsmandSettings {
 			}
 			return -1;
 		}
-
-		;
 	}.makeGlobal().cache();
 
 	public final CommonPreference<Boolean> SNAP_TO_ROAD = new BooleanPreference("snap_to_road", false).makeProfile().cache();
@@ -3402,6 +3389,8 @@ public class OsmandSettings {
 	public final CommonPreference<String> CUSTOM_APP_PROFILES =
 		new StringPreference("custom_app_profiles", "").makeGlobal().cache();
 
+	public final CommonPreference<String> CUSTOM_APP_MODES_KEYS =
+		new StringPreference("custom_app_modes_keys", "").makeGlobal().cache();
 
 	public enum DayNightMode {
 		AUTO(R.string.daynight_mode_auto, R.drawable.ic_action_map_sunset),
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
index a49f174653..210f487ba2 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
@@ -23,7 +23,6 @@ import android.widget.TextView;
 import net.osmand.AndroidUtils;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
@@ -150,7 +149,6 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 				MapActivity mapActivity = (MapActivity) getActivity();
 				if (mapActivity != null) {
 					OsmandApplication app = mapActivity.getMyApplication();
-					OsmandSettings settings = app.getSettings();
 
 					if (!deletedModesKeys.isEmpty()) {
 						List<ApplicationMode> deletedModes = new ArrayList<>();
@@ -161,9 +159,6 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 							}
 						}
 						ApplicationMode.deleteCustomModes(deletedModes, app);
-						if (deletedModes.contains(settings.APPLICATION_MODE.get())) {
-							settings.APPLICATION_MODE.resetToDefault();
-						}
 					}
 					for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
 						String modeKey = mode.getStringKey();
@@ -171,10 +166,9 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 						if (order == null) {
 							order = mode.getOrder();
 						}
-						mode.setOrder(order);
+						mode.setOrder(app, order);
 					}
-					ApplicationMode.reorderAppModes();
-					ApplicationMode.saveAppModesToSettings(app);
+					ApplicationMode.reorderAppModes(app);
 					mapActivity.onBackPressed();
 				}
 			}
@@ -273,7 +267,7 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 		private boolean deleted;
 		private boolean customProfile;
 
-		EditProfileDataObject(String stringKey, String name, String descr, int iconRes, boolean isSelected, boolean customProfile, boolean deleted, ApplicationMode.ProfileIconColors iconColor, int order) {
+		EditProfileDataObject(String stringKey, String name, String descr, int iconRes, boolean isSelected, boolean customProfile, boolean deleted, ProfileIconColors iconColor, int order) {
 			super(name, descr, stringKey, iconRes, isSelected, iconColor);
 			this.customProfile = customProfile;
 			this.deleted = deleted;
diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
index d3d2a2a573..102205e6d8 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
@@ -49,6 +49,7 @@ import net.osmand.plus.skimapsplugin.SkiMapsPlugin;
 import org.apache.commons.logging.Log;
 
 import java.io.File;
+import java.util.Collections;
 import java.util.List;
 
 import static net.osmand.plus.UiUtilities.CompoundButtonType.TOOLBAR;
@@ -413,8 +414,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 							public void onClick(DialogInterface dialog, int which) {
 								OsmandApplication app = getMyApplication();
 								if (app != null) {
-									ApplicationMode.deleteCustomMode(ApplicationMode.valueOfStringKey(profile.getStringKey(), ApplicationMode.DEFAULT), app);
-									app.getSettings().APPLICATION_MODE.set(ApplicationMode.DEFAULT);
+									ApplicationMode.deleteCustomModes(Collections.singletonList(profile), app);
 								}
 
 								if (getActivity() != null) {
diff --git a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
index e2c83de23e..2d6db4913c 100644
--- a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
@@ -138,18 +138,14 @@ public class NavigationFragment extends BaseSettingsFragment {
 		}
 		navigationType.setSummary(selectedRoutingProfileDataObject.getName());
 		navigationType.setIcon(getContentIcon(selectedRoutingProfileDataObject.getIconRes()));
-		ApplicationMode.ApplicationModeBuilder builder = ApplicationMode.changeBaseMode(getSelectedAppMode());
-		if (profileKey.equals(RoutingProfilesResources.STRAIGHT_LINE_MODE.name())) {
-			builder.setRouteService(RouteProvider.RouteService.STRAIGHT);
-		} else if (profileKey.equals(RoutingProfilesResources.BROUTER_MODE.name())) {
-			builder.setRouteService(RouteProvider.RouteService.BROUTER);
-		} else {
-			builder.setRoutingProfile(profileKey);
-		}
 
-		ApplicationMode mode = ApplicationMode.saveProfile(builder, app);
-		if (!ApplicationMode.values(app).contains(mode)) {
-			ApplicationMode.changeProfileAvailability(mode, true, app);
+		ApplicationMode appMode = getSelectedAppMode();
+		if (profileKey.equals(RoutingProfilesResources.STRAIGHT_LINE_MODE.name())) {
+			appMode.setRouteService(app, RouteProvider.RouteService.STRAIGHT);
+		} else if (profileKey.equals(RoutingProfilesResources.BROUTER_MODE.name())) {
+			appMode.setRouteService(app, RouteProvider.RouteService.BROUTER);
+		} else {
+			appMode.setRoutingProfile(app, profileKey);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
index ac7829f37d..cc58d154c8 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
@@ -49,6 +49,7 @@ import net.osmand.util.Algorithms;
 import org.apache.commons.logging.Log;
 
 import java.util.ArrayList;
+import java.util.Collections;
 
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID;
 import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.DIALOG_TYPE;
@@ -280,12 +281,12 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		changedProfile.name = savedInstanceState.getString(PROFILE_NAME_KEY);
 		changedProfile.stringKey = savedInstanceState.getString(PROFILE_STRINGKEY_KEY);
 		changedProfile.iconRes = savedInstanceState.getInt(PROFILE_ICON_RES_KEY);
-		changedProfile.color = (ApplicationMode.ProfileIconColors) savedInstanceState.getSerializable(PROFILE_COLOR_KEY);
+		changedProfile.color = (ProfileIconColors) savedInstanceState.getSerializable(PROFILE_COLOR_KEY);
 		String parentStringKey = savedInstanceState.getString(PROFILE_PARENT_KEY);
 		changedProfile.parent = ApplicationMode.valueOfStringKey(parentStringKey, null);
 		isBaseProfileImported = savedInstanceState.getBoolean(IS_BASE_PROFILE_IMPORTED);
-		changedProfile.locationIcon = (ApplicationMode.LocationIcon) savedInstanceState.getSerializable(PROFILE_LOCATION_ICON_KEY);
-		changedProfile.navigationIcon = (ApplicationMode.NavigationIcon) savedInstanceState.getSerializable(PROFILE_NAVIGATION_ICON_KEY);
+		changedProfile.locationIcon = (LocationIcon) savedInstanceState.getSerializable(PROFILE_LOCATION_ICON_KEY);
+		changedProfile.navigationIcon = (NavigationIcon) savedInstanceState.getSerializable(PROFILE_NAVIGATION_ICON_KEY);
 	}
 
 	@Override
@@ -372,7 +373,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		} else if (COLOR_ITEMS.equals(preference.getKey())) {
 			colorItems = (FlowLayout) holder.findViewById(R.id.color_items);
 			colorItems.removeAllViews();
-			for (ApplicationMode.ProfileIconColors color : ApplicationMode.ProfileIconColors.values()) {
+			for (ProfileIconColors color : ProfileIconColors.values()) {
 				View colorItem = createColorItemView(color, colorItems);
 				colorItems.addView(colorItem, new FlowLayout.LayoutParams(0, 0));
 
@@ -381,7 +382,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		} else if (ICON_ITEMS.equals(preference.getKey())) {
 			iconItems = (FlowLayout) holder.findViewById(R.id.color_items);
 			iconItems.removeAllViews();
-			ArrayList<Integer> icons = ApplicationMode.ProfileIcons.getIcons();
+			ArrayList<Integer> icons = ProfileIcons.getIcons();
 			for (int iconRes : icons) {
 				View iconItem = createIconItemView(iconRes, iconItems);
 				iconItems.addView(iconItem, new FlowLayout.LayoutParams(0, 0));
@@ -390,7 +391,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		} else if (LOCATION_ICON_ITEMS.equals(preference.getKey())) {
 			locationIconItems = (FlowLayout) holder.findViewById(R.id.color_items);
 			locationIconItems.removeAllViews();
-			for (ApplicationMode.LocationIcon locationIcon : ApplicationMode.LocationIcon.values()) {
+			for (LocationIcon locationIcon : LocationIcon.values()) {
 				View iconItemView = createLocationIconView(locationIcon, locationIconItems);
 				locationIconItems.addView(iconItemView, new FlowLayout.LayoutParams(0, 0));
 			}
@@ -398,7 +399,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		} else if (NAV_ICON_ITEMS.equals(preference.getKey())) {
 			navIconItems = (FlowLayout) holder.findViewById(R.id.color_items);
 			navIconItems.removeAllViews();
-			for (ApplicationMode.NavigationIcon navigationIcon : ApplicationMode.NavigationIcon.values()) {
+			for (NavigationIcon navigationIcon : NavigationIcon.values()) {
 				View iconItemView = createNavigationIconView(navigationIcon, navIconItems);
 				navIconItems.addView(iconItemView, new FlowLayout.LayoutParams(0, 0));
 			}
@@ -406,7 +407,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		}
 	}
 
-	private View createColorItemView(final ApplicationMode.ProfileIconColors colorRes, ViewGroup rootView) {
+	private View createColorItemView(final ProfileIconColors colorRes, ViewGroup rootView) {
 		FrameLayout colorItemView = (FrameLayout) UiUtilities.getInflater(getContext(), isNightMode())
 				.inflate(R.layout.preference_circle_item, rootView, false);
 		ImageView coloredCircle = colorItemView.findViewById(R.id.backgroundCircle);
@@ -439,7 +440,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		return colorItemView;
 	}
 
-	private void updateColorSelector(ApplicationMode.ProfileIconColors color) {
+	private void updateColorSelector(ProfileIconColors color) {
 		View colorItem = colorItems.findViewWithTag(changedProfile.color);
 		colorItem.findViewById(R.id.outlineCircle).setVisibility(View.GONE);
 		colorItem.findViewById(R.id.checkMark).setVisibility(View.GONE);
@@ -499,7 +500,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		updateProfileButton();
 	}
 
-	private View createLocationIconView(final ApplicationMode.LocationIcon locationIcon, ViewGroup rootView) {
+	private View createLocationIconView(final LocationIcon locationIcon, ViewGroup rootView) {
 		FrameLayout locationIconView = (FrameLayout) UiUtilities.getInflater(getContext(), isNightMode())
 				.inflate(R.layout.preference_select_icon_button, rootView, false);
 		int changedProfileColor = ContextCompat.getColor(app, changedProfile.color.getColor(
@@ -533,7 +534,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		return locationIconView;
 	}
 
-	private void updateLocationIconSelector(ApplicationMode.LocationIcon locationIcon) {
+	private void updateLocationIconSelector(LocationIcon locationIcon) {
 		View viewWithTag = locationIconItems.findViewWithTag(changedProfile.locationIcon);
 		viewWithTag.findViewById(R.id.outlineRect).setVisibility(View.GONE);
 		viewWithTag = locationIconItems.findViewWithTag(locationIcon);
@@ -541,7 +542,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		changedProfile.locationIcon = locationIcon;
 	}
 
-	private View createNavigationIconView(final ApplicationMode.NavigationIcon navigationIcon, ViewGroup rootView) {
+	private View createNavigationIconView(final NavigationIcon navigationIcon, ViewGroup rootView) {
 		FrameLayout navigationIconView = (FrameLayout) UiUtilities.getInflater(getContext(), isNightMode())
 				.inflate(R.layout.preference_select_icon_button, rootView, false);
 		LayerDrawable navigationIconDrawable = (LayerDrawable) app.getResources().getDrawable(navigationIcon.getIconId());
@@ -579,7 +580,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		return navigationIconView;
 	}
 
-	private void updateNavigationIconSelector(ApplicationMode.NavigationIcon navigationIcon) {
+	private void updateNavigationIconSelector(NavigationIcon navigationIcon) {
 		View viewWithTag = navIconItems.findViewWithTag(changedProfile.navigationIcon);
 		viewWithTag.findViewById(R.id.outlineRect).setVisibility(View.GONE);
 		viewWithTag = navIconItems.findViewWithTag(navigationIcon);
@@ -652,21 +653,33 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 			}
 			return false;
 		}
+		ApplicationMode mode = ApplicationMode.valueOfStringKey(changedProfile.stringKey, null);
+		if (mode != null && !isNew) {
+			mode.setParentAppMode(app, changedProfile.parent);
+			mode.setUserProfileName(app, changedProfile.name.trim());
+			mode.setIconResName(app, ProfileIcons.getResStringByResId(changedProfile.iconRes));
+			mode.setRouteService(app, changedProfile.routeService);
+			mode.setRoutingProfile(app, changedProfile.routingProfile);
+			mode.setIconColor(app, changedProfile.color);
+			mode.setLocationIcon(app, changedProfile.locationIcon);
+			mode.setNavigationIcon(app, changedProfile.navigationIcon);
+		} else {
+			ApplicationMode.ApplicationModeBuilder builder = ApplicationMode
+					.createCustomMode(changedProfile.parent, changedProfile.name.trim(), changedProfile.stringKey)
+					.icon(app, ProfileIcons.getResStringByResId(changedProfile.iconRes))
+					.setRouteService(changedProfile.routeService)
+					.setRoutingProfile(changedProfile.routingProfile)
+					.setColor(changedProfile.color)
+					.locationIcon(changedProfile.locationIcon)
+					.navigationIcon(changedProfile.navigationIcon);
 
-		ApplicationMode.ApplicationModeBuilder builder = ApplicationMode
-				.createCustomMode(changedProfile.parent, changedProfile.name.trim(), changedProfile.stringKey)
-				.icon(app, ApplicationMode.ProfileIcons.getResStringByResId(changedProfile.iconRes))
-				.setRouteService(changedProfile.routeService)
-				.setRoutingProfile(changedProfile.routingProfile)
-				.setColor(changedProfile.color)
-				.locationIcon(changedProfile.locationIcon)
-				.navigationIcon(changedProfile.navigationIcon);
-
-		ApplicationMode mode = ApplicationMode.saveProfile(builder, getMyApplication());
-		if (!ApplicationMode.values(app).contains(mode)) {
-			ApplicationMode.changeProfileAvailability(mode, true, getMyApplication());
+			mode = ApplicationMode.saveProfile(builder, app);
 		}
+
 		if (isNew) {
+			if (!ApplicationMode.values(app).contains(mode)) {
+				ApplicationMode.changeProfileAvailability(mode, true, app);
+			}
 			app.getSettings().copyPreferencesFromProfile(changedProfile.parent, mode);
 		}
 		return true;
@@ -719,8 +732,10 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 
 	private void deleteImportedProfile() {
 		if (isBaseProfileImported) {
-			ApplicationMode.deleteCustomMode(ApplicationMode.valueOfStringKey(
-					changedProfile.parent.getStringKey(), ApplicationMode.DEFAULT), app);
+			ApplicationMode appMode = ApplicationMode.valueOfStringKey(changedProfile.parent.getStringKey(), null);
+			if (appMode != null) {
+				ApplicationMode.deleteCustomModes(Collections.singletonList(appMode), app);
+			}
 		}
 	}
 
@@ -748,12 +763,12 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		String stringKey;
 		ApplicationMode parent = null;
 		String name;
-		ApplicationMode.ProfileIconColors color;
+		ProfileIconColors color;
 		int iconRes;
 		String routingProfile;
 		RouteProvider.RouteService routeService;
-		ApplicationMode.NavigationIcon navigationIcon;
-		ApplicationMode.LocationIcon locationIcon;
+		NavigationIcon navigationIcon;
+		LocationIcon locationIcon;
 
 		@Override
 		public boolean equals(Object o) {

From 440411001ef45ab67c7922457641c80bddfe2959 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Mon, 27 Jan 2020 19:04:05 +0200
Subject: [PATCH 06/24] Fix app mode params migration

---
 .../src/net/osmand/plus/ApplicationMode.java  | 75 +++++++++----------
 .../src/net/osmand/plus/OsmandSettings.java   | 31 ++++++--
 .../plus/profiles/EditProfilesFragment.java   |  2 +-
 3 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index dac3900210..7c66a50a93 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -621,7 +621,7 @@ public class ApplicationMode {
 		return order;
 	}
 
-	public void setOrder(OsmandApplication app, int order) {
+	public void setOrder(int order) {
 		this.order = order;
 	}
 
@@ -637,15 +637,17 @@ public class ApplicationMode {
 	private static void initModesParams(OsmandApplication app) {
 		OsmandSettings settings = app.getSettings();
 		for (ApplicationMode mode : allPossibleValues()) {
+			mode.routingProfile = settings.ROUTING_PROFILE.getModeValue(mode);
+			mode.routeService = settings.ROUTE_SERVICE.getModeValue(mode);
 			mode.defaultSpeed = settings.DEFAULT_SPEED.getModeValue(mode);
-			updateAppModeIcon(app, settings.ICON_RES_NAME.getModeValue(mode), mode);
-			mode.iconColor = settings.ICON_COLOR.getModeValue(mode);
 			mode.minDistanceForTurn = settings.MIN_DISTANCE_FOR_TURN.getModeValue(mode);
 			mode.arrivalDistance = settings.ARRIVAL_DISTANCE.getModeValue(mode);
 			mode.offRouteDistance = settings.OFF_ROUTE_DISTANCE.getModeValue(mode);
+			mode.userProfileName = settings.USER_PROFILE_NAME.getModeValue(mode);
 			mode.navigationIcon = settings.NAVIGATION_ICON.getModeValue(mode);
 			mode.locationIcon = settings.LOCATION_ICON.getModeValue(mode);
-//			mode.order = settings.APP_MODE_ORDER.getModeValue(mode);
+			mode.iconColor = settings.ICON_COLOR.getModeValue(mode);
+			updateAppModeIcon(app, settings.ICON_RES_NAME.getModeValue(mode), mode);
 		}
 	}
 
@@ -664,7 +666,7 @@ public class ApplicationMode {
 
 	private static void updateAppModesOrder(OsmandApplication app) {
 		for (int i = 0; i < values.size(); i++) {
-			values.get(i).setOrder(app, i);
+			values.get(i).setOrder(i);
 		}
 	}
 
@@ -717,7 +719,6 @@ public class ApplicationMode {
 						settings.USER_PROFILE_NAME.setModeValue(mode, modeBean.userProfileName);
 						settings.ROUTING_PROFILE.setModeValue(mode, modeBean.routingProfile);
 						settings.ROUTE_SERVICE.setModeValue(mode, modeBean.routeService);
-//						settings.APP_MODE_ORDER.setModeValue(mode, modeBean.order);
 						if (modeBean.locIcon != null) {
 							settings.LOCATION_ICON.setModeValue(mode, modeBean.locIcon);
 						}
@@ -738,50 +739,46 @@ public class ApplicationMode {
 			Type t = new TypeToken<ArrayList<ApplicationModeBean>>() {
 			}.getType();
 			List<ApplicationModeBean> customProfiles = gson.fromJson(app.getSettings().CUSTOM_APP_PROFILES.get(), t);
-			List<String> customModesKeys = new ArrayList<>();
 			if (!Algorithms.isEmpty(customProfiles)) {
 				for (ApplicationModeBean m : customProfiles) {
-					customModesKeys.add(m.stringKey);
 					ApplicationMode parentMode = valueOfStringKey(m.parent, CAR);
-					createCustomMode(parentMode, m.userProfileName, m.stringKey)
+					ApplicationModeBuilder builder = createCustomMode(parentMode, m.userProfileName, m.stringKey)
 							.setRouteService(m.routeService)
 							.setRoutingProfile(m.routingProfile)
 							.icon(app, m.iconName)
 							.setColor(m.iconColor)
 							.locationIcon(m.locIcon)
 							.navigationIcon(m.navIcon)
-							.setOrder(m.order)
-							.customReg();
+							.setOrder(m.order);
+					saveProfile(builder, app);
 				}
 			}
-			settings.CUSTOM_APP_MODES_KEYS.set(gson.toJson(customModesKeys));
 			settings.CUSTOM_APP_PROFILES.resetToDefault();
 		}
-	}
-
-	private static void saveAppModesToSettings(OsmandSettings settings) {
-		List<ApplicationModeBean> modeBeans = createApplicationModeBeans(getCustomValues());
-		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-		settings.CUSTOM_APP_PROFILES.set(gson.toJson(modeBeans));
-	}
-
-	private static List<ApplicationModeBean> createApplicationModeBeans(List<ApplicationMode> applicationModes) {
-		List<ApplicationModeBean> modeBeans = new ArrayList<>();
-		for (ApplicationMode mode : applicationModes) {
-			ApplicationModeBean mb = new ApplicationModeBean();
-			mb.userProfileName = mode.userProfileName;
-			mb.iconColor = mode.iconColor;
-			mb.iconName = mode.iconResName;
-			mb.parent = mode.parentAppMode != null ? mode.parentAppMode.getStringKey() : null;
-			mb.stringKey = mode.stringKey;
-			mb.routeService = mode.routeService;
-			mb.routingProfile = mode.routingProfile;
-			mb.order = mode.order;
-			mb.locIcon = mode.locationIcon;
-			mb.navIcon = mode.navigationIcon;
-			modeBeans.add(mb);
+		if (settings.CUSTOM_APP_MODES_KEYS.isSet()) {
+			Set<String> customModesKeys = settings.getCustomAppModesKeys();
+			for (String appModeKey : customModesKeys) {
+				Object profilePreferences = settings.getProfilePreferences(appModeKey);
+				String parent = settings.PARENT_APP_MODE.getValue(profilePreferences, null);
+				String userProfileName = settings.USER_PROFILE_NAME.getValue(profilePreferences, "");
+				createCustomMode(valueOfStringKey(parent, CAR), userProfileName, appModeKey).customReg();
+			}
 		}
-		return modeBeans;
+	}
+
+	private static boolean saveCustomAppModesToSettings(OsmandSettings settings) {
+		StringBuilder stringBuilder = new StringBuilder();
+		Iterator<ApplicationMode> it = ApplicationMode.getCustomValues().iterator();
+		while (it.hasNext()) {
+			stringBuilder.append(it.next().getStringKey());
+			if (it.hasNext()) {
+				stringBuilder.append(",");
+			}
+		}
+		if (!stringBuilder.toString().equals(settings.CUSTOM_APP_MODES_KEYS.get())) {
+			return settings.CUSTOM_APP_MODES_KEYS.set(stringBuilder.toString());
+		}
+		return false;
 	}
 
 	public static ApplicationMode saveProfile(ApplicationModeBuilder builder, OsmandApplication app) {
@@ -799,9 +796,9 @@ public class ApplicationMode {
 		mode.setIconColor(app, builder.applicationMode.iconColor);
 		mode.setLocationIcon(app, builder.applicationMode.locationIcon);
 		mode.setNavigationIcon(app, builder.applicationMode.navigationIcon);
-		mode.setOrder(app, builder.applicationMode.order);
+		mode.setOrder(builder.applicationMode.order);
 
-		saveAppModesToSettings(app.getSettings());
+		saveCustomAppModesToSettings(app.getSettings());
 		return mode;
 	}
 
@@ -818,7 +815,7 @@ public class ApplicationMode {
 			settings.APPLICATION_MODE.resetToDefault();
 		}
 		cachedFilteredValues.removeAll(modes);
-		saveAppModesToSettings(app.getSettings());
+		saveCustomAppModesToSettings(app.getSettings());
 	}
 
 	public static boolean changeProfileAvailability(ApplicationMode mode, boolean isSelected, OsmandApplication app) {
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index eed57d6422..13f2b22644 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -30,9 +30,6 @@ import net.osmand.map.ITileSource;
 import net.osmand.map.TileSourceManager;
 import net.osmand.map.TileSourceManager.TileSourceTemplate;
 import net.osmand.osm.io.NetworkUtils;
-import net.osmand.plus.profiles.LocationIcon;
-import net.osmand.plus.profiles.NavigationIcon;
-import net.osmand.plus.profiles.ProfileIconColors;
 import net.osmand.plus.access.AccessibilityMode;
 import net.osmand.plus.access.RelativeDirectionStyle;
 import net.osmand.plus.api.SettingsAPI;
@@ -42,6 +39,9 @@ import net.osmand.plus.dialogs.RateUsBottomSheetDialogFragment;
 import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.mapillary.MapillaryPlugin;
 import net.osmand.plus.mapmarkers.CoordinateInputFormats.Format;
+import net.osmand.plus.profiles.LocationIcon;
+import net.osmand.plus.profiles.NavigationIcon;
+import net.osmand.plus.profiles.ProfileIconColors;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.plus.voice.CommandPlayer;
@@ -218,11 +218,16 @@ public class OsmandSettings {
 	}
 
 	public static String getSharedPreferencesName(ApplicationMode mode) {
+		String modeKey = mode != null ? mode.getStringKey() : null;
+		return getSharedPreferencesNameForKey(modeKey);
+	}
+
+	public static String getSharedPreferencesNameForKey(String modeKey) {
 		String sharedPreferencesName = !Algorithms.isEmpty(CUSTOM_SHARED_PREFERENCES_NAME) ? CUSTOM_SHARED_PREFERENCES_NAME : SHARED_PREFERENCES_NAME;
-		if (mode == null) {
+		if (modeKey == null) {
 			return sharedPreferencesName;
 		} else {
-			return sharedPreferencesName + "." + mode.getStringKey().toLowerCase();
+			return sharedPreferencesName + "." + modeKey.toLowerCase();
 		}
 	}
 
@@ -301,6 +306,10 @@ public class OsmandSettings {
 		return settingsAPI.getPreferenceObject(getSharedPreferencesName(mode));
 	}
 
+	public Object getProfilePreferences(String modeKey) {
+		return settingsAPI.getPreferenceObject(getSharedPreferencesNameForKey(modeKey));
+	}
+
 	public OsmandPreference getPreference(String key) {
 		return registeredPreferences.get(key);
 	}
@@ -1560,8 +1569,6 @@ public class OsmandSettings {
 		LOCATION_ICON.setModeDefaultValue(ApplicationMode.SKI, LocationIcon.BICYCLE);
 	}
 
-//	public final CommonPreference<Integer> APP_MODE_ORDER = new IntPreference("app_mode_order", 0).makeProfile().cache();
-
 	public final OsmandPreference<Float> SWITCH_MAP_DIRECTION_TO_COMPASS =
 			new FloatPreference("speed_for_map_to_direction_of_movement", 0f).makeProfile();
 
@@ -3392,6 +3399,16 @@ public class OsmandSettings {
 	public final CommonPreference<String> CUSTOM_APP_MODES_KEYS =
 		new StringPreference("custom_app_modes_keys", "").makeGlobal().cache();
 
+	public Set<String> getCustomAppModesKeys() {
+		String appModesKeys = CUSTOM_APP_MODES_KEYS.get();
+		StringTokenizer toks = new StringTokenizer(appModesKeys, ",");
+		Set<String> res = new LinkedHashSet<String>();
+		while (toks.hasMoreTokens()) {
+			res.add(toks.nextToken());
+		}
+		return res;
+	}
+
 	public enum DayNightMode {
 		AUTO(R.string.daynight_mode_auto, R.drawable.ic_action_map_sunset),
 		DAY(R.string.daynight_mode_day, R.drawable.ic_action_map_day),
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
index 210f487ba2..cd98fa6fe2 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
@@ -166,7 +166,7 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 						if (order == null) {
 							order = mode.getOrder();
 						}
-						mode.setOrder(app, order);
+						mode.setOrder(order);
 					}
 					ApplicationMode.reorderAppModes(app);
 					mapActivity.onBackPressed();

From 61e588fca9e122ef43fc25aa5ef682621e667119 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Tue, 28 Jan 2020 10:01:12 +0200
Subject: [PATCH 07/24] Fix app modes order

---
 .../src/net/osmand/plus/ApplicationMode.java  | 63 ++++++++++++-------
 .../src/net/osmand/plus/OsmandSettings.java   |  2 +
 .../plus/profiles/EditProfilesFragment.java   |  3 +-
 3 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 7c66a50a93..87a0b40150 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -19,6 +19,7 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -336,6 +337,12 @@ public class ApplicationMode {
 		return create(parent, -1, stringKey).userProfileTitle(userProfileTitle);
 	}
 
+	public static ApplicationModeBuilder changeBaseMode(ApplicationMode applicationMode) {
+		ApplicationModeBuilder builder = new ApplicationModeBuilder();
+		builder.applicationMode = applicationMode;
+		return builder;
+	}
+
 	public static List<ApplicationMode> values(OsmandApplication app) {
 		if (customizationListener == null) {
 			customizationListener = new OsmAndAppCustomization.OsmAndAppCustomizationListener() {
@@ -631,11 +638,16 @@ public class ApplicationMode {
 		initCustomModes(app);
 		initModesParams(app);
 		initRegVisibility();
-		reorderAppModes(app);
+		reorderAppModes();
 	}
 
 	private static void initModesParams(OsmandApplication app) {
 		OsmandSettings settings = app.getSettings();
+		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+		Type t = new TypeToken<Map<String, Integer>>() {
+		}.getType();
+		Map<String, Integer> appModesOrders = gson.fromJson(app.getSettings().APP_MODES_ORDERS.get(), t);
+
 		for (ApplicationMode mode : allPossibleValues()) {
 			mode.routingProfile = settings.ROUTING_PROFILE.getModeValue(mode);
 			mode.routeService = settings.ROUTE_SERVICE.getModeValue(mode);
@@ -647,11 +659,15 @@ public class ApplicationMode {
 			mode.navigationIcon = settings.NAVIGATION_ICON.getModeValue(mode);
 			mode.locationIcon = settings.LOCATION_ICON.getModeValue(mode);
 			mode.iconColor = settings.ICON_COLOR.getModeValue(mode);
+			Integer order = appModesOrders.get(mode.getStringKey());
+			if (order != null) {
+				mode.order = order;
+			}
 			updateAppModeIcon(app, settings.ICON_RES_NAME.getModeValue(mode), mode);
 		}
 	}
 
-	public static void reorderAppModes(OsmandApplication app) {
+	public static void reorderAppModes() {
 		Comparator<ApplicationMode> comparator = new Comparator<ApplicationMode>() {
 			@Override
 			public int compare(ApplicationMode mode1, ApplicationMode mode2) {
@@ -661,10 +677,10 @@ public class ApplicationMode {
 		Collections.sort(values, comparator);
 		Collections.sort(defaultValues, comparator);
 		Collections.sort(cachedFilteredValues, comparator);
-		updateAppModesOrder(app);
+		updateAppModesOrder();
 	}
 
-	private static void updateAppModesOrder(OsmandApplication app) {
+	private static void updateAppModesOrder() {
 		for (int i = 0; i < values.size(); i++) {
 			values.get(i).setOrder(i);
 		}
@@ -709,22 +725,19 @@ public class ApplicationMode {
 			Type t = new TypeToken<ArrayList<ApplicationModeBean>>() {
 			}.getType();
 			List<ApplicationModeBean> defaultAppModeBeans = gson.fromJson(settings.DEFAULT_APP_PROFILES.get(), t);
-
 			if (!Algorithms.isEmpty(defaultAppModeBeans)) {
 				for (ApplicationModeBean modeBean : defaultAppModeBeans) {
 					ApplicationMode mode = ApplicationMode.valueOfStringKey(modeBean.stringKey, null);
 					if (mode != null) {
-						settings.ICON_RES_NAME.setModeValue(mode, modeBean.iconName);
-						settings.ICON_COLOR.setModeValue(mode, modeBean.iconColor);
-						settings.USER_PROFILE_NAME.setModeValue(mode, modeBean.userProfileName);
-						settings.ROUTING_PROFILE.setModeValue(mode, modeBean.routingProfile);
-						settings.ROUTE_SERVICE.setModeValue(mode, modeBean.routeService);
-						if (modeBean.locIcon != null) {
-							settings.LOCATION_ICON.setModeValue(mode, modeBean.locIcon);
-						}
-						if (modeBean.navIcon != null) {
-							settings.NAVIGATION_ICON.setModeValue(mode, modeBean.navIcon);
-						}
+						ApplicationModeBuilder builder = changeBaseMode(mode)
+								.setRouteService(modeBean.routeService)
+								.setRoutingProfile(modeBean.routingProfile)
+								.icon(app, modeBean.iconName)
+								.setColor(modeBean.iconColor)
+								.locationIcon(modeBean.locIcon)
+								.navigationIcon(modeBean.navIcon)
+								.setOrder(modeBean.order);
+						saveProfile(builder, app);
 					}
 				}
 			}
@@ -766,7 +779,8 @@ public class ApplicationMode {
 		}
 	}
 
-	private static boolean saveCustomAppModesToSettings(OsmandSettings settings) {
+	public static void saveAppModesToSettings(OsmandApplication app) {
+		OsmandSettings settings = app.getSettings();
 		StringBuilder stringBuilder = new StringBuilder();
 		Iterator<ApplicationMode> it = ApplicationMode.getCustomValues().iterator();
 		while (it.hasNext()) {
@@ -776,9 +790,16 @@ public class ApplicationMode {
 			}
 		}
 		if (!stringBuilder.toString().equals(settings.CUSTOM_APP_MODES_KEYS.get())) {
-			return settings.CUSTOM_APP_MODES_KEYS.set(stringBuilder.toString());
+			settings.CUSTOM_APP_MODES_KEYS.set(stringBuilder.toString());
 		}
-		return false;
+
+		Map<String, Integer> appModesOrders = new HashMap<>();
+		for (ApplicationMode mode : allPossibleValues()) {
+			appModesOrders.put(mode.getStringKey(), mode.getOrder());
+		}
+		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+		String modesOrdersStr = gson.toJson(appModesOrders);
+		settings.APP_MODES_ORDERS.set(modesOrdersStr);
 	}
 
 	public static ApplicationMode saveProfile(ApplicationModeBuilder builder, OsmandApplication app) {
@@ -798,7 +819,7 @@ public class ApplicationMode {
 		mode.setNavigationIcon(app, builder.applicationMode.navigationIcon);
 		mode.setOrder(builder.applicationMode.order);
 
-		saveCustomAppModesToSettings(app.getSettings());
+		saveAppModesToSettings(app);
 		return mode;
 	}
 
@@ -815,7 +836,7 @@ public class ApplicationMode {
 			settings.APPLICATION_MODE.resetToDefault();
 		}
 		cachedFilteredValues.removeAll(modes);
-		saveCustomAppModesToSettings(app.getSettings());
+		saveAppModesToSettings(app);
 	}
 
 	public static boolean changeProfileAvailability(ApplicationMode mode, boolean isSelected, OsmandApplication app) {
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 13f2b22644..03439103ee 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1569,6 +1569,8 @@ public class OsmandSettings {
 		LOCATION_ICON.setModeDefaultValue(ApplicationMode.SKI, LocationIcon.BICYCLE);
 	}
 
+	public final CommonPreference<String> APP_MODES_ORDERS = new StringPreference("app_modes_orders", "").makeGlobal().cache();
+
 	public final OsmandPreference<Float> SWITCH_MAP_DIRECTION_TO_COMPASS =
 			new FloatPreference("speed_for_map_to_direction_of_movement", 0f).makeProfile();
 
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
index cd98fa6fe2..61ccb08e85 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
@@ -168,7 +168,8 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 						}
 						mode.setOrder(order);
 					}
-					ApplicationMode.reorderAppModes(app);
+					ApplicationMode.reorderAppModes();
+					ApplicationMode.saveAppModesToSettings(app);
 					mapActivity.onBackPressed();
 				}
 			}

From b602b3180e38cc617b35dadb6cb057661b9bd343 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Tue, 28 Jan 2020 11:12:44 +0200
Subject: [PATCH 08/24] Fix update modes params

---
 .../access/AccessibilitySettingsFragment.java |  2 +
 .../src/net/osmand/plus/ApplicationMode.java  | 79 +++++++++----------
 .../src/net/osmand/plus/OsmandSettings.java   | 26 ++----
 .../audionotes/MultimediaNotesFragment.java   |  2 +
 .../MonitoringSettingsFragment.java           |  2 +
 .../settings/ConfigureProfileFragment.java    | 16 +++-
 6 files changed, 64 insertions(+), 63 deletions(-)

diff --git a/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java b/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java
index 86b1711a0f..ea7796f7b8 100644
--- a/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java
+++ b/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java
@@ -180,6 +180,7 @@ public class AccessibilitySettingsFragment extends BaseSettingsFragment implemen
 		OsmandMonitoringPlugin plugin = OsmandPlugin.getPlugin(OsmandMonitoringPlugin.class);
 		if (plugin != null) {
 			app.getSettings().copyProfilePreferences(appMode, getSelectedAppMode(), plugin.getPreferences());
+			updateAllSettings();
 		}
 	}
 
@@ -188,6 +189,7 @@ public class AccessibilitySettingsFragment extends BaseSettingsFragment implemen
 		OsmandMonitoringPlugin plugin = OsmandPlugin.getPlugin(OsmandMonitoringPlugin.class);
 		if (plugin != null) {
 			app.getSettings().resetProfilePreferences(appMode, plugin.getPreferences());
+			updateAllSettings();
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 87a0b40150..58ba01720b 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -89,48 +89,35 @@ public class ApplicationMode {
 	 * DEFAULT("Browse map"), CAR("Car"), BICYCLE("Bicycle"), PEDESTRIAN("Pedestrian"); NAUTICAL("boat"); PUBLIC_TRANSPORT("Public transport"); AIRCRAFT("Aircraft")
 	 */
 	public static final ApplicationMode DEFAULT = createBase(R.string.app_mode_default, "default")
-			.speed(1.5f, 5).arrivalDistance(90)
-			.locationIcon(LocationIcon.DEFAULT).navigationIcon(NavigationIcon.DEFAULT)
 			.icon(R.drawable.ic_world_globe_dark, R.drawable.map_world_globe_dark, "ic_world_globe_dark").reg();
 
 	public static final ApplicationMode CAR = createBase(R.string.app_mode_car, "car")
-			.speed(12.5f, 35)
-			.locationIcon(LocationIcon.CAR).navigationIcon(NavigationIcon.DEFAULT)
 			.icon(R.drawable.ic_action_car_dark, R.drawable.map_action_car_dark, "ic_action_car_dark")
-			.setRoutingProfile("car").description(R.string.base_profile_descr_car).reg();
+			.description(R.string.base_profile_descr_car).reg();
 
 	public static final ApplicationMode BICYCLE = createBase(R.string.app_mode_bicycle, "bicycle")
-			.speed(2.77f, 15).arrivalDistance(60).offRouteDistance(50)
-			.locationIcon(LocationIcon.BICYCLE).navigationIcon(NavigationIcon.DEFAULT)
 			.icon(R.drawable.ic_action_bicycle_dark, R.drawable.map_action_bicycle_dark, "ic_action_bicycle_dark")
-			.setRoutingProfile("bicycle").description(R.string.base_profile_descr_bicycle).reg();
+			.description(R.string.base_profile_descr_bicycle).reg();
 
 	public static final ApplicationMode PEDESTRIAN = createBase(R.string.app_mode_pedestrian, "pedestrian")
-			.speed(1.11f, 5).arrivalDistance(45).offRouteDistance(20)
 			.icon(R.drawable.ic_action_pedestrian_dark, R.drawable.map_action_pedestrian_dark, "ic_action_pedestrian_dark")
-			.setRoutingProfile("pedestrian").description(R.string.base_profile_descr_pedestrian).reg();
+			.description(R.string.base_profile_descr_pedestrian).reg();
 
 	public static final ApplicationMode PUBLIC_TRANSPORT = createBase(R.string.app_mode_public_transport, "public_transport")
 			.icon(R.drawable.ic_action_bus_dark, R.drawable.map_action_bus_dark, "ic_action_bus_dark")
-			.setRoutingProfile("public_transport").description(R.string.base_profile_descr_public_transport).reg();
+			.description(R.string.base_profile_descr_public_transport).reg();
 
 	public static final ApplicationMode BOAT = createBase(R.string.app_mode_boat, "boat")
-			.speed(1.38f, 20)
-			.locationIcon(LocationIcon.DEFAULT).navigationIcon(NavigationIcon.NAUTICAL)
 			.icon(R.drawable.ic_action_sail_boat_dark, R.drawable.map_action_sail_boat_dark, "ic_action_sail_boat_dark")
-			.setRoutingProfile("boat").description(R.string.base_profile_descr_boat).reg();
+			.description(R.string.base_profile_descr_boat).reg();
 
 	public static final ApplicationMode AIRCRAFT = createBase(R.string.app_mode_aircraft, "aircraft")
-			.speed(40f, 100)
-			.locationIcon(LocationIcon.CAR).navigationIcon(NavigationIcon.DEFAULT)
 			.icon(R.drawable.ic_action_aircraft, R.drawable.map_action_aircraft, "ic_action_aircraft").setRouteService(RouteService.STRAIGHT)
-			.setRoutingProfile("STRAIGHT_LINE_MODE").description(R.string.base_profile_descr_aircraft).reg();
+			.description(R.string.base_profile_descr_aircraft).reg();
 
 	public static final ApplicationMode SKI = createBase(R.string.app_mode_skiing, "ski")
-			.speed(1.38f, 15).arrivalDistance(60).offRouteDistance(50)
-			.locationIcon(LocationIcon.BICYCLE).navigationIcon(NavigationIcon.DEFAULT)
 			.icon(R.drawable.ic_action_skiing, R.drawable.map_action_skiing, "ic_action_skiing")
-			.setRoutingProfile("ski").description(R.string.base_profile_descr_ski).reg();
+			.description(R.string.base_profile_descr_ski).reg();
 
 	private static class ApplicationModeBean {
 		@Expose
@@ -320,6 +307,20 @@ public class ApplicationMode {
 		}
 	}
 
+	private static void updateAppModeOrder(OsmandApplication app, ApplicationMode mode) {
+		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+		Type t = new TypeToken<Map<String, Integer>>() {
+		}.getType();
+
+		Map<String, Integer> appModesOrders = gson.fromJson(app.getSettings().APP_MODES_ORDERS.get(), t);
+		if (!Algorithms.isEmpty(appModesOrders)) {
+			Integer order = appModesOrders.get(mode.getStringKey());
+			if (order != null) {
+				mode.order = order;
+			}
+		}
+	}
+
 	private static ApplicationModeBuilder create(ApplicationMode parent, int key, String stringKey) {
 		ApplicationModeBuilder builder = new ApplicationModeBuilder();
 		builder.applicationMode = new ApplicationMode(key, stringKey);
@@ -642,31 +643,27 @@ public class ApplicationMode {
 	}
 
 	private static void initModesParams(OsmandApplication app) {
-		OsmandSettings settings = app.getSettings();
-		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-		Type t = new TypeToken<Map<String, Integer>>() {
-		}.getType();
-		Map<String, Integer> appModesOrders = gson.fromJson(app.getSettings().APP_MODES_ORDERS.get(), t);
-
 		for (ApplicationMode mode : allPossibleValues()) {
-			mode.routingProfile = settings.ROUTING_PROFILE.getModeValue(mode);
-			mode.routeService = settings.ROUTE_SERVICE.getModeValue(mode);
-			mode.defaultSpeed = settings.DEFAULT_SPEED.getModeValue(mode);
-			mode.minDistanceForTurn = settings.MIN_DISTANCE_FOR_TURN.getModeValue(mode);
-			mode.arrivalDistance = settings.ARRIVAL_DISTANCE.getModeValue(mode);
-			mode.offRouteDistance = settings.OFF_ROUTE_DISTANCE.getModeValue(mode);
-			mode.userProfileName = settings.USER_PROFILE_NAME.getModeValue(mode);
-			mode.navigationIcon = settings.NAVIGATION_ICON.getModeValue(mode);
-			mode.locationIcon = settings.LOCATION_ICON.getModeValue(mode);
-			mode.iconColor = settings.ICON_COLOR.getModeValue(mode);
-			Integer order = appModesOrders.get(mode.getStringKey());
-			if (order != null) {
-				mode.order = order;
-			}
-			updateAppModeIcon(app, settings.ICON_RES_NAME.getModeValue(mode), mode);
+			initModeParams(app, mode);
 		}
 	}
 
+	public static void initModeParams(OsmandApplication app, ApplicationMode mode) {
+		OsmandSettings settings = app.getSettings();
+		mode.routingProfile = settings.ROUTING_PROFILE.getModeValue(mode);
+		mode.routeService = settings.ROUTE_SERVICE.getModeValue(mode);
+		mode.defaultSpeed = settings.DEFAULT_SPEED.getModeValue(mode);
+		mode.minDistanceForTurn = settings.MIN_DISTANCE_FOR_TURN.getModeValue(mode);
+		mode.arrivalDistance = settings.ARRIVAL_DISTANCE.getModeValue(mode);
+		mode.offRouteDistance = settings.OFF_ROUTE_DISTANCE.getModeValue(mode);
+		mode.userProfileName = settings.USER_PROFILE_NAME.getModeValue(mode);
+		mode.navigationIcon = settings.NAVIGATION_ICON.getModeValue(mode);
+		mode.locationIcon = settings.LOCATION_ICON.getModeValue(mode);
+		mode.iconColor = settings.ICON_COLOR.getModeValue(mode);
+		updateAppModeOrder(app, mode);
+		updateAppModeIcon(app, settings.ICON_RES_NAME.getModeValue(mode), mode);
+	}
+
 	public static void reorderAppModes() {
 		Comparator<ApplicationMode> comparator = new Comparator<ApplicationMode>() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 03439103ee..fc06a92660 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -424,44 +424,30 @@ public class OsmandSettings {
 		return false;
 	}
 
-	public boolean copyPreferencesFromProfile(ApplicationMode modeFrom, ApplicationMode modeTo) {
-		return copyProfilePreferences(modeFrom, modeTo, new ArrayList<OsmandPreference>(registeredPreferences.values()));
+	public void copyPreferencesFromProfile(ApplicationMode modeFrom, ApplicationMode modeTo) {
+		copyProfilePreferences(modeFrom, modeTo, new ArrayList<OsmandPreference>(registeredPreferences.values()));
 	}
 
-	public boolean copyProfilePreferences(ApplicationMode modeFrom, ApplicationMode modeTo, List<OsmandPreference> profilePreferences) {
-		SettingsEditor settingsEditor = settingsAPI.edit(getProfilePreferences(modeTo));
+	public void copyProfilePreferences(ApplicationMode modeFrom, ApplicationMode modeTo, List<OsmandPreference> profilePreferences) {
 		for (OsmandPreference pref : profilePreferences) {
 			if (pref instanceof CommonPreference && !((CommonPreference) pref).global) {
 				CommonPreference profilePref = (CommonPreference) pref;
 				Object copiedValue = profilePref.getModeValue(modeFrom);
-				if (copiedValue instanceof String) {
-					settingsEditor.putString(pref.getId(), (String) copiedValue);
-				} else if (copiedValue instanceof Boolean) {
-					settingsEditor.putBoolean(pref.getId(), (Boolean) copiedValue);
-				} else if (copiedValue instanceof Float) {
-					settingsEditor.putFloat(pref.getId(), (Float) copiedValue);
-				} else if (copiedValue instanceof Integer) {
-					settingsEditor.putInt(pref.getId(), (Integer) copiedValue);
-				} else if (copiedValue instanceof Long) {
-					settingsEditor.putLong(pref.getId(), (Long) copiedValue);
-				}
+				profilePref.setModeValue(modeTo, copiedValue);
 			}
 		}
-		return settingsEditor.commit();
 	}
 
 	public boolean resetPreferencesForProfile(ApplicationMode mode) {
 		return settingsAPI.edit(getProfilePreferences(mode)).clear().commit();
 	}
 
-	public boolean resetProfilePreferences(ApplicationMode mode, List<OsmandPreference> profilePreferences) {
-		SettingsEditor settingsEditor = settingsAPI.edit(getProfilePreferences(mode));
+	public void resetProfilePreferences(ApplicationMode mode, List<OsmandPreference> profilePreferences) {
 		for (OsmandPreference pref : profilePreferences) {
 			if (pref instanceof CommonPreference && !((CommonPreference) pref).global) {
-				settingsEditor.remove(pref.getId());
+				pref.resetModeToDefault(mode);
 			}
 		}
-		return settingsEditor.commit();
 	}
 
 	public ApplicationMode LAST_ROUTING_APPLICATION_MODE = null;
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java
index a83ea40136..d47c018db5 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java
@@ -475,6 +475,7 @@ public class MultimediaNotesFragment extends BaseSettingsFragment implements Cop
 		AudioVideoNotesPlugin plugin = OsmandPlugin.getPlugin(AudioVideoNotesPlugin.class);
 		if (plugin != null) {
 			app.getSettings().copyProfilePreferences(appMode, getSelectedAppMode(), plugin.getPreferences());
+			updateAllSettings();
 		}
 	}
 
@@ -483,6 +484,7 @@ public class MultimediaNotesFragment extends BaseSettingsFragment implements Cop
 		AudioVideoNotesPlugin plugin = OsmandPlugin.getPlugin(AudioVideoNotesPlugin.class);
 		if (plugin != null) {
 			app.getSettings().resetProfilePreferences(appMode, plugin.getPreferences());
+			updateAllSettings();
 		}
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
index a9c18346c0..eee941987c 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
@@ -290,6 +290,7 @@ public class MonitoringSettingsFragment extends BaseSettingsFragment implements
 		OsmandMonitoringPlugin plugin = OsmandPlugin.getPlugin(OsmandMonitoringPlugin.class);
 		if (plugin != null) {
 			app.getSettings().copyProfilePreferences(appMode, getSelectedAppMode(), plugin.getPreferences());
+			updateAllSettings();
 		}
 	}
 
@@ -298,6 +299,7 @@ public class MonitoringSettingsFragment extends BaseSettingsFragment implements
 		OsmandMonitoringPlugin plugin = OsmandPlugin.getPlugin(OsmandMonitoringPlugin.class);
 		if (plugin != null) {
 			app.getSettings().resetProfilePreferences(appMode, plugin.getPreferences());
+			updateAllSettings();
 		}
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
index 102205e6d8..ddbea118c6 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
@@ -143,13 +143,22 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 	@Override
 	protected void updateToolbar() {
 		super.updateToolbar();
-		updateToolbarSwitch();
+		View view = getView();
+		if (view != null) {
+			updateToolbarSwitch();
+			TextView toolbarTitle = view.findViewById(R.id.toolbar_title);
+			toolbarTitle.setText(getSelectedAppMode().toHumanString(getContext()));
+		}
 	}
 
 	@Override
 	public void copyAppModePrefs(ApplicationMode appMode) {
 		if (appMode != null) {
-			app.getSettings().copyPreferencesFromProfile(appMode, getSelectedAppMode());
+			ApplicationMode selectedAppMode = getSelectedAppMode();
+			app.getSettings().copyPreferencesFromProfile(appMode, selectedAppMode);
+			ApplicationMode.initModeParams(app, selectedAppMode);
+			updateToolbar();
+			updateAllSettings();
 		}
 	}
 
@@ -157,6 +166,9 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 	public void resetAppModePrefs(ApplicationMode appMode) {
 		if (appMode != null) {
 			app.getSettings().resetPreferencesForProfile(appMode);
+			ApplicationMode.initModeParams(app, appMode);
+			updateToolbar();
+			updateAllSettings();
 		}
 	}
 

From c88625bfeecbde7cb0cb78dd17c4e3d5b6684ef8 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Tue, 28 Jan 2020 11:24:22 +0200
Subject: [PATCH 09/24] Fix title update

---
 OsmAnd/src/net/osmand/plus/ApplicationMode.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 58ba01720b..7ae60ad096 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -730,6 +730,7 @@ public class ApplicationMode {
 								.setRouteService(modeBean.routeService)
 								.setRoutingProfile(modeBean.routingProfile)
 								.icon(app, modeBean.iconName)
+								.userProfileTitle(modeBean.userProfileName)
 								.setColor(modeBean.iconColor)
 								.locationIcon(modeBean.locIcon)
 								.navigationIcon(modeBean.navIcon)
@@ -756,6 +757,7 @@ public class ApplicationMode {
 							.setRouteService(m.routeService)
 							.setRoutingProfile(m.routingProfile)
 							.icon(app, m.iconName)
+							.userProfileTitle(m.userProfileName)
 							.setColor(m.iconColor)
 							.locationIcon(m.locIcon)
 							.navigationIcon(m.navIcon)

From 091d23ad9321fcbe64c15ac01ebdbe3f20d630fb Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Tue, 28 Jan 2020 11:38:33 +0200
Subject: [PATCH 10/24] Fix creating new profile

---
 .../settings/ProfileAppearanceFragment.java   | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
index cc58d154c8..8e29cc36ec 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
@@ -94,7 +94,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 	private FlowLayout navIconItems;
 	private OsmandTextFieldBoxes profileNameOtfb;
 	private View saveButton;
-	
+
 	private boolean isBaseProfileImported;
 
 	@Override
@@ -653,17 +653,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 			}
 			return false;
 		}
-		ApplicationMode mode = ApplicationMode.valueOfStringKey(changedProfile.stringKey, null);
-		if (mode != null && !isNew) {
-			mode.setParentAppMode(app, changedProfile.parent);
-			mode.setUserProfileName(app, changedProfile.name.trim());
-			mode.setIconResName(app, ProfileIcons.getResStringByResId(changedProfile.iconRes));
-			mode.setRouteService(app, changedProfile.routeService);
-			mode.setRoutingProfile(app, changedProfile.routingProfile);
-			mode.setIconColor(app, changedProfile.color);
-			mode.setLocationIcon(app, changedProfile.locationIcon);
-			mode.setNavigationIcon(app, changedProfile.navigationIcon);
-		} else {
+		if (isNew) {
 			ApplicationMode.ApplicationModeBuilder builder = ApplicationMode
 					.createCustomMode(changedProfile.parent, changedProfile.name.trim(), changedProfile.stringKey)
 					.icon(app, ProfileIcons.getResStringByResId(changedProfile.iconRes))
@@ -673,15 +663,23 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 					.locationIcon(changedProfile.locationIcon)
 					.navigationIcon(changedProfile.navigationIcon);
 
-			mode = ApplicationMode.saveProfile(builder, app);
-		}
-
-		if (isNew) {
+			app.getSettings().copyPreferencesFromProfile(changedProfile.parent, builder.getApplicationMode());
+			ApplicationMode mode = ApplicationMode.saveProfile(builder, app);
 			if (!ApplicationMode.values(app).contains(mode)) {
 				ApplicationMode.changeProfileAvailability(mode, true, app);
 			}
-			app.getSettings().copyPreferencesFromProfile(changedProfile.parent, mode);
+		} else {
+			ApplicationMode mode = ApplicationMode.valueOfStringKey(changedProfile.stringKey, null);
+			mode.setParentAppMode(app, changedProfile.parent);
+			mode.setUserProfileName(app, changedProfile.name.trim());
+			mode.setIconResName(app, ProfileIcons.getResStringByResId(changedProfile.iconRes));
+			mode.setRouteService(app, changedProfile.routeService);
+			mode.setRoutingProfile(app, changedProfile.routingProfile);
+			mode.setIconColor(app, changedProfile.color);
+			mode.setLocationIcon(app, changedProfile.locationIcon);
+			mode.setNavigationIcon(app, changedProfile.navigationIcon);
 		}
+
 		return true;
 	}
 

From 2391a76fcb96fbe4b5fe38f4ae083c5a64b02974 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Tue, 28 Jan 2020 12:15:42 +0200
Subject: [PATCH 11/24] Remove unnecessary preferences

---
 .../src/net/osmand/plus/ApplicationMode.java  | 24 ++++++---
 .../src/net/osmand/plus/OsmandSettings.java   | 50 ++++++-------------
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 7ae60ad096..1781d63e40 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -89,17 +89,21 @@ public class ApplicationMode {
 	 * DEFAULT("Browse map"), CAR("Car"), BICYCLE("Bicycle"), PEDESTRIAN("Pedestrian"); NAUTICAL("boat"); PUBLIC_TRANSPORT("Public transport"); AIRCRAFT("Aircraft")
 	 */
 	public static final ApplicationMode DEFAULT = createBase(R.string.app_mode_default, "default")
+			.distanceForTurn(5).arrivalDistance(90)
 			.icon(R.drawable.ic_world_globe_dark, R.drawable.map_world_globe_dark, "ic_world_globe_dark").reg();
 
 	public static final ApplicationMode CAR = createBase(R.string.app_mode_car, "car")
+			.distanceForTurn(35)
 			.icon(R.drawable.ic_action_car_dark, R.drawable.map_action_car_dark, "ic_action_car_dark")
 			.description(R.string.base_profile_descr_car).reg();
 
 	public static final ApplicationMode BICYCLE = createBase(R.string.app_mode_bicycle, "bicycle")
+			.distanceForTurn(15).arrivalDistance(60).offRouteDistance(50)
 			.icon(R.drawable.ic_action_bicycle_dark, R.drawable.map_action_bicycle_dark, "ic_action_bicycle_dark")
 			.description(R.string.base_profile_descr_bicycle).reg();
 
 	public static final ApplicationMode PEDESTRIAN = createBase(R.string.app_mode_pedestrian, "pedestrian")
+			.distanceForTurn(5).arrivalDistance(45).offRouteDistance(20)
 			.icon(R.drawable.ic_action_pedestrian_dark, R.drawable.map_action_pedestrian_dark, "ic_action_pedestrian_dark")
 			.description(R.string.base_profile_descr_pedestrian).reg();
 
@@ -108,17 +112,21 @@ public class ApplicationMode {
 			.description(R.string.base_profile_descr_public_transport).reg();
 
 	public static final ApplicationMode BOAT = createBase(R.string.app_mode_boat, "boat")
+			.distanceForTurn(20)
 			.icon(R.drawable.ic_action_sail_boat_dark, R.drawable.map_action_sail_boat_dark, "ic_action_sail_boat_dark")
 			.description(R.string.base_profile_descr_boat).reg();
 
 	public static final ApplicationMode AIRCRAFT = createBase(R.string.app_mode_aircraft, "aircraft")
-			.icon(R.drawable.ic_action_aircraft, R.drawable.map_action_aircraft, "ic_action_aircraft").setRouteService(RouteService.STRAIGHT)
+			.distanceForTurn(100)
+			.icon(R.drawable.ic_action_aircraft, R.drawable.map_action_aircraft, "ic_action_aircraft")
 			.description(R.string.base_profile_descr_aircraft).reg();
 
 	public static final ApplicationMode SKI = createBase(R.string.app_mode_skiing, "ski")
+			.distanceForTurn(15).arrivalDistance(60).offRouteDistance(50)
 			.icon(R.drawable.ic_action_skiing, R.drawable.map_action_skiing, "ic_action_skiing")
 			.description(R.string.base_profile_descr_ski).reg();
 
+
 	private static class ApplicationModeBean {
 		@Expose
 		String stringKey;
@@ -202,7 +210,7 @@ public class ApplicationMode {
 			values.add(applicationMode);
 			defaultValues.add(applicationMode);
 			if (applicationMode.getOrder() == 0 && !values.isEmpty()) {
-				applicationMode.order = values.size();
+				applicationMode.setOrder(values.size());
 			}
 			return applicationMode;
 		}
@@ -210,7 +218,7 @@ public class ApplicationMode {
 		private ApplicationMode customReg() {
 			values.add(applicationMode);
 			if (applicationMode.getOrder() == 0 && !values.isEmpty()) {
-				applicationMode.order = values.size();
+				applicationMode.setOrder(values.size());
 			}
 			return applicationMode;
 		}
@@ -251,8 +259,12 @@ public class ApplicationMode {
 			return this;
 		}
 
-		public ApplicationModeBuilder speed(float defSpeed, int distForTurn) {
+		public ApplicationModeBuilder speed(float defSpeed) {
 			applicationMode.defaultSpeed = defSpeed;
+			return this;
+		}
+
+		public ApplicationModeBuilder distanceForTurn(int distForTurn) {
 			applicationMode.minDistanceForTurn = distForTurn;
 			return this;
 		}
@@ -653,13 +665,11 @@ public class ApplicationMode {
 		mode.routingProfile = settings.ROUTING_PROFILE.getModeValue(mode);
 		mode.routeService = settings.ROUTE_SERVICE.getModeValue(mode);
 		mode.defaultSpeed = settings.DEFAULT_SPEED.getModeValue(mode);
-		mode.minDistanceForTurn = settings.MIN_DISTANCE_FOR_TURN.getModeValue(mode);
-		mode.arrivalDistance = settings.ARRIVAL_DISTANCE.getModeValue(mode);
-		mode.offRouteDistance = settings.OFF_ROUTE_DISTANCE.getModeValue(mode);
 		mode.userProfileName = settings.USER_PROFILE_NAME.getModeValue(mode);
 		mode.navigationIcon = settings.NAVIGATION_ICON.getModeValue(mode);
 		mode.locationIcon = settings.LOCATION_ICON.getModeValue(mode);
 		mode.iconColor = settings.ICON_COLOR.getModeValue(mode);
+		mode.parentAppMode = valueOfStringKey(settings.PARENT_APP_MODE.getModeValue(mode), null);
 		updateAppModeOrder(app, mode);
 		updateAppModeIcon(app, settings.ICON_RES_NAME.getModeValue(mode), mode);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index fc06a92660..8a7d5a8fae 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -430,10 +430,20 @@ public class OsmandSettings {
 
 	public void copyProfilePreferences(ApplicationMode modeFrom, ApplicationMode modeTo, List<OsmandPreference> profilePreferences) {
 		for (OsmandPreference pref : profilePreferences) {
-			if (pref instanceof CommonPreference && !((CommonPreference) pref).global) {
+			if (pref instanceof CommonPreference
+					&& !((CommonPreference) pref).global
+					&& !USER_PROFILE_NAME.getId().equals(pref.getId())) {
 				CommonPreference profilePref = (CommonPreference) pref;
-				Object copiedValue = profilePref.getModeValue(modeFrom);
-				profilePref.setModeValue(modeTo, copiedValue);
+				if (modeTo.isCustomProfile() && PARENT_APP_MODE.getId().equals(pref.getId())) {
+					if (modeFrom.isCustomProfile()) {
+						PARENT_APP_MODE.setModeValue(modeTo, modeFrom.getParent().getStringKey());
+					} else {
+						PARENT_APP_MODE.setModeValue(modeTo, modeFrom.getStringKey());
+					}
+				} else {
+					Object copiedValue = profilePref.getModeValue(modeFrom);
+					profilePref.setModeValue(modeTo, copiedValue);
+				}
 			}
 		}
 	}
@@ -1444,6 +1454,9 @@ public class OsmandSettings {
 	public final OsmandPreference<Float> SPEECH_RATE =
 			new FloatPreference("speech_rate", 1f).makeProfile();
 
+	public final OsmandPreference<Float> ARRIVAL_DISTANCE_FACTOR =
+			new FloatPreference("arrival_distance_factor", 1f).makeProfile();
+
 	public final OsmandPreference<Float> SPEED_LIMIT_EXCEED =
 			new FloatPreference("speed_limit_exceed", 5f).makeProfile();
 
@@ -1502,37 +1515,6 @@ public class OsmandSettings {
 		ROUTE_SERVICE.setModeDefaultValue(ApplicationMode.AIRCRAFT, RouteService.STRAIGHT);
 	}
 
-	public final CommonPreference<Integer> MIN_DISTANCE_FOR_TURN = new IntPreference("min_distance_for_turn", 50).makeProfile().cache();
-
-	{
-		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.DEFAULT, 5);
-		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.CAR, 35);
-		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.BICYCLE, 15);
-		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 5);
-		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.BOAT, 20);
-		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.AIRCRAFT, 100);
-		MIN_DISTANCE_FOR_TURN.setModeDefaultValue(ApplicationMode.SKI, 15);
-	}
-
-	public final OsmandPreference<Float> ARRIVAL_DISTANCE_FACTOR = new FloatPreference("arrival_distance_factor", 1f).makeProfile().cache();
-
-	public final CommonPreference<Integer> ARRIVAL_DISTANCE = new IntPreference("arrival_distance", 90).makeProfile().cache();
-
-	{
-		ARRIVAL_DISTANCE.setModeDefaultValue(ApplicationMode.DEFAULT, 90);
-		ARRIVAL_DISTANCE.setModeDefaultValue(ApplicationMode.BICYCLE, 60);
-		ARRIVAL_DISTANCE.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 45);
-		ARRIVAL_DISTANCE.setModeDefaultValue(ApplicationMode.SKI, 60);
-	}
-
-	public final CommonPreference<Integer> OFF_ROUTE_DISTANCE = new IntPreference("off_route_distance", 350).makeProfile().cache();
-
-	{
-		OFF_ROUTE_DISTANCE.setModeDefaultValue(ApplicationMode.BICYCLE, 50);
-		OFF_ROUTE_DISTANCE.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 20);
-		OFF_ROUTE_DISTANCE.setModeDefaultValue(ApplicationMode.SKI, 50);
-	}
-
 	public final CommonPreference<NavigationIcon> NAVIGATION_ICON = new EnumIntPreference<>("navigation_icon", NavigationIcon.DEFAULT, NavigationIcon.values()).makeProfile().cache();
 
 	{

From 285749921b76f56e4e6acf581fcf2cef898e959a Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Tue, 28 Jan 2020 12:59:14 +0200
Subject: [PATCH 12/24] Fix set routing profile

---
 OsmAnd/src/net/osmand/plus/ApplicationMode.java          | 4 ++++
 OsmAnd/src/net/osmand/plus/OsmandSettings.java           | 9 ++++-----
 .../src/net/osmand/plus/settings/NavigationFragment.java | 9 ++++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 1781d63e40..04685fa3a4 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -216,6 +216,10 @@ public class ApplicationMode {
 		}
 
 		private ApplicationMode customReg() {
+			ApplicationMode m = applicationMode;
+			m.minDistanceForTurn = m.parentAppMode.minDistanceForTurn;
+			m.arrivalDistance = m.parentAppMode.arrivalDistance;
+			m.offRouteDistance = m.parentAppMode.offRouteDistance;
 			values.add(applicationMode);
 			if (applicationMode.getOrder() == 0 && !values.isEmpty()) {
 				applicationMode.setOrder(values.size());
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 8a7d5a8fae..635bd07764 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -434,11 +434,10 @@ public class OsmandSettings {
 					&& !((CommonPreference) pref).global
 					&& !USER_PROFILE_NAME.getId().equals(pref.getId())) {
 				CommonPreference profilePref = (CommonPreference) pref;
-				if (modeTo.isCustomProfile() && PARENT_APP_MODE.getId().equals(pref.getId())) {
-					if (modeFrom.isCustomProfile()) {
-						PARENT_APP_MODE.setModeValue(modeTo, modeFrom.getParent().getStringKey());
-					} else {
-						PARENT_APP_MODE.setModeValue(modeTo, modeFrom.getStringKey());
+				if (PARENT_APP_MODE.getId().equals(pref.getId())) {
+					if (modeTo.isCustomProfile()) {
+						String parentKey = modeFrom.isCustomProfile() ? modeFrom.getParent().getStringKey() : modeFrom.getStringKey();
+						PARENT_APP_MODE.setModeValue(modeTo, parentKey);
 					}
 				} else {
 					Object copiedValue = profilePref.getModeValue(modeFrom);
diff --git a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
index 2d6db4913c..b3343ca112 100644
--- a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
@@ -140,13 +140,16 @@ public class NavigationFragment extends BaseSettingsFragment {
 		navigationType.setIcon(getContentIcon(selectedRoutingProfileDataObject.getIconRes()));
 
 		ApplicationMode appMode = getSelectedAppMode();
+		RouteProvider.RouteService routeService;
 		if (profileKey.equals(RoutingProfilesResources.STRAIGHT_LINE_MODE.name())) {
-			appMode.setRouteService(app, RouteProvider.RouteService.STRAIGHT);
+			routeService = RouteProvider.RouteService.STRAIGHT;
 		} else if (profileKey.equals(RoutingProfilesResources.BROUTER_MODE.name())) {
-			appMode.setRouteService(app, RouteProvider.RouteService.BROUTER);
+			routeService = RouteProvider.RouteService.BROUTER;
 		} else {
-			appMode.setRoutingProfile(app, profileKey);
+			routeService = RouteProvider.RouteService.OSMAND;
 		}
+		appMode.setRouteService(app, routeService);
+		appMode.setRoutingProfile(app, profileKey);
 	}
 
 	public static Map<String, RoutingProfileDataObject> getRoutingProfiles(OsmandApplication context) {

From 746932386caf60724c09cf161d92ab5e3fa9aedd Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Tue, 28 Jan 2020 13:23:55 +0200
Subject: [PATCH 13/24] Show toast after prefs restored

---
 OsmAnd/res/values/strings.xml                         |  2 ++
 .../osmand/access/AccessibilitySettingsFragment.java  |  1 +
 .../plus/audionotes/MultimediaNotesFragment.java      |  1 +
 .../plus/monitoring/MonitoringSettingsFragment.java   |  1 +
 .../plus/settings/ConfigureProfileFragment.java       | 11 +++++++----
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 7b1ec14f21..9d020f32b4 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,6 +11,8 @@
 	Thx - Hardy
 
 -->
+    <string name="plugin_prefs_reset_successful">All plugin settings restored to default state.</string>
+    <string name="profile_prefs_reset_successful">All profile settings restored to default state.</string>
     <string name="ltr_or_rtl_combine_via_slash">%1$s/%2$s</string>
     <string name="sunset_at">Sunset at %1$s</string>
     <string name="sunrise_at">Sunrise at %1$s</string>
diff --git a/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java b/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java
index ea7796f7b8..f87c8a01dc 100644
--- a/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java
+++ b/OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java
@@ -189,6 +189,7 @@ public class AccessibilitySettingsFragment extends BaseSettingsFragment implemen
 		OsmandMonitoringPlugin plugin = OsmandPlugin.getPlugin(OsmandMonitoringPlugin.class);
 		if (plugin != null) {
 			app.getSettings().resetProfilePreferences(appMode, plugin.getPreferences());
+			app.showToastMessage(R.string.plugin_prefs_reset_successful);
 			updateAllSettings();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java
index d47c018db5..96787cf511 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java
@@ -484,6 +484,7 @@ public class MultimediaNotesFragment extends BaseSettingsFragment implements Cop
 		AudioVideoNotesPlugin plugin = OsmandPlugin.getPlugin(AudioVideoNotesPlugin.class);
 		if (plugin != null) {
 			app.getSettings().resetProfilePreferences(appMode, plugin.getPreferences());
+			app.showToastMessage(R.string.plugin_prefs_reset_successful);
 			updateAllSettings();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
index eee941987c..8c0a0bfda3 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
@@ -299,6 +299,7 @@ public class MonitoringSettingsFragment extends BaseSettingsFragment implements
 		OsmandMonitoringPlugin plugin = OsmandPlugin.getPlugin(OsmandMonitoringPlugin.class);
 		if (plugin != null) {
 			app.getSettings().resetProfilePreferences(appMode, plugin.getPreferences());
+			app.showToastMessage(R.string.plugin_prefs_reset_successful);
 			updateAllSettings();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
index ddbea118c6..4fc1f6c141 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
@@ -165,10 +165,13 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 	@Override
 	public void resetAppModePrefs(ApplicationMode appMode) {
 		if (appMode != null) {
-			app.getSettings().resetPreferencesForProfile(appMode);
-			ApplicationMode.initModeParams(app, appMode);
-			updateToolbar();
-			updateAllSettings();
+			boolean prefsRestored = app.getSettings().resetPreferencesForProfile(appMode);
+			if (prefsRestored) {
+				app.showToastMessage(R.string.profile_prefs_reset_successful);
+				ApplicationMode.initModeParams(app, appMode);
+				updateToolbar();
+				updateAllSettings();
+			}
 		}
 	}
 

From 0ebbb2fd4ecc76379ea3bb7bcc8ddc5c0350c286 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Tue, 28 Jan 2020 13:31:24 +0200
Subject: [PATCH 14/24] Fix cached prefs reset

---
 OsmAnd/src/net/osmand/plus/OsmandSettings.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 635bd07764..25f94099e0 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -448,7 +448,19 @@ public class OsmandSettings {
 	}
 
 	public boolean resetPreferencesForProfile(ApplicationMode mode) {
-		return settingsAPI.edit(getProfilePreferences(mode)).clear().commit();
+		boolean prefsCleared = settingsAPI.edit(getProfilePreferences(mode)).clear().commit();
+		if (prefsCleared) {
+			for (OsmandPreference pref : registeredPreferences.values()) {
+				if (pref instanceof CommonPreference) {
+					CommonPreference commonPreference = (CommonPreference) pref;
+					if (commonPreference.cache && !commonPreference.global) {
+						commonPreference.cachedValue = null;
+					}
+				}
+			}
+		}
+
+		return prefsCleared;
 	}
 
 	public void resetProfilePreferences(ApplicationMode mode, List<OsmandPreference> profilePreferences) {

From 52c1ce3b4ccdf0434027e547170665a742240bc0 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Thu, 30 Jan 2020 13:11:09 +0200
Subject: [PATCH 15/24] Add app context to ApplicationMode

---
 .../src/net/osmand/plus/ApplicationMode.java  | 969 ++++++++----------
 .../src/net/osmand/plus/OsmandSettings.java   |  35 +-
 .../src/net/osmand/plus/SettingsHelper.java   |   2 +-
 .../SettingsNavigationActivity.java           |   4 +-
 .../settings/ConfigureProfileFragment.java    |  12 +-
 .../plus/settings/NavigationFragment.java     |   4 +-
 .../settings/ProfileAppearanceFragment.java   |  32 +-
 7 files changed, 477 insertions(+), 581 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 04685fa3a4..59bba64ae8 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -6,7 +6,6 @@ import android.support.annotation.DrawableRes;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
-import com.google.gson.reflect.TypeToken;
 
 import net.osmand.StateChangedListener;
 import net.osmand.plus.profiles.LocationIcon;
@@ -15,11 +14,9 @@ import net.osmand.plus.profiles.ProfileIconColors;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.util.Algorithms;
 
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -57,28 +54,22 @@ public class ApplicationMode {
 	private static List<ApplicationMode> cachedFilteredValues = new ArrayList<>();
 
 	private static StateChangedListener<String> listener;
+	private static StateChangedListener<String> iconNameListener;
 	private static OsmAndAppCustomization.OsmAndAppCustomizationListener customizationListener;
 
+	private OsmandApplication app;
+
 	private final int keyName;
 	private final String stringKey;
-	private String userProfileName;
 	private int descriptionId;
-	private int order;
 
 	private ApplicationMode parentAppMode;
-	private String iconResName = "ic_world_globe_dark";
 	private int iconRes = R.drawable.ic_world_globe_dark;
 	private int iconMapRes = R.drawable.map_world_globe_dark;
-	private ProfileIconColors iconColor = ProfileIconColors.DEFAULT;
-	private String routingProfile = "";
-	private RouteService routeService = RouteService.OSMAND;
 
-	private float defaultSpeed = 10f;
 	private int minDistanceForTurn = 50;
 	private int arrivalDistance = 90;
 	private int offRouteDistance = 350;
-	private NavigationIcon navigationIcon = NavigationIcon.DEFAULT;
-	private LocationIcon locationIcon = LocationIcon.DEFAULT;
 
 	private ApplicationMode(int key, String stringKey) {
 		this.keyName = key;
@@ -90,64 +81,145 @@ public class ApplicationMode {
 	 */
 	public static final ApplicationMode DEFAULT = createBase(R.string.app_mode_default, "default")
 			.distanceForTurn(5).arrivalDistance(90)
-			.icon(R.drawable.ic_world_globe_dark, R.drawable.map_world_globe_dark, "ic_world_globe_dark").reg();
+			.icon(R.drawable.ic_world_globe_dark, R.drawable.map_world_globe_dark).reg();
 
 	public static final ApplicationMode CAR = createBase(R.string.app_mode_car, "car")
 			.distanceForTurn(35)
-			.icon(R.drawable.ic_action_car_dark, R.drawable.map_action_car_dark, "ic_action_car_dark")
+			.icon(R.drawable.ic_action_car_dark, R.drawable.map_action_car_dark)
 			.description(R.string.base_profile_descr_car).reg();
 
 	public static final ApplicationMode BICYCLE = createBase(R.string.app_mode_bicycle, "bicycle")
 			.distanceForTurn(15).arrivalDistance(60).offRouteDistance(50)
-			.icon(R.drawable.ic_action_bicycle_dark, R.drawable.map_action_bicycle_dark, "ic_action_bicycle_dark")
+			.icon(R.drawable.ic_action_bicycle_dark, R.drawable.map_action_bicycle_dark)
 			.description(R.string.base_profile_descr_bicycle).reg();
 
 	public static final ApplicationMode PEDESTRIAN = createBase(R.string.app_mode_pedestrian, "pedestrian")
 			.distanceForTurn(5).arrivalDistance(45).offRouteDistance(20)
-			.icon(R.drawable.ic_action_pedestrian_dark, R.drawable.map_action_pedestrian_dark, "ic_action_pedestrian_dark")
+			.icon(R.drawable.ic_action_pedestrian_dark, R.drawable.map_action_pedestrian_dark)
 			.description(R.string.base_profile_descr_pedestrian).reg();
 
 	public static final ApplicationMode PUBLIC_TRANSPORT = createBase(R.string.app_mode_public_transport, "public_transport")
-			.icon(R.drawable.ic_action_bus_dark, R.drawable.map_action_bus_dark, "ic_action_bus_dark")
+			.icon(R.drawable.ic_action_bus_dark, R.drawable.map_action_bus_dark)
 			.description(R.string.base_profile_descr_public_transport).reg();
 
 	public static final ApplicationMode BOAT = createBase(R.string.app_mode_boat, "boat")
 			.distanceForTurn(20)
-			.icon(R.drawable.ic_action_sail_boat_dark, R.drawable.map_action_sail_boat_dark, "ic_action_sail_boat_dark")
+			.icon(R.drawable.ic_action_sail_boat_dark, R.drawable.map_action_sail_boat_dark)
 			.description(R.string.base_profile_descr_boat).reg();
 
 	public static final ApplicationMode AIRCRAFT = createBase(R.string.app_mode_aircraft, "aircraft")
 			.distanceForTurn(100)
-			.icon(R.drawable.ic_action_aircraft, R.drawable.map_action_aircraft, "ic_action_aircraft")
+			.icon(R.drawable.ic_action_aircraft, R.drawable.map_action_aircraft)
 			.description(R.string.base_profile_descr_aircraft).reg();
 
 	public static final ApplicationMode SKI = createBase(R.string.app_mode_skiing, "ski")
 			.distanceForTurn(15).arrivalDistance(60).offRouteDistance(50)
-			.icon(R.drawable.ic_action_skiing, R.drawable.map_action_skiing, "ic_action_skiing")
+			.icon(R.drawable.ic_action_skiing, R.drawable.map_action_skiing)
 			.description(R.string.base_profile_descr_ski).reg();
 
+	public static List<ApplicationMode> values(OsmandApplication app) {
+		if (customizationListener == null) {
+			customizationListener = new OsmAndAppCustomization.OsmAndAppCustomizationListener() {
+				@Override
+				public void onOsmAndSettingsCustomized() {
+					cachedFilteredValues = new ArrayList<>();
+				}
+			};
+			app.getAppCustomization().addListener(customizationListener);
+		}
+		if (cachedFilteredValues.isEmpty()) {
 
-	private static class ApplicationModeBean {
-		@Expose
-		String stringKey;
-		@Expose
-		String userProfileName;
-		@Expose
-		String parent;
-		@Expose
-		String iconName = "map_world_globe_dark";
-		@Expose
-		ProfileIconColors iconColor = ProfileIconColors.DEFAULT;
-		@Expose
-		String routingProfile = null;
-		@Expose
-		RouteService routeService = RouteService.OSMAND;
-		@Expose
-		LocationIcon locIcon = null;
-		@Expose
-		NavigationIcon navIcon = null;
-		@Expose
-		int order;
+			OsmandSettings settings = app.getSettings();
+			if (listener == null) {
+				listener = new StateChangedListener<String>() {
+					@Override
+					public void stateChanged(String change) {
+						cachedFilteredValues = new ArrayList<>();
+					}
+				};
+				settings.AVAILABLE_APP_MODES.addListener(listener);
+			}
+			String available = settings.AVAILABLE_APP_MODES.get();
+			cachedFilteredValues = new ArrayList<>();
+			for (ApplicationMode v : values) {
+				if (available.contains(v.getStringKey() + ",") || v == DEFAULT) {
+					cachedFilteredValues.add(v);
+				}
+			}
+		}
+		return cachedFilteredValues;
+	}
+
+	public static List<ApplicationMode> allPossibleValues() {
+		return values;
+	}
+
+	public static List<ApplicationMode> getDefaultValues() {
+		return defaultValues;
+	}
+
+	public static List<ApplicationMode> getCustomValues() {
+		List<ApplicationMode> customModes = new ArrayList<>();
+		for (ApplicationMode mode : values) {
+			if (mode.isCustomProfile()) {
+				customModes.add(mode);
+			}
+		}
+		return customModes;
+	}
+
+	public static List<ApplicationMode> getModesDerivedFrom(ApplicationMode am) {
+		List<ApplicationMode> list = new ArrayList<ApplicationMode>();
+		for (ApplicationMode a : values) {
+			if (a == am || a.getParent() == am) {
+				list.add(a);
+			}
+		}
+		return list;
+	}
+
+	public static ApplicationMode valueOfStringKey(String key, ApplicationMode def) {
+		for (ApplicationMode p : values) {
+			if (p.getStringKey().equals(key)) {
+				return p;
+			}
+		}
+		return def;
+	}
+
+	// returns modifiable ! Set<ApplicationMode> to exclude non-wanted derived
+	public static Set<ApplicationMode> regWidgetVisibility(String widgetId, ApplicationMode... am) {
+		HashSet<ApplicationMode> set = new HashSet<>();
+		if (am == null) {
+			set.addAll(values);
+		} else {
+			Collections.addAll(set, am);
+		}
+		for (ApplicationMode m : values) {
+			// add derived modes
+			if (set.contains(m.getParent())) {
+				set.add(m);
+			}
+		}
+		widgetsVisibilityMap.put(widgetId, set);
+		return set;
+	}
+
+	public static Set<ApplicationMode> regWidgetAvailability(String widgetId, ApplicationMode... am) {
+		HashSet<ApplicationMode> set = new HashSet<>();
+		if (am == null) {
+			set.addAll(values);
+		} else {
+			Collections.addAll(set, am);
+		}
+		for (ApplicationMode m : values) {
+			// add derived modes
+			if (set.contains(m.getParent())) {
+				set.add(m);
+			}
+		}
+		widgetsAvailabilityMap.put(widgetId, set);
+		return set;
 	}
 
 	private static void initRegVisibility() {
@@ -199,236 +271,6 @@ public class ApplicationMode {
 //		regWidgetAvailability(WIDGET_STREET_NAME, all);
 	}
 
-	public static class ApplicationModeBuilder {
-		private ApplicationMode applicationMode;
-
-		public ApplicationMode getApplicationMode() {
-			return applicationMode;
-		}
-
-		private ApplicationMode reg() {
-			values.add(applicationMode);
-			defaultValues.add(applicationMode);
-			if (applicationMode.getOrder() == 0 && !values.isEmpty()) {
-				applicationMode.setOrder(values.size());
-			}
-			return applicationMode;
-		}
-
-		private ApplicationMode customReg() {
-			ApplicationMode m = applicationMode;
-			m.minDistanceForTurn = m.parentAppMode.minDistanceForTurn;
-			m.arrivalDistance = m.parentAppMode.arrivalDistance;
-			m.offRouteDistance = m.parentAppMode.offRouteDistance;
-			values.add(applicationMode);
-			if (applicationMode.getOrder() == 0 && !values.isEmpty()) {
-				applicationMode.setOrder(values.size());
-			}
-			return applicationMode;
-		}
-
-		public ApplicationModeBuilder icon(int iconRes, int iconMapRes, String iconResName) {
-			try {
-				applicationMode.iconResName = iconResName;
-				applicationMode.iconMapRes = iconMapRes;
-				applicationMode.iconRes = iconRes;
-			} catch (Exception e) {
-
-			}
-			return this;
-		}
-
-		public ApplicationModeBuilder description(int strId) {
-			applicationMode.descriptionId = strId;
-			return this;
-		}
-
-		public ApplicationModeBuilder icon(Context app, String iconResName) {
-			updateAppModeIcon(app, iconResName, applicationMode);
-			return this;
-		}
-
-		public ApplicationModeBuilder parent(ApplicationMode parent) {
-			applicationMode.parentAppMode = parent;
-			return this;
-		}
-
-		public ApplicationModeBuilder locationIcon(LocationIcon locationIcon) {
-			applicationMode.locationIcon = locationIcon;
-			return this;
-		}
-
-		public ApplicationModeBuilder navigationIcon(NavigationIcon navigationIcon) {
-			applicationMode.navigationIcon = navigationIcon;
-			return this;
-		}
-
-		public ApplicationModeBuilder speed(float defSpeed) {
-			applicationMode.defaultSpeed = defSpeed;
-			return this;
-		}
-
-		public ApplicationModeBuilder distanceForTurn(int distForTurn) {
-			applicationMode.minDistanceForTurn = distForTurn;
-			return this;
-		}
-
-		public ApplicationModeBuilder arrivalDistance(int arrivalDistance) {
-			applicationMode.arrivalDistance = arrivalDistance;
-			return this;
-		}
-
-		public ApplicationModeBuilder offRouteDistance(int offRouteDistance) {
-			applicationMode.offRouteDistance = offRouteDistance;
-			return this;
-		}
-
-		public ApplicationModeBuilder userProfileTitle(String userProfileTitle) {
-			applicationMode.userProfileName = userProfileTitle;
-			return this;
-		}
-
-		public ApplicationModeBuilder setRoutingProfile(String routingProfileName) {
-			applicationMode.routingProfile = routingProfileName;
-			return this;
-		}
-
-		public ApplicationModeBuilder setRouteService(RouteService service) {
-			applicationMode.routeService = service;
-			return this;
-		}
-
-		public ApplicationModeBuilder setColor(ProfileIconColors colorData) {
-			applicationMode.iconColor = colorData;
-			return this;
-		}
-
-		public ApplicationModeBuilder setOrder(int order) {
-			applicationMode.order = order;
-			return this;
-		}
-	}
-
-	private static void updateAppModeIcon(Context app, String iconResName, ApplicationMode mode) {
-		try {
-			int iconRes = app.getResources().getIdentifier(iconResName, "drawable", app.getPackageName());
-			int iconMapRes = app.getResources().getIdentifier(iconResName.replace("ic_", "map_"), "drawable", app.getPackageName());
-			if (iconRes != 0 && iconMapRes != 0) {
-				mode.iconResName = iconResName;
-				mode.iconRes = iconRes;
-				mode.iconMapRes = iconMapRes;
-			}
-		} catch (Exception e) {
-//				return R.drawable.map_world_globe_dark;
-		}
-	}
-
-	private static void updateAppModeOrder(OsmandApplication app, ApplicationMode mode) {
-		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-		Type t = new TypeToken<Map<String, Integer>>() {
-		}.getType();
-
-		Map<String, Integer> appModesOrders = gson.fromJson(app.getSettings().APP_MODES_ORDERS.get(), t);
-		if (!Algorithms.isEmpty(appModesOrders)) {
-			Integer order = appModesOrders.get(mode.getStringKey());
-			if (order != null) {
-				mode.order = order;
-			}
-		}
-	}
-
-	private static ApplicationModeBuilder create(ApplicationMode parent, int key, String stringKey) {
-		ApplicationModeBuilder builder = new ApplicationModeBuilder();
-		builder.applicationMode = new ApplicationMode(key, stringKey);
-		builder.parent(parent);
-		return builder;
-	}
-
-	private static ApplicationModeBuilder createBase(int key, String stringKey) {
-		ApplicationModeBuilder builder = new ApplicationModeBuilder();
-		builder.applicationMode = new ApplicationMode(key, stringKey);
-		return builder;
-	}
-
-	public static ApplicationModeBuilder createCustomMode(ApplicationMode parent, String userProfileTitle, String stringKey) {
-		return create(parent, -1, stringKey).userProfileTitle(userProfileTitle);
-	}
-
-	public static ApplicationModeBuilder changeBaseMode(ApplicationMode applicationMode) {
-		ApplicationModeBuilder builder = new ApplicationModeBuilder();
-		builder.applicationMode = applicationMode;
-		return builder;
-	}
-
-	public static List<ApplicationMode> values(OsmandApplication app) {
-		if (customizationListener == null) {
-			customizationListener = new OsmAndAppCustomization.OsmAndAppCustomizationListener() {
-				@Override
-				public void onOsmAndSettingsCustomized() {
-					cachedFilteredValues = new ArrayList<>();
-				}
-			};
-			app.getAppCustomization().addListener(customizationListener);
-		}
-		if (cachedFilteredValues.isEmpty()) {
-
-			OsmandSettings settings = app.getSettings();
-			if (listener == null) {
-				listener = new StateChangedListener<String>() {
-					@Override
-					public void stateChanged(String change) {
-						cachedFilteredValues = new ArrayList<>();
-					}
-				};
-				settings.AVAILABLE_APP_MODES.addListener(listener);
-			}
-			String available = settings.AVAILABLE_APP_MODES.get();
-			cachedFilteredValues = new ArrayList<>();
-			for (ApplicationMode v : values) {
-				if (available.indexOf(v.getStringKey() + ",") != -1 || v == DEFAULT) {
-					cachedFilteredValues.add(v);
-				}
-			}
-		}
-		return cachedFilteredValues;
-	}
-
-	public static List<ApplicationMode> allPossibleValues() {
-		return values;
-	}
-
-	public static List<ApplicationMode> getDefaultValues() {
-		return defaultValues;
-	}
-
-	public static List<ApplicationMode> getCustomValues() {
-		List<ApplicationMode> customModes = new ArrayList<>();
-		for (ApplicationMode mode : values) {
-			if (mode.isCustomProfile()) {
-				customModes.add(mode);
-			}
-		}
-		return customModes;
-	}
-
-	// returns modifiable ! Set<ApplicationMode> to exclude non-wanted derived
-	public static Set<ApplicationMode> regWidgetVisibility(String widgetId, ApplicationMode... am) {
-		HashSet<ApplicationMode> set = new HashSet<>();
-		if (am == null) {
-			set.addAll(values);
-		} else {
-			Collections.addAll(set, am);
-		}
-		for (ApplicationMode m : values) {
-			// add derived modes
-			if (set.contains(m.getParent())) {
-				set.add(m);
-			}
-		}
-		widgetsVisibilityMap.put(widgetId, set);
-		return set;
-	}
-
 	public boolean isWidgetCollapsible(String key) {
 		return false;
 	}
@@ -444,23 +286,6 @@ public class ApplicationMode {
 		return set.contains(this);
 	}
 
-	public static Set<ApplicationMode> regWidgetAvailability(String widgetId, ApplicationMode... am) {
-		HashSet<ApplicationMode> set = new HashSet<>();
-		if (am == null) {
-			set.addAll(values);
-		} else {
-			Collections.addAll(set, am);
-		}
-		for (ApplicationMode m : values) {
-			// add derived modes
-			if (set.contains(m.getParent())) {
-				set.add(m);
-			}
-		}
-		widgetsAvailabilityMap.put(widgetId, set);
-		return set;
-	}
-
 	public boolean isWidgetAvailable(OsmandApplication app, String key) {
 		if (app.getAppCustomization().areWidgetsCustomized()) {
 			return app.getAppCustomization().isWidgetAvailable(key, this);
@@ -472,51 +297,30 @@ public class ApplicationMode {
 		return set.contains(this);
 	}
 
-	public static List<ApplicationMode> getModesDerivedFrom(ApplicationMode am) {
-		List<ApplicationMode> list = new ArrayList<ApplicationMode>();
-		for (ApplicationMode a : values) {
-			if (a == am || a.getParent() == am) {
-				list.add(a);
-			}
-		}
-		return list;
+	public String getStringKey() {
+		return stringKey;
 	}
 
 	public boolean isCustomProfile() {
 		return parentAppMode != null;
 	}
 
+	public boolean isDerivedRoutingFrom(ApplicationMode mode) {
+		return this == mode || getParent() == mode;
+	}
+
 	public ApplicationMode getParent() {
 		return parentAppMode;
 	}
 
-	public boolean hasFastSpeed() {
-		return getDefaultSpeed() > 10;
-	}
-
-	public NavigationIcon getNavigationIcon() {
-		return navigationIcon;
-	}
-
-	public LocationIcon getLocationIcon() {
-		return locationIcon;
-	}
-
-	public String getStringKey() {
-		return stringKey;
-	}
-
 	public int getNameKeyResource() {
 		return keyName;
 	}
 
-	public String getCustomProfileName() {
-		return userProfileName;
-	}
-
 	public String toHumanString(Context ctx) {
+		String userProfileName = getCustomProfileName();
 		if (Algorithms.isEmpty(userProfileName) && keyName != -1) {
-			return ctx.getString(keyName);
+			return app.getString(keyName);
 		} else {
 			return userProfileName;
 		}
@@ -524,83 +328,41 @@ public class ApplicationMode {
 
 	public String getDescription(Context ctx) {
 		if (descriptionId != 0) {
-			return ctx.getString(descriptionId);
+			return app.getString(descriptionId);
 		}
 		return "";
 	}
 
-	public RouteService getRouteService() {
-		return routeService;
+	@DrawableRes
+	public int getIconRes() {
+		return iconRes;
 	}
 
-	public static ApplicationMode valueOfStringKey(String key, ApplicationMode def) {
-		for (ApplicationMode p : values) {
-			if (p.getStringKey().equals(key)) {
-				return p;
-			}
-		}
-		return def;
+	@DrawableRes
+	public int getMapIconRes() {
+		return iconMapRes;
 	}
 
-	public String getIconName() {
-		return iconResName;
-	}
-
-	public float getDefaultSpeed() {
-		return defaultSpeed;
-	}
-
-	public void setIconResName(OsmandApplication app, String iconResName) {
-		updateAppModeIcon(app, iconResName, this);
+	public void setIconResName(String iconResName) {
 		app.getSettings().ICON_RES_NAME.setModeValue(this, iconResName);
 	}
 
-	public void setIconColor(OsmandApplication app, ProfileIconColors iconColor) {
-		this.iconColor = iconColor;
-		app.getSettings().ICON_COLOR.setModeValue(this, iconColor);
-	}
-
-	public void setUserProfileName(OsmandApplication app, String userProfileName) {
-		this.userProfileName = userProfileName;
-		app.getSettings().USER_PROFILE_NAME.setModeValue(this, userProfileName);
-	}
-
-	public void setParentAppMode(OsmandApplication app, ApplicationMode parentAppMode) {
-		if (isCustomProfile()) {
-			this.parentAppMode = parentAppMode;
-			app.getSettings().PARENT_APP_MODE.setModeValue(this, parentAppMode.getStringKey());
+	private void updateAppModeIcon() {
+		String iconResName = app.getSettings().ICON_RES_NAME.getModeValue(this);
+		try {
+			int iconRes = app.getResources().getIdentifier(iconResName, "drawable", app.getPackageName());
+			int iconMapRes = app.getResources().getIdentifier(iconResName.replace("ic_", "map_"), "drawable", app.getPackageName());
+			if (iconRes != 0 && iconMapRes != 0) {
+				this.iconRes = iconRes;
+				this.iconMapRes = iconMapRes;
+			}
+		} catch (Exception e) {
+//				return R.drawable.map_world_globe_dark;
 		}
 	}
 
-	public void setRoutingProfile(OsmandApplication app, String routingProfile) {
-		this.routingProfile = routingProfile;
-		app.getSettings().ROUTING_PROFILE.setModeValue(this, routingProfile);
-	}
-
-	public void setRouteService(OsmandApplication app, RouteService routeService) {
-		this.routeService = routeService;
-		app.getSettings().ROUTE_SERVICE.setModeValue(this, routeService);
-	}
-
-	public void setNavigationIcon(OsmandApplication app, NavigationIcon navigationIcon) {
-		this.navigationIcon = navigationIcon;
-		app.getSettings().NAVIGATION_ICON.setModeValue(this, navigationIcon);
-	}
-
-	public void setLocationIcon(OsmandApplication app, LocationIcon locationIcon) {
-		this.locationIcon = locationIcon;
-		app.getSettings().LOCATION_ICON.setModeValue(this, locationIcon);
-	}
-
-	public void setDefaultSpeed(OsmandApplication app, float defaultSpeed) {
-		this.defaultSpeed = defaultSpeed;
-		app.getSettings().DEFAULT_SPEED.setModeValue(this, defaultSpeed);
-	}
-
-	public void resetDefaultSpeed(OsmandApplication app) {
-		OsmandSettings settings = app.getSettings();
-		settings.DEFAULT_SPEED.resetModeToDefault(this);
-		this.defaultSpeed = settings.DEFAULT_SPEED.getModeValue(this);
+	public String getIconName() {
+		return app.getSettings().ICON_RES_NAME.getModeValue(this);
 	}
 
 	public int getMinDistanceForTurn() {
@@ -615,43 +377,86 @@ public class ApplicationMode {
 		return offRouteDistance;
 	}
 
-	public boolean isDerivedRoutingFrom(ApplicationMode mode) {
-		return this == mode || getParent() == mode;
+	public boolean hasFastSpeed() {
+		return getDefaultSpeed() > 10;
 	}
 
-	public String getRoutingProfile() {
-		return routingProfile;
+	public float getDefaultSpeed() {
+		return app.getSettings().DEFAULT_SPEED.getModeValue(this);
 	}
 
-	@DrawableRes
-	public int getIconRes() {
-		return iconRes;
+	public void setDefaultSpeed(float defaultSpeed) {
+		app.getSettings().DEFAULT_SPEED.setModeValue(this, defaultSpeed);
 	}
 
-	@DrawableRes
-	public int getMapIconRes() {
-		return iconMapRes;
+	public void resetDefaultSpeed() {
+		app.getSettings().DEFAULT_SPEED.resetModeToDefault(this);
 	}
 
-	public ProfileIconColors getIconColorInfo() {
-		if (iconColor != null) {
-			return iconColor;
-		} else {
-			return ProfileIconColors.DEFAULT;
+	public String getCustomProfileName() {
+		return app.getSettings().USER_PROFILE_NAME.getModeValue(this);
+	}
+
+	public void setUserProfileName(String userProfileName) {
+		app.getSettings().USER_PROFILE_NAME.setModeValue(this, userProfileName);
+	}
+
+	public void setParentAppMode(ApplicationMode parentAppMode) {
+		if (isCustomProfile()) {
+			this.parentAppMode = parentAppMode;
+			app.getSettings().PARENT_APP_MODE.setModeValue(this, parentAppMode.getStringKey());
 		}
 	}
 
+	public void setRoutingProfile(String routingProfile) {
+		app.getSettings().ROUTING_PROFILE.setModeValue(this, routingProfile);
+	}
+
+	public RouteService getRouteService() {
+		return app.getSettings().ROUTE_SERVICE.getModeValue(this);
+	}
+
+	public void setRouteService(RouteService routeService) {
+		app.getSettings().ROUTE_SERVICE.setModeValue(this, routeService);
+	}
+
+	public NavigationIcon getNavigationIcon() {
+		return app.getSettings().NAVIGATION_ICON.getModeValue(this);
+	}
+
+	public void setNavigationIcon(NavigationIcon navigationIcon) {
+		app.getSettings().NAVIGATION_ICON.setModeValue(this, navigationIcon);
+	}
+
+	public LocationIcon getLocationIcon() {
+		return app.getSettings().LOCATION_ICON.getModeValue(this);
+	}
+
+	public void setLocationIcon(LocationIcon locationIcon) {
+		app.getSettings().LOCATION_ICON.setModeValue(this, locationIcon);
+	}
+
+	public String getRoutingProfile() {
+		return app.getSettings().ROUTING_PROFILE.getModeValue(this);
+	}
+
+	public void setIconColor(ProfileIconColors iconColor) {
+		app.getSettings().ICON_COLOR.setModeValue(this, iconColor);
+	}
+
+	public ProfileIconColors getIconColorInfo() {
+		return app.getSettings().ICON_COLOR.getModeValue(this);
+	}
+
 	public int getOrder() {
-		return order;
+		return app.getSettings().APP_MODE_ORDER.getModeValue(this);
 	}
 
 	public void setOrder(int order) {
-		this.order = order;
+		app.getSettings().APP_MODE_ORDER.setModeValue(this, order);
 	}
 
 	public static void onApplicationStart(OsmandApplication app) {
-		// load for default profiles to initialize later custom modes
-		initDefaultModesParams(app);
 		initCustomModes(app);
 		initModesParams(app);
 		initRegVisibility();
@@ -659,30 +464,38 @@ public class ApplicationMode {
 	}
 
 	private static void initModesParams(OsmandApplication app) {
+		if (iconNameListener == null) {
+			iconNameListener = new StateChangedListener<String>() {
+				@Override
+				public void stateChanged(String change) {
+					for (ApplicationMode mode : allPossibleValues()) {
+						mode.updateAppModeIcon();
+					}
+				}
+			};
+			app.getSettings().ICON_RES_NAME.addListener(iconNameListener);
+		}
 		for (ApplicationMode mode : allPossibleValues()) {
-			initModeParams(app, mode);
+			mode.app = app;
+			mode.updateAppModeIcon();
 		}
 	}
 
-	public static void initModeParams(OsmandApplication app, ApplicationMode mode) {
+	private static void initCustomModes(OsmandApplication app) {
 		OsmandSettings settings = app.getSettings();
-		mode.routingProfile = settings.ROUTING_PROFILE.getModeValue(mode);
-		mode.routeService = settings.ROUTE_SERVICE.getModeValue(mode);
-		mode.defaultSpeed = settings.DEFAULT_SPEED.getModeValue(mode);
-		mode.userProfileName = settings.USER_PROFILE_NAME.getModeValue(mode);
-		mode.navigationIcon = settings.NAVIGATION_ICON.getModeValue(mode);
-		mode.locationIcon = settings.LOCATION_ICON.getModeValue(mode);
-		mode.iconColor = settings.ICON_COLOR.getModeValue(mode);
-		mode.parentAppMode = valueOfStringKey(settings.PARENT_APP_MODE.getModeValue(mode), null);
-		updateAppModeOrder(app, mode);
-		updateAppModeIcon(app, settings.ICON_RES_NAME.getModeValue(mode), mode);
+		for (String appModeKey : settings.getCustomAppModesKeys()) {
+			Object profilePreferences = settings.getProfilePreferences(appModeKey);
+			String parent = settings.PARENT_APP_MODE.getValue(profilePreferences, null);
+			ApplicationModeBuilder builder = createCustomMode(valueOfStringKey(parent, CAR), appModeKey);
+			builder.customReg(app);
+		}
 	}
 
 	public static void reorderAppModes() {
 		Comparator<ApplicationMode> comparator = new Comparator<ApplicationMode>() {
 			@Override
 			public int compare(ApplicationMode mode1, ApplicationMode mode2) {
-				return (mode1.order < mode2.order) ? -1 : ((mode1.order == mode2.order) ? 0 : 1);
+				return (mode1.getOrder() < mode2.getOrder()) ? -1 : ((mode1.getOrder() == mode2.getOrder()) ? 0 : 1);
 			}
 		};
 		Collections.sort(values, comparator);
@@ -697,101 +510,6 @@ public class ApplicationMode {
 		}
 	}
 
-	public static ApplicationModeBuilder fromJson(OsmandApplication app, String json) {
-		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-		ApplicationModeBean mb = gson.fromJson(json, ApplicationModeBean.class);
-
-		ApplicationModeBuilder b = createCustomMode(valueOfStringKey(mb.parent, null),
-				mb.userProfileName, mb.stringKey);
-		b.setRouteService(mb.routeService);
-		b.setRoutingProfile(mb.routingProfile);
-		b.icon(app, mb.iconName);
-		b.setColor(mb.iconColor);
-		b.setOrder(mb.order);
-		b.locationIcon(mb.locIcon);
-		b.navigationIcon(mb.navIcon);
-		return b;
-	}
-
-	public String toJson() {
-		ApplicationModeBean mb = new ApplicationModeBean();
-		mb.userProfileName = userProfileName;
-		mb.iconColor = iconColor;
-		mb.iconName = iconResName;
-		mb.parent = parentAppMode != null ? parentAppMode.getStringKey() : null;
-		mb.stringKey = stringKey;
-		mb.routeService = routeService;
-		mb.routingProfile = routingProfile;
-		mb.locIcon = locationIcon;
-		mb.navIcon = navigationIcon;
-		mb.order = order;
-		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-		return gson.toJson(mb);
-	}
-
-	private static void initDefaultModesParams(OsmandApplication app) {
-		OsmandSettings settings = app.getSettings();
-		if (settings.DEFAULT_APP_PROFILES.isSet()) {
-			Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-			Type t = new TypeToken<ArrayList<ApplicationModeBean>>() {
-			}.getType();
-			List<ApplicationModeBean> defaultAppModeBeans = gson.fromJson(settings.DEFAULT_APP_PROFILES.get(), t);
-			if (!Algorithms.isEmpty(defaultAppModeBeans)) {
-				for (ApplicationModeBean modeBean : defaultAppModeBeans) {
-					ApplicationMode mode = ApplicationMode.valueOfStringKey(modeBean.stringKey, null);
-					if (mode != null) {
-						ApplicationModeBuilder builder = changeBaseMode(mode)
-								.setRouteService(modeBean.routeService)
-								.setRoutingProfile(modeBean.routingProfile)
-								.icon(app, modeBean.iconName)
-								.userProfileTitle(modeBean.userProfileName)
-								.setColor(modeBean.iconColor)
-								.locationIcon(modeBean.locIcon)
-								.navigationIcon(modeBean.navIcon)
-								.setOrder(modeBean.order);
-						saveProfile(builder, app);
-					}
-				}
-			}
-			settings.DEFAULT_APP_PROFILES.resetToDefault();
-		}
-	}
-
-	private static void initCustomModes(OsmandApplication app) {
-		OsmandSettings settings = app.getSettings();
-		if (settings.CUSTOM_APP_PROFILES.isSet()) {
-			Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-			Type t = new TypeToken<ArrayList<ApplicationModeBean>>() {
-			}.getType();
-			List<ApplicationModeBean> customProfiles = gson.fromJson(app.getSettings().CUSTOM_APP_PROFILES.get(), t);
-			if (!Algorithms.isEmpty(customProfiles)) {
-				for (ApplicationModeBean m : customProfiles) {
-					ApplicationMode parentMode = valueOfStringKey(m.parent, CAR);
-					ApplicationModeBuilder builder = createCustomMode(parentMode, m.userProfileName, m.stringKey)
-							.setRouteService(m.routeService)
-							.setRoutingProfile(m.routingProfile)
-							.icon(app, m.iconName)
-							.userProfileTitle(m.userProfileName)
-							.setColor(m.iconColor)
-							.locationIcon(m.locIcon)
-							.navigationIcon(m.navIcon)
-							.setOrder(m.order);
-					saveProfile(builder, app);
-				}
-			}
-			settings.CUSTOM_APP_PROFILES.resetToDefault();
-		}
-		if (settings.CUSTOM_APP_MODES_KEYS.isSet()) {
-			Set<String> customModesKeys = settings.getCustomAppModesKeys();
-			for (String appModeKey : customModesKeys) {
-				Object profilePreferences = settings.getProfilePreferences(appModeKey);
-				String parent = settings.PARENT_APP_MODE.getValue(profilePreferences, null);
-				String userProfileName = settings.USER_PROFILE_NAME.getValue(profilePreferences, "");
-				createCustomMode(valueOfStringKey(parent, CAR), userProfileName, appModeKey).customReg();
-			}
-		}
-	}
-
 	public static void saveAppModesToSettings(OsmandApplication app) {
 		OsmandSettings settings = app.getSettings();
 		StringBuilder stringBuilder = new StringBuilder();
@@ -805,37 +523,61 @@ public class ApplicationMode {
 		if (!stringBuilder.toString().equals(settings.CUSTOM_APP_MODES_KEYS.get())) {
 			settings.CUSTOM_APP_MODES_KEYS.set(stringBuilder.toString());
 		}
-
-		Map<String, Integer> appModesOrders = new HashMap<>();
-		for (ApplicationMode mode : allPossibleValues()) {
-			appModesOrders.put(mode.getStringKey(), mode.getOrder());
-		}
-		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-		String modesOrdersStr = gson.toJson(appModesOrders);
-		settings.APP_MODES_ORDERS.set(modesOrdersStr);
 	}
 
 	public static ApplicationMode saveProfile(ApplicationModeBuilder builder, OsmandApplication app) {
 		ApplicationMode mode = ApplicationMode.valueOfStringKey(builder.applicationMode.stringKey, null);
-		if (mode == null) {
-			mode = builder.customReg();
+		if (mode != null) {
+			mode.setParentAppMode(builder.applicationMode.parentAppMode);
+			mode.setIconResName(builder.iconResName);
+			mode.setUserProfileName(builder.userProfileName);
+			mode.setRoutingProfile(builder.routingProfile);
+			mode.setRouteService(builder.routeService);
+			mode.setIconColor(builder.iconColor);
+			mode.setLocationIcon(builder.locationIcon);
+			mode.setNavigationIcon(builder.navigationIcon);
+			mode.setOrder(builder.order);
+		} else {
+			mode = builder.customReg(app);
 			initRegVisibility();
 		}
-
-		mode.setIconResName(app, builder.applicationMode.iconResName);
-		mode.setUserProfileName(app, builder.applicationMode.userProfileName);
-		mode.setParentAppMode(app, builder.applicationMode.parentAppMode);
-		mode.setRoutingProfile(app, builder.applicationMode.routingProfile);
-		mode.setRouteService(app, builder.applicationMode.routeService);
-		mode.setIconColor(app, builder.applicationMode.iconColor);
-		mode.setLocationIcon(app, builder.applicationMode.locationIcon);
-		mode.setNavigationIcon(app, builder.applicationMode.navigationIcon);
-		mode.setOrder(builder.applicationMode.order);
-
 		saveAppModesToSettings(app);
 		return mode;
 	}
 
+	public static ApplicationModeBuilder fromJson(String json) {
+		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+		ApplicationModeBean mb = gson.fromJson(json, ApplicationModeBean.class);
+
+		ApplicationModeBuilder builder = createCustomMode(valueOfStringKey(mb.parent, null), mb.stringKey);
+		builder.setUserProfileName(mb.userProfileName);
+		builder.setIconResName(mb.iconName);
+		builder.setIconColor(mb.iconColor);
+		builder.setRoutingProfile(mb.routingProfile);
+		builder.setRouteService(mb.routeService);
+		builder.setLocationIcon(mb.locIcon);
+		builder.setNavigationIcon(mb.navIcon);
+		builder.setOrder(mb.order);
+
+		return builder;
+	}
+
+	public String toJson() {
+		ApplicationModeBean mb = new ApplicationModeBean();
+		mb.stringKey = stringKey;
+		mb.userProfileName = getCustomProfileName();
+		mb.iconColor = getIconColorInfo();
+		mb.iconName = getIconName();
+		mb.parent = parentAppMode != null ? parentAppMode.getStringKey() : null;
+		mb.routeService = getRouteService();
+		mb.routingProfile = getRoutingProfile();
+		mb.locIcon = getLocationIcon();
+		mb.navIcon = getNavigationIcon();
+		mb.order = getOrder();
+		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+		return gson.toJson(mb);
+	}
+
 	public static void deleteCustomModes(List<ApplicationMode> modes, OsmandApplication app) {
 		Iterator<ApplicationMode> it = values.iterator();
 		while (it.hasNext()) {
@@ -873,4 +615,175 @@ public class ApplicationMode {
 		}
 		return false;
 	}
+
+	private static ApplicationModeBuilder create(ApplicationMode parent, int key, String stringKey) {
+		ApplicationModeBuilder builder = new ApplicationModeBuilder();
+		builder.applicationMode = new ApplicationMode(key, stringKey);
+		builder.parent(parent);
+		return builder;
+	}
+
+	private static ApplicationModeBuilder createBase(int key, String stringKey) {
+		ApplicationModeBuilder builder = new ApplicationModeBuilder();
+		builder.applicationMode = new ApplicationMode(key, stringKey);
+		return builder;
+	}
+
+	public static ApplicationModeBuilder createCustomMode(ApplicationMode parent, String stringKey) {
+		return create(parent, -1, stringKey);
+	}
+
+	public static class ApplicationModeBuilder {
+
+		private ApplicationMode applicationMode;
+
+		private String userProfileName;
+		private RouteService routeService;
+		private String routingProfile;
+		private String iconResName;
+		private ProfileIconColors iconColor;
+		private Integer order;
+		private LocationIcon locationIcon;
+		private NavigationIcon navigationIcon;
+
+		public ApplicationMode getApplicationMode() {
+			return applicationMode;
+		}
+
+		private ApplicationMode reg() {
+			values.add(applicationMode);
+			defaultValues.add(applicationMode);
+			return applicationMode;
+		}
+
+		private ApplicationMode customReg(OsmandApplication app) {
+			values.add(applicationMode);
+
+			applicationMode.app = app;
+			applicationMode.minDistanceForTurn = applicationMode.parentAppMode.minDistanceForTurn;
+			applicationMode.arrivalDistance = applicationMode.parentAppMode.arrivalDistance;
+			applicationMode.offRouteDistance = applicationMode.parentAppMode.offRouteDistance;
+
+			if (userProfileName != null) {
+				applicationMode.setUserProfileName(userProfileName);
+			}
+			if (routeService != null) {
+				applicationMode.setRouteService(routeService);
+			}
+			if (routingProfile != null) {
+				applicationMode.setRoutingProfile(routingProfile);
+			}
+			if (iconResName != null) {
+				applicationMode.setIconResName(iconResName);
+			}
+			if (iconColor != null) {
+				applicationMode.setIconColor(iconColor);
+			}
+			if (order != null) {
+				applicationMode.setOrder(order);
+			}
+			if (locationIcon != null) {
+				applicationMode.setLocationIcon(locationIcon);
+			}
+			if (navigationIcon != null) {
+				applicationMode.setNavigationIcon(navigationIcon);
+			}
+
+			return applicationMode;
+		}
+
+		public ApplicationModeBuilder icon(int iconRes, int iconMapRes) {
+			applicationMode.iconMapRes = iconMapRes;
+			applicationMode.iconRes = iconRes;
+			return this;
+		}
+
+		public ApplicationModeBuilder description(int strId) {
+			applicationMode.descriptionId = strId;
+			return this;
+		}
+
+		public ApplicationModeBuilder parent(ApplicationMode parent) {
+			applicationMode.parentAppMode = parent;
+			return this;
+		}
+
+		public ApplicationModeBuilder distanceForTurn(int distForTurn) {
+			applicationMode.minDistanceForTurn = distForTurn;
+			return this;
+		}
+
+		public ApplicationModeBuilder arrivalDistance(int arrivalDistance) {
+			applicationMode.arrivalDistance = arrivalDistance;
+			return this;
+		}
+
+		public ApplicationModeBuilder offRouteDistance(int offRouteDistance) {
+			applicationMode.offRouteDistance = offRouteDistance;
+			return this;
+		}
+
+		public ApplicationModeBuilder setUserProfileName(String userProfileName) {
+			this.userProfileName = userProfileName;
+			return this;
+		}
+
+		public ApplicationModeBuilder setRouteService(RouteService routeService) {
+			this.routeService = routeService;
+			return this;
+		}
+
+		public ApplicationModeBuilder setRoutingProfile(String routingProfile) {
+			this.routingProfile = routingProfile;
+			return this;
+		}
+
+		public ApplicationModeBuilder setIconResName(String iconResName) {
+			this.iconResName = iconResName;
+			return this;
+		}
+
+		public ApplicationModeBuilder setIconColor(ProfileIconColors iconColor) {
+			this.iconColor = iconColor;
+			return this;
+		}
+
+		public ApplicationModeBuilder setOrder(int order) {
+			this.order = order;
+			return this;
+		}
+
+		public ApplicationModeBuilder setLocationIcon(LocationIcon locIcon) {
+			this.locationIcon = locIcon;
+			return this;
+		}
+
+		public ApplicationModeBuilder setNavigationIcon(NavigationIcon navIcon) {
+			this.navigationIcon = navIcon;
+			return this;
+		}
+	}
+
+	static class ApplicationModeBean {
+		@Expose
+		String stringKey;
+		@Expose
+		String userProfileName;
+		@Expose
+		String parent;
+		@Expose
+		String iconName = "map_world_globe_dark";
+		@Expose
+		ProfileIconColors iconColor = ProfileIconColors.DEFAULT;
+		@Expose
+		String routingProfile = null;
+		@Expose
+		RouteService routeService = RouteService.OSMAND;
+		@Expose
+		LocationIcon locIcon = null;
+		@Expose
+		NavigationIcon navIcon = null;
+		@Expose
+		int order;
+	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 25f94099e0..3c2903ec42 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -430,9 +430,7 @@ public class OsmandSettings {
 
 	public void copyProfilePreferences(ApplicationMode modeFrom, ApplicationMode modeTo, List<OsmandPreference> profilePreferences) {
 		for (OsmandPreference pref : profilePreferences) {
-			if (pref instanceof CommonPreference
-					&& !((CommonPreference) pref).global
-					&& !USER_PROFILE_NAME.getId().equals(pref.getId())) {
+			if (prefCanBeCopiedOrReset(pref)) {
 				CommonPreference profilePref = (CommonPreference) pref;
 				if (PARENT_APP_MODE.getId().equals(pref.getId())) {
 					if (modeTo.isCustomProfile()) {
@@ -447,30 +445,23 @@ public class OsmandSettings {
 		}
 	}
 
-	public boolean resetPreferencesForProfile(ApplicationMode mode) {
-		boolean prefsCleared = settingsAPI.edit(getProfilePreferences(mode)).clear().commit();
-		if (prefsCleared) {
-			for (OsmandPreference pref : registeredPreferences.values()) {
-				if (pref instanceof CommonPreference) {
-					CommonPreference commonPreference = (CommonPreference) pref;
-					if (commonPreference.cache && !commonPreference.global) {
-						commonPreference.cachedValue = null;
-					}
-				}
-			}
-		}
-
-		return prefsCleared;
+	public void resetPreferencesForProfile(ApplicationMode mode) {
+		resetProfilePreferences(mode, new ArrayList<OsmandPreference>(registeredPreferences.values()));
 	}
 
 	public void resetProfilePreferences(ApplicationMode mode, List<OsmandPreference> profilePreferences) {
 		for (OsmandPreference pref : profilePreferences) {
-			if (pref instanceof CommonPreference && !((CommonPreference) pref).global) {
+			if (prefCanBeCopiedOrReset(pref)) {
 				pref.resetModeToDefault(mode);
 			}
 		}
 	}
 
+	private boolean prefCanBeCopiedOrReset(OsmandPreference pref) {
+		return pref instanceof CommonPreference && !((CommonPreference) pref).global
+				&& !USER_PROFILE_NAME.getId().equals(pref.getId()) && !APP_MODE_ORDER.getId().equals(pref.getId());
+	}
+
 	public ApplicationMode LAST_ROUTING_APPLICATION_MODE = null;
 
 	// this value string is synchronized with settings_pref.xml preference name
@@ -1548,7 +1539,7 @@ public class OsmandSettings {
 		LOCATION_ICON.setModeDefaultValue(ApplicationMode.SKI, LocationIcon.BICYCLE);
 	}
 
-	public final CommonPreference<String> APP_MODES_ORDERS = new StringPreference("app_modes_orders", "").makeGlobal().cache();
+	public final CommonPreference<Integer> APP_MODE_ORDER = new IntPreference("app_mode_order", 0).makeProfile().cache();
 
 	public final OsmandPreference<Float> SWITCH_MAP_DIRECTION_TO_COMPASS =
 			new FloatPreference("speed_for_map_to_direction_of_movement", 0f).makeProfile();
@@ -3371,12 +3362,6 @@ public class OsmandSettings {
 					RateUsBottomSheetDialogFragment.RateUsState.INITIAL_STATE, RateUsBottomSheetDialogFragment.RateUsState.values())
 					.makeGlobal();
 
-	public final CommonPreference<String> DEFAULT_APP_PROFILES =
-			new StringPreference("default_app_profiles", "").makeGlobal().cache();
-
-	public final CommonPreference<String> CUSTOM_APP_PROFILES =
-		new StringPreference("custom_app_profiles", "").makeGlobal().cache();
-
 	public final CommonPreference<String> CUSTOM_APP_MODES_KEYS =
 		new StringPreference("custom_app_modes_keys", "").makeGlobal().cache();
 
diff --git a/OsmAnd/src/net/osmand/plus/SettingsHelper.java b/OsmAnd/src/net/osmand/plus/SettingsHelper.java
index 61509da462..a5fff39ec3 100644
--- a/OsmAnd/src/net/osmand/plus/SettingsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/SettingsHelper.java
@@ -437,7 +437,7 @@ public class SettingsHelper {
 
 		void readFromJson(@NonNull OsmandApplication app, @NonNull JSONObject json) throws JSONException {
 			String appModeJson = json.getString("appMode");
-			builder = ApplicationMode.fromJson(app, appModeJson);
+			builder = ApplicationMode.fromJson(appModeJson);
 			ApplicationMode appMode = builder.getApplicationMode();
 			if (!appMode.isCustomProfile()) {
 				appMode = ApplicationMode.valueOfStringKey(appMode.getStringKey(), appMode);
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
index a63a645e29..a605414935 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
@@ -783,7 +783,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 		builder.setPositiveButton(R.string.shared_string_ok, new OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
-				mode.setDefaultSpeed(app, defaultValue[0] / ratio[0]);
+				mode.setDefaultSpeed(defaultValue[0] / ratio[0]);
 				if (!defaultSpeedOnly) {
 					settings.MIN_SPEED.setModeValue(mode, minValue[0] / ratio[0]);
 					settings.MAX_SPEED.setModeValue(mode, maxValue[0] / ratio[0]);
@@ -798,7 +798,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 		builder.setNeutralButton(R.string.shared_string_revert, new OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
-				mode.resetDefaultSpeed(app);
+				mode.resetDefaultSpeed();
 				if (!defaultSpeedOnly) {
 					settings.MIN_SPEED.setModeValue(mode,0f);
 					settings.MAX_SPEED.setModeValue(mode,0f);
diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
index 4fc1f6c141..f5f518209b 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
@@ -156,7 +156,6 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 		if (appMode != null) {
 			ApplicationMode selectedAppMode = getSelectedAppMode();
 			app.getSettings().copyPreferencesFromProfile(appMode, selectedAppMode);
-			ApplicationMode.initModeParams(app, selectedAppMode);
 			updateToolbar();
 			updateAllSettings();
 		}
@@ -165,13 +164,10 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 	@Override
 	public void resetAppModePrefs(ApplicationMode appMode) {
 		if (appMode != null) {
-			boolean prefsRestored = app.getSettings().resetPreferencesForProfile(appMode);
-			if (prefsRestored) {
-				app.showToastMessage(R.string.profile_prefs_reset_successful);
-				ApplicationMode.initModeParams(app, appMode);
-				updateToolbar();
-				updateAllSettings();
-			}
+			app.getSettings().resetPreferencesForProfile(appMode);
+			app.showToastMessage(R.string.profile_prefs_reset_successful);
+			updateToolbar();
+			updateAllSettings();
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
index b3343ca112..ee2c11770b 100644
--- a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
@@ -148,8 +148,8 @@ public class NavigationFragment extends BaseSettingsFragment {
 		} else {
 			routeService = RouteProvider.RouteService.OSMAND;
 		}
-		appMode.setRouteService(app, routeService);
-		appMode.setRoutingProfile(app, profileKey);
+		appMode.setRouteService(routeService);
+		appMode.setRoutingProfile(profileKey);
 	}
 
 	public static Map<String, RoutingProfileDataObject> getRoutingProfiles(OsmandApplication context) {
diff --git a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
index 8e29cc36ec..0080cd4be1 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
@@ -655,13 +655,15 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		}
 		if (isNew) {
 			ApplicationMode.ApplicationModeBuilder builder = ApplicationMode
-					.createCustomMode(changedProfile.parent, changedProfile.name.trim(), changedProfile.stringKey)
-					.icon(app, ProfileIcons.getResStringByResId(changedProfile.iconRes))
-					.setRouteService(changedProfile.routeService)
+					.createCustomMode(changedProfile.parent, changedProfile.stringKey)
+					.setIconResName(ProfileIcons.getResStringByResId(changedProfile.iconRes))
+					.setUserProfileName(changedProfile.name.trim())
 					.setRoutingProfile(changedProfile.routingProfile)
-					.setColor(changedProfile.color)
-					.locationIcon(changedProfile.locationIcon)
-					.navigationIcon(changedProfile.navigationIcon);
+					.setRouteService(changedProfile.routeService)
+					.setIconColor(changedProfile.color)
+					.setLocationIcon(changedProfile.locationIcon)
+					.setNavigationIcon(changedProfile.navigationIcon)
+					.setOrder(ApplicationMode.allPossibleValues().size());
 
 			app.getSettings().copyPreferencesFromProfile(changedProfile.parent, builder.getApplicationMode());
 			ApplicationMode mode = ApplicationMode.saveProfile(builder, app);
@@ -669,15 +671,15 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 				ApplicationMode.changeProfileAvailability(mode, true, app);
 			}
 		} else {
-			ApplicationMode mode = ApplicationMode.valueOfStringKey(changedProfile.stringKey, null);
-			mode.setParentAppMode(app, changedProfile.parent);
-			mode.setUserProfileName(app, changedProfile.name.trim());
-			mode.setIconResName(app, ProfileIcons.getResStringByResId(changedProfile.iconRes));
-			mode.setRouteService(app, changedProfile.routeService);
-			mode.setRoutingProfile(app, changedProfile.routingProfile);
-			mode.setIconColor(app, changedProfile.color);
-			mode.setLocationIcon(app, changedProfile.locationIcon);
-			mode.setNavigationIcon(app, changedProfile.navigationIcon);
+			ApplicationMode mode = getSelectedAppMode();
+			mode.setParentAppMode(changedProfile.parent);
+			mode.setIconResName(ProfileIcons.getResStringByResId(changedProfile.iconRes));
+			mode.setUserProfileName(changedProfile.name.trim());
+			mode.setRoutingProfile(changedProfile.routingProfile);
+			mode.setRouteService(changedProfile.routeService);
+			mode.setIconColor(changedProfile.color);
+			mode.setLocationIcon(changedProfile.locationIcon);
+			mode.setNavigationIcon(changedProfile.navigationIcon);
 		}
 
 		return true;

From 148f3974e50967a955f7bed4854ff13acb8dce15 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Thu, 30 Jan 2020 14:23:22 +0200
Subject: [PATCH 16/24] Remove unnecessary changes

---
 .../src/net/osmand/plus/ApplicationMode.java  | 88 +++++++++----------
 .../plus/profiles/EditProfilesFragment.java   |  2 +-
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 59bba64ae8..854f4c882d 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -168,16 +168,6 @@ public class ApplicationMode {
 		return customModes;
 	}
 
-	public static List<ApplicationMode> getModesDerivedFrom(ApplicationMode am) {
-		List<ApplicationMode> list = new ArrayList<ApplicationMode>();
-		for (ApplicationMode a : values) {
-			if (a == am || a.getParent() == am) {
-				list.add(a);
-			}
-		}
-		return list;
-	}
-
 	public static ApplicationMode valueOfStringKey(String key, ApplicationMode def) {
 		for (ApplicationMode p : values) {
 			if (p.getStringKey().equals(key)) {
@@ -187,39 +177,14 @@ public class ApplicationMode {
 		return def;
 	}
 
-	// returns modifiable ! Set<ApplicationMode> to exclude non-wanted derived
-	public static Set<ApplicationMode> regWidgetVisibility(String widgetId, ApplicationMode... am) {
-		HashSet<ApplicationMode> set = new HashSet<>();
-		if (am == null) {
-			set.addAll(values);
-		} else {
-			Collections.addAll(set, am);
-		}
-		for (ApplicationMode m : values) {
-			// add derived modes
-			if (set.contains(m.getParent())) {
-				set.add(m);
+	public static List<ApplicationMode> getModesDerivedFrom(ApplicationMode am) {
+		List<ApplicationMode> list = new ArrayList<ApplicationMode>();
+		for (ApplicationMode a : values) {
+			if (a == am || a.getParent() == am) {
+				list.add(a);
 			}
 		}
-		widgetsVisibilityMap.put(widgetId, set);
-		return set;
-	}
-
-	public static Set<ApplicationMode> regWidgetAvailability(String widgetId, ApplicationMode... am) {
-		HashSet<ApplicationMode> set = new HashSet<>();
-		if (am == null) {
-			set.addAll(values);
-		} else {
-			Collections.addAll(set, am);
-		}
-		for (ApplicationMode m : values) {
-			// add derived modes
-			if (set.contains(m.getParent())) {
-				set.add(m);
-			}
-		}
-		widgetsAvailabilityMap.put(widgetId, set);
-		return set;
+		return list;
 	}
 
 	private static void initRegVisibility() {
@@ -271,6 +236,24 @@ public class ApplicationMode {
 //		regWidgetAvailability(WIDGET_STREET_NAME, all);
 	}
 
+	// returns modifiable ! Set<ApplicationMode> to exclude non-wanted derived
+	public static Set<ApplicationMode> regWidgetVisibility(String widgetId, ApplicationMode... am) {
+		HashSet<ApplicationMode> set = new HashSet<>();
+		if (am == null) {
+			set.addAll(values);
+		} else {
+			Collections.addAll(set, am);
+		}
+		for (ApplicationMode m : values) {
+			// add derived modes
+			if (set.contains(m.getParent())) {
+				set.add(m);
+			}
+		}
+		widgetsVisibilityMap.put(widgetId, set);
+		return set;
+	}
+
 	public boolean isWidgetCollapsible(String key) {
 		return false;
 	}
@@ -286,6 +269,23 @@ public class ApplicationMode {
 		return set.contains(this);
 	}
 
+	public static Set<ApplicationMode> regWidgetAvailability(String widgetId, ApplicationMode... am) {
+		HashSet<ApplicationMode> set = new HashSet<>();
+		if (am == null) {
+			set.addAll(values);
+		} else {
+			Collections.addAll(set, am);
+		}
+		for (ApplicationMode m : values) {
+			// add derived modes
+			if (set.contains(m.getParent())) {
+				set.add(m);
+			}
+		}
+		widgetsAvailabilityMap.put(widgetId, set);
+		return set;
+	}
+
 	public boolean isWidgetAvailable(OsmandApplication app, String key) {
 		if (app.getAppCustomization().areWidgetsCustomized()) {
 			return app.getAppCustomization().isWidgetAvailable(key, this);
@@ -510,7 +510,7 @@ public class ApplicationMode {
 		}
 	}
 
-	public static void saveAppModesToSettings(OsmandApplication app) {
+	public static void saveCustomAppModesToSettings(OsmandApplication app) {
 		OsmandSettings settings = app.getSettings();
 		StringBuilder stringBuilder = new StringBuilder();
 		Iterator<ApplicationMode> it = ApplicationMode.getCustomValues().iterator();
@@ -541,7 +541,7 @@ public class ApplicationMode {
 			mode = builder.customReg(app);
 			initRegVisibility();
 		}
-		saveAppModesToSettings(app);
+		saveCustomAppModesToSettings(app);
 		return mode;
 	}
 
@@ -591,7 +591,7 @@ public class ApplicationMode {
 			settings.APPLICATION_MODE.resetToDefault();
 		}
 		cachedFilteredValues.removeAll(modes);
-		saveAppModesToSettings(app);
+		saveCustomAppModesToSettings(app);
 	}
 
 	public static boolean changeProfileAvailability(ApplicationMode mode, boolean isSelected, OsmandApplication app) {
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
index 61ccb08e85..72c5d0d359 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
@@ -169,7 +169,7 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 						mode.setOrder(order);
 					}
 					ApplicationMode.reorderAppModes();
-					ApplicationMode.saveAppModesToSettings(app);
+					ApplicationMode.saveCustomAppModesToSettings(app);
 					mapActivity.onBackPressed();
 				}
 			}

From 468428e9d2a966bf75d042703516bbbdc613d8fa Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Thu, 30 Jan 2020 15:30:37 +0200
Subject: [PATCH 17/24] Remove unnecessary context as methods parameter

---
 .../src/net/osmand/plus/ApplicationMode.java  | 79 +++++++++++--------
 .../src/net/osmand/plus/SettingsHelper.java   |  7 +-
 .../plus/activities/MapActivityActions.java   |  8 +-
 .../plus/activities/SettingsBaseActivity.java |  6 +-
 .../activities/SettingsGeneralActivity.java   |  5 +-
 .../SettingsNavigationActivity.java           | 12 +--
 .../activities/actions/AppModeDialog.java     | 11 ++-
 .../PluginInstalledBottomSheetDialog.java     |  2 +-
 .../DirectionIndicationDialogFragment.java    |  2 +-
 .../SnapToRoadBottomSheetDialogFragment.java  |  6 +-
 .../SettingsMonitoringActivity.java           |  2 +-
 .../profiles/ConfigureProfileMenuAdapter.java |  2 +-
 .../plus/profiles/EditProfilesFragment.java   |  3 +-
 .../SelectCopyProfilesMenuAdapter.java        |  2 +-
 .../profiles/SelectProfileMenuAdapter.java    |  2 +-
 .../osmand/plus/routing/RouteProvider.java    |  6 +-
 .../plus/settings/BaseSettingsFragment.java   |  4 +-
 .../settings/ConfigureProfileFragment.java    | 10 +--
 .../plus/settings/GlobalSettingsFragment.java |  2 +-
 .../plus/settings/MainSettingsFragment.java   |  4 +-
 .../plus/settings/NavigationFragment.java     |  2 +-
 .../settings/ProfileAppearanceFragment.java   | 16 ++--
 .../settings/RouteParametersFragment.java     |  2 +-
 .../settings/VehicleParametersFragment.java   |  2 +-
 .../ChangeGeneralProfilesPrefBottomSheet.java |  2 +-
 .../ResetProfilePrefsBottomSheet.java         |  2 +-
 .../views/mapwidgets/MapWidgetRegistry.java   |  7 +-
 27 files changed, 110 insertions(+), 98 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 854f4c882d..385238c956 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -1,6 +1,5 @@
 package net.osmand.plus;
 
-import android.content.Context;
 import android.support.annotation.DrawableRes;
 
 import com.google.gson.Gson;
@@ -258,7 +257,7 @@ public class ApplicationMode {
 		return false;
 	}
 
-	public boolean isWidgetVisible(OsmandApplication app, String key) {
+	public boolean isWidgetVisible(String key) {
 		if (app.getAppCustomization().areWidgetsCustomized()) {
 			return app.getAppCustomization().isWidgetVisible(key, this);
 		}
@@ -286,7 +285,7 @@ public class ApplicationMode {
 		return set;
 	}
 
-	public boolean isWidgetAvailable(OsmandApplication app, String key) {
+	public boolean isWidgetAvailable(String key) {
 		if (app.getAppCustomization().areWidgetsCustomized()) {
 			return app.getAppCustomization().isWidgetAvailable(key, this);
 		}
@@ -313,12 +312,19 @@ public class ApplicationMode {
 		return parentAppMode;
 	}
 
+	public void setParentAppMode(ApplicationMode parentAppMode) {
+		if (isCustomProfile()) {
+			this.parentAppMode = parentAppMode;
+			app.getSettings().PARENT_APP_MODE.setModeValue(this, parentAppMode.getStringKey());
+		}
+	}
+
 	public int getNameKeyResource() {
 		return keyName;
 	}
 
-	public String toHumanString(Context ctx) {
-		String userProfileName = getCustomProfileName();
+	public String toHumanString() {
+		String userProfileName = getUserProfileName();
 		if (Algorithms.isEmpty(userProfileName) && keyName != -1) {
 			return app.getString(keyName);
 		} else {
@@ -326,7 +332,7 @@ public class ApplicationMode {
 		}
 	}
 
-	public String getDescription(Context ctx) {
+	public String getDescription() {
 		if (descriptionId != 0) {
 			return app.getString(descriptionId);
 		}
@@ -393,7 +399,23 @@ public class ApplicationMode {
 		app.getSettings().DEFAULT_SPEED.resetModeToDefault(this);
 	}
 
-	public String getCustomProfileName() {
+	public float getMinSpeed() {
+		return app.getSettings().MIN_SPEED.getModeValue(this);
+	}
+
+	public void setMinSpeed(float defaultSpeed) {
+		app.getSettings().MIN_SPEED.setModeValue(this, defaultSpeed);
+	}
+
+	public float getMaxSpeed() {
+		return app.getSettings().MAX_SPEED.getModeValue(this);
+	}
+
+	public void setMaxSpeed(float defaultSpeed) {
+		app.getSettings().MAX_SPEED.setModeValue(this, defaultSpeed);
+	}
+
+	public String getUserProfileName() {
 		return app.getSettings().USER_PROFILE_NAME.getModeValue(this);
 	}
 
@@ -401,11 +423,8 @@ public class ApplicationMode {
 		app.getSettings().USER_PROFILE_NAME.setModeValue(this, userProfileName);
 	}
 
-	public void setParentAppMode(ApplicationMode parentAppMode) {
-		if (isCustomProfile()) {
-			this.parentAppMode = parentAppMode;
-			app.getSettings().PARENT_APP_MODE.setModeValue(this, parentAppMode.getStringKey());
-		}
+	public String getRoutingProfile() {
+		return app.getSettings().ROUTING_PROFILE.getModeValue(this);
 	}
 
 	public void setRoutingProfile(String routingProfile) {
@@ -436,18 +455,14 @@ public class ApplicationMode {
 		app.getSettings().LOCATION_ICON.setModeValue(this, locationIcon);
 	}
 
-	public String getRoutingProfile() {
-		return app.getSettings().ROUTING_PROFILE.getModeValue(this);
+	public ProfileIconColors getIconColorInfo() {
+		return app.getSettings().ICON_COLOR.getModeValue(this);
 	}
 
 	public void setIconColor(ProfileIconColors iconColor) {
 		app.getSettings().ICON_COLOR.setModeValue(this, iconColor);
 	}
 
-	public ProfileIconColors getIconColorInfo() {
-		return app.getSettings().ICON_COLOR.getModeValue(this);
-	}
-
 	public int getOrder() {
 		return app.getSettings().APP_MODE_ORDER.getModeValue(this);
 	}
@@ -510,7 +525,7 @@ public class ApplicationMode {
 		}
 	}
 
-	public static void saveCustomAppModesToSettings(OsmandApplication app) {
+	private static void saveCustomAppModesToSettings(OsmandApplication app) {
 		OsmandSettings settings = app.getSettings();
 		StringBuilder stringBuilder = new StringBuilder();
 		Iterator<ApplicationMode> it = ApplicationMode.getCustomValues().iterator();
@@ -545,19 +560,21 @@ public class ApplicationMode {
 		return mode;
 	}
 
-	public static ApplicationModeBuilder fromJson(String json) {
+	public static ApplicationModeBean fromJson(String json) {
 		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-		ApplicationModeBean mb = gson.fromJson(json, ApplicationModeBean.class);
+		return gson.fromJson(json, ApplicationModeBean.class);
+	}
 
-		ApplicationModeBuilder builder = createCustomMode(valueOfStringKey(mb.parent, null), mb.stringKey);
-		builder.setUserProfileName(mb.userProfileName);
-		builder.setIconResName(mb.iconName);
-		builder.setIconColor(mb.iconColor);
-		builder.setRoutingProfile(mb.routingProfile);
-		builder.setRouteService(mb.routeService);
-		builder.setLocationIcon(mb.locIcon);
-		builder.setNavigationIcon(mb.navIcon);
-		builder.setOrder(mb.order);
+	public static ApplicationModeBuilder fromModeBean(ApplicationModeBean modeBean) {
+		ApplicationModeBuilder builder = createCustomMode(valueOfStringKey(modeBean.parent, null), modeBean.stringKey);
+		builder.setUserProfileName(modeBean.userProfileName);
+		builder.setIconResName(modeBean.iconName);
+		builder.setIconColor(modeBean.iconColor);
+		builder.setRoutingProfile(modeBean.routingProfile);
+		builder.setRouteService(modeBean.routeService);
+		builder.setLocationIcon(modeBean.locIcon);
+		builder.setNavigationIcon(modeBean.navIcon);
+		builder.setOrder(modeBean.order);
 
 		return builder;
 	}
@@ -565,7 +582,7 @@ public class ApplicationMode {
 	public String toJson() {
 		ApplicationModeBean mb = new ApplicationModeBean();
 		mb.stringKey = stringKey;
-		mb.userProfileName = getCustomProfileName();
+		mb.userProfileName = getUserProfileName();
 		mb.iconColor = getIconColorInfo();
 		mb.iconName = getIconName();
 		mb.parent = parentAppMode != null ? parentAppMode.getStringKey() : null;
diff --git a/OsmAnd/src/net/osmand/plus/SettingsHelper.java b/OsmAnd/src/net/osmand/plus/SettingsHelper.java
index a5fff39ec3..9d50161966 100644
--- a/OsmAnd/src/net/osmand/plus/SettingsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/SettingsHelper.java
@@ -12,6 +12,7 @@ import android.support.v7.app.AlertDialog;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.ApplicationMode.ApplicationModeBuilder;
 import net.osmand.plus.OsmandSettings.OsmandPreference;
+import net.osmand.plus.ApplicationMode.ApplicationModeBean;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
@@ -400,6 +401,7 @@ public class SettingsHelper {
 
 		private ApplicationMode appMode;
 		private ApplicationModeBuilder builder;
+		private ApplicationModeBean modeBean;
 
 		public ProfileSettingsItem(@NonNull OsmandSettings settings, @NonNull ApplicationMode appMode) {
 			super(SettingsItemType.PROFILE, settings);
@@ -421,7 +423,7 @@ public class SettingsHelper {
 		@Override
 		public String getPublicName(@NonNull Context ctx) {
 			if (appMode.isCustomProfile()) {
-				return appMode.getCustomProfileName();
+				return modeBean.userProfileName;
 			} else if (appMode.getNameKeyResource() != -1) {
 				return ctx.getString(appMode.getNameKeyResource());
 			} else {
@@ -437,7 +439,8 @@ public class SettingsHelper {
 
 		void readFromJson(@NonNull OsmandApplication app, @NonNull JSONObject json) throws JSONException {
 			String appModeJson = json.getString("appMode");
-			builder = ApplicationMode.fromJson(appModeJson);
+			modeBean = ApplicationMode.fromJson(appModeJson);
+			builder = ApplicationMode.fromModeBean(modeBean);
 			ApplicationMode appMode = builder.getApplicationMode();
 			if (!appMode.isCustomProfile()) {
 				appMode = ApplicationMode.valueOfStringKey(appMode.getStringKey(), appMode);
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 9e40804e2d..057f214a87 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -673,7 +673,7 @@ public class MapActivityActions implements DialogProvider {
 		for (final ApplicationMode appMode : activeModes) {
 			if (appMode.isCustomProfile()) {
 				modeDescription = String.format(app.getString(R.string.profile_type_descr_string),
-						Algorithms.capitalizeFirstLetterAndLowercase(appMode.getParent().toHumanString(app)));
+						Algorithms.capitalizeFirstLetterAndLowercase(appMode.getParent().toHumanString()));
 			} else {
 				modeDescription = getString(R.string.profile_type_base_string);
 			}
@@ -684,7 +684,7 @@ public class MapActivityActions implements DialogProvider {
 					.setIcon(appMode.getIconRes())
 					.setColor(appMode.getIconColorInfo().getColor(nightMode))
 					.setTag(tag)
-					.setTitle(appMode.toHumanString(app))
+					.setTitle(appMode.toHumanString())
 					.setDescription(modeDescription)
 					.setListener(new ItemClickListener() {
 						@Override
@@ -994,7 +994,7 @@ public class MapActivityActions implements DialogProvider {
 		String modeDescription;
 		if (currentMode.isCustomProfile()) {
 			modeDescription = String.format(app.getString(R.string.profile_type_descr_string),
-					Algorithms.capitalizeFirstLetterAndLowercase(currentMode.getParent().toHumanString(app)));
+					Algorithms.capitalizeFirstLetterAndLowercase(currentMode.getParent().toHumanString()));
 		} else {
 			modeDescription = getString(R.string.profile_type_base_string);
 		}
@@ -1004,7 +1004,7 @@ public class MapActivityActions implements DialogProvider {
 				.setIcon(currentMode.getIconRes())
 				.setSecondaryIcon(icArrowResId)
 				.setColor(currentMode.getIconColorInfo().getColor(nightMode))
-				.setTitle(currentMode.toHumanString(app))
+				.setTitle(currentMode.toHumanString())
 				.setDescription(modeDescription)
 				.setListener(new ItemClickListener() {
 					@Override
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
index 4c2eafbef7..797fe4eede 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
@@ -386,7 +386,7 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
 
 		    if (am != ApplicationMode.DEFAULT || !(this instanceof SettingsNavigationActivity)) {
 			    activeModes.add(new ProfileDataObject(
-					    am.toHumanString(getMyApplication()),
+					    am.toHumanString(),
 					    getAppModeDescription(am),
 					    am.getStringKey(),
 					    am.getIconRes(),
@@ -429,7 +429,7 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
     void updateModeButton(ApplicationMode mode) {
 		OsmandApplication app = getMyApplication();
 		boolean nightMode = !app.getSettings().isLightContent();
-	    String title = mode.toHumanString(SettingsBaseActivity.this);
+	    String title = mode.toHumanString();
 
 	    getModeTitleTV().setText(title);
 	    getModeSubTitleTV().setText(getAppModeDescription(mode));
@@ -448,7 +448,7 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
 		    descr = getString(R.string.profile_type_base_string);
 	    } else {
 		    descr = String.format(getString(R.string.profile_type_descr_string),
-			    mode.getParent().toHumanString(getMyApplication()));
+			    mode.getParent().toHumanString());
 		    if (mode.getRoutingProfile() != null && mode.getRoutingProfile().contains("/")) {
 			    descr = descr.concat(", " + mode.getRoutingProfile()
 				    .substring(0, mode.getRoutingProfile().indexOf("/")));
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index 52bc2c6ab8..47e01150f7 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -1,7 +1,6 @@
 package net.osmand.plus.activities;
 
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -91,7 +90,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
 		ApplicationMode[] appModes = ApplicationMode.values(app).toArray(new ApplicationMode[0]);
 		entries = new String[appModes.length];
 		for (int i = 0; i < entries.length; i++) {
-			entries[i] = appModes[i].toHumanString(app);
+			entries[i] = appModes[i].toHumanString();
 		}
 		registerListPreference(settings.DEFAULT_APPLICATION_MODE, screen, entries, appModes);
 
@@ -545,7 +544,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
 		super.updateAllSettings();
 		updateApplicationDirTextAndSummary();
 		applicationModePreference.setTitle(getString(R.string.settings_preset) + "  ["
-				+ settings.APPLICATION_MODE.get().toHumanString(getMyApplication()) + "]");
+				+ settings.APPLICATION_MODE.get().toHumanString() + "]");
 		drivingRegionPreference.setTitle(getString(R.string.driving_region) + "  ["
 				+ getString(settings.DRIVING_REGION_AUTOMATIC.get() ? R.string.driving_region_automatic : settings.DRIVING_REGION.get().name) + "]");
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
index a605414935..669570e088 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
@@ -755,8 +755,8 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 				break;
 		}
 
-		float settingsMinSpeed = settings.MIN_SPEED.getModeValue(mode);
-		float settingsMaxSpeed = settings.MAX_SPEED.getModeValue(mode);
+		float settingsMinSpeed = mode.getMinSpeed();
+		float settingsMaxSpeed = mode.getMaxSpeed();
 
 		final int[] defaultValue = {Math.round(mode.getDefaultSpeed() * ratio[0])};
 		final int[] minValue = new int[1];
@@ -785,8 +785,8 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 			public void onClick(DialogInterface dialog, int which) {
 				mode.setDefaultSpeed(defaultValue[0] / ratio[0]);
 				if (!defaultSpeedOnly) {
-					settings.MIN_SPEED.setModeValue(mode, minValue[0] / ratio[0]);
-					settings.MAX_SPEED.setModeValue(mode, maxValue[0] / ratio[0]);
+					mode.setMinSpeed(minValue[0] / ratio[0]);
+					mode.setMaxSpeed(maxValue[0] / ratio[0]);
 				}
 				RoutingHelper routingHelper = app.getRoutingHelper();
 				if (mode.equals(routingHelper.getAppMode()) && (routingHelper.isRouteCalculated() || routingHelper.isRouteBeingCalculated())) {
@@ -800,8 +800,8 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 			public void onClick(DialogInterface dialog, int which) {
 				mode.resetDefaultSpeed();
 				if (!defaultSpeedOnly) {
-					settings.MIN_SPEED.setModeValue(mode,0f);
-					settings.MAX_SPEED.setModeValue(mode,0f);
+					mode.setMinSpeed(0f);
+					mode.setMaxSpeed(0f);
 				}
 				RoutingHelper routingHelper = app.getRoutingHelper();
 				if (mode.equals(routingHelper.getAppMode()) && (routingHelper.isRouteCalculated() || routingHelper.isRouteBeingCalculated())) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
index 27a0a739d3..8b927c5658 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
@@ -1,7 +1,6 @@
 package net.osmand.plus.activities.actions;
 
 import android.app.Activity;
-import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
@@ -117,7 +116,7 @@ public class AppModeDialog {
 			ImageView iv = (ImageView) tb.findViewById(R.id.app_mode_icon);
 			if (checked) {
 				iv.setImageDrawable(ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode)));
-				iv.setContentDescription(String.format("%s %s", mode.toHumanString(ctx), ctx.getString(R.string.item_checked)));
+				iv.setContentDescription(String.format("%s %s", mode.toHumanString(), ctx.getString(R.string.item_checked)));
 				selection.setBackgroundResource(mode.getIconColorInfo().getColor(nightMode));
 				selection.setVisibility(View.VISIBLE);
 			} else {
@@ -127,7 +126,7 @@ public class AppModeDialog {
 				} else {
 					iv.setImageDrawable(ctx.getUIUtilities().getThemedIcon(mode.getIconRes()));
 				}
-				iv.setContentDescription(String.format("%s %s", mode.toHumanString(ctx), ctx.getString(R.string.item_unchecked)));
+				iv.setContentDescription(String.format("%s %s", mode.toHumanString(), ctx.getString(R.string.item_unchecked)));
 				selection.setVisibility(View.INVISIBLE);
 			}
 			iv.setOnClickListener(new View.OnClickListener() {
@@ -170,7 +169,7 @@ public class AppModeDialog {
 			Drawable drawable = ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode));
 			if (checked) {
 				iv.setImageDrawable(drawable);
-				iv.setContentDescription(String.format("%s %s", mode.toHumanString(ctx), ctx.getString(R.string.item_checked)));
+				iv.setContentDescription(String.format("%s %s", mode.toHumanString(), ctx.getString(R.string.item_checked)));
 				if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
 					AndroidUtils.setBackground(ctx, iv, nightMode, R.drawable.btn_checked_border_light, R.drawable.btn_checked_border_light);
 					AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.ripple_light, R.drawable.ripple_light);
@@ -193,7 +192,7 @@ public class AppModeDialog {
 				} else {
 					iv.setImageDrawable(ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode)));
 				}
-				iv.setContentDescription(String.format("%s %s", mode.toHumanString(ctx), ctx.getString(R.string.item_unchecked)));
+				iv.setContentDescription(String.format("%s %s", mode.toHumanString(), ctx.getString(R.string.item_unchecked)));
 			}
 			tb.setOnClickListener(new View.OnClickListener() {
 
@@ -229,7 +228,7 @@ public class AppModeDialog {
 		View tb = layoutInflater.inflate(layoutId, null);
 		ImageView iv = (ImageView) tb.findViewById(R.id.app_mode_icon);
 		iv.setImageDrawable(ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(isNightMode(ctx, useMapTheme))));
-		iv.setContentDescription(mode.toHumanString(ctx));
+		iv.setContentDescription(mode.toHumanString());
 //		tb.setCompoundDrawablesWithIntrinsicBounds(null, ctx.getIconsCache().getIcon(mode.getIconId(), R.color.app_mode_icon_color), null, null);
 		LayoutParams lp = new LinearLayout.LayoutParams(metricsX, metricsY);
 //		lp.setMargins(left, 0, 0, 0);
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java b/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java
index 25d84a2735..07e3058730 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java
@@ -198,7 +198,7 @@ public class PluginInstalledBottomSheetDialog extends MenuBottomSheetDialogFragm
 			appModeItem[0] = (BottomSheetItemWithCompoundButton) new BottomSheetItemWithCompoundButton.Builder()
 					.setChecked(ApplicationMode.values(app).contains(mode))
 					.setDescription(BaseSettingsFragment.getAppModeDescription(app, mode))
-					.setTitle(mode.toHumanString(app))
+					.setTitle(mode.toHumanString())
 					.setIcon(getActiveIcon(mode.getIconRes()))
 					.setLayoutId(R.layout.bottom_sheet_item_with_descr_and_switch_56dp)
 					.setOnClickListener(new View.OnClickListener() {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
index 4202a76402..e3e5d8926d 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
@@ -80,7 +80,7 @@ public class DirectionIndicationDialogFragment extends BaseOsmAndDialogFragment
 
 		TextView appModeTv = (TextView) mainView.findViewById(R.id.app_mode_text_view);
 		ApplicationMode appMode = settings.APPLICATION_MODE.get();
-		appModeTv.setText(appMode.toHumanString(getContext()));
+		appModeTv.setText(appMode.toHumanString());
 		appModeTv.setCompoundDrawablesWithIntrinsicBounds(null, null, getIconsCache().getIcon(
 			appMode.getIconRes()), null);
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index 99f67cecf1..0b711f6e3f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -2,11 +2,8 @@ package net.osmand.plus.measurementtool;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
 import android.support.design.widget.BottomSheetBehavior;
 import android.support.design.widget.BottomSheetDialog;
-import android.support.v4.content.ContextCompat;
 import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.view.Window;
@@ -19,7 +16,6 @@ import android.widget.TextView;
 import net.osmand.AndroidUtils;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
@@ -92,7 +88,7 @@ public class SnapToRoadBottomSheetDialogFragment extends android.support.design.
 			View row = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.list_item_icon_and_title, null);
 			((ImageView) row.findViewById(R.id.icon)).setImageDrawable(
 				app.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode)));
-			((TextView) row.findViewById(R.id.title)).setText(mode.toHumanString(getContext()));
+			((TextView) row.findViewById(R.id.title)).setText(mode.toHumanString());
 			row.setOnClickListener(onClickListener);
 			row.setTag(i);
 			container.addView(row);
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java b/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
index 12b84adbc4..a8a12a9b2b 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
@@ -248,7 +248,7 @@ public class SettingsMonitoringActivity extends SettingsBaseActivity {
 	protected void showConfirmDialog(final String prefId, final Object newValue) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
-		String appModeName = selectedAppMode.toHumanString(this);
+		String appModeName = selectedAppMode.toHumanString();
 		String currentModeText = getString(R.string.apply_to_current_profile, appModeName);
 		int start = currentModeText.indexOf(appModeName);
 
diff --git a/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java b/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java
index a8870d7b86..a7d4790e5d 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/ConfigureProfileMenuAdapter.java
@@ -103,7 +103,7 @@ public class ConfigureProfileMenuAdapter extends AbstractProfileMenuAdapter<Conf
 			holder.compoundButton.setVisibility(View.VISIBLE);
 			holder.menuIcon.setVisibility(View.VISIBLE);
 			final ApplicationMode item = (ApplicationMode) obj;
-			holder.title.setText(item.toHumanString(app));
+			holder.title.setText(item.toHumanString());
 			holder.descr.setText(BaseSettingsFragment.getAppModeDescription(app, item));
 
 			holder.initSwitcher = true;
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
index 72c5d0d359..d0f8807b21 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
@@ -169,7 +169,6 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 						mode.setOrder(order);
 					}
 					ApplicationMode.reorderAppModes();
-					ApplicationMode.saveCustomAppModesToSettings(app);
 					mapActivity.onBackPressed();
 				}
 			}
@@ -234,7 +233,7 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 				if (order == null) {
 					order = mode.getOrder();
 				}
-				profiles.add(new EditProfileDataObject(modeKey, mode.toHumanString(getContext()), BaseSettingsFragment.getAppModeDescription(getContext(), mode),
+				profiles.add(new EditProfileDataObject(modeKey, mode.toHumanString(), BaseSettingsFragment.getAppModeDescription(getContext(), mode),
 						mode.getIconRes(), false, mode.isCustomProfile(), deleted, mode.getIconColorInfo(), order));
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectCopyProfilesMenuAdapter.java b/OsmAnd/src/net/osmand/plus/profiles/SelectCopyProfilesMenuAdapter.java
index 2770eb2e4e..2030a7ce49 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/SelectCopyProfilesMenuAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/SelectCopyProfilesMenuAdapter.java
@@ -50,7 +50,7 @@ public class SelectCopyProfilesMenuAdapter extends AbstractProfileMenuAdapter<Se
 		ApplicationMode appMode = items.get(position);
 		boolean selected = appMode == selectedAppMode;
 
-		holder.title.setText(appMode.toHumanString(app));
+		holder.title.setText(appMode.toHumanString());
 		holder.compoundButton.setChecked(selected);
 
 		updateViewHolder(holder, appMode, selected);
diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java
index b7a26fb080..8c259757a7 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileMenuAdapter.java
@@ -97,7 +97,7 @@ public class SelectProfileMenuAdapter extends AbstractProfileMenuAdapter<SelectP
 			holder.compoundButton.setVisibility(View.GONE);
 			holder.menuIcon.setVisibility(View.GONE);
 			final ApplicationMode item = (ApplicationMode) obj;
-			holder.title.setText(item.toHumanString(app));
+			holder.title.setText(item.toHumanString());
 			holder.descr.setText(BaseSettingsFragment.getAppModeDescription(app, item));
 
 			int profileColorResId = item.getIconColorInfo().getColor(nightMode);
diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
index 0a96c7d8a1..018bb5ae9c 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
@@ -704,11 +704,11 @@ public class RouteProvider {
 		if (defaultSpeed > 0) {
 			paramsR.put(GeneralRouter.DEFAULT_SPEED, String.valueOf(defaultSpeed));
 		}
-		Float minSpeed = settings.MIN_SPEED.getModeValue(params.mode);
+		Float minSpeed = params.mode.getMinSpeed();
 		if (minSpeed > 0) {
 			paramsR.put(GeneralRouter.MIN_SPEED, String.valueOf(minSpeed));
 		}
-		Float maxSpeed = settings.MAX_SPEED.getModeValue(params.mode);
+		Float maxSpeed = params.mode.getMaxSpeed();
 		if (maxSpeed > 0) {
 			paramsR.put(GeneralRouter.MAX_SPEED, String.valueOf(maxSpeed));
 		}
@@ -790,7 +790,7 @@ public class RouteProvider {
 	}
 
 	private RouteCalculationResult applicationModeNotSupported(RouteCalculationParams params) {
-		return new RouteCalculationResult("Application mode '"+ params.mode.toHumanString(params.ctx)+ "' is not supported.");
+		return new RouteCalculationResult("Application mode '"+ params.mode.toHumanString()+ "' is not supported.");
 	}
 
 	private RouteCalculationResult interrupted() {
diff --git a/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java
index 18b66b81ab..131d453e82 100644
--- a/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java
@@ -447,7 +447,7 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
 		}
 		TextView profileTitle = (TextView) view.findViewById(R.id.profile_title);
 		if (profileTitle != null) {
-			String appName = selectedAppMode.toHumanString(app);
+			String appName = selectedAppMode.toHumanString();
 			profileTitle.setText(appName);
 		}
 		View toolbarDivider = view.findViewById(R.id.toolbar_divider);
@@ -745,7 +745,7 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
 		String description;
 		if (mode.isCustomProfile()) {
 			description = String.format(ctx.getString(R.string.profile_type_descr_string),
-					Algorithms.capitalizeFirstLetterAndLowercase(mode.getParent().toHumanString(ctx)));
+					Algorithms.capitalizeFirstLetterAndLowercase(mode.getParent().toHumanString()));
 		} else {
 			description = ctx.getString(R.string.profile_type_base_string);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
index f5f518209b..3cdeae14c4 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
@@ -90,7 +90,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 
 		TextView toolbarTitle = view.findViewById(R.id.toolbar_title);
 		toolbarTitle.setTypeface(FontCache.getRobotoMedium(view.getContext()));
-		toolbarTitle.setText(getSelectedAppMode().toHumanString(getContext()));
+		toolbarTitle.setText(getSelectedAppMode().toHumanString());
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 			float letterSpacing = AndroidUtils.getFloatValueFromRes(view.getContext(), R.dimen.title_letter_spacing);
 			toolbarTitle.setLetterSpacing(letterSpacing);
@@ -147,7 +147,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 		if (view != null) {
 			updateToolbarSwitch();
 			TextView toolbarTitle = view.findViewById(R.id.toolbar_title);
-			toolbarTitle.setText(getSelectedAppMode().toHumanString(getContext()));
+			toolbarTitle.setText(getSelectedAppMode().toHumanString());
 		}
 	}
 
@@ -317,7 +317,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 			Context ctx = requireContext();
 			final Intent sendIntent = new Intent();
 			sendIntent.setAction(Intent.ACTION_SEND);
-			sendIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.exported_osmand_profile, profile.toHumanString(ctx)));
+			sendIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.exported_osmand_profile, profile.toHumanString()));
 			sendIntent.putExtra(Intent.EXTRA_STREAM, AndroidUtils.getUriForFile(getMyApplication(), file));
 			sendIntent.setType("*/*");
 			sendIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
@@ -392,7 +392,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 			if (!tempDir.exists()) {
 				tempDir.mkdirs();
 			}
-			String fileName = profile.toHumanString(ctx);
+			String fileName = profile.toHumanString();
 			app.getSettingsHelper().exportSettings(tempDir, fileName, new SettingsHelper.SettingsExportListener() {
 				@Override
 				public void onSettingsExportFinished(@NonNull File file, boolean succeed) {
@@ -418,7 +418,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 				bld.setTitle(R.string.profile_alert_delete_title);
 				bld.setMessage(String
 						.format(getString(R.string.profile_alert_delete_msg),
-								profile.getCustomProfileName()));
+								profile.getUserProfileName()));
 				bld.setPositiveButton(R.string.shared_string_delete,
 						new DialogInterface.OnClickListener() {
 							@Override
diff --git a/OsmAnd/src/net/osmand/plus/settings/GlobalSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/GlobalSettingsFragment.java
index 2058f32bdd..65df6189c0 100644
--- a/OsmAnd/src/net/osmand/plus/settings/GlobalSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/GlobalSettingsFragment.java
@@ -102,7 +102,7 @@ public class GlobalSettingsFragment extends BaseSettingsFragment implements Send
 		String[] entries = new String[appModes.length];
 		String[] entryValues = new String[appModes.length];
 		for (int i = 0; i < entries.length; i++) {
-			entries[i] = appModes[i].toHumanString(app);
+			entries[i] = appModes[i].toHumanString();
 			entryValues[i] = appModes[i].getStringKey();
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java
index 147001d44b..5dd684c876 100644
--- a/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java
@@ -147,7 +147,7 @@ public class MainSettingsFragment extends BaseSettingsFragment {
 
 	private void setupConfigureProfilePref() {
 		ApplicationMode selectedMode = app.getSettings().APPLICATION_MODE.get();
-		String title = selectedMode.toHumanString(getContext());
+		String title = selectedMode.toHumanString();
 		String profileType = getAppModeDescription(getContext(), selectedMode);
 		int iconRes = selectedMode.getIconRes();
 		Preference configureProfile = findPreference(CONFIGURE_PROFILE);
@@ -181,7 +181,7 @@ public class MainSettingsFragment extends BaseSettingsFragment {
 			pref.setPersistent(false);
 			pref.setKey(applicationMode.getStringKey());
 			pref.setIcon(getAppProfilesIcon(applicationMode, isAppProfileEnabled));
-			pref.setTitle(applicationMode.toHumanString(getContext()));
+			pref.setTitle(applicationMode.toHumanString());
 			pref.setSummary(getAppModeDescription(getContext(), applicationMode));
 			pref.setChecked(isAppProfileEnabled);
 			pref.setLayoutResource(R.layout.preference_with_descr_dialog_and_switch);
diff --git a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
index ee2c11770b..d3c8bc8691 100644
--- a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
@@ -193,7 +193,7 @@ public class NavigationFragment extends BaseSettingsFragment {
 		List<ProfileDataObject> profiles = new ArrayList<>();
 		for (ApplicationMode mode : ApplicationMode.getDefaultValues()) {
 			if (mode != ApplicationMode.DEFAULT) {
-				profiles.add(new ProfileDataObject(mode.toHumanString(ctx), mode.getDescription(ctx),
+				profiles.add(new ProfileDataObject(mode.toHumanString(), mode.getDescription(),
 						mode.getStringKey(), mode.getIconRes(), false, mode.getIconColorInfo()));
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
index 0080cd4be1..da593f5340 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
@@ -111,7 +111,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		if (baseModeForNewProfile != null) {
 			profile.stringKey = baseModeForNewProfile.getStringKey() + "_" + System.currentTimeMillis();
 			profile.parent = baseModeForNewProfile;
-			profile.name = baseModeForNewProfile.toHumanString(app);
+			profile.name = baseModeForNewProfile.toHumanString();
 			profile.color = baseModeForNewProfile.getIconColorInfo();
 			profile.iconRes = baseModeForNewProfile.getIconRes();
 			profile.routingProfile = baseModeForNewProfile.getRoutingProfile();
@@ -122,7 +122,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		} else {
 			profile.stringKey = getSelectedAppMode().getStringKey();
 			profile.parent = getSelectedAppMode().getParent();
-			profile.name = getSelectedAppMode().toHumanString(getContext());
+			profile.name = getSelectedAppMode().toHumanString();
 			profile.color = getSelectedAppMode().getIconColorInfo();
 			profile.iconRes = getSelectedAppMode().getIconRes();
 			profile.routingProfile = getSelectedAppMode().getRoutingProfile();
@@ -137,7 +137,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 			changedProfile.stringKey = profile.stringKey;
 			changedProfile.parent = profile.parent;
 			if (baseModeForNewProfile != null) {
-				changedProfile.name = createNonDuplicateName(baseModeForNewProfile.toHumanString(app));
+				changedProfile.name = createNonDuplicateName(baseModeForNewProfile.toHumanString());
 			} else {
 				changedProfile.name = profile.name;
 			}
@@ -176,7 +176,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 
 	private boolean hasProfileWithName(String newName) {
 		for (ApplicationMode m : ApplicationMode.allPossibleValues()) {
-			if (m.toHumanString(app).equals(newName)) {
+			if (m.toHumanString().equals(newName)) {
 				return true;
 			}
 		}
@@ -346,8 +346,8 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 			baseProfileName = (EditText) holder.findViewById(R.id.master_profile_et);
 			baseProfileName.setFocusable(false);
 			baseProfileName.setText(changedProfile.parent != null
-					? changedProfile.parent.toHumanString(getContext())
-					: getSelectedAppMode().toHumanString(getContext()));
+					? changedProfile.parent.toHumanString()
+					: getSelectedAppMode().toHumanString());
 			OsmandTextFieldBoxes baseProfileNameHint = (OsmandTextFieldBoxes) holder.findViewById(R.id.master_profile_otfb);
 			baseProfileNameHint.setLabelText(getString(R.string.master_profile));
 			FrameLayout selectNavTypeBtn = (FrameLayout) holder.findViewById(R.id.select_nav_type_btn);
@@ -640,7 +640,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 	private void setupBaseProfileView(String stringKey) {
 		for (ApplicationMode am : ApplicationMode.getDefaultValues()) {
 			if (am.getStringKey().equals(stringKey)) {
-				baseProfileName.setText(Algorithms.capitalizeFirstLetter(am.toHumanString(app)));
+				baseProfileName.setText(Algorithms.capitalizeFirstLetter(am.toHumanString()));
 			}
 		}
 	}
@@ -687,7 +687,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 
 	private boolean hasNameDuplicate() {
 		for (ApplicationMode m : ApplicationMode.allPossibleValues()) {
-			if (m.toHumanString(app).equals(changedProfile.name) &&
+			if (m.toHumanString().equals(changedProfile.name) &&
 					!m.getStringKey().equals(profile.stringKey)) {
 				return true;
 			}
diff --git a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
index b4b71d82d0..fca4c6ca43 100644
--- a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
@@ -79,7 +79,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 
 		Preference routeParametersInfo = findPreference(ROUTE_PARAMETERS_INFO);
 		routeParametersInfo.setIcon(getContentIcon(R.drawable.ic_action_info_dark));
-		routeParametersInfo.setTitle(getString(R.string.route_parameters_info, getSelectedAppMode().toHumanString(getContext())));
+		routeParametersInfo.setTitle(getString(R.string.route_parameters_info, getSelectedAppMode().toHumanString()));
 
 		setupRoutingPrefs();
 		setupTimeConditionalRoutingPref();
diff --git a/OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java
index c0d3cff143..1dd7d149ca 100644
--- a/OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java
@@ -31,7 +31,7 @@ public class VehicleParametersFragment extends BaseSettingsFragment implements O
 
 		Preference vehicleParametersInfo = findPreference("vehicle_parameters_info");
 		vehicleParametersInfo.setIcon(getContentIcon(R.drawable.ic_action_info_dark));
-		vehicleParametersInfo.setTitle(getString(R.string.route_parameters_info, getSelectedAppMode().toHumanString(getContext())));
+		vehicleParametersInfo.setTitle(getString(R.string.route_parameters_info, getSelectedAppMode().toHumanString()));
 
 		RouteService routeService = getSelectedAppMode().getRouteService();
 		if (routeService == RouteService.OSMAND) {
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java
index bca0a60c42..ea0e0e914c 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeGeneralProfilesPrefBottomSheet.java
@@ -65,7 +65,7 @@ public class ChangeGeneralProfilesPrefBottomSheet extends BasePreferenceBottomSh
 		ApplicationMode selectedAppMode = getAppMode();
 
 		BaseBottomSheetItem applyToCurrentProfile = new SimpleBottomSheetItem.Builder()
-				.setTitle(getString(R.string.apply_to_current_profile, selectedAppMode.toHumanString(app)))
+				.setTitle(getString(R.string.apply_to_current_profile, selectedAppMode.toHumanString()))
 				.setIcon(getActiveIcon(selectedAppMode.getIconRes()))
 				.setLayoutId(R.layout.bottom_sheet_item_simple)
 				.setOnClickListener(new View.OnClickListener() {
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java
index 5bbfa9f31a..70bd98036e 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ResetProfilePrefsBottomSheet.java
@@ -46,7 +46,7 @@ public class ResetProfilePrefsBottomSheet extends BasePreferenceBottomSheet {
 				.setButtonTintList(ColorStateList.valueOf(getResolvedColor(profileColor)))
 				.setDescription(BaseSettingsFragment.getAppModeDescription(ctx, mode))
 				.setIcon(getIcon(mode.getIconRes(), profileColor))
-				.setTitle(mode.toHumanString(ctx))
+				.setTitle(mode.toHumanString())
 				.setBackground(new LayerDrawable(layers))
 				.setLayoutId(R.layout.preference_profile_item_with_radio_btn)
 				.create();
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 7e86beb96b..14a8e6a8aa 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -220,7 +219,7 @@ public class MapWidgetRegistry {
 	private void processVisibleModes(String key, MapWidgetRegInfo ii) {
 		for (ApplicationMode ms : ApplicationMode.values(app)) {
 			boolean collapse = ms.isWidgetCollapsible(key);
-			boolean def = ms.isWidgetVisible(app, key);
+			boolean def = ms.isWidgetVisible(key);
 			Set<String> set = visibleElementsFromSettings.get(ms);
 			if (set != null) {
 				if (set.contains(key)) {
@@ -313,7 +312,7 @@ public class MapWidgetRegistry {
 		for (MapWidgetRegInfo ri : set) {
 			ri.visibleCollapsible.remove(mode);
 			ri.visibleModes.remove(mode);
-			if (mode.isWidgetVisible(app, ri.key)) {
+			if (mode.isWidgetVisible(ri.key)) {
 				if (mode.isWidgetCollapsible(ri.key)) {
 					ri.visibleCollapsible.add(mode);
 				} else {
@@ -485,7 +484,7 @@ public class MapWidgetRegistry {
 	private void addControls(final MapActivity mapActivity, final ContextMenuAdapter contextMenuAdapter,
 							 Set<MapWidgetRegInfo> groupTitle, final ApplicationMode mode) {
 		for (final MapWidgetRegInfo r : groupTitle) {
-			if (!mode.isWidgetAvailable(app, r.key)) {
+			if (!mode.isWidgetAvailable(r.key)) {
 				continue;
 			}
 

From 9397ab62a6a0165b5ca18ba2faede56053f2adca Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Thu, 30 Jan 2020 15:42:56 +0200
Subject: [PATCH 18/24] Fix update profile preferences after copy or reset

---
 OsmAnd/src/net/osmand/plus/OsmandSettings.java        |  8 ++------
 .../plus/settings/ConfigureProfileFragment.java       | 11 +++++++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 3c2903ec42..905a31eb4b 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -3163,9 +3163,6 @@ public class OsmandSettings {
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<String> RENDERER = new StringPreference("renderer", RendererRegistry.DEFAULT_RENDER) {
-		{
-			makeProfile();
-		}
 
 		@Override
 		protected boolean setValue(Object prefs, String val) {
@@ -3174,13 +3171,12 @@ public class OsmandSettings {
 			}
 			RenderingRulesStorage loaded = ctx.getRendererRegistry().getRenderer(val);
 			if (loaded != null) {
-				super.setValue(prefs, val);
-				return true;
+				return super.setValue(prefs, val);
 			}
 			return false;
 		}
 
-	};
+	}.makeProfile();
 
 	{
 		RENDERER.setModeDefaultValue(ApplicationMode.BOAT, RendererRegistry.NAUTICAL_RENDER);
diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
index 3cdeae14c4..3e0b6f6938 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
@@ -156,8 +156,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 		if (appMode != null) {
 			ApplicationMode selectedAppMode = getSelectedAppMode();
 			app.getSettings().copyPreferencesFromProfile(appMode, selectedAppMode);
-			updateToolbar();
-			updateAllSettings();
+			updateCopiedOrResetPrefs();
 		}
 	}
 
@@ -166,6 +165,14 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 		if (appMode != null) {
 			app.getSettings().resetPreferencesForProfile(appMode);
 			app.showToastMessage(R.string.profile_prefs_reset_successful);
+			updateCopiedOrResetPrefs();
+		}
+	}
+
+	private void updateCopiedOrResetPrefs() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			mapActivity.updateApplicationModeSettings();
 			updateToolbar();
 			updateAllSettings();
 		}

From 826eba624d7c09c6087c34b5906d5339938fcf26 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Thu, 30 Jan 2020 18:31:12 +0200
Subject: [PATCH 19/24] Fix update widgets visibility after reset

---
 .../src/net/osmand/plus/OsmandSettings.java   |  4 +-
 .../settings/ConfigureProfileFragment.java    |  2 +
 .../views/mapwidgets/MapWidgetRegistry.java   | 41 +++++++++++++------
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 905a31eb4b..677a716d63 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -430,7 +430,7 @@ public class OsmandSettings {
 
 	public void copyProfilePreferences(ApplicationMode modeFrom, ApplicationMode modeTo, List<OsmandPreference> profilePreferences) {
 		for (OsmandPreference pref : profilePreferences) {
-			if (prefCanBeCopiedOrReset(pref)) {
+			if (prefCanBeCopiedOrReset(pref) && !USER_PROFILE_NAME.getId().equals(pref.getId())) {
 				CommonPreference profilePref = (CommonPreference) pref;
 				if (PARENT_APP_MODE.getId().equals(pref.getId())) {
 					if (modeTo.isCustomProfile()) {
@@ -459,7 +459,7 @@ public class OsmandSettings {
 
 	private boolean prefCanBeCopiedOrReset(OsmandPreference pref) {
 		return pref instanceof CommonPreference && !((CommonPreference) pref).global
-				&& !USER_PROFILE_NAME.getId().equals(pref.getId()) && !APP_MODE_ORDER.getId().equals(pref.getId());
+				&& !APP_MODE_ORDER.getId().equals(pref.getId());
 	}
 
 	public ApplicationMode LAST_ROUTING_APPLICATION_MODE = null;
diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
index 3e0b6f6938..2dd0a010d5 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
@@ -172,6 +172,8 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
 	private void updateCopiedOrResetPrefs() {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
+			app.getPoiFilters().loadSelectedPoiFilters();
+			mapActivity.getMapLayers().getMapWidgetRegistry().updateVisibleWidgets();
 			mapActivity.updateApplicationModeSettings();
 			updateToolbar();
 			updateAllSettings();
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 14a8e6a8aa..a447c81a5e 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -14,11 +14,11 @@ import android.widget.LinearLayout;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
-import net.osmand.plus.UiUtilities;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.OsmandPreference;
 import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dialogs.ConfigureMapMenu;
 import net.osmand.plus.mapmarkers.DirectionIndicationDialogFragment;
@@ -74,17 +74,7 @@ public class MapWidgetRegistry {
 	public MapWidgetRegistry(OsmandApplication app) {
 		this.app = app;
 		this.settings = app.getSettings();
-
-		for (ApplicationMode ms : ApplicationMode.values(app)) {
-			String mpf = settings.MAP_INFO_CONTROLS.getModeValue(ms);
-			if (mpf.equals(SHOW_PREFIX)) {
-				visibleElementsFromSettings.put(ms, null);
-			} else {
-				LinkedHashSet<String> set = new LinkedHashSet<>();
-				visibleElementsFromSettings.put(ms, set);
-				Collections.addAll(set, mpf.split(SETTINGS_SEPARATOR));
-			}
-		}
+		loadVisibleElementsFromSettings();
 	}
 
 	public void populateStackControl(LinearLayout stack,
@@ -237,6 +227,9 @@ public class MapWidgetRegistry {
 				ii.visibleModes.add(ms);
 			} else if (collapse) {
 				ii.visibleCollapsible.add(ms);
+			} else {
+				ii.visibleModes.remove(ms);
+				ii.visibleCollapsible.remove(ms);
 			}
 		}
 	}
@@ -299,6 +292,30 @@ public class MapWidgetRegistry {
 		}
 	}
 
+	public void updateVisibleWidgets() {
+		loadVisibleElementsFromSettings();
+		for (MapWidgetRegInfo ri : leftWidgetSet) {
+			processVisibleModes(ri.key, ri);
+		}
+		for (MapWidgetRegInfo ri : rightWidgetSet) {
+			processVisibleModes(ri.key, ri);
+		}
+	}
+
+	private void loadVisibleElementsFromSettings() {
+		visibleElementsFromSettings.clear();
+		for (ApplicationMode ms : ApplicationMode.values(app)) {
+			String mpf = settings.MAP_INFO_CONTROLS.getModeValue(ms);
+			if (mpf.equals(SHOW_PREFIX)) {
+				visibleElementsFromSettings.put(ms, null);
+			} else {
+				LinkedHashSet<String> set = new LinkedHashSet<>();
+				visibleElementsFromSettings.put(ms, set);
+				Collections.addAll(set, mpf.split(SETTINGS_SEPARATOR));
+			}
+		}
+	}
+
 	private void saveVisibleElementsToSettings(ApplicationMode mode) {
 		StringBuilder bs = new StringBuilder();
 		for (String ks : this.visibleElementsFromSettings.get(mode)) {

From 2ada619baeeb1f3f36b94ed6cc460163e469f490 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Fri, 31 Jan 2020 11:19:27 +0200
Subject: [PATCH 20/24] Migrate custom app modes

---
 .../src/net/osmand/plus/ApplicationMode.java  | 76 ++++++++++---------
 .../src/net/osmand/plus/OsmandSettings.java   | 19 +++++
 2 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 385238c956..fd1b9db646 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -350,7 +350,9 @@ public class ApplicationMode {
 	}
 
 	public void setIconResName(String iconResName) {
-		app.getSettings().ICON_RES_NAME.setModeValue(this, iconResName);
+		if (!Algorithms.isEmpty(iconResName)) {
+			app.getSettings().ICON_RES_NAME.setModeValue(this, iconResName);
+		}
 	}
 
 	private void updateAppModeIcon() {
@@ -420,7 +422,9 @@ public class ApplicationMode {
 	}
 
 	public void setUserProfileName(String userProfileName) {
-		app.getSettings().USER_PROFILE_NAME.setModeValue(this, userProfileName);
+		if (!Algorithms.isEmpty(userProfileName)) {
+			app.getSettings().USER_PROFILE_NAME.setModeValue(this, userProfileName);
+		}
 	}
 
 	public String getRoutingProfile() {
@@ -428,7 +432,9 @@ public class ApplicationMode {
 	}
 
 	public void setRoutingProfile(String routingProfile) {
-		app.getSettings().ROUTING_PROFILE.setModeValue(this, routingProfile);
+		if (!Algorithms.isEmpty(routingProfile)) {
+			app.getSettings().ROUTING_PROFILE.setModeValue(this, routingProfile);
+		}
 	}
 
 	public RouteService getRouteService() {
@@ -436,7 +442,9 @@ public class ApplicationMode {
 	}
 
 	public void setRouteService(RouteService routeService) {
-		app.getSettings().ROUTE_SERVICE.setModeValue(this, routeService);
+		if (routeService != null) {
+			app.getSettings().ROUTE_SERVICE.setModeValue(this, routeService);
+		}
 	}
 
 	public NavigationIcon getNavigationIcon() {
@@ -444,7 +452,9 @@ public class ApplicationMode {
 	}
 
 	public void setNavigationIcon(NavigationIcon navigationIcon) {
-		app.getSettings().NAVIGATION_ICON.setModeValue(this, navigationIcon);
+		if (navigationIcon != null) {
+			app.getSettings().NAVIGATION_ICON.setModeValue(this, navigationIcon);
+		}
 	}
 
 	public LocationIcon getLocationIcon() {
@@ -452,7 +462,9 @@ public class ApplicationMode {
 	}
 
 	public void setLocationIcon(LocationIcon locationIcon) {
-		app.getSettings().LOCATION_ICON.setModeValue(this, locationIcon);
+		if (locationIcon != null) {
+			app.getSettings().LOCATION_ICON.setModeValue(this, locationIcon);
+		}
 	}
 
 	public ProfileIconColors getIconColorInfo() {
@@ -460,7 +472,9 @@ public class ApplicationMode {
 	}
 
 	public void setIconColor(ProfileIconColors iconColor) {
-		app.getSettings().ICON_COLOR.setModeValue(this, iconColor);
+		if (iconColor != null) {
+			app.getSettings().ICON_COLOR.setModeValue(this, iconColor);
+		}
 	}
 
 	public int getOrder() {
@@ -556,6 +570,7 @@ public class ApplicationMode {
 			mode = builder.customReg(app);
 			initRegVisibility();
 		}
+		reorderAppModes();
 		saveCustomAppModesToSettings(app);
 		return mode;
 	}
@@ -566,7 +581,7 @@ public class ApplicationMode {
 	}
 
 	public static ApplicationModeBuilder fromModeBean(ApplicationModeBean modeBean) {
-		ApplicationModeBuilder builder = createCustomMode(valueOfStringKey(modeBean.parent, null), modeBean.stringKey);
+		ApplicationModeBuilder builder = createCustomMode(valueOfStringKey(modeBean.parent, CAR), modeBean.stringKey);
 		builder.setUserProfileName(modeBean.userProfileName);
 		builder.setIconResName(modeBean.iconName);
 		builder.setIconColor(modeBean.iconColor);
@@ -659,9 +674,9 @@ public class ApplicationMode {
 		private String routingProfile;
 		private String iconResName;
 		private ProfileIconColors iconColor;
-		private Integer order;
 		private LocationIcon locationIcon;
 		private NavigationIcon navigationIcon;
+		private int order = -1;
 
 		public ApplicationMode getApplicationMode() {
 			return applicationMode;
@@ -677,34 +692,21 @@ public class ApplicationMode {
 			values.add(applicationMode);
 
 			applicationMode.app = app;
-			applicationMode.minDistanceForTurn = applicationMode.parentAppMode.minDistanceForTurn;
-			applicationMode.arrivalDistance = applicationMode.parentAppMode.arrivalDistance;
-			applicationMode.offRouteDistance = applicationMode.parentAppMode.offRouteDistance;
 
-			if (userProfileName != null) {
-				applicationMode.setUserProfileName(userProfileName);
-			}
-			if (routeService != null) {
-				applicationMode.setRouteService(routeService);
-			}
-			if (routingProfile != null) {
-				applicationMode.setRoutingProfile(routingProfile);
-			}
-			if (iconResName != null) {
-				applicationMode.setIconResName(iconResName);
-			}
-			if (iconColor != null) {
-				applicationMode.setIconColor(iconColor);
-			}
-			if (order != null) {
-				applicationMode.setOrder(order);
-			}
-			if (locationIcon != null) {
-				applicationMode.setLocationIcon(locationIcon);
-			}
-			if (navigationIcon != null) {
-				applicationMode.setNavigationIcon(navigationIcon);
-			}
+			ApplicationMode parent = applicationMode.parentAppMode;
+			applicationMode.minDistanceForTurn = parent.minDistanceForTurn;
+			applicationMode.arrivalDistance = parent.arrivalDistance;
+			applicationMode.offRouteDistance = parent.offRouteDistance;
+
+			applicationMode.setParentAppMode(parent);
+			applicationMode.setUserProfileName(userProfileName);
+			applicationMode.setRouteService(routeService);
+			applicationMode.setRoutingProfile(routingProfile);
+			applicationMode.setIconResName(iconResName);
+			applicationMode.setIconColor(iconColor);
+			applicationMode.setLocationIcon(locationIcon);
+			applicationMode.setNavigationIcon(navigationIcon);
+			applicationMode.setOrder(order != -1 ? order : values.size());
 
 			return applicationMode;
 		}
@@ -801,6 +803,6 @@ public class ApplicationMode {
 		@Expose
 		NavigationIcon navIcon = null;
 		@Expose
-		int order;
+		int order = -1;
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 677a716d63..fb18a82dc7 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -19,6 +19,10 @@ import android.support.annotation.StringRes;
 import android.support.v4.util.Pair;
 import android.support.v7.preference.PreferenceDataStore;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+
 import net.osmand.IndexConstants;
 import net.osmand.StateChangedListener;
 import net.osmand.ValueHolder;
@@ -30,6 +34,7 @@ import net.osmand.map.ITileSource;
 import net.osmand.map.TileSourceManager;
 import net.osmand.map.TileSourceManager.TileSourceTemplate;
 import net.osmand.osm.io.NetworkUtils;
+import net.osmand.plus.ApplicationMode.ApplicationModeBean;
 import net.osmand.plus.access.AccessibilityMode;
 import net.osmand.plus.access.RelativeDirectionStyle;
 import net.osmand.plus.api.SettingsAPI;
@@ -54,6 +59,7 @@ import org.json.JSONObject;
 import java.io.File;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -277,6 +283,19 @@ public class OsmandSettings {
 				}
 			}
 		}
+
+		String json = settingsAPI.getString(globalPreferences, "custom_app_profiles", "");
+		if (!Algorithms.isEmpty(json)) {
+			Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+			Type t = new TypeToken<ArrayList<ApplicationModeBean>>() {
+			}.getType();
+			List<ApplicationModeBean> customProfiles = gson.fromJson(json, t);
+			if (!Algorithms.isEmpty(customProfiles)) {
+				for (ApplicationModeBean modeBean : customProfiles) {
+					ApplicationMode.saveProfile(ApplicationMode.fromModeBean(modeBean), ctx);
+				}
+			}
+		}
 	}
 
 	void migrateHomeWorkParkingToFavorites() {

From 1e09b8d0932400bee6adc8ad436db8014e5b1317 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Fri, 31 Jan 2020 12:24:01 +0200
Subject: [PATCH 21/24] Remove unnecessary params from app mode bean

---
 OsmAnd/src/net/osmand/plus/ApplicationMode.java | 17 ++++-------------
 OsmAnd/src/net/osmand/plus/OsmandSettings.java  |  3 +--
 .../settings/ProfileAppearanceFragment.java     |  3 +--
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index fd1b9db646..64f920a69e 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -315,6 +315,9 @@ public class ApplicationMode {
 	public void setParentAppMode(ApplicationMode parentAppMode) {
 		if (isCustomProfile()) {
 			this.parentAppMode = parentAppMode;
+			minDistanceForTurn = parentAppMode.minDistanceForTurn;
+			arrivalDistance = parentAppMode.arrivalDistance;
+			offRouteDistance = parentAppMode.offRouteDistance;
 			app.getSettings().PARENT_APP_MODE.setModeValue(this, parentAppMode.getStringKey());
 		}
 	}
@@ -581,15 +584,12 @@ public class ApplicationMode {
 	}
 
 	public static ApplicationModeBuilder fromModeBean(ApplicationModeBean modeBean) {
-		ApplicationModeBuilder builder = createCustomMode(valueOfStringKey(modeBean.parent, CAR), modeBean.stringKey);
+		ApplicationModeBuilder builder = createCustomMode(valueOfStringKey(modeBean.parent, null), modeBean.stringKey);
 		builder.setUserProfileName(modeBean.userProfileName);
 		builder.setIconResName(modeBean.iconName);
 		builder.setIconColor(modeBean.iconColor);
 		builder.setRoutingProfile(modeBean.routingProfile);
 		builder.setRouteService(modeBean.routeService);
-		builder.setLocationIcon(modeBean.locIcon);
-		builder.setNavigationIcon(modeBean.navIcon);
-		builder.setOrder(modeBean.order);
 
 		return builder;
 	}
@@ -603,9 +603,6 @@ public class ApplicationMode {
 		mb.parent = parentAppMode != null ? parentAppMode.getStringKey() : null;
 		mb.routeService = getRouteService();
 		mb.routingProfile = getRoutingProfile();
-		mb.locIcon = getLocationIcon();
-		mb.navIcon = getNavigationIcon();
-		mb.order = getOrder();
 		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
 		return gson.toJson(mb);
 	}
@@ -798,11 +795,5 @@ public class ApplicationMode {
 		String routingProfile = null;
 		@Expose
 		RouteService routeService = RouteService.OSMAND;
-		@Expose
-		LocationIcon locIcon = null;
-		@Expose
-		NavigationIcon navIcon = null;
-		@Expose
-		int order = -1;
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index fb18a82dc7..70f4e97a68 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -453,8 +453,7 @@ public class OsmandSettings {
 				CommonPreference profilePref = (CommonPreference) pref;
 				if (PARENT_APP_MODE.getId().equals(pref.getId())) {
 					if (modeTo.isCustomProfile()) {
-						String parentKey = modeFrom.isCustomProfile() ? modeFrom.getParent().getStringKey() : modeFrom.getStringKey();
-						PARENT_APP_MODE.setModeValue(modeTo, parentKey);
+						modeTo.setParentAppMode(modeFrom.isCustomProfile() ? modeFrom.getParent() : modeFrom);
 					}
 				} else {
 					Object copiedValue = profilePref.getModeValue(modeFrom);
diff --git a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
index da593f5340..75e1767817 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
@@ -662,8 +662,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 					.setRouteService(changedProfile.routeService)
 					.setIconColor(changedProfile.color)
 					.setLocationIcon(changedProfile.locationIcon)
-					.setNavigationIcon(changedProfile.navigationIcon)
-					.setOrder(ApplicationMode.allPossibleValues().size());
+					.setNavigationIcon(changedProfile.navigationIcon);
 
 			app.getSettings().copyPreferencesFromProfile(changedProfile.parent, builder.getApplicationMode());
 			ApplicationMode mode = ApplicationMode.saveProfile(builder, app);

From a016b138f36ec3daf5ceaff0979e19ccc2ae294b Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Fri, 31 Jan 2020 12:58:43 +0200
Subject: [PATCH 22/24] Add check for app mode bean prefs ids

---
 OsmAnd/src/net/osmand/plus/OsmandSettings.java |  9 +++++++++
 OsmAnd/src/net/osmand/plus/SettingsHelper.java | 16 +++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 70f4e97a68..cab71717e4 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -3681,6 +3681,15 @@ public class OsmandSettings {
 			DRIVING_REGION_AUTOMATIC
 	};
 
+	String[] appModeBeanPrefsIds = new String[] {
+			ICON_COLOR.getId(),
+			ICON_RES_NAME.getId(),
+			PARENT_APP_MODE.getId(),
+			ROUTING_PROFILE.getId(),
+			ROUTE_SERVICE.getId(),
+			USER_PROFILE_NAME.getId()
+	};
+
 	public class PreferencesDataStore extends PreferenceDataStore {
 
 		private ApplicationMode appMode;
diff --git a/OsmAnd/src/net/osmand/plus/SettingsHelper.java b/OsmAnd/src/net/osmand/plus/SettingsHelper.java
index 9d50161966..0d4fd1afc0 100644
--- a/OsmAnd/src/net/osmand/plus/SettingsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/SettingsHelper.java
@@ -10,9 +10,9 @@ import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 
 import net.osmand.PlatformUtil;
+import net.osmand.plus.ApplicationMode.ApplicationModeBean;
 import net.osmand.plus.ApplicationMode.ApplicationModeBuilder;
 import net.osmand.plus.OsmandSettings.OsmandPreference;
-import net.osmand.plus.ApplicationMode.ApplicationModeBean;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
@@ -35,10 +35,12 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
@@ -402,15 +404,19 @@ public class SettingsHelper {
 		private ApplicationMode appMode;
 		private ApplicationModeBuilder builder;
 		private ApplicationModeBean modeBean;
+		private Set<String> appModeBeanPrefsIds;
+
 
 		public ProfileSettingsItem(@NonNull OsmandSettings settings, @NonNull ApplicationMode appMode) {
 			super(SettingsItemType.PROFILE, settings);
 			this.appMode = appMode;
+			appModeBeanPrefsIds = new HashSet<>(Arrays.asList(settings.appModeBeanPrefsIds));
 		}
 
 		public ProfileSettingsItem(@NonNull OsmandSettings settings, @NonNull JSONObject json) throws JSONException {
 			super(SettingsItemType.PROFILE, settings, json);
 			readFromJson(settings.getContext(), json);
+			appModeBeanPrefsIds = new HashSet<>(Arrays.asList(settings.appModeBeanPrefsIds));
 		}
 
 		@NonNull
@@ -473,7 +479,9 @@ public class SettingsHelper {
 			return new OsmandSettingsItemReader(this, getSettings()) {
 				@Override
 				protected void readPreferenceFromJson(@NonNull OsmandPreference<?> preference, @NonNull JSONObject json) throws JSONException {
-					preference.readFromJson(json, appMode);
+					if (!appModeBeanPrefsIds.contains(preference.getId())) {
+						preference.readFromJson(json, appMode);
+					}
 				}
 			};
 		}
@@ -484,7 +492,9 @@ public class SettingsHelper {
 			return new OsmandSettingsItemWriter(this, getSettings()) {
 				@Override
 				protected void writePreferenceToJson(@NonNull OsmandPreference<?> preference, @NonNull JSONObject json) throws JSONException {
-					preference.writeToJson(json, appMode);
+					if (!appModeBeanPrefsIds.contains(preference.getId())) {
+						preference.writeToJson(json, appMode);
+					}
 				}
 			};
 		}

From cb6fc9284272e6e8e9c390899f3b30e31c7d6ae4 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Fri, 31 Jan 2020 13:36:00 +0200
Subject: [PATCH 23/24] Fix custom modes initial order

---
 OsmAnd/src/net/osmand/plus/ApplicationMode.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 64f920a69e..859f1c4c8a 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -518,7 +518,10 @@ public class ApplicationMode {
 		for (String appModeKey : settings.getCustomAppModesKeys()) {
 			Object profilePreferences = settings.getProfilePreferences(appModeKey);
 			String parent = settings.PARENT_APP_MODE.getValue(profilePreferences, null);
+			int order = settings.APP_MODE_ORDER.getValue(profilePreferences, values.size());
+
 			ApplicationModeBuilder builder = createCustomMode(valueOfStringKey(parent, CAR), appModeKey);
+			builder.setOrder(order);
 			builder.customReg(app);
 		}
 	}

From acddd4f4ff0864df6deed59a964e36f5d9fc5c3e Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Fri, 31 Jan 2020 16:25:29 +0200
Subject: [PATCH 24/24] Add profile params to mode bean

---
 OsmAnd/src/net/osmand/plus/ApplicationMode.java | 12 ++++++++++++
 OsmAnd/src/net/osmand/plus/OsmandSettings.java  |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 859f1c4c8a..c2437af48f 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -593,6 +593,9 @@ public class ApplicationMode {
 		builder.setIconColor(modeBean.iconColor);
 		builder.setRoutingProfile(modeBean.routingProfile);
 		builder.setRouteService(modeBean.routeService);
+		builder.setLocationIcon(modeBean.locIcon);
+		builder.setNavigationIcon(modeBean.navIcon);
+		builder.setOrder(modeBean.order);
 
 		return builder;
 	}
@@ -606,6 +609,9 @@ public class ApplicationMode {
 		mb.parent = parentAppMode != null ? parentAppMode.getStringKey() : null;
 		mb.routeService = getRouteService();
 		mb.routingProfile = getRoutingProfile();
+		mb.locIcon = getLocationIcon();
+		mb.navIcon = getNavigationIcon();
+		mb.order = getOrder();
 		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
 		return gson.toJson(mb);
 	}
@@ -798,5 +804,11 @@ public class ApplicationMode {
 		String routingProfile = null;
 		@Expose
 		RouteService routeService = RouteService.OSMAND;
+		@Expose
+		LocationIcon locIcon = null;
+		@Expose
+		NavigationIcon navIcon = null;
+		@Expose
+		int order = -1;
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index cab71717e4..ae338eff10 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -3687,7 +3687,10 @@ public class OsmandSettings {
 			PARENT_APP_MODE.getId(),
 			ROUTING_PROFILE.getId(),
 			ROUTE_SERVICE.getId(),
-			USER_PROFILE_NAME.getId()
+			USER_PROFILE_NAME.getId(),
+			LOCATION_ICON.getId(),
+			NAVIGATION_ICON.getId(),
+			APP_MODE_ORDER.getId()
 	};
 
 	public class PreferencesDataStore extends PreferenceDataStore {