From f98ad9ae9eee902d2bdf51825e0542876c94e8a4 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Mon, 23 Dec 2019 16:21:24 +0200
Subject: [PATCH 1/3] Small profiles fixes

---
 OsmAnd/res/layout/bottom_buttons.xml          | 30 +++++++
 OsmAnd/res/layout/bottom_sheet_menu_base.xml  | 28 +-----
 .../layout/edit_profiles_list_fragment.xml    | 23 +----
 .../layout/preference_cancel_save_button.xml  | 44 ---------
 .../res/layout/preference_dropdown_list.xml   | 89 ++++++++++---------
 OsmAnd/res/layout/preference_text_field.xml   | 49 +++++-----
 OsmAnd/res/xml/navigation_settings_new.xml    | 14 +--
 .../src/net/osmand/plus/ApplicationMode.java  | 26 ++++--
 .../plus/profiles/EditProfilesFragment.java   | 21 ++---
 .../plus/settings/MainSettingsFragment.java   |  5 +-
 .../plus/settings/NavigationFragment.java     |  3 +-
 .../settings/ProfileAppearanceFragment.java   | 24 +++--
 12 files changed, 163 insertions(+), 193 deletions(-)
 create mode 100644 OsmAnd/res/layout/bottom_buttons.xml
 delete mode 100644 OsmAnd/res/layout/preference_cancel_save_button.xml

diff --git a/OsmAnd/res/layout/bottom_buttons.xml b/OsmAnd/res/layout/bottom_buttons.xml
new file mode 100644
index 0000000000..6c40ad7130
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_buttons.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/buttons_container"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/dialog_button_ex_height"
+	android:gravity="center"
+	android:layout_gravity="bottom"
+	android:orientation="horizontal"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding">
+
+	<include
+		android:id="@+id/dismiss_button"
+		layout="@layout/bottom_sheet_dialog_button" />
+
+	<View
+		android:id="@+id/buttons_divider"
+		android:layout_width="@dimen/content_padding"
+		android:layout_height="match_parent"
+		android:visibility="gone"
+		tools:visibility="visible" />
+
+	<include
+		android:id="@+id/right_bottom_button"
+		layout="@layout/bottom_sheet_dialog_button"
+		android:visibility="gone"
+		tools:visibility="visible" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/bottom_sheet_menu_base.xml b/OsmAnd/res/layout/bottom_sheet_menu_base.xml
index 19aa0c91b7..323d5569e1 100644
--- a/OsmAnd/res/layout/bottom_sheet_menu_base.xml
+++ b/OsmAnd/res/layout/bottom_sheet_menu_base.xml
@@ -26,32 +26,6 @@
 		android:orientation="vertical"
 		android:visibility="gone" />
 
-	<LinearLayout
-		android:id="@+id/buttons_container"
-		android:layout_width="match_parent"
-		android:layout_height="@dimen/dialog_button_ex_height"
-		android:gravity="center"
-		android:orientation="horizontal"
-		android:paddingLeft="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding">
-
-		<include
-			android:id="@+id/dismiss_button"
-			layout="@layout/bottom_sheet_dialog_button" />
-
-		<View
-			android:id="@+id/buttons_divider"
-			android:layout_width="@dimen/content_padding"
-			android:layout_height="match_parent"
-			android:visibility="gone"
-			tools:visibility="visible" />
-
-		<include
-			android:id="@+id/right_bottom_button"
-			layout="@layout/bottom_sheet_dialog_button"
-			android:visibility="gone"
-			tools:visibility="visible" />
-
-	</LinearLayout>
+	<include layout="@layout/bottom_buttons" />
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/edit_profiles_list_fragment.xml b/OsmAnd/res/layout/edit_profiles_list_fragment.xml
index 53d992555a..36eaaaf6cc 100644
--- a/OsmAnd/res/layout/edit_profiles_list_fragment.xml
+++ b/OsmAnd/res/layout/edit_profiles_list_fragment.xml
@@ -36,32 +36,17 @@
 				android:id="@+id/buttons_shadow"
 				android:layout_width="match_parent"
 				android:layout_height="10dp"
-				android:layout_gravity="bottom"
 				android:background="@drawable/bg_contextmenu_shadow_top_light" />
 
 			<LinearLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_gravity="bottom"
