Merge pull request #11466 from osmandapp/PlanRouteLendscape

Plan Route: Lendscape

OsmAnd/res/layout-land/fragment_measurement_tool.xml

@@ -67,6 +67,19 @@
                     android:background="@null"
                     tools:src="@drawable/ic_action_ruler"/>
 
+                <include
+                    layout="@layout/custom_icon_radio_buttons"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="@dimen/content_padding_half"
+                    android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+                    android:layout_marginRight="@dimen/content_padding_half"
+                    android:layout_marginStart="@dimen/bottom_sheet_content_margin"
+                    android:background="@null" />
+
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/up_down_button"
                     android:layout_width="wrap_content"
@@ -79,6 +92,7 @@
                     android:layout_marginRight="@dimen/bottom_sheet_content_margin"
                     android:layout_marginStart="@dimen/bottom_sheet_content_margin"
                     android:background="@null"
+                    android:visibility="gone"
                     tools:src="@drawable/ic_action_arrow_down"/>
 
                 <TextView

OsmAnd/res/layout-land/map_hud_top.xml

@@ -659,6 +659,7 @@
         <!-- CENTER -->
 
         <FrameLayout
+            android:id="@+id/top_controls_container"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
 

OsmAnd/res/layout/custom_icon_radio_buttons.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/custom_radio_buttons"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="?attr/btn_bg_border_inactive"
+    android:baselineAligned="false"
+    android:minHeight="@dimen/dialog_button_height"
+    android:orientation="horizontal">
+
+    <include
+        layout="@layout/custom_radio_btn_icon_item"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1" />
+
+    <include
+        layout="@layout/custom_radio_btn_icon_item"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1" />
+
+</LinearLayout>

OsmAnd/res/layout/custom_radio_btn_icon_item.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:background="?attr/selectableItemBackground"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/content_padding_small_half"
+    android:paddingBottom="@dimen/content_padding_small_half"
+    android:paddingLeft="@dimen/content_padding_small"
+    android:paddingRight="@dimen/content_padding_small">
+    
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/icon"
+        android:layout_width="@dimen/standard_icon_size"
+        android:layout_height="@dimen/standard_icon_size"
+        android:layout_gravity="center"
+        tools:src="@drawable/ic_action_info_dark"/>
+
+</FrameLayout>

OsmAnd/res/layout/measurement_tool_graph_card.xml

@@ -4,6 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/list_background_color"
+    android:clickable="true"
+    android:focusable="true"
     android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView

OsmAnd/src/net/osmand/plus/base/ModeSelectionBottomSheet.java

@@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentManager;
 
 import net.osmand.AndroidUtils;
 import net.osmand.plus.R;
-import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem;
 
 import java.util.Collections;
 import java.util.List;

OsmAnd/src/net/osmand/plus/base/MultipleSelectionWithModeBottomSheet.java

@@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentManager;
 
-import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem;
 
 import java.util.List;
 

OsmAnd/src/net/osmand/plus/base/SelectionBottomSheet.java

@@ -19,8 +19,9 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.SimpleDividerItem;
 import net.osmand.plus.helpers.AndroidUiHelper;
-import net.osmand.plus.widgets.MultiStateToggleButton;
+import net.osmand.plus.widgets.multistatetoggle.MultiStateToggleButton;
-import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem;
+import net.osmand.plus.widgets.multistatetoggle.TextToggleButton;
 import net.osmand.util.Algorithms;
 import net.osmand.view.ThreeStateCheckbox;
 
@@ -91,7 +92,7 @@ public abstract class SelectionBottomSheet extends MenuBottomSheetDialogFragment
 		secondaryDescription = view.findViewById(R.id.secondary_description);
 		selectedSize = view.findViewById(R.id.selected_size);
 		toggleContainer = view.findViewById(R.id.custom_radio_buttons);
-		radioGroup = new MultiStateToggleButton(app, toggleContainer, nightMode);
+		radioGroup = new TextToggleButton(app, toggleContainer, nightMode);
 		selectAllButton = view.findViewById(R.id.select_all_button);
 		checkBoxTitle = view.findViewById(R.id.check_box_title);
 		checkBox = view.findViewById(R.id.check_box);

OsmAnd/src/net/osmand/plus/download/SelectIndexesUiHelper.java

@@ -15,8 +15,9 @@ import net.osmand.plus.base.SelectionBottomSheet;
 import net.osmand.plus.base.SelectionBottomSheet.OnApplySelectionListener;
 import net.osmand.plus.base.SelectionBottomSheet.OnUiInitializedAdapter;
 import net.osmand.plus.base.SelectionBottomSheet.SelectableItem;
