From a0d57b39cf8dbc4bb7ca4020043c8e887b930669 Mon Sep 17 00:00:00 2001
From: androiddevkotlin <64539346+androiddevkotlin@users.noreply.github.com>
Date: Tue, 2 Feb 2021 13:28:19 +0200
Subject: [PATCH] hillshade/terrain toggle fix

---
 OsmAnd/res/layout/center_button_container.xml |  2 +-
 OsmAnd/res/layout/custom_radio_buttons.xml    |  5 +++--
 OsmAnd/res/layout/left_button_container.xml   |  2 +-
 OsmAnd/res/layout/right_button_container.xml  |  2 +-
 OsmAnd/src/net/osmand/plus/UiUtilities.java   | 21 +++++++++++--------
 .../plus/myplaces/GPXItemPagerAdapter.java    |  6 +++++-
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/res/layout/center_button_container.xml b/OsmAnd/res/layout/center_button_container.xml
index 99858650dc..05fa83eae0 100644
--- a/OsmAnd/res/layout/center_button_container.xml
+++ b/OsmAnd/res/layout/center_button_container.xml
@@ -8,7 +8,7 @@
 	android:layout_weight="1">
 
 	<net.osmand.plus.widgets.TextViewEx
-		android:id="@+id/tab_title"
+		android:id="@+id/center_button"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:background="?attr/selectableItemBackground"
diff --git a/OsmAnd/res/layout/custom_radio_buttons.xml b/OsmAnd/res/layout/custom_radio_buttons.xml
index 2ea2775d62..6ad61aa700 100644
--- a/OsmAnd/res/layout/custom_radio_buttons.xml
+++ b/OsmAnd/res/layout/custom_radio_buttons.xml
@@ -3,12 +3,12 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/custom_radio_buttons"
 	android:layout_width="match_parent"
-	android:minHeight="@dimen/dialog_button_height"
 	android:layout_height="wrap_content"
 	android:layout_marginStart="@dimen/content_padding"
 	android:layout_marginEnd="@dimen/content_padding"
 	android:background="?attr/btn_bg_border_inactive"
 	android:baselineAligned="false"
+	android:minHeight="@dimen/dialog_button_height"
 	android:orientation="horizontal"
 	tools:showIn="@layout/fragment_route_between_points_bottom_sheet_dialog">
 
@@ -22,7 +22,8 @@
 		layout="@layout/center_button_container"
 		android:layout_width="0dp"
 		android:layout_height="match_parent"
-		android:layout_weight="1" />
+		android:layout_weight="1"
+		android:visibility="gone" />
 
 	<include
 		layout="@layout/right_button_container"
diff --git a/OsmAnd/res/layout/left_button_container.xml b/OsmAnd/res/layout/left_button_container.xml
index 3370e554aa..c30305819c 100644
--- a/OsmAnd/res/layout/left_button_container.xml
+++ b/OsmAnd/res/layout/left_button_container.xml
@@ -8,7 +8,7 @@
 	android:layout_weight="1">
 
 	<net.osmand.plus.widgets.TextViewEx
-		android:id="@+id/tab_title"
+		android:id="@+id/left_button"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:background="?attr/selectableItemBackground"
diff --git a/OsmAnd/res/layout/right_button_container.xml b/OsmAnd/res/layout/right_button_container.xml
index ab24bdfcc9..98a99f991a 100644
--- a/OsmAnd/res/layout/right_button_container.xml
+++ b/OsmAnd/res/layout/right_button_container.xml
@@ -8,7 +8,7 @@
 	android:layout_weight="1">
 
 	<net.osmand.plus.widgets.TextViewEx
-		android:id="@+id/tab_title"
+		android:id="@+id/right_button"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:background="?attr/selectableItemBackground"
diff --git a/OsmAnd/src/net/osmand/plus/UiUtilities.java b/OsmAnd/src/net/osmand/plus/UiUtilities.java
index 5e5dc0db1e..aaa9d01f8b 100644
--- a/OsmAnd/src/net/osmand/plus/UiUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/UiUtilities.java
@@ -51,6 +51,7 @@ import net.osmand.AndroidUtils;
 import net.osmand.Location;
 import net.osmand.PlatformUtil;
 import net.osmand.data.LatLon;
+import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.views.DirectionDrawable;
 import net.osmand.plus.widgets.TextViewEx;
