From 9655500ea998d66d3b61dfdb9f67e376e5960b9e Mon Sep 17 00:00:00 2001
From: veliymolfar <veliymolfar@gmailcom>
Date: Fri, 10 Apr 2020 12:54:57 +0300
Subject: [PATCH] slope/hillshade fixes

---
 OsmAnd/res/drawable/btn_bg_border_inactive.xml             | 2 +-
 OsmAnd/res/values/attrs.xml                                | 1 +
 OsmAnd/res/values/styles.xml                               | 2 ++
 OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java      | 4 ++++
 OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java | 6 +++---
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/drawable/btn_bg_border_inactive.xml b/OsmAnd/res/drawable/btn_bg_border_inactive.xml
index 844747ac35..dcf60ef7ed 100644
--- a/OsmAnd/res/drawable/btn_bg_border_inactive.xml
+++ b/OsmAnd/res/drawable/btn_bg_border_inactive.xml
@@ -4,7 +4,7 @@
 		<shape android:shape="rectangle">
 			<solid android:color="@android:color/transparent" />
 			<corners android:radius="4dp" />
-			<stroke android:width="1dp" android:color="?attr/secondary_icon_color" />
+			<stroke android:width="1dp" android:color="?attr/stroked_buttons_and_links_outline" />
 		</shape>
 	</item>
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index 750eb1993a..048cd83aca 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -34,6 +34,7 @@
         <attr name="ctx_menu_divider" format="reference" />
         <attr name="bottom_menu_view_bg" format="reference" />
         <attr name="left_menu_view_bg" format="reference" />
+        <attr name="stroked_buttons_and_links_outline" format="color" />
 
         <attr name="dashboard_divider" format="reference" />
 		<attr name="dashboard_button" format="reference" />
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index cea274876b..8fea939e8f 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -277,6 +277,7 @@
         <item name="colorBackgroundFloating">@color/list_background_color_light</item>
         <item name="android:colorBackgroundFloating">@color/list_background_color_light</item>
         <item name="preferenceTheme">@style/OsmandPreferenceTheme</item>
+        <item name="stroked_buttons_and_links_outline">@color/stroked_buttons_and_links_outline_light</item>
     </style>
 
     <style name="OverflowMenuButton" parent="@style/Widget.AppCompat.ActionButton.Overflow">
@@ -542,6 +543,7 @@
         <item name="colorBackgroundFloating">@color/list_background_color_dark</item>
         <item name="android:colorBackgroundFloating">@color/list_background_color_dark</item>
         <item name="preferenceTheme">@style/OsmandPreferenceTheme</item>
+        <item name="stroked_buttons_and_links_outline">@color/stroked_buttons_and_links_outline_dark</item>
     </style>
 
     <style name="FreeVersionBanner" parent="OsmandDarkTheme">
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
index 3f904f9f91..bdcdb63506 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
@@ -352,9 +352,13 @@ public class SRTMPlugin extends OsmandPlugin {
 					.setListener(listener).createItem());
 		}
 		boolean terrainEnabled = settings.TERRAIN.get();
+		TerrainMode terrainMode = settings.TERRAIN_MODE.get();
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
 				.setId(TERRAIN)
 				.setTitleId(R.string.shared_string_terrain, mapActivity)
+				.setDescription(app.getString(terrainMode == TerrainMode.HILLSHADE
+						? R.string.shared_string_hillshade
+						: R.string.shared_string_slope))
 				.setSelected(terrainEnabled)
 				.setColor(terrainEnabled ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
 				.setIcon(R.drawable.ic_action_hillshade_dark)
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java
index f923f4e416..3b1403f320 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java
@@ -225,8 +225,8 @@ public class TerrainFragment extends BaseOsmAndFragment implements View.OnClickL
 	public void onStopTrackingTouch(@NonNull Slider slider) {
 		switch (slider.getId()) {
 			case R.id.transparency_slider:
-				double d = (100 - slider.getValue()) * 2.55;
-				srtmPlugin.setTerrainTransparency((int) d, srtmPlugin.getTerrainMode());
+				double d = slider.getValue() * 2.55;
+				srtmPlugin.setTerrainTransparency((int) Math.ceil(d), srtmPlugin.getTerrainMode());
 				break;
 			case R.id.zoom_slider:
 				List<Float> values = slider.getValues();
@@ -260,7 +260,7 @@ public class TerrainFragment extends BaseOsmAndFragment implements View.OnClickL
 	private void updateUiMode() {
 		TerrainMode mode = srtmPlugin.getTerrainMode();
 		if (terrainEnabled) {
-			int transparencyValue = (int) (100 - srtmPlugin.getTerrainTransparency() / 2.55);
+			int transparencyValue = (int) (srtmPlugin.getTerrainTransparency() / 2.55);
 			String transparency = transparencyValue + "%";
 			int minZoom = Math.max(srtmPlugin.getTerrainMinZoom(), TERRAIN_MIN_ZOOM);
 			int maxZoom = Math.min(srtmPlugin.getTerrainMaxZoom(), TERRAIN_MAX_ZOOM);