-import net.osmand.plus.widgets.MultiStateToggleButton.OnRadioItemClickListener;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem;
-import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem.OnRadioItemClickListener;
+import net.osmand.plus.widgets.multistatetoggle.TextToggleButton.TextRadioItem;
 import net.osmand.util.Algorithms;
 
 import java.text.DateFormat;
@@ -176,7 +177,7 @@ public class SelectIndexesUiHelper {
 	private RadioItem createSrtmRadioBtn(int titleId,
 	                                     final boolean useMeters) {
 		String title = Algorithms.capitalizeFirstLetter(app.getString(titleId));
-		RadioItem radioItem = new RadioItem(title);
+		RadioItem radioItem = new TextRadioItem(title);
 		radioItem.setOnClickListener(new OnRadioItemClickListener() {
 			@Override
 			public boolean onRadioItemClick(RadioItem radioItem, View view) {

OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsBottomSheet.java

@@ -42,9 +42,10 @@ import net.osmand.plus.liveupdates.LiveUpdatesHelper.UpdateFrequency;
 import net.osmand.plus.resources.IncrementalChangesManager;
 import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.widgets.MultiStateToggleButton;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem;
-import net.osmand.plus.widgets.MultiStateToggleButton.OnRadioItemClickListener;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem.OnRadioItemClickListener;
-import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem;
+import net.osmand.plus.widgets.multistatetoggle.TextToggleButton;
+import net.osmand.plus.widgets.multistatetoggle.TextToggleButton.TextRadioItem;
 import net.osmand.plus.widgets.TextViewEx;
 import net.osmand.plus.widgets.style.CustomTypefaceSpan;
 import net.osmand.util.Algorithms;
@@ -83,8 +84,8 @@ public class LiveUpdatesSettingsBottomSheet extends MenuBottomSheetDialogFragmen
 	private BaseBottomSheetItem itemFrequencyHelpMessage;
 	private BaseBottomSheetItem itemClear;
 	private BaseBottomSheetItem itemViaWiFi;
-	private MultiStateToggleButton frequencyToggleButton;
+	private TextToggleButton frequencyToggleButton;
-	private MultiStateToggleButton timeOfDayToggleButton;
+	private TextToggleButton timeOfDayToggleButton;
 
 	private String fileName;
 	private OnLiveUpdatesForLocalChange onLiveUpdatesForLocalChange;
@@ -195,9 +196,9 @@ public class LiveUpdatesSettingsBottomSheet extends MenuBottomSheetDialogFragmen
 
 		String morning = getString(R.string.morning);
 		String night = getString(R.string.night);
-		RadioItem morningButton = new RadioItem(morning);
+		TextRadioItem morningButton = new TextRadioItem(morning);
-		RadioItem nightButton = new RadioItem(night);
+		TextRadioItem nightButton = new TextRadioItem(night);
-		timeOfDayToggleButton = new MultiStateToggleButton(app, itemTimeOfDayButtons, nightMode);
+		timeOfDayToggleButton = new TextToggleButton(app, itemTimeOfDayButtons, nightMode);
 		timeOfDayToggleButton.setItems(morningButton, nightButton);
 		setSelectedRadioItem(timeOfDayToggleButton, timeOfDayPreference.get(), morningButton, nightButton);
 		timeOfDayToggleButton.updateView(localUpdatePreference.get());
@@ -231,10 +232,10 @@ public class LiveUpdatesSettingsBottomSheet extends MenuBottomSheetDialogFragmen
 		String hourly = getString(R.string.hourly);
 		String daily = getString(R.string.daily);
 		String weekly = getString(R.string.weekly);
-		RadioItem hourlyButton = new RadioItem(hourly);
+		TextRadioItem hourlyButton = new TextRadioItem(hourly);
-		RadioItem dailyButton = new RadioItem(daily);
+		TextRadioItem dailyButton = new TextRadioItem(daily);
-		RadioItem weeklyButton = new RadioItem(weekly);
+		TextRadioItem weeklyButton = new TextRadioItem(weekly);
-		frequencyToggleButton = new MultiStateToggleButton(app, itemFrequencyButtons, nightMode);
+		frequencyToggleButton = new TextToggleButton(app, itemFrequencyButtons, nightMode);
 		frequencyToggleButton.setItems(hourlyButton, dailyButton, weeklyButton);
 		setSelectedRadioItem(frequencyToggleButton, frequencyPreference.get(), hourlyButton, dailyButton, weeklyButton);
 		frequencyToggleButton.updateView(localUpdatePreference.get());
@@ -467,7 +468,7 @@ public class LiveUpdatesSettingsBottomSheet extends MenuBottomSheetDialogFragmen
 		return dividerItem;
 	}
 
-	private void setSelectedRadioItem(MultiStateToggleButton toggleButton, int position, RadioItem... buttons) {
+	private void setSelectedRadioItem(TextToggleButton toggleButton, int position, TextRadioItem... buttons) {
 		toggleButton.setSelectedItem(buttons[position]);
 	}
 

OsmAnd/src/net/osmand/plus/measurementtool/GraphsCard.java

@@ -24,6 +24,7 @@ import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper.LineGraphType;
 import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter;
@@ -109,9 +110,16 @@ public class GraphsCard extends BaseCard implements OnUpdateInfoListener {
 
 		GraphAdapterHelper.bindGraphAdapters(commonGraphAdapter, Collections.singletonList((BaseGraphAdapter) customGraphAdapter), (ViewGroup) view);
 		refreshMapCallback = GraphAdapterHelper.bindToMap(commonGraphAdapter, mapActivity, trackDetailsMenu);
+		updateTopPadding();
 		fullUpdate();
 	}
 
+	private void updateTopPadding() {
+		int topPadding = AndroidUiHelper.isOrientationPortrait(mapActivity) ?
+				0 : app.getResources().getDimensionPixelSize(R.dimen.content_padding_small);
+		view.setPadding(0, topPadding, 0, 0);
+	}
+
 	@Override
 	public int getCardLayoutId() {
 		return R.layout.measurement_tool_graph_card;

OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java

@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.view.ViewGroup.MarginLayoutParams;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -82,9 +83,13 @@ import net.osmand.plus.views.layers.MapControlsLayer.MapControlsThemeInfoProvide
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarControllerType;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarView;
-import net.osmand.plus.widgets.MultiStateToggleButton;
+import net.osmand.plus.widgets.multistatetoggle.IconToggleButton;
-import net.osmand.plus.widgets.MultiStateToggleButton.OnRadioItemClickListener;
+import net.osmand.plus.widgets.multistatetoggle.IconToggleButton.IconRadioItem;
-import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem;
+import net.osmand.plus.widgets.multistatetoggle.MultiStateToggleButton;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem.OnRadioItemClickListener;
+import net.osmand.plus.widgets.multistatetoggle.TextToggleButton;
+import net.osmand.plus.widgets.multistatetoggle.TextToggleButton.TextRadioItem;
 import net.osmand.router.RoutePlannerFrontEnd.GpxRouteApproximation;
 import net.osmand.util.Algorithms;
 
@@ -130,6 +135,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	private RadioItem graphBtn;
 	private View mainView;
 	private View bottomMapControls;
+	private View topMapControls;
 	private ImageView upDownBtn;
 	private ImageView undoBtn;
 	private ImageView redoBtn;
@@ -251,7 +257,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			public void showProgressBar() {
 				MeasurementToolFragment.this.showProgressBar();
 				updateInfoView();
-				updateCardContainerSize();
+				updateInfoViewAppearance();
 			}
 
 			@Override
@@ -264,7 +270,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 				((ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar)).setVisibility(View.INVISIBLE);
 				progressBarVisible = false;
 				updateInfoView();
-				updateCardContainerSize();
+				updateInfoViewAppearance();
 			}
 
 			@Override
@@ -288,30 +294,37 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 
 		mainView = view.findViewById(R.id.main_view);
 		detailsMenu = new GraphDetailsMenu();
+		LinearLayout infoButtonsContainer = mainView.findViewById(R.id.custom_radio_buttons);
 		if (portrait) {
 			cardsContainer = mainView.findViewById(R.id.cards_container);
+			infoTypeBtn = new TextToggleButton(app, infoButtonsContainer, nightMode);
 
 			String pointsBtnTitle = getString(R.string.shared_string_gpx_points);
-			pointsBtn = new RadioItem(pointsBtnTitle);
+			pointsBtn = new TextRadioItem(pointsBtnTitle);
-			pointsBtn.setOnClickListener(getInfoTypeBtnListener(InfoType.POINTS));
 
 			String graphBtnTitle = getString(R.string.shared_string_graph);
-			graphBtn = new RadioItem(graphBtnTitle);
+			graphBtn = new TextRadioItem(graphBtnTitle);
-			graphBtn.setOnClickListener(getInfoTypeBtnListener(InfoType.GRAPH));
 
-			LinearLayout infoButtonsContainer = mainView.findViewById(R.id.custom_radio_buttons);
-			infoTypeBtn = new MultiStateToggleButton(app, infoButtonsContainer, nightMode);
-			infoTypeBtn.setItems(pointsBtn, graphBtn);
 		} else {
 			cardsContainer = mapActivity.findViewById(R.id.left_side_menu);
 			bottomMapControls = mapActivity.findViewById(R.id.bottom_controls_container);
+			topMapControls = mapActivity.findViewById(R.id.top_controls_container);
+
+			infoTypeBtn = new IconToggleButton(app, infoButtonsContainer, nightMode);
+			pointsBtn = new IconRadioItem(R.drawable.ic_action_plan_route_point_colored, true);
+			graphBtn = new IconRadioItem(R.drawable.ic_action_analyze_intervals);
+
 			ScrollUtils.addOnGlobalLayoutListener(mainView, new Runnable() {
 				@Override
 				public void run() {
-					updateCardContainerSize();
+					updateInfoViewAppearance();
 				}
 			});
 		}
+		pointsBtn.setOnClickListener(getInfoTypeBtnListener(InfoType.POINTS));
+		graphBtn.setOnClickListener(getInfoTypeBtnListener(InfoType.GRAPH));
+		infoTypeBtn.setItems(pointsBtn, graphBtn);
+
 		pointsCard = new PointsCard(mapActivity, this);
 		graphsCard = new GraphsCard(mapActivity, detailsMenu, this);
 
@@ -347,7 +360,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			public void onClick(View v) {
 				if (infoExpanded) {
 					collapseInfoView();
-				} else if (setInfoType(InfoType.POINTS) && portrait) {
+				} else if (setInfoType(InfoType.POINTS)) {
 					infoTypeBtn.setSelectedItem(pointsBtn);
 				}
 			}
@@ -625,7 +638,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		if (portrait) {
 			setMapPosition(OsmandSettings.MIDDLE_TOP_CONSTANT);
 		} else {
-			shiftBottomMapControls(false);
+			shiftMapControls(false);
 			setMapPosition(OsmandSettings.LANDSCAPE_MIDDLE_RIGHT_CONSTANT);
 		}
 		cardsContainer.setVisibility(View.VISIBLE);
@@ -639,15 +652,14 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	}
 
 	private void collapseInfoView() {
-		cardsContainer.setVisibility(View.GONE);
-		if (portrait) {
-			infoTypeBtn.setSelectedItem(null);
-		} else {
-			shiftBottomMapControls(true);
-		}
 		infoExpanded = false;
 		currentInfoType = null;
-		setDefaultMapPosition();
+		cardsContainer.setVisibility(View.GONE);
+		if (!portrait) {
+			shiftMapControls(true);
+		}
+		infoTypeBtn.setSelectedItem(null);
+		moveMapToDefaultPosition();
 		updateUpDownBtn();
 	}
 
@@ -675,37 +687,37 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		}
 	}
 
-	private void updateCardContainerSize() {
+	private void updateInfoViewAppearance() {
-		if (portrait) {
+		if (portrait) return;
-			return;
+
+		View toolsPanel = mainView.findViewById(R.id.measure_mode_controls);
+		View snapToRoadProgress = mainView.findViewById(R.id.snap_to_road_progress_bar);
+
+		int infoViewWidth = mainView.getWidth() - toolsPanel.getWidth();
+		int bottomMargin = toolsPanel.getHeight();
+		if (progressBarVisible) {
+			bottomMargin += snapToRoadProgress.getHeight();
 		}
-		View measureModeControls = mainView.findViewById(R.id.measure_mode_controls);
+
-		int width = mainView.getWidth() - measureModeControls.getWidth();
+		ViewGroup.MarginLayoutParams params = null;
-		int bottomMargin = measureModeControls.getHeight();
-		bottomMargin = progressBarVisible ? bottomMargin + mainView.findViewById(R.id.snap_to_road_progress_bar).getHeight() : bottomMargin;
 		if (mainView.getParent() instanceof FrameLayout) {
-			FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(width, -1);
+			params = new FrameLayout.LayoutParams(infoViewWidth, -1);
-			params.setMargins(0, 0, 0, bottomMargin);
-			cardsContainer.setLayoutParams(params);
 		} else if (mainView.getParent() instanceof LinearLayout) {
-			LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(width, -1);
+			params = new LinearLayout.LayoutParams(infoViewWidth, -1);
-			params.setMargins(0, 0, 0, bottomMargin);
+		}
+		if (params != null) {
+			AndroidUtils.setMargins(params, 0, 0, 0, bottomMargin);
 			cardsContainer.setLayoutParams(params);
 		}
 	}
 
-	private void shiftBottomMapControls(boolean toInitialPosition) {
+	private void shiftMapControls(boolean toInitialPosition) {
-		if (portrait) {
+		boolean isLayoutRtl = AndroidUtils.isLayoutRtl(getContext());
-			return;
+		int shiftPosition = toInitialPosition ? 0 : cardsContainer.getWidth();
-		}
+		int start = isLayoutRtl ? 0 : shiftPosition;
-		int leftMargin = toInitialPosition ? 0 : cardsContainer.getWidth();
+		int end = isLayoutRtl ? shiftPosition : 0;
-		if (bottomMapControls.getParent() instanceof LinearLayout) {
+		AndroidUtils.setMargins((MarginLayoutParams) bottomMapControls.getLayoutParams(), start, 0, end, 0);
-			LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) bottomMapControls.getLayoutParams();
+		AndroidUtils.setMargins((MarginLayoutParams) topMapControls.getLayoutParams(), start, 0, end, 0);
-			params.setMargins(leftMargin, 0, 0, 0);
-		} else if (bottomMapControls.getParent() instanceof FrameLayout) {
-			FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) bottomMapControls.getLayoutParams();
-			params.setMargins(leftMargin, 0, 0, 0);
-		}
 	}
 
 	public boolean isInEditMode() {
@@ -771,7 +783,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			mapActivity.getMapLayers().getMapControlsLayer().addThemeInfoProviderTag(TAG);
 			mapActivity.getMapLayers().getMapControlsLayer().showMapControlsIfHidden();
 			cachedMapPosition = mapActivity.getMapView().getMapPosition();
-			setDefaultMapPosition();
+			moveMapToDefaultPosition();
 			addInitialPoint();
 		}
 	}
@@ -1195,7 +1207,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 
 	@Override
 	public void onCloseMenu() {
-		setDefaultMapPosition();
+		moveMapToDefaultPosition();
 	}
 
 	@Override
@@ -1640,7 +1652,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		updateInfoView();
 	}
 
-	private void setDefaultMapPosition() {
+	private void moveMapToDefaultPosition() {
 		setMapPosition(OsmandSettings.CENTER_CONSTANT);
 	}
 

OsmAnd/src/net/osmand/plus/routing/cards/RouteLineColorCard.java

@@ -32,9 +32,10 @@ import net.osmand.plus.settings.fragments.HeaderUiAdapter;
 import net.osmand.plus.track.AppearanceViewHolder;
 import net.osmand.plus.track.ColorsCard;
 import net.osmand.plus.track.CustomColorBottomSheet.ColorPickerListener;
-import net.osmand.plus.widgets.MultiStateToggleButton;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem;
-import net.osmand.plus.widgets.MultiStateToggleButton.OnRadioItemClickListener;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem.OnRadioItemClickListener;
-import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem;
+import net.osmand.plus.widgets.multistatetoggle.TextToggleButton;
+import net.osmand.plus.widgets.multistatetoggle.TextToggleButton.TextRadioItem;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -134,17 +135,17 @@ public class RouteLineColorCard extends BaseCard implements CardListener, ColorP
 	}
 
 	private void setupRadioGroup(LinearLayout buttonsContainer) {
-		RadioItem day = createMapThemeButton(false);
+		TextRadioItem day = createMapThemeButton(false);
-		RadioItem night = createMapThemeButton(true);
+		TextRadioItem night = createMapThemeButton(true);
 
-		MultiStateToggleButton radioGroup = new MultiStateToggleButton(app, buttonsContainer, nightMode);
+		TextToggleButton radioGroup = new TextToggleButton(app, buttonsContainer, nightMode);
 		radioGroup.setItems(day, night);
 
 		radioGroup.setSelectedItem(!isNightMap() ? day : night);
 	}
 
-	private RadioItem createMapThemeButton(final boolean isNight) {
+	private TextRadioItem createMapThemeButton(final boolean isNight) {
-		RadioItem item = new RadioItem(app.getString(!isNight ? DAY_TITLE_ID : NIGHT_TITLE_ID));
+		TextRadioItem item = new TextRadioItem(app.getString(!isNight ? DAY_TITLE_ID : NIGHT_TITLE_ID));
 		item.setOnClickListener(new OnRadioItemClickListener() {
 			@Override
 			public boolean onRadioItemClick(RadioItem radioItem, View view) {

OsmAnd/src/net/osmand/plus/track/SplitIntervalBottomSheet.java

@@ -22,12 +22,12 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
-import net.osmand.plus.base.bottomsheetmenu.simpleitems.LongDescriptionItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
 import net.osmand.plus.helpers.AndroidUiHelper;
-import net.osmand.plus.widgets.MultiStateToggleButton;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem;
-import net.osmand.plus.widgets.MultiStateToggleButton.OnRadioItemClickListener;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem.OnRadioItemClickListener;
-import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem;
+import net.osmand.plus.widgets.multistatetoggle.TextToggleButton;
+import net.osmand.plus.widgets.multistatetoggle.TextToggleButton.TextRadioItem;
 
 import org.apache.commons.logging.Log;
 
@@ -120,11 +120,11 @@ public class SplitIntervalBottomSheet extends MenuBottomSheetDialogFragment {
 	}
 
 	private void setupTypeRadioGroup(LinearLayout buttonsContainer) {
-		RadioItem none = createRadioButton(GpxSplitType.NO_SPLIT, R.string.shared_string_none);
+		TextRadioItem none = createRadioButton(GpxSplitType.NO_SPLIT, R.string.shared_string_none);
-		RadioItem time = createRadioButton(GpxSplitType.TIME, R.string.shared_string_time);
+		TextRadioItem time = createRadioButton(GpxSplitType.TIME, R.string.shared_string_time);
-		RadioItem distance = createRadioButton(GpxSplitType.DISTANCE, R.string.distance);
+		TextRadioItem distance = createRadioButton(GpxSplitType.DISTANCE, R.string.distance);
 
-		MultiStateToggleButton radioGroup = new MultiStateToggleButton(app, buttonsContainer, nightMode);
+		TextToggleButton radioGroup = new TextToggleButton(app, buttonsContainer, nightMode);
 		radioGroup.setItems(none, time, distance);
 
 		if (selectedSplitType == GpxSplitType.NO_SPLIT) {
@@ -134,9 +134,9 @@ public class SplitIntervalBottomSheet extends MenuBottomSheetDialogFragment {
 		}
 	}
 
-	private RadioItem createRadioButton(final GpxSplitType splitType, int titleId) {
+	private TextRadioItem createRadioButton(final GpxSplitType splitType, int titleId) {
 		String title = app.getString(titleId);
-		RadioItem item = new RadioItem(title);
+		TextRadioItem item = new TextRadioItem(title);
 		item.setOnClickListener(new OnRadioItemClickListener() {
 			@Override
 			public boolean onRadioItemClick(RadioItem radioItem, View view) {

OsmAnd/src/net/osmand/plus/widgets/multistatetoggle/IconToggleButton.java

@@ -0,0 +1,70 @@
+package net.osmand.plus.widgets.multistatetoggle;
+
+import android.graphics.drawable.Drawable;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.widgets.multistatetoggle.IconToggleButton.IconRadioItem;
+
+public class IconToggleButton extends MultiStateToggleButton<IconRadioItem> {
+
+	public IconToggleButton(@NonNull OsmandApplication app,
+	                        @NonNull LinearLayout container,
+	                        boolean nightMode) {
+		super(app, container, nightMode);
+	}
+
+	@Override
+	protected int getRadioItemLayoutId() {
+		return R.layout.custom_radio_btn_icon_item;
+	}
+
+	@Override
+	protected void initItemView(@NonNull ViewGroup view,
+	                            @NonNull IconRadioItem item) {
+		if (item.isUseDefaultColor()) {
+			ImageView ivIcon = view.findViewById(R.id.icon);
+			ivIcon.setImageDrawable(uiUtilities.getIcon(item.getIconId()));
+		}
+	}
+
+	@Override
+	protected void updateItemView(@NonNull ViewGroup view,
+	                              @NonNull IconRadioItem item,
+	                              @ColorInt int color) {
+		if (!item.isUseDefaultColor()) {
+			ImageView ivIcon = view.findViewById(R.id.icon);
+			Drawable icon = uiUtilities.getPaintedIcon(item.getIconId(), color);
+			ivIcon.setImageDrawable(icon);
+		}
+	}
+
+	public static class IconRadioItem extends RadioItem {
+
+		private final int iconId;
+		private final boolean useDefaultColor;
+
+		public IconRadioItem(int iconId) {
+			this(iconId, false);
+		}
+
+		public IconRadioItem(int iconId, boolean useDefaultColor) {
+			this.iconId = iconId;
+			this.useDefaultColor = useDefaultColor;
+		}
+
+		public int getIconId() {
+			return iconId;
+		}
+
+		public boolean isUseDefaultColor() {
+			return useDefaultColor;
+		}
+	}
+}

OsmAnd/src/net/osmand/plus/widgets/multistatetoggle/MultiStateToggleButton.java

@@ -1,4 +1,4 @@
-package net.osmand.plus.widgets;
+package net.osmand.plus.widgets.multistatetoggle;
 
 import android.graphics.Color;
 import android.graphics.drawable.GradientDrawable;
@@ -6,46 +6,58 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
 import net.osmand.AndroidUtils;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
+import net.osmand.plus.widgets.multistatetoggle.RadioItem.OnRadioItemClickListener;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collection;
 import java.util.List;
 
-public class MultiStateToggleButton {
+public abstract class MultiStateToggleButton<_Radio extends RadioItem> {
 
-	private List<RadioItem> items = new ArrayList<>();
+	protected final OsmandApplication app;
-	private OsmandApplication app;
+	protected final UiUtilities uiUtilities;
-	private List<ViewGroup> buttons = new ArrayList<>();
-	private List<View> dividers = new ArrayList<>();
-	private RadioItem selectedItem;
 
-	private LinearLayout container;
+	private final LinearLayout container;
-	private boolean nightMode;
+	private final List<ViewGroup> buttons = new ArrayList<>();
+	private final List<View> dividers = new ArrayList<>();
 
-	public MultiStateToggleButton(OsmandApplication app, LinearLayout container, boolean nightMode) {
+	protected final List<_Radio> items = new ArrayList<>();
+	protected final boolean nightMode;
+	protected boolean isEnabled;
+	protected RadioItem selectedItem;
+
+	public MultiStateToggleButton(@NonNull OsmandApplication app,
+	                              @NonNull LinearLayout container,
+	                              boolean nightMode) {
 		this.app = app;
+		this.uiUtilities = app.getUIUtilities();
 		this.container = container;
 		this.nightMode = nightMode;
 	}
 
-	public void setItems(Collection<RadioItem> radioItems) {
+	public void setItems(Collection<_Radio> radioItems) {
 		if (radioItems == null || radioItems.size() < 2) return;
 		items.clear();
 		items.addAll(radioItems);
 		initView();
 	}
 
-	public void setItems(RadioItem firstBtn, RadioItem secondBtn, RadioItem... other) {
+	@SafeVarargs
+	public final void setItems(@NonNull _Radio firstBtn,
+	                           @NonNull _Radio secondBtn,
+	                           @Nullable _Radio... other) {
 		items.clear();
 		items.add(firstBtn);
 		items.add(secondBtn);
@@ -55,6 +67,11 @@ public class MultiStateToggleButton {
 		initView();
 	}
 
+	public final void setSelectedItem(@Nullable RadioItem selectedItem) {
+		this.selectedItem = selectedItem;
+		updateView();
+	}
+
 	private void initView() {
 		buttons.clear();
 		dividers.clear();
@@ -68,16 +85,10 @@ public class MultiStateToggleButton {
 		updateView();
 	}
 
-	private boolean isLastItem(int index) {
+	private void createBtn(@NonNull final _Radio item) {
-		return index == items.size() - 1;
-	}
-
-	private void createBtn(@NonNull final RadioItem item) {
 		LayoutInflater inflater = UiUtilities.getInflater(app, nightMode);
 		ViewGroup button = (ViewGroup) inflater.inflate(
-				R.layout.custom_radio_btn_text_item, container, false);
+				getRadioItemLayoutId(), container, false);
-		TextView title = button.findViewById(R.id.title);
-		title.setText(item.getTitle());
 		button.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -87,6 +98,7 @@ public class MultiStateToggleButton {
 				}
 			}
 		});
+		initItemView(button, item);
 		buttons.add(button);
 		container.addView(button);
 	}
@@ -103,11 +115,6 @@ public class MultiStateToggleButton {
 		container.addView(divider);
 	}
 
-	public void setSelectedItem(RadioItem selectedItem) {
-		this.selectedItem = selectedItem;
-		updateView();
-	}
-
 	private void updateView() {
 		updateView(true);
 	}
@@ -131,15 +138,14 @@ public class MultiStateToggleButton {
 
 		showAllDividers();
 		for (int i = 0; i < items.size(); i++) {
-			RadioItem item = items.get(i);
+			_Radio item = items.get(i);
 			ViewGroup container = buttons.get(i);
 			container.setEnabled(isEnabled);
-			TextView tvTitle = (TextView) container.findViewById(R.id.title);
 			if (selectedItem == item) {
 				if (i == 0) {
 					background.setCornerRadii(isLayoutRtl ? rightBtnRadii : leftBtnRadii);
 					hideDividers(0);
-				} else if (i == items.size() - 1) {
+				} else if (isLastItem(i)) {
 					background.setCornerRadii(isLayoutRtl ? leftBtnRadii : rightBtnRadii);
 					hideDividers(dividers.size() - 1);
 				} else {
@@ -147,14 +153,21 @@ public class MultiStateToggleButton {
 					hideDividers(i - 1, i);
 				}
 				container.setBackgroundDrawable(background);
-				tvTitle.setTextColor(textColor);
+				updateItemView(container, item, textColor);
 			} else {
 				container.setBackgroundColor(Color.TRANSPARENT);
-				tvTitle.setTextColor(activeColor);
+				updateItemView(container, item, activeColor);
 			}
 		}
 	}
 
+	protected abstract int getRadioItemLayoutId();
+
+	protected abstract void initItemView(@NonNull ViewGroup view, @NonNull _Radio item);
+
+	protected abstract void updateItemView(@NonNull ViewGroup view, @NonNull _Radio item,
+	                                       @ColorInt int color);
+
 	private void showAllDividers() {
 		for (View divider : dividers) {
 			divider.setVisibility(View.VISIBLE);
@@ -169,28 +182,7 @@ public class MultiStateToggleButton {
 		}
 	}
 
-	public static class RadioItem {
+	private boolean isLastItem(int index) {
-		private String title;
+		return index == items.size() - 1;
-		private OnRadioItemClickListener listener;
-
-		public RadioItem(String title) {
-			this.title = title;
-		}
-
-		public void setOnClickListener(OnRadioItemClickListener listener) {
-			this.listener = listener;
-		}
-
-		public String getTitle() {
-			return title;
-		}
-
-		public OnRadioItemClickListener getListener() {
-			return listener;
-		}
-	}
-
-	public interface OnRadioItemClickListener {
-		boolean onRadioItemClick(RadioItem radioItem, View view);
 	}
 }

OsmAnd/src/net/osmand/plus/widgets/multistatetoggle/RadioItem.java

@@ -0,0 +1,20 @@
+package net.osmand.plus.widgets.multistatetoggle;
+
+import android.view.View;
+
+public class RadioItem {
+
+	private OnRadioItemClickListener listener;
+
+	public void setOnClickListener(OnRadioItemClickListener listener) {
+		this.listener = listener;
+	}
+
+	public OnRadioItemClickListener getListener() {
+		return listener;
+	}
+
+	public interface OnRadioItemClickListener {
+		boolean onRadioItemClick(RadioItem radioItem, View view);
+	}
+}

OsmAnd/src/net/osmand/plus/widgets/multistatetoggle/TextToggleButton.java

@@ -0,0 +1,54 @@
+package net.osmand.plus.widgets.multistatetoggle;
+
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.widgets.multistatetoggle.TextToggleButton.TextRadioItem;
+
+public class TextToggleButton extends MultiStateToggleButton<TextRadioItem> {
+
+	public TextToggleButton(@NonNull OsmandApplication app,
+	                        @NonNull LinearLayout container,
+	                        boolean nightMode) {
+		super(app, container, nightMode);
+	}
+
+	@Override
+	protected int getRadioItemLayoutId() {
+		return R.layout.custom_radio_btn_text_item;
+	}
+
+	@Override
+	protected void initItemView(@NonNull ViewGroup view, @NonNull TextRadioItem item) {
+		TextView title = view.findViewById(R.id.title);
+		title.setText(item.getTitle());
+	}
+
+	@Override
+	protected void updateItemView(@NonNull ViewGroup view,
+	                              @NonNull TextRadioItem item,
+	                              @ColorInt int color) {
+		TextView tvTitle = (TextView) view.findViewById(R.id.title);
+		tvTitle.setTextColor(color);
+	}
+
+	public static class TextRadioItem extends RadioItem {
+
+		private final String title;
+
+		public TextRadioItem(String title) {
+			this.title = title;
+		}
+
+		public String getTitle() {
+			return title;
+		}
+	}
+
+}