-				android:background="?attr/list_background_color"
-				android:orientation="horizontal"
-				android:paddingLeft="@dimen/content_padding"
-				android:paddingTop="@dimen/content_padding_small"
-				android:paddingRight="@dimen/content_padding"
-				android:paddingBottom="@dimen/content_padding_small">
+				android:background="?attr/list_background_color">
 
 				<include
-					android:id="@+id/cancel_button"
-					layout="@layout/bottom_sheet_dialog_button" />
-
-				<View
-					android:id="@+id/buttons_divider"
-					android:layout_width="@dimen/content_padding"
-					android:layout_height="match_parent" />
-
-				<include
-					android:id="@+id/apply_button"
-					layout="@layout/bottom_sheet_dialog_button" />
+					layout="@layout/bottom_buttons"
+					android:layout_width="match_parent"
+					android:layout_height="@dimen/dialog_button_ex_height" />
 
 			</LinearLayout>
 
diff --git a/OsmAnd/res/layout/preference_cancel_save_button.xml b/OsmAnd/res/layout/preference_cancel_save_button.xml
deleted file mode 100644
index ac9d07b7b1..0000000000
--- a/OsmAnd/res/layout/preference_cancel_save_button.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		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"
-		style="@style/Widget.AppCompat.Button.ButtonBar.AlertDialog"
-		android:layout_width="0dp"
-		android:layout_height="36dp"
-		android:layout_marginStart="@dimen/list_content_padding"
-		android:layout_marginLeft="@dimen/list_content_padding"
-		android:layout_marginTop="@dimen/card_padding"
-		android:layout_marginEnd="8dp"
-		android:layout_marginRight="8dp"
-		android:layout_marginBottom="@dimen/card_padding"
-		android:layout_weight="1"
-		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"
-		style="@style/Widget.AppCompat.Button.ButtonBar.AlertDialog"
-		android:layout_width="0dp"
-		android:layout_height="36dp"
-		android:layout_marginStart="8dp"
-		android:layout_marginLeft="8dp"
-		android:layout_marginTop="@dimen/card_padding"
-		android:layout_marginEnd="@dimen/list_content_padding"
-		android:layout_marginRight="@dimen/list_content_padding"
-		android:layout_marginBottom="@dimen/card_padding"
-		android:layout_weight="1"
-		android:background="?attr/profile_save_btn"
-		android:text="@string/shared_string_save"
-		android:textAllCaps="false"
-		android:textColor="@color/color_white" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/preference_dropdown_list.xml b/OsmAnd/res/layout/preference_dropdown_list.xml
index 39b91cc8c7..b8bf803801 100644
--- a/OsmAnd/res/layout/preference_dropdown_list.xml
+++ b/OsmAnd/res/layout/preference_dropdown_list.xml
@@ -1,54 +1,55 @@
 <?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:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/list_header_top_margin"
-        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">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
 
-        <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"/>
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/list_content_padding"
+		android:layout_marginLeft="@dimen/list_content_padding"
+		android:layout_marginTop="@dimen/list_header_top_margin"
+		android:layout_marginEnd="@dimen/list_content_padding"
+		android:layout_marginRight="@dimen/list_content_padding"
+		android:layout_marginBottom="8dp">
 
-        <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/master_profile">
+		<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" />
 
-            <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"
+		<net.osmand.plus.widgets.OsmandTextFieldBoxes
+			android:id="@+id/master_profile_otfb"
+			android:layout_width="match_parent"
+			android:layout_height="60dp"
+			app:labelText="@string/master_profile"
+			app:primaryColor="@color/active_color_primary_dark"
+			app:secondaryColor="?android:textColorSecondary">
 
-                tools:text="Car"/>
+			<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>
+		</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
+			android:id="@+id/select_nav_type_btn"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:clickable="true"
+			android:focusable="true" />
+
+	</FrameLayout>
 