@@ -468,8 +469,8 @@ public class UiUtilities {
 			} else {
 				background.setCornerRadii(new float[]{radius, radius, 0, 0, 0, 0, radius, radius});
 			}
-			TextView startButtonText = startButtonContainer.findViewById(R.id.tab_title);
-			TextView endButtonText = endButtonContainer.findViewById(R.id.tab_title);
+			TextView startButtonText = startButtonContainer.findViewById(R.id.left_button);
+			TextView endButtonText = endButtonContainer.findViewById(R.id.right_button);
 
 			endButtonContainer.setBackgroundColor(Color.TRANSPARENT);
 			endButtonText.setTextColor(activeColor);
@@ -477,23 +478,25 @@ public class UiUtilities {
 			startButtonText.setTextColor(textColor);
 
 			if (centerButtonContainer != null) {
-				TextView centerButtonText = centerButtonContainer.findViewById(R.id.tab_title);
+				TextView centerButtonText = centerButtonContainer.findViewById(R.id.center_button);
 				centerButtonText.setTextColor(activeColor);
 				centerButtonContainer.setBackgroundColor(Color.TRANSPARENT);
 			}
 		} else if (buttonType == CustomRadioButtonType.CENTER) {
 			background.setCornerRadii(new float[] {0, 0, 0, 0, 0, 0, 0, 0});
 			centerButtonContainer.setBackgroundDrawable(background);
-			TextView centerButtonText = centerButtonContainer.findViewById(R.id.tab_title);
+			AndroidUiHelper.updateVisibility(centerButtonContainer, true);
+
+			TextView centerButtonText = centerButtonContainer.findViewById(R.id.center_button);
 			centerButtonText.setTextColor(textColor);
 
 			if (endButtonContainer != null) {
-				TextView endButtonText = endButtonContainer.findViewById(R.id.tab_title);
+				TextView endButtonText = endButtonContainer.findViewById(R.id.right_button);
 				endButtonText.setTextColor(activeColor);
 				endButtonContainer.setBackgroundColor(Color.TRANSPARENT);
 			}
 			if (startButtonContainer != null) {
-				TextView startButtonText = startButtonContainer.findViewById(R.id.tab_title);
+				TextView startButtonText = startButtonContainer.findViewById(R.id.left_button);
 				startButtonText.setTextColor(activeColor);
 				startButtonContainer.setBackgroundColor(Color.TRANSPARENT);
 			}
@@ -503,8 +506,8 @@ public class UiUtilities {
 			} else {
 				background.setCornerRadii(new float[]{0, 0, radius, radius, radius, radius, 0, 0});
 			}
-			TextView startButtonText = startButtonContainer.findViewById(R.id.tab_title);
-			TextView endButtonText = endButtonContainer.findViewById(R.id.tab_title);
+			TextView startButtonText = startButtonContainer.findViewById(R.id.left_button);
+			TextView endButtonText = endButtonContainer.findViewById(R.id.right_button);
 
 			endButtonContainer.setBackgroundDrawable(background);
 			endButtonText.setTextColor(textColor);
@@ -512,7 +515,7 @@ public class UiUtilities {
 			startButtonText.setTextColor(activeColor);
 
 			if (centerButtonContainer != null) {
-				TextView centerButtonText = centerButtonContainer.findViewById(R.id.tab_title);
+				TextView centerButtonText = centerButtonContainer.findViewById(R.id.center_button);
 				centerButtonText.setTextColor(activeColor);
 				centerButtonContainer.setBackgroundColor(Color.TRANSPARENT);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/GPXItemPagerAdapter.java b/OsmAnd/src/net/osmand/plus/myplaces/GPXItemPagerAdapter.java
index 0b167e4c97..4aad0a0951 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/GPXItemPagerAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/GPXItemPagerAdapter.java
@@ -573,8 +573,12 @@ public class GPXItemPagerAdapter extends PagerAdapter implements CustomTabProvid
 		} else {
 			layoutId = tripleTabsLayoutIds[position];
 		}
-		View tab = LayoutInflater.from(parent.getContext()).inflate(layoutId, parent, false);
+		ViewGroup tab = (ViewGroup) UiUtilities.getInflater(parent.getContext(), nightMode).inflate(layoutId, parent, false);
 		tab.setTag(tabTypes[position].name());
+		TextView title = (TextView) tab.getChildAt(0);
+		if (title != null) {
+			title.setText(getPageTitle(position));
+		}
 		return tab;
 	}