-    </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/preference_text_field.xml b/OsmAnd/res/layout/preference_text_field.xml
index 64a1c20e1f..c8fd71c944 100644
--- a/OsmAnd/res/layout/preference_text_field.xml
+++ b/OsmAnd/res/layout/preference_text_field.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android: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">
+	<net.osmand.plus.widgets.OsmandTextFieldBoxes
+		android:id="@+id/profile_name_otfb"
+		android:layout_width="0dp"
+		android:layout_height="60dp"
+		android:layout_margin="@dimen/list_content_padding"
+		android:layout_weight="1"
+		app:labelText="@string/profile_name_hint"
+		app:primaryColor="@color/active_color_primary_dark"
+		app:secondaryColor="?android:textColorSecondary">
 
-            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
-                android:id="@+id/profile_name_et"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:lines="1"
-                android:singleLine="true"
-                tools:text="@string/lorem_ipsum"/>
+		<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+			android:id="@+id/profile_name_et"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:lines="1"
+			android:maxLines="1"
+			android:singleLine="true"
+			tools:text="@string/lorem_ipsum" />
+
+	</net.osmand.plus.widgets.OsmandTextFieldBoxes>
 
-        </net.osmand.plus.widgets.OsmandTextFieldBoxes>
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/xml/navigation_settings_new.xml b/OsmAnd/res/xml/navigation_settings_new.xml
index 27fe337ccc..50df1cdf35 100644
--- a/OsmAnd/res/xml/navigation_settings_new.xml
+++ b/OsmAnd/res/xml/navigation_settings_new.xml
@@ -11,13 +11,13 @@
 		android:title="@string/nav_type_hint"
 		tools:icon="@drawable/ic_action_car_dark" />
 
-    <Preference
-        android:key="route_parameters"
-        android:layout="@layout/preference_with_descr"
-        android:summary="@string/route_parameters_descr"
-        android:title="@string/route_parameters"
-        app:fragment="net.osmand.plus.settings.RouteParametersFragment"
-        tools:icon="@drawable/ic_action_route_distance" />
+	<Preference
+		android:key="route_parameters"
+		android:layout="@layout/preference_with_descr"
+		android:summary="@string/route_parameters_descr"
+		android:title="@string/route_parameters"
+		app:fragment="net.osmand.plus.settings.RouteParametersFragment"
+		tools:icon="@drawable/ic_action_route_distance" />
 
 	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
 		android:key="show_routing_alarms"
diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index e82c9ba463..f35b2bc76f 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -412,7 +412,13 @@ public class ApplicationMode {
 	}
 
 	public static List<ApplicationMode> getCustomValues() {
-		return customValues;
+		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
@@ -656,12 +662,11 @@ public class ApplicationMode {
 	public static void reorderAppModes() {
 		Comparator<ApplicationMode> comparator = new Comparator<ApplicationMode>() {
 			@Override
-			public int compare(ApplicationMode o1, ApplicationMode o2) {
-				return (o1.order < o2.order) ? -1 : ((o1.order == o2.order) ? 0 : 1);
+			public int compare(ApplicationMode mode1, ApplicationMode mode2) {
+				return (mode1.order < mode2.order) ? -1 : ((mode1.order == mode2.order) ? 0 : 1);
 			}
 		};
 		Collections.sort(values, comparator);
-		Collections.sort(customValues, comparator);
 		Collections.sort(defaultValues, comparator);
 		Collections.sort(cachedFilteredValues, comparator);
 	}
@@ -734,7 +739,7 @@ public class ApplicationMode {
 		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
 
 		List<ApplicationModeBean> defaultModeBeans = createApplicationModeBeans(defaultValues);
-		List<ApplicationModeBean> customModeBeans = createApplicationModeBeans(customValues);
+		List<ApplicationModeBean> customModeBeans = createApplicationModeBeans(getCustomValues());
 
 		String defaultProfiles = gson.toJson(defaultModeBeans);
 		String customProfiles = gson.toJson(customModeBeans);
@@ -744,7 +749,7 @@ public class ApplicationMode {
 	}
 
 	private static void saveAppModesToSettings(OsmandSettings settings, boolean saveCustomModes) {
-		List<ApplicationMode> appModes = saveCustomModes ? customValues : defaultValues;
+		List<ApplicationMode> appModes = saveCustomModes ? getCustomValues() : defaultValues;
 		List<ApplicationModeBean> modeBeans = createApplicationModeBeans(appModes);
 
 		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
@@ -808,8 +813,13 @@ public class ApplicationMode {
 	}
 
 	public static void deleteCustomModes(List<ApplicationMode> modes, OsmandApplication app) {
-		values.removeAll(modes);
-		customValues.removeAll(modes);
+		Iterator<ApplicationMode> it = values.iterator();
+		while (it.hasNext()) {
+			ApplicationMode m = it.next();
+			if (modes.contains(m)) {
+				it.remove();
+			}
+		}
 		cachedFilteredValues.removeAll(modes);
 		saveAppModesToSettings(app.getSettings(), true);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
index 901562e2e1..f8bc935ed1 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
@@ -50,15 +50,13 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 	@Nullable
 	@Override
 	public View onCreateView(@NonNull final LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-		final MapActivity mapActivity = (MapActivity) requireActivity();
+		OsmandApplication app = requireMyApplication();
 		if (savedInstanceState != null && savedInstanceState.containsKey(APP_MODES_ORDER_KEY) && savedInstanceState.containsKey(DELETED_APP_MODES_KEY)) {
 			appModesOrders = (HashMap<String, Integer>) savedInstanceState.getSerializable(APP_MODES_ORDER_KEY);
 			deletedModesKeys = savedInstanceState.getStringArrayList(DELETED_APP_MODES_KEY);
 		} else {
-			List<ApplicationMode> appModes = ApplicationMode.allPossibleValues();
-			for (int i = 0; i < appModes.size(); i++) {
-				ApplicationMode mode = appModes.get(i);
-				appModesOrders.put(mode.getStringKey(), i);
+			for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
+				appModesOrders.put(mode.getStringKey(), mode.getOrder());
 			}
 		}
 		View mainView = inflater.inflate(R.layout.edit_profiles_list_fragment, container, false);
@@ -82,7 +80,7 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 		RecyclerView recyclerView = mainView.findViewById(R.id.profiles_list);
 		recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-		adapter = new EditProfilesAdapter(mapActivity);
+		adapter = new EditProfilesAdapter(app);
 		updateItems();
 
 		final ItemTouchHelper touchHelper = new ItemTouchHelper(new ReorderItemTouchHelperCallback(adapter));
@@ -125,7 +123,7 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 
 		recyclerView.setAdapter(adapter);
 
-		View cancelButton = mainView.findViewById(R.id.cancel_button);
+		View cancelButton = mainView.findViewById(R.id.dismiss_button);
 		UiUtilities.setupDialogButton(false, cancelButton, UiUtilities.DialogButtonType.SECONDARY, R.string.shared_string_cancel);
 		cancelButton.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -137,8 +135,11 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 			}
 		});
 
-		View applyButton = mainView.findViewById(R.id.apply_button);
+		mainView.findViewById(R.id.buttons_divider).setVisibility(View.VISIBLE);
+
+		View applyButton = mainView.findViewById(R.id.right_bottom_button);
 		UiUtilities.setupDialogButton(false, applyButton, UiUtilities.DialogButtonType.PRIMARY, R.string.shared_string_apply);
+		applyButton.setVisibility(View.VISIBLE);
 		applyButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -271,9 +272,9 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 
 		private boolean nightMode;
 
-		EditProfilesAdapter(MapActivity mapActivity) {
+		EditProfilesAdapter(OsmandApplication app) {
 			setHasStableIds(true);
-			app = mapActivity.getMyApplication();
+			this.app = app;
 			uiUtilities = app.getUIUtilities();
 			nightMode = !app.getSettings().isLightContent();
 		}
diff --git a/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java
index ebe67d362e..fc21889ed7 100644
--- a/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java
@@ -40,6 +40,7 @@ public class MainSettingsFragment extends BaseSettingsFragment {
 	private static final String CREATE_PROFILE = "create_profile";
 	private static final String IMPORT_PROFILE = "import_profile";
 	private static final String REORDER_PROFILES = "reorder_profiles";
+
 	private List<ApplicationMode> allAppModes;
 	private Set<ApplicationMode> availableAppModes;
 	private SelectProfileListener selectProfileListener = null;
@@ -89,7 +90,7 @@ public class MainSettingsFragment extends BaseSettingsFragment {
 
 	@Override
 	public boolean onPreferenceChange(Preference preference, Object newValue) {
-        ApplicationMode applicationMode = ApplicationMode.valueOfStringKey(preference.getKey(), null);
+		ApplicationMode applicationMode = ApplicationMode.valueOfStringKey(preference.getKey(), null);
 		if (applicationMode != null) {
 			if (newValue instanceof Boolean) {
 				boolean isChecked = (Boolean) newValue;
@@ -121,7 +122,7 @@ public class MainSettingsFragment extends BaseSettingsFragment {
 	}
 
 	private void setupConfigureProfilePref() {
-        ApplicationMode selectedMode = app.getSettings().APPLICATION_MODE.get();
+		ApplicationMode selectedMode = app.getSettings().APPLICATION_MODE.get();
 		String title = selectedMode.toHumanString(getContext());
 		String profileType = getAppModeDescription(getContext(), selectedMode);
 		int iconRes = selectedMode.getIconRes();
diff --git a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
index 7b8be26915..3ed69b7afe 100644
--- a/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java
@@ -27,8 +27,9 @@ public class NavigationFragment extends BaseSettingsFragment {
 
 	public static final String TAG = NavigationFragment.class.getSimpleName();
 	public static final String NAVIGATION_TYPE = "navigation_type";
+
 	private SelectProfileBottomSheetDialogFragment.SelectProfileListener navTypeListener;
-	List<RoutingProfileDataObject> routingProfileDataObjects;
+	private List<RoutingProfileDataObject> routingProfileDataObjects;
 	private Preference navigationType;
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
index 45b6b56001..089cdd8b97 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
@@ -20,7 +20,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -30,6 +29,7 @@ import net.osmand.PlatformUtil;
 import net.osmand.plus.ApplicationMode;
 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.SelectProfileBottomSheetDialogFragment;
 import net.osmand.plus.profiles.SettingsProfileFragment;
@@ -134,12 +134,22 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View view = super.onCreateView(inflater, container, savedInstanceState);
 		if (view != null) {
-			FrameLayout frameLayout = view.findViewById(android.R.id.list_container);
-			View inflatedLayout = UiUtilities.getInflater(getContext(), isNightMode())
-					.inflate(R.layout.preference_cancel_save_button, frameLayout, false);
-			frameLayout.addView(inflatedLayout);
-			Button cancelButton = inflatedLayout.findViewById(R.id.cancel_button);
-			Button saveButton = inflatedLayout.findViewById(R.id.save_profile_btn);
+			FrameLayout preferencesContainer = view.findViewById(android.R.id.list_container);
+			LayoutInflater themedInflater = UiUtilities.getInflater(getContext(), isNightMode());
+			View buttonsContainer = themedInflater.inflate(R.layout.bottom_buttons, preferencesContainer, false);
+
+			preferencesContainer.addView(buttonsContainer);
+			View cancelButton = buttonsContainer.findViewById(R.id.dismiss_button);
+			View saveButton = buttonsContainer.findViewById(R.id.right_bottom_button);
+
+			saveButton.setVisibility(View.VISIBLE);
+			buttonsContainer.findViewById(R.id.buttons_divider).setVisibility(View.VISIBLE);
+
+			AndroidUtils.setBackground(getContext(), buttonsContainer, isNightMode(), R.color.list_background_color_light, R.color.list_background_color_dark);
+
+			UiUtilities.setupDialogButton(false, cancelButton, DialogButtonType.SECONDARY, R.string.shared_string_cancel);
+			UiUtilities.setupDialogButton(false, saveButton, DialogButtonType.PRIMARY, R.string.shared_string_save);
+
 			cancelButton.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {

From 1a83b4c847c974bbc202336d8092253d172bb316 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Tue, 24 Dec 2019 10:02:38 +0200
Subject: [PATCH 2/3] Fix profiles reorder

---
 OsmAnd/src/net/osmand/plus/ApplicationMode.java   | 14 ++++++++++----
 .../plus/profiles/EditProfilesFragment.java       | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index f35b2bc76f..7c8499d484 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -52,7 +52,6 @@ public class ApplicationMode {
 	private static Map<String, Set<ApplicationMode>> widgetsAvailabilityMap = new LinkedHashMap<>();
 
 	private static List<ApplicationMode> defaultValues = new ArrayList<>();
-	private static List<ApplicationMode> customValues = new ArrayList<>();
 	private static List<ApplicationMode> values = new ArrayList<>();
 	private static List<ApplicationMode> cachedFilteredValues = new ArrayList<>();
 
@@ -194,6 +193,9 @@ public class ApplicationMode {
 		private ApplicationMode reg() {
 			values.add(applicationMode);
 			defaultValues.add(applicationMode);
+			if (applicationMode.getOrder() == 0 && !values.isEmpty()) {
+				applicationMode.setOrder(values.size());
+			}
 			return applicationMode;
 		}
 
@@ -213,7 +215,9 @@ public class ApplicationMode {
 			m.locationIconDayLost = m.parentAppMode.locationIconDayLost;
 			m.locationIconNightLost = m.parentAppMode.locationIconNightLost;
 			values.add(applicationMode);
-			customValues.add(applicationMode);
+			if (applicationMode.getOrder() == 0 && !values.isEmpty()) {
+				applicationMode.setOrder(values.size());
+			}
 			return applicationMode;
 		}
 
@@ -677,9 +681,11 @@ public class ApplicationMode {
 
 		ApplicationModeBuilder b = createCustomMode(valueOfStringKey(mb.parent, null),
 				mb.userProfileName, mb.stringKey);
-		b.setRouteService(mb.routeService).setRoutingProfile(mb.routingProfile);
+		b.setRouteService(mb.routeService);
+		b.setRoutingProfile(mb.routingProfile);
 		b.icon(app, mb.iconName);
 		b.setColor(mb.iconColor);
+		b.setOrder(mb.order);
 		return b;
 	}
 
@@ -692,6 +698,7 @@ public class ApplicationMode {
 		mb.stringKey = stringKey;
 		mb.routeService = routeService;
 		mb.routingProfile = routingProfile;
+		mb.order = order;
 		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
 		return gson.toJson(mb);
 	}
@@ -807,7 +814,6 @@ public class ApplicationMode {
 				it.remove();
 			}
 		}
-		customValues.remove(md);
 		cachedFilteredValues.remove(md);
 		saveAppModesToSettings(app.getSettings(), md.isCustomProfile());
 	}
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
index f8bc935ed1..325c135f74 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
@@ -391,11 +391,16 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 			Object itemFrom = getItem(from);
 			Object itemTo = getItem(to);
 			if (itemFrom instanceof EditProfileDataObject && itemTo instanceof EditProfileDataObject) {
-				EditProfileDataObject profileDataObjectFrom = (EditProfileDataObject) itemFrom;
-				EditProfileDataObject profileDataObjectTo = (EditProfileDataObject) itemTo;
-				int tmp = profileDataObjectFrom.getOrder();
-				appModesOrders.put(profileDataObjectFrom.getStringKey(), profileDataObjectTo.getOrder());
-				appModesOrders.put(profileDataObjectTo.getStringKey(), tmp);
+				EditProfileDataObject profileFrom = (EditProfileDataObject) itemFrom;
+				EditProfileDataObject profileTo = (EditProfileDataObject) itemTo;
+
+				int orderFrom = profileFrom.getOrder();
+				int orderTo = profileTo.getOrder();
+
+				profileFrom.setOrder(orderTo);
+				profileTo.setOrder(orderFrom);
+				appModesOrders.put(profileFrom.getStringKey(), orderTo);
+				appModesOrders.put(profileTo.getStringKey(), orderFrom);
 
 				Collections.swap(items, from, to);
 				notifyItemMoved(from, to);

From bb0ccd33f5ced8a10eb3cef7efbc1c8ba096c12b Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Tue, 24 Dec 2019 12:19:42 +0200
Subject: [PATCH 3/3] Fix UI in edit profiles screen

---
 .../MeasurementToolFragment.java              |  2 +-
 .../adapter/MeasurementToolAdapter.java       |  2 +-
 .../plus/profiles/EditProfilesFragment.java   | 41 +++++++++++++++++++
 .../quickaction/QuickActionListFragment.java  |  6 +--
 .../plus/quickaction/SwitchableAction.java    |  2 +-
 .../ReorderItemTouchHelperCallback.java       |  2 +-
 6 files changed, 48 insertions(+), 7 deletions(-)
 rename OsmAnd/src/net/osmand/plus/{profiles => views/controls}/ReorderItemTouchHelperCallback.java (97%)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 907779eb4b..13fdaa5270 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -68,7 +68,7 @@ import net.osmand.plus.measurementtool.command.ClearPointsCommand;
 import net.osmand.plus.measurementtool.command.MovePointCommand;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
 import net.osmand.plus.measurementtool.command.ReorderPointCommand;
-import net.osmand.plus.profiles.ReorderItemTouchHelperCallback;
+import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index cd5fb5c3de..9e0b157c9e 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -20,7 +20,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.measurementtool.NewGpxData.ActionType;
-import net.osmand.plus.profiles.ReorderItemTouchHelperCallback;
+import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
index 325c135f74..c3ceb7dc3a 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
@@ -29,6 +29,7 @@ import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.BaseOsmAndFragment;
 import net.osmand.plus.settings.BaseSettingsFragment;
+import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,6 +48,9 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 
 	private EditProfilesAdapter adapter;
 
+	private boolean nightMode;
+	private boolean wasDrawerDisabled;
+
 	@Nullable
 	@Override
 	public View onCreateView(@NonNull final LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -59,6 +63,8 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 				appModesOrders.put(mode.getStringKey(), mode.getOrder());
 			}
 		}
+		nightMode = !app.getSettings().isLightContent();
+
 		View mainView = inflater.inflate(R.layout.edit_profiles_list_fragment, container, false);
 		AndroidUtils.addStatusBarPadding21v(getContext(), mainView);
 
@@ -186,6 +192,41 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 		outState.putStringArrayList(DELETED_APP_MODES_KEY, deletedModesKeys);
 	}
 
+	@Override
+	public void onResume() {
+		super.onResume();
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			wasDrawerDisabled = mapActivity.isDrawerDisabled();
+			if (!wasDrawerDisabled) {
+				mapActivity.disableDrawer();
+			}
+		}
+	}
+
+	public void onPause() {
+		super.onPause();
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null && !wasDrawerDisabled) {
+			mapActivity.enableDrawer();
+		}
+	}
+
+	@Override
+	public int getStatusBarColorId() {
+		return nightMode ? R.color.status_bar_color_dark : R.color.status_bar_color_light;
+	}
+
+	@Nullable
+	public MapActivity getMapActivity() {
+		FragmentActivity activity = getActivity();
+		if (activity instanceof MapActivity) {
+			return (MapActivity) activity;
+		} else {
+			return null;
+		}
+	}
+
 	public List<EditProfileDataObject> getProfiles(boolean deleted) {
 		List<EditProfileDataObject> profiles = new ArrayList<>();
 		for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
index 66bce540dd..998a1464a1 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
@@ -28,9 +28,9 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.BaseOsmAndFragment;
-import net.osmand.plus.profiles.ReorderItemTouchHelperCallback;
-import net.osmand.plus.profiles.ReorderItemTouchHelperCallback.UnmovableItem;
-import net.osmand.plus.profiles.ReorderItemTouchHelperCallback.OnItemMoveCallback;
+import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
+import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback.UnmovableItem;
+import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback.OnItemMoveCallback;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/SwitchableAction.java b/OsmAnd/src/net/osmand/plus/quickaction/SwitchableAction.java
index abad8a7432..3c8dcd9464 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/SwitchableAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/SwitchableAction.java
@@ -20,7 +20,7 @@ import android.widget.TextView;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dialogs.SelectMapViewQuickActionsBottomSheet;
-import net.osmand.plus.profiles.ReorderItemTouchHelperCallback;
+import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/OsmAnd/src/net/osmand/plus/profiles/ReorderItemTouchHelperCallback.java b/OsmAnd/src/net/osmand/plus/views/controls/ReorderItemTouchHelperCallback.java
similarity index 97%
rename from OsmAnd/src/net/osmand/plus/profiles/ReorderItemTouchHelperCallback.java
rename to OsmAnd/src/net/osmand/plus/views/controls/ReorderItemTouchHelperCallback.java
index c6b72e413a..832f7a10fa 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/ReorderItemTouchHelperCallback.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/ReorderItemTouchHelperCallback.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.profiles;
+package net.osmand.plus.views.controls;
 
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;